From a905fe8d07878f1b269493e72c66e7852b1bb778 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 4 May 2023 14:55:02 +0200 Subject: [PATCH 1/3] Update frontend.config.ts --- src/config/frontend.config.ts | 206 +++++++++++++++++----------------- 1 file changed, 101 insertions(+), 105 deletions(-) diff --git a/src/config/frontend.config.ts b/src/config/frontend.config.ts index 5b243d859..4959b7a57 100644 --- a/src/config/frontend.config.ts +++ b/src/config/frontend.config.ts @@ -1,131 +1,127 @@ -export default { - accessTokenPrefix: "Bearer ", - lbTokenPrefix: "Bearer ", - addDatasetEnabled: true, - archiveWorkflowEnabled: false, - datasetReduceEnabled: true, - editDatasetSampleEnabled: true, - editMetadataEnabled: true, - editPublishedData: false, - editSampleEnabled: true, - externalAuthEndpoint: "/api/v3/auth/msad", - facility: "ESS", - loginFacilityLabel: "ESS", - loginLdapLabel: "Ldap", - loginLocalLabel: "Local", - loginFacilityEnabled: true, - loginLdapEnabled: true, - loginLocalEnabled: true, - fileColorEnabled: true, - fileDownloadEnabled: true, - gettingStarted: null, - ingestManual: null, - jobsEnabled: true, - jsonMetadataEnabled: true, - jupyterHubUrl: "https://jupyterhub.esss.lu.se/", - landingPage: "doi.ess.eu/detail/", - lbBaseURL: "http://localhost:3000", - localColumns: [ +{ + "accessTokenPrefix": "Bearer ", + "addDatasetEnabled": true, + "archiveWorkflowEnabled": false, + "datasetReduceEnabled": false, + "editDatasetSampleEnabled": true, + "editMetadataEnabled": true, + "editPublishedData": true, + "editSampleEnabled": true, + "externalAuthEndpoint": "/api/v3/auth/msad", + "facility": "ESS", + "loginFacilityLabel": "ESS", + "loginLdapLabel" : "Ldap", + "loginLocalLabel" : "Local", + "loginFacilityEnabled" : true, + "loginLdapEnabled" : false, + "loginLocalEnabled" : true, + "fileColorEnabled": true, + "fileDownloadEnabled": true, + "gettingStarted": null, + "ingestManual": null, + "jobsEnabled": false, + "jsonMetadataEnabled": false, + "jupyterHubUrl": null, + "landingPage": "doi.ess.eu/detail/", + "lbBaseURL": "", + "localColumns": [ { - name: "select", - order: 0, - type: "standard", - enabled: true, + "name": "select", + "order": 0, + "type": "standard", + "enabled": true }, { - name: "pid", - order: 1, - type: "standard", - enabled: true, + "name": "pid", + "order": 1, + "type": "standard", + "enabled": true }, { - name: "datasetName", - order: 2, - type: "standard", - enabled: true, + "name": "datasetName", + "order": 2, + "type": "standard", + "enabled": true }, { - name: "runNumber", - order: 3, - type: "standard", - enabled: true, + "name": "runNumber", + "order": 3, + "type": "standard", + "enabled": true }, { - name: "sourceFolder", - order: 4, - type: "standard", - enabled: true, + "name": "sourceFolder", + "order": 4, + "type": "standard", + "enabled": false }, { - name: "size", - order: 5, - type: "standard", - enabled: true, + "name": "size", + "order": 5, + "type": "standard", + "enabled": true }, { - name: "creationTime", - order: 6, - type: "standard", - enabled: true, + "name": "creationTime", + "order": 6, + "type": "standard", + "enabled": true }, { - name: "type", - order: 7, - type: "standard", - enabled: true, + "name": "type", + "order": 7, + "type": "standard", + "enabled": true }, { - name: "image", - order: 8, - type: "standard", - enabled: true, + "name": "image", + "order": 8, + "type": "standard", + "enabled": true }, { - name: "metadata", - order: 9, - type: "standard", - enabled: true, + "name": "metadata", + "order": 9, + "type": "standard", + "enabled": false }, { - name: "proposalId", - order: 10, - type: "standard", - enabled: true, + "name": "proposalId", + "order": 10, + "type": "standard", + "enabled": true }, { - name: "ownerGroup", - order: 11, - type: "standard", - enabled: false, + "name": "ownerGroup", + "order": 11, + "type": "standard", + "enabled": false }, { - name: "dataStatus", - order: 12, - type: "standard", - enabled: false, - }, - ], - logbookEnabled: true, - loginFormEnabled: true, - maxDirectDownloadSize: 5000000000, - metadataPreviewEnabled: true, - metadataStructure: "", - multipleDownloadAction: "http://localhost:3012/zip", - multipleDownloadEnabled: true, - oAuth2Endpoints: [ - { authURL: "api/v3/auth/oidc", displayText: "ESS One Identity" }, + "name": "dataStatus", + "order": 12, + "type": "standard", + "enabled": false + } ], - policiesEnabled: true, - retrieveDestinations: [], - riotBaseUrl: "http://scichat.swap.ess.eu", - scienceSearchEnabled: true, - scienceSearchUnitsEnabled: true, - searchPublicDataEnabled: true, - searchSamples: true, - sftpHost: "login.esss.dk", - shareEnabled: true, - shoppingCartEnabled: true, - shoppingCartOnHeader: true, - tableSciDataEnabled: true, - datasetDetailsShowMissingProposalId: false, -}; + "logbookEnabled": true, + "loginFormEnabled": true, + "maxDirectDownloadSize": 5000000000, + "metadataPreviewEnabled": true, + "metadataStructure": "", + "multipleDownloadAction": "https://scicatfileserver.esss.dk/zip", + "multipleDownloadEnabled": true, + "oAuth2Endpoints": [ { "authURL": "api/v3/auth/oidc", "displayText": "ESS One Identity" } ], + "policiesEnabled": false, + "retrieveDestinations": [], + "riotBaseUrl": "http://scichat.esss.lu.se", + "scienceSearchEnabled": true, + "scienceSearchUnitsEnabled": true, + "searchPublicDataEnabled": true, + "searchSamples": true, + "sftpHost": "login.esss.dk", + "shareEnabled": true, + "shoppingCartEnabled": true, + "shoppingCartOnHeader": true, + "tableSciDataEnabled": true +} From b4affd607f76bf9e8c73cd390b8a970ba00d89b8 Mon Sep 17 00:00:00 2001 From: Martin Trajanovski Date: Fri, 5 May 2023 09:17:01 +0200 Subject: [PATCH 2/3] use js object instead of json --- src/config/frontend.config.ts | 207 +++++++++++++++++----------------- 1 file changed, 106 insertions(+), 101 deletions(-) diff --git a/src/config/frontend.config.ts b/src/config/frontend.config.ts index 4959b7a57..cc1059238 100644 --- a/src/config/frontend.config.ts +++ b/src/config/frontend.config.ts @@ -1,127 +1,132 @@ -{ - "accessTokenPrefix": "Bearer ", - "addDatasetEnabled": true, - "archiveWorkflowEnabled": false, - "datasetReduceEnabled": false, - "editDatasetSampleEnabled": true, - "editMetadataEnabled": true, - "editPublishedData": true, - "editSampleEnabled": true, - "externalAuthEndpoint": "/api/v3/auth/msad", - "facility": "ESS", - "loginFacilityLabel": "ESS", - "loginLdapLabel" : "Ldap", - "loginLocalLabel" : "Local", - "loginFacilityEnabled" : true, - "loginLdapEnabled" : false, - "loginLocalEnabled" : true, - "fileColorEnabled": true, - "fileDownloadEnabled": true, - "gettingStarted": null, - "ingestManual": null, - "jobsEnabled": false, - "jsonMetadataEnabled": false, - "jupyterHubUrl": null, - "landingPage": "doi.ess.eu/detail/", - "lbBaseURL": "", - "localColumns": [ +export default { + accessTokenPrefix: "Bearer ", + addDatasetEnabled: true, + archiveWorkflowEnabled: false, + datasetReduceEnabled: false, + editDatasetSampleEnabled: true, + editMetadataEnabled: true, + editPublishedData: true, + editSampleEnabled: true, + externalAuthEndpoint: "/api/v3/auth/msad", + facility: "ESS", + loginFacilityLabel: "ESS", + loginLdapLabel: "Ldap", + loginLocalLabel: "Local", + loginFacilityEnabled: true, + loginLdapEnabled: false, + loginLocalEnabled: true, + fileColorEnabled: true, + fileDownloadEnabled: true, + gettingStarted: null, + ingestManual: null, + jobsEnabled: false, + jsonMetadataEnabled: false, + jupyterHubUrl: null, + landingPage: "doi.ess.eu/detail/", + lbBaseURL: "", + localColumns: [ { - "name": "select", - "order": 0, - "type": "standard", - "enabled": true + name: "select", + order: 0, + type: "standard", + enabled: true, }, { - "name": "pid", - "order": 1, - "type": "standard", - "enabled": true + name: "pid", + order: 1, + type: "standard", + enabled: true, }, { - "name": "datasetName", - "order": 2, - "type": "standard", - "enabled": true + name: "datasetName", + order: 2, + type: "standard", + enabled: true, }, { - "name": "runNumber", - "order": 3, - "type": "standard", - "enabled": true + name: "runNumber", + order: 3, + type: "standard", + enabled: true, }, { - "name": "sourceFolder", - "order": 4, - "type": "standard", - "enabled": false + name: "sourceFolder", + order: 4, + type: "standard", + enabled: false, }, { - "name": "size", - "order": 5, - "type": "standard", - "enabled": true + name: "size", + order: 5, + type: "standard", + enabled: true, }, { - "name": "creationTime", - "order": 6, - "type": "standard", - "enabled": true + name: "creationTime", + order: 6, + type: "standard", + enabled: true, }, { - "name": "type", - "order": 7, - "type": "standard", - "enabled": true + name: "type", + order: 7, + type: "standard", + enabled: true, }, { - "name": "image", - "order": 8, - "type": "standard", - "enabled": true + name: "image", + order: 8, + type: "standard", + enabled: true, }, { - "name": "metadata", - "order": 9, - "type": "standard", - "enabled": false + name: "metadata", + order: 9, + type: "standard", + enabled: false, }, { - "name": "proposalId", - "order": 10, - "type": "standard", - "enabled": true + name: "proposalId", + order: 10, + type: "standard", + enabled: true, }, { - "name": "ownerGroup", - "order": 11, - "type": "standard", - "enabled": false + name: "ownerGroup", + order: 11, + type: "standard", + enabled: false, }, { - "name": "dataStatus", - "order": 12, - "type": "standard", - "enabled": false - } + name: "dataStatus", + order: 12, + type: "standard", + enabled: false, + }, + ], + logbookEnabled: true, + loginFormEnabled: true, + maxDirectDownloadSize: 5000000000, + metadataPreviewEnabled: true, + metadataStructure: "", + multipleDownloadAction: "https://scicatfileserver.esss.dk/zip", + multipleDownloadEnabled: true, + oAuth2Endpoints: [ + { + authURL: "api/v3/auth/oidc", + displayText: "ESS One Identity", + }, ], - "logbookEnabled": true, - "loginFormEnabled": true, - "maxDirectDownloadSize": 5000000000, - "metadataPreviewEnabled": true, - "metadataStructure": "", - "multipleDownloadAction": "https://scicatfileserver.esss.dk/zip", - "multipleDownloadEnabled": true, - "oAuth2Endpoints": [ { "authURL": "api/v3/auth/oidc", "displayText": "ESS One Identity" } ], - "policiesEnabled": false, - "retrieveDestinations": [], - "riotBaseUrl": "http://scichat.esss.lu.se", - "scienceSearchEnabled": true, - "scienceSearchUnitsEnabled": true, - "searchPublicDataEnabled": true, - "searchSamples": true, - "sftpHost": "login.esss.dk", - "shareEnabled": true, - "shoppingCartEnabled": true, - "shoppingCartOnHeader": true, - "tableSciDataEnabled": true -} + policiesEnabled: false, + retrieveDestinations: [], + riotBaseUrl: "http://scichat.esss.lu.se", + scienceSearchEnabled: true, + scienceSearchUnitsEnabled: true, + searchPublicDataEnabled: true, + searchSamples: true, + sftpHost: "login.esss.dk", + shareEnabled: true, + shoppingCartEnabled: true, + shoppingCartOnHeader: true, + tableSciDataEnabled: true, +}; From b5f01369c265dcd993c06394f5063310a2c550a2 Mon Sep 17 00:00:00 2001 From: Martin Trajanovski Date: Fri, 5 May 2023 10:18:18 +0200 Subject: [PATCH 3/3] fix the frontend config --- src/config/frontend.config.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/config/frontend.config.ts b/src/config/frontend.config.ts index cc1059238..8c450f437 100644 --- a/src/config/frontend.config.ts +++ b/src/config/frontend.config.ts @@ -2,10 +2,10 @@ export default { accessTokenPrefix: "Bearer ", addDatasetEnabled: true, archiveWorkflowEnabled: false, - datasetReduceEnabled: false, + datasetReduceEnabled: true, editDatasetSampleEnabled: true, editMetadataEnabled: true, - editPublishedData: true, + editPublishedData: false, editSampleEnabled: true, externalAuthEndpoint: "/api/v3/auth/msad", facility: "ESS", @@ -13,15 +13,17 @@ export default { loginLdapLabel: "Ldap", loginLocalLabel: "Local", loginFacilityEnabled: true, - loginLdapEnabled: false, + loginLdapEnabled: true, loginLocalEnabled: true, + facilityLoginLabel: "ESS", + localLoginLabel: "Local", fileColorEnabled: true, fileDownloadEnabled: true, gettingStarted: null, ingestManual: null, - jobsEnabled: false, - jsonMetadataEnabled: false, - jupyterHubUrl: null, + jobsEnabled: true, + jsonMetadataEnabled: true, + jupyterHubUrl: "https://jupyterhub.esss.lu.se/", landingPage: "doi.ess.eu/detail/", lbBaseURL: "", localColumns: [ @@ -53,7 +55,7 @@ export default { name: "sourceFolder", order: 4, type: "standard", - enabled: false, + enabled: true, }, { name: "size", @@ -117,7 +119,7 @@ export default { displayText: "ESS One Identity", }, ], - policiesEnabled: false, + policiesEnabled: true, retrieveDestinations: [], riotBaseUrl: "http://scichat.esss.lu.se", scienceSearchEnabled: true, @@ -129,4 +131,5 @@ export default { shoppingCartEnabled: true, shoppingCartOnHeader: true, tableSciDataEnabled: true, + datasetDetailsShowMissingProposalId: false, };