Moved models to appropriate namespace folders

src/accessions/actions/public.ts

@@ -3,14 +3,14 @@
  */
 import navigateTo from 'actions/navigation';
 import FilteredPage, { IPageRequest } from 'model/FilteredPage';
-import Accession from 'model/Accession';
-import AccessionFilter from 'model/AccessionFilter';
-import AccessionDetails from 'model/AccessionDetails';
-import AccessionMapInfo from 'model/AccessionMapInfo';
+import Accession from 'model/accession/Accession';
+import AccessionFilter from 'model/accession/AccessionFilter';
+import AccessionDetails from 'model/accession/AccessionDetails';
+import AccessionMapInfo from 'model/accession/AccessionMapInfo';
 
 import {RECEIVE_ACCESSIONS, RECEIVE_ACCESSION, RECEIVE_ACCESSION_OVERVIEW, APPEND_ACCESSIONS, RECEIVE_ACCESSION_MAPINFO} from 'accessions/constants';
 import AccessionService from 'service/genesys/AccessionService';
-import { AccessionRef } from 'model/dataset.model';
+import { AccessionRef } from 'model/accession/AccessionRef';
 
 const receiveAccessions = (paged: FilteredPage<Accession>, error = null) => ({
   type: RECEIVE_ACCESSIONS,

src/accessions/reducers/public.ts

@@ -4,9 +4,9 @@ import { IReducerAction } from 'model/common.model';
 import {RECEIVE_ACCESSIONS, RECEIVE_ACCESSION, RECEIVE_ACCESSION_OVERVIEW, APPEND_ACCESSIONS, RECEIVE_ACCESSION_MAPINFO} from 'accessions/constants';
 
 import FilteredPage from 'model/FilteredPage';
-import Accession from 'model/Accession';
-import AccessionMapInfo from 'model/AccessionMapInfo';
-import AccessionOverview from 'model/AccessionOverview';
+import Accession from 'model/accession/Accession';
+import AccessionMapInfo from 'model/accession/AccessionMapInfo';
+import AccessionOverview from 'model/accession/AccessionOverview';
 
 const INITIAL_STATE: {
   accession: Accession;

src/accessions/ui/BrowsePage.tsx

@@ -7,7 +7,7 @@ import { parse } from 'query-string';
 import { applyFilters, loadAccessionsPage, updateRoute } from 'accessions/actions/public';
 
 // Models
-import Accession from 'model/Accession';
+import Accession from 'model/accession/Accession';
 
 // UI
 import BrowsePageTemplate, { IBrowsePageProps } from 'ui/pages/_base/BrowsePage';

src/accessions/ui/DisplayPage.tsx

@@ -8,7 +8,7 @@ import { loadAccession } from 'accessions/actions/public';
 import {addAccessionToMyList, removeAccessionFromMyList} from 'user/actions/public';
 
 // Models
-import AccessionDetails from 'model/AccessionDetails';
+import AccessionDetails from 'model/accession/AccessionDetails';
 
 // UI
 import { Link } from 'react-router-dom';

src/accessions/ui/MapPage.tsx

@@ -3,9 +3,9 @@ import {connect} from 'react-redux';
 import {withStyles} from '@material-ui/core/styles';
 import {bindActionCreators} from 'redux';
 import { loadAccessionsMapInfo } from 'accessions/actions/public';
-import AccessionFilter from 'model/AccessionFilter';
+import AccessionFilter from 'model/accession/AccessionFilter';
 import Loading from 'ui/common/Loading';
-import AccessionMapInfo from 'model/AccessionMapInfo';
+import AccessionMapInfo from 'model/accession/AccessionMapInfo';
 import PageLayout from 'ui/layout/PageLayout';
 import ContentHeader from 'ui/common/heading/ContentHeader';
 import Button from '@material-ui/core/Button';

src/accessions/ui/OverviewPage.tsx

@@ -10,10 +10,10 @@ import {applyFilters, loadAccessionsPage, listAccessionsPromise, updateRoute, ap
 import { showSnackbar } from 'actions/snackbar';
 
 // Models
-import Accession from 'model/Accession';
+import Accession from 'model/accession/Accession';
 import FilteredPage, {IPageRequest} from 'model/FilteredPage';
-import AccessionFilter from 'model/AccessionFilter';
-import AccessionOverview from 'model/AccessionOverview';
+import AccessionFilter from 'model/accession/AccessionFilter';
+import AccessionOverview from 'model/accession/AccessionOverview';
 
 // UI
 import PageLayout, { PageContents } from 'ui/layout/PageLayout';

src/accessions/ui/c/AccessionCard.tsx

@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import { withStyles } from '@material-ui/core/styles';
 
-import Accession from 'model/Accession';
+import Accession from 'model/accession/Accession';
 import { AccessionLink } from 'ui/genesys/Links';
 import Card, {CardContent, CardActions} from 'ui/common/Card';
 import DOI from 'ui/common/DOI';

src/accessions/ui/c/Filters.tsx

@@ -9,7 +9,7 @@ import BooleanFilter from 'ui/common/filter/BooleanFilter';
 import NumberFilter from 'ui/common/filter/NumberFilter';
 import StringFilter from 'ui/common/filter/StringFilter';
 import StringArrFilter from 'ui/common/filter/StringArrFilter';
-import Accession from 'model/Accession';
+import Accession from 'model/accession/Accession';
 import DateFilter from 'ui/common/filter/DateFilter';
 
 const AccessionFilters = ({handleSubmit, initialValues, initialize, ...other}) => {

src/accessions/ui/c/PdciTable.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {translate} from 'react-i18next';
 
 // model
-import PDCI from 'model/PDCI';
+import PDCI from 'model/accession/PDCI';
 
 // UI
 import Grid from '@material-ui/core/Grid';

src/crop/actions/public.ts

-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 import {CropService} from 'service/CropService';
 import {LOAD_CROPS_CACHE_IDLE, RECEIVE_CROPS} from 'crop/constants';
 import {IReducerAction} from 'model/common.model';

src/crop/ui/BrowsePage.tsx

@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 
 // Models
-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 
 // UI
 import PageLayout, { PageContents } from 'ui/layout/PageLayout';

src/crop/ui/DisplayPage.tsx

@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 
 // Models
-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 
 // UI
 import PageLayout, {PageContents} from 'ui/layout/PageLayout';

src/crop/ui/c/CropCard.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {Link} from 'react-router-dom';
 
 // Models
-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 
 // UI
 import Card, {CardHeader, CardContent} from 'ui/common/Card';

src/crop/ui/c/CropChips.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import { withStyles } from '@material-ui/core/styles';
 
-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 
 interface ICropChipsProps extends React.ClassAttributes<any> {
     crops?: string[] | string;

src/crop/ui/c/CropFilter.tsx

 import * as React from 'react';
 import { connect } from 'react-redux';
 
-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 
 import StringArrFilter from 'ui/common/filter/StringArrFilter';
 

src/crop/ui/c/CropSelector.tsx

@@ -10,7 +10,7 @@ import FormHelperText from '@material-ui/core/FormHelperText';
 import Checkbox from '@material-ui/core/Checkbox';
 import Radio from '@material-ui/core/Radio';
 
-import Crop from 'model/Crop';
+import Crop from 'model/genesys/Crop';
 
 interface ICropSelectorProps extends React.ClassAttributes<any> {
     t: any;

src/institutes/actions/dashboard.ts

@@ -4,7 +4,7 @@ import {DASHBOARD_APPEND_INSTITUTES, DASHBOARD_RECEIVE_INSTITUTE, DASHBOARD_RECE
 
 // Model
 import FilteredPage, {IPageRequest} from 'model/FilteredPage';
-import FaoInstitute from 'model/FaoInstitute';
+import FaoInstitute from 'model/genesys/FaoInstitute';
 import InstituteService from 'service/genesys/InstituteService';
 
 const receiveInstitutes = (paged: FilteredPage<FaoInstitute>, error = null) => ({

src/institutes/actions/public.ts

@@ -2,8 +2,8 @@ import navigateTo from 'actions/navigation';
 
 import {APPEND_INSTITUTES, RECEIVE_INSTITUTE, RECEIVE_INSTITUTES} from 'institutes/constants';
 
-import FaoInstitute from 'model/FaoInstitute';
-import FaoInstituteFilter from 'model/FaoInstituteFilter';
+import FaoInstitute from 'model/genesys/FaoInstitute';
+import FaoInstituteFilter from 'model/genesys/FaoInstituteFilter';
 import FilteredPage, {IPageRequest} from 'model/FilteredPage';
 import InstituteService from 'service/genesys/InstituteService';
 

src/institutes/reducers/dashboard.ts

@@ -4,7 +4,7 @@ import { IReducerAction } from 'model/common.model';
 
 import FilteredPage from 'model/FilteredPage';
 import {DASHBOARD_APPEND_INSTITUTES, DASHBOARD_RECEIVE_INSTITUTE, DASHBOARD_RECEIVE_INSTITUTES} from 'institutes/constants';
-import FaoInstitute from 'model/FaoInstitute';
+import FaoInstitute from 'model/genesys/FaoInstitute';
 
 const INITIAL_STATE: {
     institute: FaoInstitute;

src/institutes/reducers/public.ts

@@ -4,7 +4,7 @@ import { IReducerAction } from 'model/common.model';
 
 import FilteredPage from 'model/FilteredPage';
 import {APPEND_INSTITUTES, RECEIVE_INSTITUTE, RECEIVE_INSTITUTES} from 'institutes/constants';
-import FaoInstitute from 'model/FaoInstitute';
+import FaoInstitute from 'model/genesys/FaoInstitute';
 
 const INITIAL_STATE: {
     institute: FaoInstitute;