Skip to content

Commit

Permalink
Merge pull request #481 from SciCatProject/swap-3245-2
Browse files Browse the repository at this point in the history
Swap 3245 2 - still hunting missing groups
  • Loading branch information
nitrosx authored May 8, 2023
2 parents 1d2e82a + 7e43d4a commit 927605f
Show file tree
Hide file tree
Showing 4 changed files with 319 additions and 145 deletions.
33 changes: 33 additions & 0 deletions CI/E2E/backend.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
DOI_PREFIX="10.17199/"
HTTP_MAX_REDIRECTS=5
HTTP_TIMEOUT=5000
JWT_SECRET=x23xrudhd4rf8242w4gf6czr3mb3kraubacamq3q
JWT_EXPIRES_IN=3600
LDAP_URL="ldaps://ldap.server.com:636/"
LDAP_BIND_DN="<USERNAME>@server.com"
LDAP_BIND_CREDENTIALS=<PASSWORD>
LDAP_SEARCH_BASE=<SEARCH_BASE>
LDAP_SEARCH_FILTER="(LDAPUsername={{username}})"
LOGBOOK_ENABLED="no"
LOGBOOK_BASE_URL="http://scichat-loopback:3000/scichatapi"
LOGBOOK_USERNAME="logbookReader"
LOGBOOK_PASSWORD="<LOGBOOK_PASSWORD>"
METADATA_KEYS_RETURN_LIMIT=100
METADATA_PARENT_INSTANCES_RETURN_LIMIT=100
MONGODB_URI="mongodb://mongodb:27017/scicat-backend-nestjs-e2e-testing"
PID_PREFIX="20.500.12269/"
PUBLIC_URL_PREFIX="https://doi.ess.eu/detail/"
PORT=3000
RABBITMQ_ENABLED="no"
RABBITMQ_HOSTNAME="localhost"
RABBITMQ_USERNAME="rabbitmq"
RABBITMQ_PASSWORD="rabbitmq"
REGISTER_DOI_URI="https://mds.test.datacite.org/doi"
REGISTER_METADATA_URI="https://mds.test.datacite.org/metadata"
SITE="ESS"
ACCESS_GROUPS_STATIC_VALUES="ess,swap"
ADMIN_GROUPS="admin, ingestor, archivemanager"
CREATE_DATASET_GROUPS="group1, group2, group3"
DELETE_GROUPS="admin, archivemanager"
OAI_PROVIDER_ROUTER=

15 changes: 8 additions & 7 deletions CI/E2E/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,24 @@ services:
- "./CI/E2E/.env.scichat-loopback:/home/node/app/.env"
depends_on:
- mongodb
backend-next:
backend:
build:
context: .
dockerfile: Dockerfile
volumes:
- "./CI/E2E/.env.backend-next:/home/node/app/.env"
- "./CI/E2E/backend.env:/home/node/app/.env"
# - "./CI/E2E/frontend.config.json:/home/node/app/dist/config/frontend.config.json"
depends_on:
- mongodb
labels:
- "traefik.http.routers.backend-next.rule=PathPrefix(`/api`)"
- "traefik.http.routers.backend-next.entrypoints=web"
- "traefik.http.routers.backend.rule=PathPrefix(`/api`)"
- "traefik.http.routers.backend.entrypoints=web"
frontend:
image: ghcr.io/scicatproject/frontend:latest
volumes:
- "./CI/E2E/config.e2e.json:/usr/share/nginx/html/assets/config.json"
#volumes:
# - "./CI/E2E/config-frontend.backend-e2e.json:/usr/share/nginx/html/assets/config.json"
depends_on:
- backend-next
- backend
labels:
- "traefik.http.routers.frontend.rule=PathPrefix(`/`)"
- "traefik.http.routers.frontend.entrypoints=web"
Expand Down
128 changes: 128 additions & 0 deletions CI/E2E/frontend.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"accessTokenPrefix": "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://backend:80",
"localColumns": [
{
"name": "select",
"order": 0,
"type": "standard",
"enabled": true
},
{
"name": "pid",
"order": 1,
"type": "standard",
"enabled": true
},
{
"name": "datasetName",
"order": 2,
"type": "standard",
"enabled": true
},
{
"name": "runNumber",
"order": 3,
"type": "standard",
"enabled": true
},
{
"name": "sourceFolder",
"order": 4,
"type": "standard",
"enabled": false
},
{
"name": "size",
"order": 5,
"type": "standard",
"enabled": true
},
{
"name": "creationTime",
"order": 6,
"type": "standard",
"enabled": true
},
{
"name": "type",
"order": 7,
"type": "standard",
"enabled": true
},
{
"name": "image",
"order": 8,
"type": "standard",
"enabled": false
},
{
"name": "metadata",
"order": 9,
"type": "standard",
"enabled": false
},
{
"name": "proposalId",
"order": 10,
"type": "standard",
"enabled": true
},
{
"name": "ownerGroup",
"order": 11,
"type": "standard",
"enabled": true
},
{
"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": [],
"policiesEnabled": true,
"retrieveDestinations": [],
"riotBaseUrl": "http://scitest.esss.lu.se/riot",
"scienceSearchEnabled": false,
"scienceSearchUnitsEnabled": true,
"searchPublicDataEnabled": true,
"searchSamples": true,
"sftpHost": "login.esss.dk",
"shareEnabled": true,
"shoppingCartEnabled": true,
"shoppingCartOnHeader": true,
"tableSciDataEnabled": true,
"datasetDetailsShowMissingProposalId": false
}
Loading

0 comments on commit 927605f

Please sign in to comment.