Skip to content

fix: take frontend config primarily from the backend #2290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sbliven wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: take frontend config primarily from the backend #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions CI/e2e/frontend.config.e2e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"checkBoxFilterClickTrigger": false,
"accessTokenPrefix": "Bearer ",
"addDatasetEnabled": false,
"allowConfigOverrides": true,
"archiveWorkflowEnabled": false,
"datasetReduceEnabled": true,
"datasetJsonScientificMetadata": true,
Expand All @@ -19,8 +18,8 @@
"facility": "SciCat Vanilla CI Test",
"siteIcon": "site-header-logo.png",
"siteHeaderLogoUrl": "https://my.facility.site",
"sitetitle": "SciCat FE CI repo",
"siteSciCatLogo": "full",
"siteTitle": "SciCat FE CI repo",
"siteSciCatLogo": "full",
"loginFacilityLabel": "SciCat Vanilla",
"loginLdapLabel": "Ldap",
"loginLocalLabel": "Local",
Expand Down Expand Up @@ -77,7 +76,7 @@
"datasetDetailsShowMissingProposalId": false,
"notificationInterceptorEnabled": true,
"metadataEditingUnitListDisabled": true,
"hideEmptyMetadataTable": false,
"hideEmptyMetadataTable": false,
"datafilesActionsEnabled": true,
"datafilesActions": [
{
Expand Down Expand Up @@ -154,7 +153,7 @@
"item[]" : "@pid",
"directory[]" : "@folder",
"files[]": "@files"
},
},
"authorization": ["#datasetAccess", "#datasetPublic"]
},
{
Expand Down Expand Up @@ -221,7 +220,7 @@
},
"payload": "{\"template_id\":\"c975455e-ede3-11ef-94fb-138c9cd51fc0\",\"parameters\":{\"dataset\":\"{{ @pid }}\",\"directory\":\"{{ @folder }}\",\"files\": {{ @files[] }},\"jwt\":\"{{ #jwt }}\",\"scicat_url\":\"https://staging.scicat.ess.url\",\"file_server_url\":\"sftserver2.esss.dk\",\"file_server_port\":\"22\"}}",
"filename": "{{ #uuid }}.ipynb"
},
},
{
"id": "9c6a11b6-a526-11f0-8795-6f025b320cc3",
"description": "This action let users make a call an arbitrary URL and store the reply in the store",
Expand Down Expand Up @@ -279,8 +278,8 @@
],
"datasetDetailsActionsEnabled": false,
"datasetDetailsActions": [],
"selectionActionsEnabled": true,
"selectionActions": [],
"datasetSelectionActionsEnabled": true,
"datasetSelectionActions": [],
"labelMaps": {
"filters": {
"LocationFilter": "Location",
Expand Down
2 changes: 0 additions & 2 deletions src/app/admin/schema/frontend.config.jsonforms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}
},
"skipSciCatLoginPageEnabled": { "type": "boolean" },
"allowConfigOverrides": { "type": "boolean" },
"checkBoxFilterClickTrigger": { "type": "boolean" },
"dateFormat": { "type": "string" },
"accessTokenPrefix": { "type": "string" },
Expand Down Expand Up @@ -436,7 +435,6 @@
"type": "Control",
"scope": "#/properties/skipSciCatLoginPageEnabled"
},
{ "type": "Control", "scope": "#/properties/allowConfigOverrides" },
{ "type": "Control", "scope": "#/properties/archiveWorkflowEnabled" },
{ "type": "Control", "scope": "#/properties/datasetReduceEnabled" },
{
Expand Down
Loading
Loading