Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Genesys Website
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Website
Commits
86d79ec7
Commit
86d79ec7
authored
Oct 08, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved models to appropriate namespace folders
parent
3ed4abd5
Changes
96
Hide whitespace changes
Inline
Side-by-side
Showing
96 changed files
with
170 additions
and
158 deletions
+170
-158
src/accessions/actions/public.ts
src/accessions/actions/public.ts
+5
-5
src/accessions/reducers/public.ts
src/accessions/reducers/public.ts
+3
-3
src/accessions/ui/BrowsePage.tsx
src/accessions/ui/BrowsePage.tsx
+1
-1
src/accessions/ui/DisplayPage.tsx
src/accessions/ui/DisplayPage.tsx
+1
-1
src/accessions/ui/MapPage.tsx
src/accessions/ui/MapPage.tsx
+2
-2
src/accessions/ui/OverviewPage.tsx
src/accessions/ui/OverviewPage.tsx
+3
-3
src/accessions/ui/c/AccessionCard.tsx
src/accessions/ui/c/AccessionCard.tsx
+1
-1
src/accessions/ui/c/Filters.tsx
src/accessions/ui/c/Filters.tsx
+1
-1
src/accessions/ui/c/PdciTable.tsx
src/accessions/ui/c/PdciTable.tsx
+1
-1
src/crop/actions/public.ts
src/crop/actions/public.ts
+1
-1
src/crop/ui/BrowsePage.tsx
src/crop/ui/BrowsePage.tsx
+1
-1
src/crop/ui/DisplayPage.tsx
src/crop/ui/DisplayPage.tsx
+1
-1
src/crop/ui/c/CropCard.tsx
src/crop/ui/c/CropCard.tsx
+1
-1
src/crop/ui/c/CropChips.tsx
src/crop/ui/c/CropChips.tsx
+1
-1
src/crop/ui/c/CropFilter.tsx
src/crop/ui/c/CropFilter.tsx
+1
-1
src/crop/ui/c/CropSelector.tsx
src/crop/ui/c/CropSelector.tsx
+1
-1
src/institutes/actions/dashboard.ts
src/institutes/actions/dashboard.ts
+1
-1
src/institutes/actions/public.ts
src/institutes/actions/public.ts
+2
-2
src/institutes/reducers/dashboard.ts
src/institutes/reducers/dashboard.ts
+1
-1
src/institutes/reducers/public.ts
src/institutes/reducers/public.ts
+1
-1
src/institutes/ui/BrowsePage.tsx
src/institutes/ui/BrowsePage.tsx
+1
-1
src/institutes/ui/DisplayPage.tsx
src/institutes/ui/DisplayPage.tsx
+1
-1
src/institutes/ui/с/InstituteCard.tsx
src/institutes/ui/с/InstituteCard.tsx
+1
-1
src/model/License.ts
src/model/License.ts
+0
-0
src/model/accession/Accession.ts
src/model/accession/Accession.ts
+9
-9
src/model/accession/AccessionAlias.ts
src/model/accession/AccessionAlias.ts
+0
-0
src/model/accession/AccessionCollect.ts
src/model/accession/AccessionCollect.ts
+0
-0
src/model/accession/AccessionDetails.ts
src/model/accession/AccessionDetails.ts
+12
-0
src/model/accession/AccessionFilter.ts
src/model/accession/AccessionFilter.ts
+6
-6
src/model/accession/AccessionGeo.ts
src/model/accession/AccessionGeo.ts
+0
-0
src/model/accession/AccessionMapInfo.ts
src/model/accession/AccessionMapInfo.ts
+1
-1
src/model/accession/AccessionOverview.ts
src/model/accession/AccessionOverview.ts
+1
-1
src/model/accession/AccessionRef.ts
src/model/accession/AccessionRef.ts
+0
-0
src/model/accession/AccessionRemark.ts
src/model/accession/AccessionRemark.ts
+0
-0
src/model/accession/PDCI.ts
src/model/accession/PDCI.ts
+0
-0
src/model/cms/ArticleFilter.ts
src/model/cms/ArticleFilter.ts
+1
-1
src/model/filter/DateFilter.ts
src/model/filter/DateFilter.ts
+0
-0
src/model/filter/NumberFilter.ts
src/model/filter/NumberFilter.ts
+0
-0
src/model/filter/StringFilter.ts
src/model/filter/StringFilter.ts
+0
-0
src/model/genesys/Crop.ts
src/model/genesys/Crop.ts
+0
-0
src/model/genesys/FaoInstitute.ts
src/model/genesys/FaoInstitute.ts
+1
-1
src/model/genesys/FaoInstituteDetails.ts
src/model/genesys/FaoInstituteDetails.ts
+1
-1
src/model/genesys/FaoInstituteFilter.ts
src/model/genesys/FaoInstituteFilter.ts
+2
-2
src/model/genesys/InstituteFilter.ts
src/model/genesys/InstituteFilter.ts
+2
-2
src/model/genesys/Taxonomy2.ts
src/model/genesys/Taxonomy2.ts
+0
-0
src/model/genesys/TaxonomyFilter.ts
src/model/genesys/TaxonomyFilter.ts
+2
-2
src/model/geo/Country.ts
src/model/geo/Country.ts
+0
-0
src/model/geo/CountryFilter.ts
src/model/geo/CountryFilter.ts
+0
-0
src/model/request/MaterialRequest.ts
src/model/request/MaterialRequest.ts
+1
-1
src/model/request/MaterialRequestFilter.ts
src/model/request/MaterialRequestFilter.ts
+2
-2
src/model/request/MaterialSubRequest.ts
src/model/request/MaterialSubRequest.ts
+1
-1
src/model/request/MaterialSubRequestFilter.ts
src/model/request/MaterialSubRequestFilter.ts
+2
-2
src/model/subset/Subset.ts
src/model/subset/Subset.ts
+4
-4
src/model/subset/SubsetCreator.ts
src/model/subset/SubsetCreator.ts
+2
-2
src/model/subset/SubsetFilter.ts
src/model/subset/SubsetFilter.ts
+2
-2
src/model/user/User.ts
src/model/user/User.ts
+0
-0
src/requests/actions/admin.ts
src/requests/actions/admin.ts
+2
-2
src/requests/reducers/admin.ts
src/requests/reducers/admin.ts
+1
-1
src/requests/ui/admin/BrowsePage.tsx
src/requests/ui/admin/BrowsePage.tsx
+1
-1
src/requests/ui/admin/DisplayPage.tsx
src/requests/ui/admin/DisplayPage.tsx
+1
-1
src/requests/ui/admin/c/RequestCard.tsx
src/requests/ui/admin/c/RequestCard.tsx
+1
-1
src/service/CropService.ts
src/service/CropService.ts
+1
-1
src/service/UserProfileService.ts
src/service/UserProfileService.ts
+1
-1
src/service/genesys/AccessionService.ts
src/service/genesys/AccessionService.ts
+5
-5
src/service/genesys/InstituteService.ts
src/service/genesys/InstituteService.ts
+2
-2
src/service/genesys/RequestService.ts
src/service/genesys/RequestService.ts
+4
-4
src/service/genesys/SubsetService.ts
src/service/genesys/SubsetService.ts
+9
-9
src/subsets/actions/dashboard.ts
src/subsets/actions/dashboard.ts
+1
-1
src/subsets/actions/editor.ts
src/subsets/actions/editor.ts
+8
-8
src/subsets/actions/public.ts
src/subsets/actions/public.ts
+2
-2
src/subsets/reducers/dashboard.ts
src/subsets/reducers/dashboard.ts
+1
-1
src/subsets/reducers/public.ts
src/subsets/reducers/public.ts
+1
-1
src/subsets/ui/BrowsePage.tsx
src/subsets/ui/BrowsePage.tsx
+1
-1
src/subsets/ui/DisplayPage.tsx
src/subsets/ui/DisplayPage.tsx
+3
-3
src/subsets/ui/c/SubsetCard.tsx
src/subsets/ui/c/SubsetCard.tsx
+1
-1
src/subsets/ui/c/SubsetDisplay.tsx
src/subsets/ui/c/SubsetDisplay.tsx
+3
-3
src/subsets/ui/dashboard/DashboardPage.tsx
src/subsets/ui/dashboard/DashboardPage.tsx
+1
-1
src/subsets/ui/dashboard/StepperPage.ts
src/subsets/ui/dashboard/StepperPage.ts
+1
-1
src/subsets/ui/dashboard/c/SubsetDashboardRow.tsx
src/subsets/ui/dashboard/c/SubsetDashboardRow.tsx
+1
-1
src/subsets/ui/dashboard/subset-stepper/steps/accessions-list/ListOfAccessions.tsx
...subset-stepper/steps/accessions-list/ListOfAccessions.tsx
+4
-4
src/subsets/ui/dashboard/subset-stepper/steps/accessions-list/index.tsx
.../dashboard/subset-stepper/steps/accessions-list/index.tsx
+4
-4
src/subsets/ui/dashboard/subset-stepper/steps/basic-info/BasicInfoRadioGroup.tsx
...d/subset-stepper/steps/basic-info/BasicInfoRadioGroup.tsx
+1
-1
src/subsets/ui/dashboard/subset-stepper/steps/creators/SubsetCreatorForm.tsx
...board/subset-stepper/steps/creators/SubsetCreatorForm.tsx
+4
-4
src/subsets/ui/dashboard/subset-stepper/steps/creators/index.tsx
...sets/ui/dashboard/subset-stepper/steps/creators/index.tsx
+4
-4
src/ui/App.tsx
src/ui/App.tsx
+1
-1
src/ui/catalog/accession/AccessionRefsTable.tsx
src/ui/catalog/accession/AccessionRefsTable.tsx
+1
-1
src/ui/common/filter/DateFilter.tsx
src/ui/common/filter/DateFilter.tsx
+1
-1
src/ui/common/filter/NumberFilter.tsx
src/ui/common/filter/NumberFilter.tsx
+1
-1
src/ui/common/filter/PrettyFilters.tsx
src/ui/common/filter/PrettyFilters.tsx
+1
-1
src/ui/genesys/Links.tsx
src/ui/genesys/Links.tsx
+5
-5
src/user/actions/dashboard.ts
src/user/actions/dashboard.ts
+1
-1
src/user/reducers/admin.ts
src/user/reducers/admin.ts
+1
-1
src/user/reducers/dashboard.ts
src/user/reducers/dashboard.ts
+1
-1
src/user/ui/c/UserProfileCard.tsx
src/user/ui/c/UserProfileCard.tsx
+1
-1
src/user/ui/dashboard/ChangePasswordPage.tsx
src/user/ui/dashboard/ChangePasswordPage.tsx
+1
-1
src/user/ui/dashboard/ProfilePage.tsx
src/user/ui/dashboard/ProfilePage.tsx
+1
-1
No files found.
src/accessions/actions/public.ts
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
View file @
86d79ec7
...
...
@@ -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
;
...
...
src/institutes/ui/BrowsePage.tsx
View file @
86d79ec7
...
...
@@ -7,7 +7,7 @@ import { parse } from 'query-string';
import
{
applyFilters
,
loadInstitutesPage
,
updateRoute
}
from
'
institutes/actions/public
'
;
// Models
import
FaoInstitute
from
'
model/FaoInstitute
'
;
import
FaoInstitute
from
'
model/
genesys/
FaoInstitute
'
;
// UI
import
BrowsePageTemplate
,
{
IBrowsePageProps
}
from
'
ui/pages/_base/BrowsePage
'
;
...
...
src/institutes/ui/DisplayPage.tsx
View file @
86d79ec7
...
...
@@ -9,7 +9,7 @@ import {loadInstitute} from 'institutes/actions/public';
import
{
applyFilters
}
from
'
accessions/actions/public
'
;
// Models
import
FaoInstituteDetails
from
'
model/FaoInstituteDetails
'
;
import
FaoInstituteDetails
from
'
model/
genesys/
FaoInstituteDetails
'
;
// UI
import
PageLayout
,
{
MainSection
,
PageContents
,
PageSection
}
from
'
ui/layout/PageLayout
'
;
...
...
src/institutes/ui/с/InstituteCard.tsx
View file @
86d79ec7
import
*
as
React
from
'
react
'
;
import
{
withStyles
}
from
'
@material-ui/core/styles
'
;
import
FaoInstitute
from
'
model/FaoInstitute
'
;
import
FaoInstitute
from
'
model/
genesys/
FaoInstitute
'
;
import
{
InstituteLink
}
from
'
ui/genesys/Links
'
;
import
Card
,
{
CardContent
,
CardActions
}
from
'
ui/common/Card
'
;
import
SciName
from
'
ui/genesys/SciName
'
;
...
...
src/model/
license.model
.ts
→
src/model/
License
.ts
View file @
86d79ec7
File moved
src/model/Accession.ts
→
src/model/
accession/
Accession.ts
View file @
86d79ec7
import
AccessionAlias
from
'
model/AccessionAlias
'
;
import
AccessionCollect
from
'
model/AccessionCollect
'
;
import
AccessionGeo
from
'
model/AccessionGeo
'
;
import
AccessionRemark
from
'
model/AccessionRemark
'
;
import
Country
from
'
model/Country
'
;
import
Crop
from
'
model/Crop
'
;
import
FaoInstitute
from
'
model/FaoInstitute
'
;
import
PDCI
from
'
model/PDCI
'
;
import
Taxonomy2
from
'
model/Taxonomy2
'
;
import
AccessionAlias
from
'
model/
accession/
AccessionAlias
'
;
import
AccessionCollect
from
'
model/
accession/
AccessionCollect
'
;
import
AccessionGeo
from
'
model/
accession/
AccessionGeo
'
;
import
AccessionRemark
from
'
model/
accession/
AccessionRemark
'
;
import
Country
from
'
model/
geo/
Country
'
;
import
Crop
from
'
model/
genesys/
Crop
'
;
import
FaoInstitute
from
'
model/
genesys/
FaoInstitute
'
;
import
PDCI
from
'
model/
accession/
PDCI
'
;
import
Taxonomy2
from
'
model/
genesys/
Taxonomy2
'
;
/*
* Defined in Swagger as '#/definitions/Accession'
...
...
src/model/AccessionAlias.ts
→
src/model/
accession/
AccessionAlias.ts
View file @
86d79ec7
File moved
src/model/AccessionCollect.ts
→
src/model/
accession/
AccessionCollect.ts
View file @
86d79ec7
File moved
src/model/AccessionDetails.ts
→
src/model/
accession/
AccessionDetails.ts
View file @
86d79ec7
import
Accession
from
'
model/Accession
'
;
import
Subset
from
'
model/Subset
'
;
import
PDCI
from
'
model/PDCI
'
;
import
Accession
from
'
model/
accession/
Accession
'
;
import
Subset
from
'
model/
subset/
Subset
'
;
import
PDCI
from
'
model/
accession/
PDCI
'
;
class
AccessionDetails
{
public
details
:
Accession
;
...
...
src/model/AccessionFilter.ts
→
src/model/
accession/
AccessionFilter.ts
View file @
86d79ec7
import
CountryFilter
from
'
model/CountryFilter
'
;
import
DateFilter
from
'
model/DateFilter
'
;
import
InstituteFilter
from
'
model/InstituteFilter
'
;
import
NumberFilter
from
'
model/NumberFilter
'
;
import
StringFilter
from
'
model/StringFilter
'
;
import
TaxonomyFilter
from
'
model/TaxonomyFilter
'
;
import
CountryFilter
from
'
model/
geo/
CountryFilter
'
;
import
DateFilter
from
'
model/
filter/
DateFilter
'
;
import
InstituteFilter
from
'
model/
genesys/
InstituteFilter
'
;
import
NumberFilter
from
'
model/
filter/
NumberFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
import
TaxonomyFilter
from
'
model/
genesys/
TaxonomyFilter
'
;
/*
* Defined in Swagger as '#/definitions/AccessionFilter'
...
...
src/model/AccessionGeo.ts
→
src/model/
accession/
AccessionGeo.ts
View file @
86d79ec7
File moved
src/model/AccessionMapInfo.ts
→
src/model/
accession/
AccessionMapInfo.ts
View file @
86d79ec7
import
AccessionFilter
from
'
model/AccessionFilter
'
;
import
AccessionFilter
from
'
model/
accession/
AccessionFilter
'
;
/*
* Defined in Swagger as '#/definitions/AccessionMapInfo'
...
...
src/model/AccessionOverview.ts
→
src/model/
accession/
AccessionOverview.ts
View file @
86d79ec7
import
AccessionFilter
from
'
model/AccessionFilter
'
;
import
AccessionFilter
from
'
model/
accession/
AccessionFilter
'
;
/*
* Defined in Swagger as '#/definitions/AccessionOverview'
...
...
src/model/
dataset.model
.ts
→
src/model/
accession/AccessionRef
.ts
View file @
86d79ec7
File moved
src/model/AccessionRemark.ts
→
src/model/
accession/
AccessionRemark.ts
View file @
86d79ec7
File moved
src/model/PDCI.ts
→
src/model/
accession/
PDCI.ts
View file @
86d79ec7
File moved
src/model/cms/ArticleFilter.ts
View file @
86d79ec7
import
StringFilter
from
'
model/StringFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
/*
* Defined in Swagger as '#/definitions/ArticleFilter'
...
...
src/model/DateFilter.ts
→
src/model/
filter/
DateFilter.ts
View file @
86d79ec7
File moved
src/model/NumberFilter.ts
→
src/model/
filter/
NumberFilter.ts
View file @
86d79ec7
File moved
src/model/StringFilter.ts
→
src/model/
filter/
StringFilter.ts
View file @
86d79ec7
File moved
src/model/Crop.ts
→
src/model/
genesys/
Crop.ts
View file @
86d79ec7
File moved
src/model/FaoInstitute.ts
→
src/model/
genesys/
FaoInstitute.ts
View file @
86d79ec7
import
Country
from
'
model/Country
'
;
import
Country
from
'
model/
geo/
Country
'
;
/*
* Defined in Swagger as '#/definitions/FaoInstitute'
...
...
src/model/FaoInstituteDetails.ts
→
src/model/
genesys/
FaoInstituteDetails.ts
View file @
86d79ec7
import
FaoInstitute
from
'
model/FaoInstitute
'
;
import
FaoInstitute
from
'
model/
genesys/
FaoInstitute
'
;
/*
* Defined in Swagger as '#/definitions/FaoInstitute'
...
...
src/model/FaoInstituteFilter.ts
→
src/model/
genesys/
FaoInstituteFilter.ts
View file @
86d79ec7
...
...
@@ -2,8 +2,8 @@
/*
* Defined in OpenAPI as '#/definitions/FaoInstituteFilter'
*/
import
StringFilter
from
'
model/StringFilter
'
;
import
CountryFilter
from
'
.
/CountryFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
import
CountryFilter
from
'
model/geo
/CountryFilter
'
;
class
FaoInstituteFilter
{
public
code
:
string
[];
...
...
src/model/InstituteFilter.ts
→
src/model/
genesys/
InstituteFilter.ts
View file @
86d79ec7
import
CountryFilter
from
'
model/CountryFilter
'
;
import
StringFilter
from
'
model/StringFilter
'
;
import
CountryFilter
from
'
model/
geo/
CountryFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
/*
* Defined in Swagger as '#/definitions/InstituteFilter'
...
...
src/model/Taxonomy2.ts
→
src/model/
genesys/
Taxonomy2.ts
View file @
86d79ec7
File moved
src/model/TaxonomyFilter.ts
→
src/model/
genesys/
TaxonomyFilter.ts
View file @
86d79ec7
import
DateFilter
from
'
model/DateFilter
'
;
import
StringFilter
from
'
model/StringFilter
'
;
import
DateFilter
from
'
model/
filter/
DateFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
/*
* Defined in Swagger as '#/definitions/TaxonomyFilter'
...
...
src/model/Country.ts
→
src/model/
geo/
Country.ts
View file @
86d79ec7
File moved
src/model/CountryFilter.ts
→
src/model/
geo/
CountryFilter.ts
View file @
86d79ec7
File moved
src/model/MaterialRequest.ts
→
src/model/
request/
MaterialRequest.ts
View file @
86d79ec7
import
MaterialSubRequest
from
'
model/MaterialSubRequest
'
;
import
MaterialSubRequest
from
'
model/
request/
MaterialSubRequest
'
;
/*
* Defined in Swagger as '#/definitions/MaterialRequest'
...
...
src/model/MaterialRequestFilter.ts
→
src/model/
request/
MaterialRequestFilter.ts
View file @
86d79ec7
import
DateFilter
from
'
model/DateFilter
'
;
import
StringFilter
from
'
model/StringFilter
'
;
import
DateFilter
from
'
model/
filter/
DateFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
/*
* Defined in Swagger as '#/definitions/MaterialRequestFilter'
...
...
src/model/MaterialSubRequest.ts
→
src/model/
request/
MaterialSubRequest.ts
View file @
86d79ec7
import
MaterialRequest
from
'
model/MaterialRequest
'
;
import
MaterialRequest
from
'
model/
request/
MaterialRequest
'
;
/*
* Defined in Swagger as '#/definitions/MaterialSubRequest'
...
...
src/model/MaterialSubRequestFilter.ts
→
src/model/
request/
MaterialSubRequestFilter.ts
View file @
86d79ec7
import
DateFilter
from
'
model/DateFilter
'
;
import
StringFilter
from
'
model/StringFilter
'
;
import
DateFilter
from
'
model/
filter/
DateFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
/*
* Defined in Swagger as '#/definitions/MaterialSubRequestFilter'
...
...
src/model/Subset.ts
→
src/model/
subset/
Subset.ts
View file @
86d79ec7
...
...
@@ -3,15 +3,15 @@
* Defined in OpenAPI as '#/definitions/Subset'
*/
import
{
PublishState
}
from
'
model/common.model
'
;
import
Creator
from
'
model/
Creator
'
;
import
FaoInstitute
from
'
model/FaoInstitute
'
;
import
Crop
from
'
model/Crop
'
;
import
SubsetCreator
from
'
model/subset/Subset
Creator
'
;
import
FaoInstitute
from
'
model/
genesys/
FaoInstitute
'
;
import
Crop
from
'
model/
genesys/
Crop
'
;
class
Subset
{
public
accessionCount
:
number
;
public
accessionRefs
:
string
[];
public
active
:
boolean
;
public
creators
:
Creator
[];
public
creators
:
Subset
Creator
[];
public
createdBy
:
number
;
public
createdDate
:
Date
;
public
dateCreated
:
string
;
...
...
src/model/Creator.ts
→
src/model/
subset/Subset
Creator.ts
View file @
86d79ec7
import
{
UuidModel
}
from
'
model/common.model
'
;
class
Creator
extends
UuidModel
{
class
Subset
Creator
extends
UuidModel
{
public
fullName
:
string
;
public
email
:
string
;
public
phoneNumber
:
number
;
...
...
@@ -26,4 +26,4 @@ enum CreatorRole {
CURATOR
=
'
CURATOR
'
,
}
export
{
Creator
as
default
,
CreatorRole
};
export
{
Subset
Creator
as
default
,
CreatorRole
};
src/model/SubsetFilter.ts
→
src/model/
subset/
SubsetFilter.ts
View file @
86d79ec7
import
DateFilter
from
'
model/DateFilter
'
;
import
StringFilter
from
'
model/StringFilter
'
;
import
DateFilter
from
'
model/
filter/
DateFilter
'
;
import
StringFilter
from
'
model/
filter/
StringFilter
'
;
/*
* Defined in OpenAPI as '#/definitions/SubsetFilter'
...
...
src/model/User.ts
→
src/model/
user/
User.ts
View file @
86d79ec7
File moved
src/requests/actions/admin.ts
View file @
86d79ec7
...
...
@@ -4,10 +4,10 @@ import * as _ from 'lodash';
import
{
ADMIN_APPEND_MATERIAL_REQUESTS
,
ADMIN_RECEIVE_MATERIAL_REQUEST
,
ADMIN_RECEIVE_MATERIAL_REQUESTS
}
from
'
requests/constants
'
;
// models
import
MaterialRequest
from
'
model/MaterialRequest
'
;
import
MaterialRequest
from
'
model/
request/
MaterialRequest
'
;
import
FilteredPage
,
{
IPageRequest
}
from
'
model/FilteredPage
'
;
import
RequestService
from
'
service/genesys/RequestService
'
;
import
MaterialRequestFilter
from
'
model/MaterialRequestFilter
'
;
import
MaterialRequestFilter
from
'
model/
request/
MaterialRequestFilter
'
;
const
receiveRequests
=
(
paged
:
FilteredPage
<
MaterialRequest
>
,
error
=
null
)
=>
({
...
...
src/requests/reducers/admin.ts
View file @
86d79ec7
import
update
from
'
immutability-helper
'
;
import
{
IReducerAction
}
from
'
model/common.model
'
;
import
MaterialRequest
from
'
model/MaterialRequest
'
;
import
MaterialRequest
from
'
model/
request/
MaterialRequest
'
;
import
FilteredPage
from
'
model/FilteredPage
'
;
import
{
ADMIN_APPEND_MATERIAL_REQUESTS
,
ADMIN_RECEIVE_MATERIAL_REQUEST
,
ADMIN_RECEIVE_MATERIAL_REQUESTS
}
from
'
requests/constants
'
;
...
...
src/requests/ui/admin/BrowsePage.tsx
View file @
86d79ec7
...
...
@@ -6,7 +6,7 @@ import {bindActionCreators} from 'redux';
import
{
listMaterialRequests
}
from
'
requests/actions/admin
'
;
// Models
import
MaterialRequest
from
'
model/MaterialRequest
'
;
import
MaterialRequest
from
'
model/
request/
MaterialRequest
'
;
// UI
import
BrowsePageTemplate
from
'
ui/pages/_base/BrowsePage
'
;
...
...
src/requests/ui/admin/DisplayPage.tsx
View file @
86d79ec7
...
...
@@ -7,7 +7,7 @@ import {translate} from 'react-i18next';
import
{
loadMaterialRequest
,
sendValidationEmailAction
,
recheckPidAction
,
validateRequestAction
}
from
'
requests/actions/admin
'
;
// Models
import
MaterialRequest
from
'
model/MaterialRequest
'
;
import
MaterialRequest
from
'
model/
request/
MaterialRequest
'
;
// UI
import
ContentHeaderWithButton
from
'
ui/common/heading/ContentHeaderWithButton
'
;
...
...
src/requests/ui/admin/c/RequestCard.tsx
View file @
86d79ec7
import
*
as
React
from
'
react
'
;
import
{
withStyles
}
from
'
@material-ui/core/styles
'
;
import
MaterialRequest
from
'
model/MaterialRequest
'
;
import
MaterialRequest
from
'
model/
request/
MaterialRequest
'
;
import
{
RequestLink
}
from
'
ui/genesys/Links
'
;
import
Card
,
{
CardContent
}
from
'
ui/common/Card
'
;
import
PrettyDate
from
'
ui/common/time/PrettyDate
'
;
...
...
src/service/CropService.ts
View file @
86d79ec7
import
*
as
UrlTemplate
from
'
url-template
'
;
import
{
axiosBackend
}
from
'
utilities/requestUtils
'
;
import
Crop
from
'
model/Crop
'
;
import
Crop
from
'
model/
genesys/
Crop
'
;
const
URL_LIST_CROPS
=
UrlTemplate
.
parse
(
`/api/v0/crops`
);
const
URL_SAVE_CROP
=
`/api/v0/crops/save`
;
...
...
src/service/UserProfileService.ts
View file @
86d79ec7
import
{
log
}
from
'
utilities/debug
'
;
import
{
axiosBackend
}
from
'
utilities/requestUtils
'
;
import
{
User
}
from
'
model/User
'
;
import
{
User
}
from
'
model/
user/
User
'
;
const
REGISTER_URL
=
`/api/v1/user/register`
;
const
GET_USER_PROFILE_URL
=
`/api/v0/me/profile`
;
...
...
src/service/genesys/AccessionService.ts
View file @
86d79ec7
...
...
@@ -3,12 +3,12 @@ import * as UrlTemplate from 'url-template';
import
*
as
QueryString
from
'
query-string
'
;
import
{
axiosBackend
}
from
'
utilities/requestUtils
'
;
import
Accession
from
'
model/Accession
'
;
import
AccessionDetails
from
'
model/AccessionDetails
'
;
import
AccessionFilter
from
'
model/AccessionFilter
'
;
import
AccessionMapInfo
from
'
model/AccessionMapInfo
'
;
import
Accession
from
'
model/
accession/
Accession
'
;
import
AccessionDetails
from
'
model/
accession/
AccessionDetails
'
;
import
AccessionFilter
from
'
model/
accession/
AccessionFilter
'
;
import
AccessionMapInfo
from
'
model/
accession/
AccessionMapInfo
'
;
import
FilteredPage
,
{
IPageRequest
}
from
'
model/FilteredPage
'
;
import
{
AccessionRef
}
from
'
model/
dataset.model
'
;
import
{
AccessionRef
}
from
'
model/
accession/AccessionRef
'
;
const
URL_GET_BY_DOI
=
`/api/v1/acn/{doi}`
;
// UrlTemplate doesn't like the / in DOI
const
URL_GET_BY_UUID
=
UrlTemplate
.
parse
(
`/api/v1/acn/{UUID}`
);
...
...
src/service/genesys/InstituteService.ts
View file @
86d79ec7
...
...
@@ -4,8 +4,8 @@ import * as QueryString from 'query-string';
import
{
axiosBackend
}
from
'
utilities/requestUtils
'
;
import
FilteredPage
,
{
IPageRequest
}
from
'
model/FilteredPage
'
;
import
FaoInstitute
from
'
model/FaoInstitute
'
;
import
FaoInstituteFilter
from
'
model/FaoInstituteFilter
'
;
import
FaoInstitute
from
'
model/
genesys/
FaoInstitute
'
;
import
FaoInstituteFilter
from
'
model/
genesys/
FaoInstituteFilter
'
;
const
URL_LIST
=
`/api/v1/wiews/list`
;