From 5b1821e1cb33cbc456c4dbbb57c274795c977903 Mon Sep 17 00:00:00 2001 From: Igor Godlevskyi Date: Fri, 31 May 2019 16:57:58 +0300 Subject: [PATCH] Refactoring of file structure --- index.js | 2 -- lib/Notes/NoteCreatePage/NoteCreatePage.js | 4 ++-- lib/Notes/NoteEditPage/NoteEditPage.js | 4 ++-- lib/Notes/NoteForm/index.js | 2 -- lib/Notes/NoteViewPage/NoteViewPage.js | 6 +++--- .../NoteViewPage/components/NoteView/NoteView.css | 4 ++++ .../components/NoteView}/NoteView.js | 12 ++++++------ lib/Notes/NoteViewPage/components/NoteView/index.js | 1 + lib/Notes/NotesSmartAccordion/NotesSmartAccordion.js | 2 +- .../AssignmentsList/AssignmentsList.css | 0 .../AssignmentsList/AssignmentsList.js | 2 +- lib/Notes/{ => components}/AssignmentsList/index.js | 0 lib/Notes/{ => components}/NavigationModal/index.js | 0 .../NavigationModal/navigation-modal.js | 0 lib/Notes/{ => components}/NoteForm/NoteForm.css | 0 lib/Notes/{ => components}/NoteForm/NoteForm.js | 2 +- .../NoteForm/components/NoteFields/NoteFields.js | 0 .../NoteForm/components/NoteFields/index.js | 0 lib/Notes/components/NoteForm/index.js | 2 ++ lib/Notes/{ => components}/NoteForm/noteShapes.js | 0 .../NotesAccordion/NotesAccordion.css | 0 .../NotesAccordion/NotesAccordion.js | 0 .../NotesAssigningModal/NotesAssigningModal.css | 0 .../NotesAssigningModal/NotesAssigningModal.js | 4 ++-- .../components/NotesAssigningModal/constants.js | 0 .../components/NotesAssigningModal/index.js | 0 .../NotesAccordion/components/NotesList/NotesList.js | 0 .../NotesAccordion/components/NotesList/index.js | 0 .../NotesAccordion/components/index.js | 0 lib/Notes/{ => components}/NotesAccordion/index.js | 0 .../ReferredRecord/ReferredRecord.css | 0 .../ReferredRecord/ReferredRecord.js | 0 lib/Notes/{ => components}/ReferredRecord/index.js | 0 33 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 lib/Notes/NoteForm/index.js create mode 100644 lib/Notes/NoteViewPage/components/NoteView/NoteView.css rename lib/Notes/{NoteForm => NoteViewPage/components/NoteView}/NoteView.js (95%) create mode 100644 lib/Notes/NoteViewPage/components/NoteView/index.js rename lib/Notes/{ => components}/AssignmentsList/AssignmentsList.css (100%) rename lib/Notes/{ => components}/AssignmentsList/AssignmentsList.js (93%) rename lib/Notes/{ => components}/AssignmentsList/index.js (100%) rename lib/Notes/{ => components}/NavigationModal/index.js (100%) rename lib/Notes/{ => components}/NavigationModal/navigation-modal.js (100%) rename lib/Notes/{ => components}/NoteForm/NoteForm.css (100%) rename lib/Notes/{ => components}/NoteForm/NoteForm.js (99%) rename lib/Notes/{ => components}/NoteForm/components/NoteFields/NoteFields.js (100%) rename lib/Notes/{ => components}/NoteForm/components/NoteFields/index.js (100%) create mode 100644 lib/Notes/components/NoteForm/index.js rename lib/Notes/{ => components}/NoteForm/noteShapes.js (100%) rename lib/Notes/{ => components}/NotesAccordion/NotesAccordion.css (100%) rename lib/Notes/{ => components}/NotesAccordion/NotesAccordion.js (100%) rename lib/Notes/{ => components}/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.css (100%) rename lib/Notes/{ => components}/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js (99%) rename lib/Notes/{ => components}/NotesAccordion/components/NotesAssigningModal/constants.js (100%) rename lib/Notes/{ => components}/NotesAccordion/components/NotesAssigningModal/index.js (100%) rename lib/Notes/{ => components}/NotesAccordion/components/NotesList/NotesList.js (100%) rename lib/Notes/{ => components}/NotesAccordion/components/NotesList/index.js (100%) rename lib/Notes/{ => components}/NotesAccordion/components/index.js (100%) rename lib/Notes/{ => components}/NotesAccordion/index.js (100%) rename lib/Notes/{ => components}/ReferredRecord/ReferredRecord.css (100%) rename lib/Notes/{ => components}/ReferredRecord/ReferredRecord.js (100%) rename lib/Notes/{ => components}/ReferredRecord/index.js (100%) diff --git a/index.js b/index.js index 69fbbba49..efe49d62f 100644 --- a/index.js +++ b/index.js @@ -54,9 +54,7 @@ export { default as ViewMetaData } from './lib/ViewMetaData'; export { default as DueDatePicker } from './lib/ChangeDueDateDialog/DueDatePicker'; -export { default as NotesAccordion } from './lib/Notes/NotesAccordion'; export { default as NoteCreatePage } from './lib/Notes/NoteCreatePage'; export { default as NoteViewPage } from './lib/Notes/NoteViewPage'; export { default as NoteEditPage } from './lib/Notes/NoteEditPage'; -export { default as NoteForm } from './lib/Notes/NoteForm'; export { default as NotesSmartAccordion } from './lib/Notes/NotesSmartAccordion'; diff --git a/lib/Notes/NoteCreatePage/NoteCreatePage.js b/lib/Notes/NoteCreatePage/NoteCreatePage.js index 3b30e4e6d..7862d6f60 100644 --- a/lib/Notes/NoteCreatePage/NoteCreatePage.js +++ b/lib/Notes/NoteCreatePage/NoteCreatePage.js @@ -10,9 +10,9 @@ import { import { Icon } from '@folio/stripes-components'; -import NoteForm from '../NoteForm'; +import NoteForm from '../components/NoteForm'; import { noteTypesCollectionShape } from '../response-shapes'; -import { referredEntityDataShape } from '../NoteForm/noteShapes'; +import { referredEntityDataShape } from '../components/NoteForm/noteShapes'; @stripesConnect class NoteCreatePage extends Component { diff --git a/lib/Notes/NoteEditPage/NoteEditPage.js b/lib/Notes/NoteEditPage/NoteEditPage.js index 61ba59194..bc1042443 100644 --- a/lib/Notes/NoteEditPage/NoteEditPage.js +++ b/lib/Notes/NoteEditPage/NoteEditPage.js @@ -10,9 +10,9 @@ import { import { Icon } from '@folio/stripes-components'; -import NoteForm from '../NoteForm'; +import NoteForm from '../components/NoteForm'; import { noteTypesCollectionShape } from '../response-shapes'; -import { referredEntityDataShape } from '../NoteForm/noteShapes'; +import { referredEntityDataShape } from '../components/NoteForm/noteShapes'; import { getMetadataPropsFromResponse } from '../utils'; @stripesConnect diff --git a/lib/Notes/NoteForm/index.js b/lib/Notes/NoteForm/index.js deleted file mode 100644 index ce4618283..000000000 --- a/lib/Notes/NoteForm/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export { default } from './NoteForm'; -export { default as NoteView } from './NoteView'; diff --git a/lib/Notes/NoteViewPage/NoteViewPage.js b/lib/Notes/NoteViewPage/NoteViewPage.js index e4b642ff1..425bbd70f 100644 --- a/lib/Notes/NoteViewPage/NoteViewPage.js +++ b/lib/Notes/NoteViewPage/NoteViewPage.js @@ -12,10 +12,10 @@ import { ConfirmationModal, } from '@folio/stripes-components'; -import AssignmentsList from '../AssignmentsList'; -import { NoteView } from '../NoteForm'; +import AssignmentsList from '../components/AssignmentsList'; +import NoteView from './components/NoteView'; import { noteShape } from '../response-shapes'; -import { referredEntityDataShape } from '../NoteForm/noteShapes'; +import { referredEntityDataShape } from '../components/NoteForm/noteShapes'; @stripesConnect class NoteViewPage extends Component { diff --git a/lib/Notes/NoteViewPage/components/NoteView/NoteView.css b/lib/Notes/NoteViewPage/components/NoteView/NoteView.css new file mode 100644 index 000000000..44d9655bb --- /dev/null +++ b/lib/Notes/NoteViewPage/components/NoteView/NoteView.css @@ -0,0 +1,4 @@ +.note-view-content { + margin: 0 auto; + max-width: 50rem; +} diff --git a/lib/Notes/NoteForm/NoteView.js b/lib/Notes/NoteViewPage/components/NoteView/NoteView.js similarity index 95% rename from lib/Notes/NoteForm/NoteView.js rename to lib/Notes/NoteViewPage/components/NoteView/NoteView.js index 8bdacfade..f40fcdb16 100644 --- a/lib/Notes/NoteForm/NoteView.js +++ b/lib/Notes/NoteViewPage/components/NoteView/NoteView.js @@ -19,15 +19,15 @@ import { KeyValue, } from '@folio/stripes-components'; -import { NOTE_LINKS_MIN_NUMBER } from '../constants'; -import AssignmentsList from '../AssignmentsList'; -import ReferredRecord from '../ReferredRecord'; -import styles from './NoteForm.css'; +import { NOTE_LINKS_MIN_NUMBER } from '../../../constants'; +import AssignmentsList from '../../../components/AssignmentsList'; +import ReferredRecord from '../../../components/ReferredRecord'; +import styles from './NoteView.css'; import { noteDataShape, referredEntityDataShape, -} from './noteShapes'; +} from '../../../components/NoteForm/noteShapes'; export default class NoteView extends Component { static propTypes = { @@ -214,7 +214,7 @@ export default class NoteView extends Component { } diff --git a/lib/Notes/NoteViewPage/components/NoteView/index.js b/lib/Notes/NoteViewPage/components/NoteView/index.js new file mode 100644 index 000000000..8ec5bef1a --- /dev/null +++ b/lib/Notes/NoteViewPage/components/NoteView/index.js @@ -0,0 +1 @@ +export { default } from './NoteView'; diff --git a/lib/Notes/NotesSmartAccordion/NotesSmartAccordion.js b/lib/Notes/NotesSmartAccordion/NotesSmartAccordion.js index 12ebc51f9..ec88d215a 100644 --- a/lib/Notes/NotesSmartAccordion/NotesSmartAccordion.js +++ b/lib/Notes/NotesSmartAccordion/NotesSmartAccordion.js @@ -14,7 +14,7 @@ import { sortOrders, notesStatuses, } from '../constants'; -import NotesAccordion from '../NotesAccordion'; +import NotesAccordion from '../components/NotesAccordion'; import { makeSearchQuery } from './utils'; diff --git a/lib/Notes/AssignmentsList/AssignmentsList.css b/lib/Notes/components/AssignmentsList/AssignmentsList.css similarity index 100% rename from lib/Notes/AssignmentsList/AssignmentsList.css rename to lib/Notes/components/AssignmentsList/AssignmentsList.css diff --git a/lib/Notes/AssignmentsList/AssignmentsList.js b/lib/Notes/components/AssignmentsList/AssignmentsList.js similarity index 93% rename from lib/Notes/AssignmentsList/AssignmentsList.js rename to lib/Notes/components/AssignmentsList/AssignmentsList.js index 13f2f7ec1..34c5d4e9c 100644 --- a/lib/Notes/AssignmentsList/AssignmentsList.js +++ b/lib/Notes/components/AssignmentsList/AssignmentsList.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { List } from '@folio/stripes-components'; -import getLinkedEntityTypesArr from '../utils/getLinkedEntityTypesArr'; +import getLinkedEntityTypesArr from '../../utils/getLinkedEntityTypesArr'; import styles from './AssignmentsList.css'; diff --git a/lib/Notes/AssignmentsList/index.js b/lib/Notes/components/AssignmentsList/index.js similarity index 100% rename from lib/Notes/AssignmentsList/index.js rename to lib/Notes/components/AssignmentsList/index.js diff --git a/lib/Notes/NavigationModal/index.js b/lib/Notes/components/NavigationModal/index.js similarity index 100% rename from lib/Notes/NavigationModal/index.js rename to lib/Notes/components/NavigationModal/index.js diff --git a/lib/Notes/NavigationModal/navigation-modal.js b/lib/Notes/components/NavigationModal/navigation-modal.js similarity index 100% rename from lib/Notes/NavigationModal/navigation-modal.js rename to lib/Notes/components/NavigationModal/navigation-modal.js diff --git a/lib/Notes/NoteForm/NoteForm.css b/lib/Notes/components/NoteForm/NoteForm.css similarity index 100% rename from lib/Notes/NoteForm/NoteForm.css rename to lib/Notes/components/NoteForm/NoteForm.css diff --git a/lib/Notes/NoteForm/NoteForm.js b/lib/Notes/components/NoteForm/NoteForm.js similarity index 99% rename from lib/Notes/NoteForm/NoteForm.js rename to lib/Notes/components/NoteForm/NoteForm.js index 1e090c7d3..b1994f7ea 100644 --- a/lib/Notes/NoteForm/NoteForm.js +++ b/lib/Notes/components/NoteForm/NoteForm.js @@ -32,7 +32,7 @@ import { import { MAX_TITLE_LENGTH, MAX_DETAILS_LENGTH, -} from '../constants'; +} from '../../constants'; import styles from './NoteForm.css'; diff --git a/lib/Notes/NoteForm/components/NoteFields/NoteFields.js b/lib/Notes/components/NoteForm/components/NoteFields/NoteFields.js similarity index 100% rename from lib/Notes/NoteForm/components/NoteFields/NoteFields.js rename to lib/Notes/components/NoteForm/components/NoteFields/NoteFields.js diff --git a/lib/Notes/NoteForm/components/NoteFields/index.js b/lib/Notes/components/NoteForm/components/NoteFields/index.js similarity index 100% rename from lib/Notes/NoteForm/components/NoteFields/index.js rename to lib/Notes/components/NoteForm/components/NoteFields/index.js diff --git a/lib/Notes/components/NoteForm/index.js b/lib/Notes/components/NoteForm/index.js new file mode 100644 index 000000000..253515696 --- /dev/null +++ b/lib/Notes/components/NoteForm/index.js @@ -0,0 +1,2 @@ +export { default } from './NoteForm'; + diff --git a/lib/Notes/NoteForm/noteShapes.js b/lib/Notes/components/NoteForm/noteShapes.js similarity index 100% rename from lib/Notes/NoteForm/noteShapes.js rename to lib/Notes/components/NoteForm/noteShapes.js diff --git a/lib/Notes/NotesAccordion/NotesAccordion.css b/lib/Notes/components/NotesAccordion/NotesAccordion.css similarity index 100% rename from lib/Notes/NotesAccordion/NotesAccordion.css rename to lib/Notes/components/NotesAccordion/NotesAccordion.css diff --git a/lib/Notes/NotesAccordion/NotesAccordion.js b/lib/Notes/components/NotesAccordion/NotesAccordion.js similarity index 100% rename from lib/Notes/NotesAccordion/NotesAccordion.js rename to lib/Notes/components/NotesAccordion/NotesAccordion.js diff --git a/lib/Notes/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.css b/lib/Notes/components/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.css similarity index 100% rename from lib/Notes/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.css rename to lib/Notes/components/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.css diff --git a/lib/Notes/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js b/lib/Notes/components/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js similarity index 99% rename from lib/Notes/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js rename to lib/Notes/components/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js index b97e738b4..b6ccc556c 100644 --- a/lib/Notes/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js +++ b/lib/Notes/components/NotesAccordion/components/NotesAssigningModal/NotesAssigningModal.js @@ -22,13 +22,13 @@ import { import { SearchAndSortResetButton as ResetButton, CheckboxFilter, -} from '../../../../..'; +} from '../../../../../..'; import { notesStatuses, sortOrders, NOTE_LINKS_MIN_NUMBER, -} from '../../../constants'; +} from '../../../../constants'; import { columnNames, diff --git a/lib/Notes/NotesAccordion/components/NotesAssigningModal/constants.js b/lib/Notes/components/NotesAccordion/components/NotesAssigningModal/constants.js similarity index 100% rename from lib/Notes/NotesAccordion/components/NotesAssigningModal/constants.js rename to lib/Notes/components/NotesAccordion/components/NotesAssigningModal/constants.js diff --git a/lib/Notes/NotesAccordion/components/NotesAssigningModal/index.js b/lib/Notes/components/NotesAccordion/components/NotesAssigningModal/index.js similarity index 100% rename from lib/Notes/NotesAccordion/components/NotesAssigningModal/index.js rename to lib/Notes/components/NotesAccordion/components/NotesAssigningModal/index.js diff --git a/lib/Notes/NotesAccordion/components/NotesList/NotesList.js b/lib/Notes/components/NotesAccordion/components/NotesList/NotesList.js similarity index 100% rename from lib/Notes/NotesAccordion/components/NotesList/NotesList.js rename to lib/Notes/components/NotesAccordion/components/NotesList/NotesList.js diff --git a/lib/Notes/NotesAccordion/components/NotesList/index.js b/lib/Notes/components/NotesAccordion/components/NotesList/index.js similarity index 100% rename from lib/Notes/NotesAccordion/components/NotesList/index.js rename to lib/Notes/components/NotesAccordion/components/NotesList/index.js diff --git a/lib/Notes/NotesAccordion/components/index.js b/lib/Notes/components/NotesAccordion/components/index.js similarity index 100% rename from lib/Notes/NotesAccordion/components/index.js rename to lib/Notes/components/NotesAccordion/components/index.js diff --git a/lib/Notes/NotesAccordion/index.js b/lib/Notes/components/NotesAccordion/index.js similarity index 100% rename from lib/Notes/NotesAccordion/index.js rename to lib/Notes/components/NotesAccordion/index.js diff --git a/lib/Notes/ReferredRecord/ReferredRecord.css b/lib/Notes/components/ReferredRecord/ReferredRecord.css similarity index 100% rename from lib/Notes/ReferredRecord/ReferredRecord.css rename to lib/Notes/components/ReferredRecord/ReferredRecord.css diff --git a/lib/Notes/ReferredRecord/ReferredRecord.js b/lib/Notes/components/ReferredRecord/ReferredRecord.js similarity index 100% rename from lib/Notes/ReferredRecord/ReferredRecord.js rename to lib/Notes/components/ReferredRecord/ReferredRecord.js diff --git a/lib/Notes/ReferredRecord/index.js b/lib/Notes/components/ReferredRecord/index.js similarity index 100% rename from lib/Notes/ReferredRecord/index.js rename to lib/Notes/components/ReferredRecord/index.js