Deploy fe: cd6e799

* Includes ability to apply configuration at runtime * Apply changes on qa * Apply changes on production
paulscherrerinstitute · Nov 23, 2022 · ff8ac33 · ff8ac33
1 parent f23cbd1
commit ff8ac33
Show file tree

Hide file tree

Showing 16 changed files with 416 additions and 754 deletions.
diff --git a/.github/workflows/reusable.build-deploy.yml b/.github/workflows/reusable.build-deploy.yml
@@ -135,7 +135,6 @@ jobs:
         namespace: '${{ inputs.namespace_prefix }}${{ inputs.environment }}'
         chart: '${{ inputs.helm_chart }}'
         helm: helm3
-        timeout: 10m
         values: |
          ciRepository: ${{ inputs.registry }}/${{ inputs.image_name }}
          ciTag: ${{ inputs.tag }}

diff --git a/.github/workflows/scicat-fe.yml b/.github/workflows/scicat-fe.yml
@@ -61,10 +61,7 @@ jobs:
         ciVars=$(cat <<EOF
           {
             "KEYCLOAK_ICON": $(jq -R -s < helm_configs/frontend/keycloak_icon_256px.svg),
-            "ENVIRONMENT": $(jq -R -s < helm_configs/frontend/${{ needs.set_env.outputs.environment }}/environment.ts),
-            "STYLES": $(jq -R -s < helm_configs/frontend/styles.scss),
-            "LOGIN_COMPONENT": $(jq -R -s < helm_configs/frontend/login.component.html),
-            "HELP_COMPONENT": $(jq -R -s < helm_configs/frontend/help.component.html),
+            "ENVIRONMENT": $(jq -R -s < helm_configs/frontend/${{ needs.set_env.outputs.environment }}/config.json),
           }
         EOF
         )

diff --git a/frontend b/frontend
diff --git a/helm_configs/frontend/development/config.json b/helm_configs/frontend/development/config.json
@@ -0,0 +1,132 @@
+{
+    "lbBaseURL": "https://dacat-development.psi.ch",
+    "accessTokenPrefix": "",
+    "archiveWorkflowEnabled": true,
+    "retrieveDestinations": [{
+            "option": "PSI"
+        },
+        {
+            "option": "CSCS"
+        },
+        {
+            "option": "PSI-RA",
+            "location": "/gpfs/workfs/p18/p18525/retrieve"
+        }
+    ],
+    "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."
+    }
+}
diff --git a/helm_configs/frontend/development/environment.ts b/helm_configs/frontend/development/environment.ts
diff --git a/helm_configs/frontend/development/values.yaml b/helm_configs/frontend/development/values.yaml
@@ -1,5 +1 @@
-envFile: environment.development.ts
-
-envValue: development
-
 host: discovery-development.psi.ch
diff --git a/helm_configs/frontend/help.component.html b/helm_configs/frontend/help.component.html