Skip to content

Commit

Permalink
Deploy frontend: 61e84a1 adding tooltips
Browse files Browse the repository at this point in the history
  • Loading branch information
minottic authored Jan 18, 2023
1 parent 66255f2 commit f5ed4fe
Show file tree
Hide file tree
Showing 8 changed files with 160 additions and 94 deletions.
1 change: 0 additions & 1 deletion dev/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
config/jupyter/.env
config/frontend/config.json
config/proposals/.env
78 changes: 0 additions & 78 deletions dev/config/frontend/config.example.json

This file was deleted.

134 changes: 134 additions & 0 deletions dev/config/frontend/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
"lbBaseURL": "http://127.0.0.1:3000",
"accessTokenPrefix": "",
"archiveWorkflowEnabled": true,
"externalAuthEndpoint": null,
"editMetadataEnabled": false,
"editSampleEnabled": false,
"editPublishedData": true,
"scienceSearchEnabled": true,
"facility": "PSI",
"multipleDownloadEnabled": false,
"shoppingCartEnabled": true,
"shoppingCartOnHeader": true,
"ingestManual": "http://melanie.gitpages.psi.ch/SciCatPages/",
"gettingStarted": "http://melanie.gitpages.psi.ch/SciCatPages/SciCatGettingStartedSLSSummary.pdf",
"jupyterHubUrl": "https://jupyterhub.apps.ocp4a.psi.ch/hub/login",
"riotBaseUrl": null,
"datasetReduceEnabled": false,
"fileColorEnabled": false,
"jsonMetadataEnabled": true,
"localColumns": [
{
"name": "select",
"order": 0,
"type": "standard",
"enabled": true
},
{
"name": "datasetName",
"order": 1,
"type": "standard",
"enabled": true
},
{
"name": "runNumber",
"order": 2,
"type": "custom",
"enabled": false
},
{
"name": "sourceFolder",
"order": 3,
"type": "standard",
"enabled": true
},
{
"name": "size",
"order": 4,
"type": "standard",
"enabled": true
},
{
"name": "creationTime",
"order": 5,
"type": "standard",
"enabled": true
},
{
"name": "type",
"order": 6,
"type": "standard",
"enabled": true
},
{
"name": "image",
"order": 7,
"type": "standard",
"enabled": false
},
{
"name": "metadata",
"order": 8,
"type": "standard",
"enabled": false
},
{
"name": "proposalId",
"order": 9,
"type": "standard",
"enabled": true
},
{
"name": "ownerGroup",
"order": 10,
"type": "standard",
"enabled": true
},
{
"name": "dataStatus",
"order": 11,
"type": "standard",
"enabled": true
}
],
"logbookEnabled": false,
"metadataPreviewEnabled": false,
"maxDirectDownloadSize": 5000000000,
"multipleDownloadAction": null,
"searchSamples": true,
"sftpHost": null,
"tableSciDataEnabled": false,
"shareEnabled": true,
"searchPublicDataEnabled": true,
"landingPage": "doi2.psi.ch/detail/",
"fileDownloadEnabled": false,
"jobsEnabled": true,
"policiesEnabled": true,
"addDatasetEnabled": false,
"editDatasetSampleEnabled": false,
"scienceSearchUnitsEnabled": false,
"metadataStructure": "tree",
"loginFormEnabled": true,
"oAuth2Endpoints": [
{
"displayText": "PSI account",
"displayImage": "../../../assets/images/keycloak_icon_256px.svg",
"authURL": "auth/keycloak"
}
],
"helpMessages": {
"gettingStarted": "(PSI intranet only) gives a brief description on how to get started using the data catalog.",
"ingestManual": "(PSI intranet only) provides detailed information on how to make your data available to the catalog as well as archiving and retrieval of datasets."
},
"retrieveDestinations": [
{
"option": "PSI",
"tooltip": "Copy the data to the PSI storage buffer. After that, you need to copy it from there to any destination using the datasetRetriever command or using rsync from pb-retrieve.psi.ch"
},
{
"option": "PSI-RA",
"tooltip": "Copy the data directly to the PSI RA cluster destination folder at /das/work/${groupname:0:3}/${groupname}/retrieve/${sourceFolder}/"
}
]
}
2 changes: 1 addition & 1 deletion frontend
Submodule frontend updated 34 files
+0 −55 .github/workflows/build-push.yml
+48 −0 .github/workflows/build-release.yml
+67 −0 .github/workflows/deploy.yml
+0 −97 .github/workflows/main-release.yml
+0 −104 .github/workflows/test-build.yml
+73 −0 .github/workflows/test.yml
+42 −47 cypress/fixtures/derivedDataset.json
+1 −6 cypress/fixtures/rawDataset.json
+15 −5 cypress/integration/datasets-attachment.spec.js
+39 −5 cypress/integration/datasets-keyword.spec.js
+29 −9 cypress/integration/datasets-metadata.spec.js
+13 −5 cypress/integration/datasets-public.spec.js
+11 −1 cypress/integration/datasets-publish.spec.js
+12 −2 cypress/integration/datasets-reduce.spec.js
+12 −10 cypress/integration/samples-create.spec.js
+9 −2 cypress/integration/users-login.spec.js
+4 −0 cypress/support/commands.js
+62 −34 package-lock.json
+1 −1 package.json
+10 −11 src/app/_layout/app-header/app-header.component.html
+38 −38 src/app/_layout/app-header/app-header.component.spec.ts
+4 −0 src/app/_layout/app-header/app-header.component.ts
+1 −0 src/app/app-config.service.ts
+1 −1 src/app/samples/sample-dialog/sample-dialog.component.html
+1 −1 src/app/shared/modules/dialog/dialog.component.html
+7 −1 src/app/shared/modules/dialog/dialog.component.scss
+2 −0 src/app/shared/modules/dialog/dialog.module.ts
+1 −1 src/app/shared/sdk/services/custom/Dataset.ts
+227 −227 src/app/shared/sdk/services/custom/Policy.ts
+1 −3 src/app/state-management/actions/user.actions.ts
+3 −3 src/app/state-management/effects/datasets.effects.spec.ts
+1 −1 src/app/state-management/effects/datasets.effects.ts
+7 −0 src/app/state-management/reducers/user.reducer.ts
+1 −0 src/app/users/user-settings/user-settings.component.scss
24 changes: 15 additions & 9 deletions helm/configs/frontend/development/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
"lbBaseURL": "https://dacat-development.psi.ch",
"accessTokenPrefix": "",
"archiveWorkflowEnabled": true,
"retrieveDestinations": [{
"option": "PSI"
"retrieveDestinations": [
{
"option": "PSI",
"tooltip": "Copy the data to the PSI storage buffer. After that, you need to copy it from there to any destination using the datasetRetriever command or using rsync from pb-retrieve.psi.ch"
},
{
"option": "CSCS"
},
{
"option": "PSI-RA",
"location": "/gpfs/workfs/p18/p18525/retrieve"
"location": "/gpfs/workfs/p18/p18525/retrieve",
"tooltip": "Copy the data directly to the PSI RA cluster destination folder at /das/work/${groupname:0:3}/${groupname}/retrieve/${sourceFolder}/"
}
],
"externalAuthEndpoint": null,
Expand All @@ -29,7 +32,8 @@
"datasetReduceEnabled": false,
"fileColorEnabled": false,
"jsonMetadataEnabled": true,
"localColumns": [{
"localColumns": [
{
"name": "select",
"order": 0,
"type": "standard",
Expand Down Expand Up @@ -120,11 +124,13 @@
"scienceSearchUnitsEnabled": false,
"metadataStructure": "tree",
"loginFormEnabled": true,
"oAuth2Endpoints": [{
"displayText": "PSI account",
"displayImage": "../../../assets/images/keycloak_icon_256px.svg",
"authURL": "auth/keycloak"
}],
"oAuth2Endpoints": [
{
"displayText": "PSI account",
"displayImage": "../../../assets/images/keycloak_icon_256px.svg",
"authURL": "auth/keycloak"
}
],
"helpMessages": {
"gettingStarted": "(PSI intranet only) gives a brief description on how to get started using the data catalog.",
"ingestManual": "(PSI intranet only) provides detailed information on how to make your data available to the catalog as well as archiving and retrieval of datasets."
Expand Down
6 changes: 4 additions & 2 deletions helm/configs/frontend/production/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
"archiveWorkflowEnabled": true,
"retrieveDestinations": [
{
"option": "PSI"
"option": "PSI",
"tooltip": "Copy the data to the PSI storage buffer. After that, you need to copy it from there to any destination using the datasetRetriever command or using rsync from pb-retrieve.psi.ch"
},
{
"option": "PSI-RA"
"option": "PSI-RA",
"tooltip": "Copy the data directly to the PSI RA cluster destination folder at /das/work/${groupname:0:3}/${groupname}/retrieve/${sourceFolder}/"
}
],
"externalAuthEndpoint": null,
Expand Down
6 changes: 4 additions & 2 deletions helm/configs/frontend/qa/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
"archiveWorkflowEnabled": true,
"retrieveDestinations": [
{
"option": "PSI"
"option": "PSI",
"tooltip": "Copy the data to the PSI storage buffer. After that, you need to copy it from there to any destination using the datasetRetriever command or using rsync from pb-retrieve.psi.ch"
},
{
"option": "PSI-RA"
"option": "PSI-RA",
"tooltip": "Copy the data directly to the PSI RA cluster destination folder at /das/work/${groupname:0:3}/${groupname}/retrieve/${sourceFolder}/"
}
],
"externalAuthEndpoint": null,
Expand Down
3 changes: 2 additions & 1 deletion helm/configs/frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ configMaps:

initContainers:
- name: install
image: busybox
image: alpine
command:
- "/bin/sh"
- -c
args:
- >-
apk update && apk add ca-certificates && update-ca-certificates;
wget
-O /download-dir/site.png
https://raw.githubusercontent.com/paulscherrerinstitute/scicat-ci/main/helm/configs/frontend/site.png;
Expand Down

0 comments on commit f5ed4fe

Please sign in to comment.