Merge branch 'main' of https://gitlab.coko.foundation/kotahi/kotahi

.gitlab-ci.elife.yml

@@ -18,15 +18,28 @@ build:
   before_script:
     - cp app/brand-instances-configs/elife.json app/brandConfig.json
   script:
-    - if [ -z "$DOCKERHUB_USERNAME_ELIFE" ] || [ -z "$DOCKERHUB_PASSWORD_ELIFE" ]; then echo "Not pushing" && exit 0; fi
-    - docker login -u $DOCKERHUB_USERNAME_ELIFE -p $DOCKERHUB_PASSWORD_ELIFE
-    - docker pull $IMAGE_ORG/$IMAGE_NAME:latest || true
-    - docker build --build-arg instance_name=elife --file ./Dockerfile-production --cache-from $CI_REGISTRY_IMAGE:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .
-    - docker build --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME-dev:latest --tag $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME-dev:latest .
-    - docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_ORG/$IMAGE_NAME:latest
-    - docker push $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-    - docker push $IMAGE_ORG/$IMAGE_NAME-dev:latest
+    - |
+      if [ -z "$DOCKERHUB_USERNAME_ELIFE" ] || [ -z "$DOCKERHUB_PASSWORD_ELIFE" ]; then echo "Not pushing" && exit 0; fi
+      docker login -u $DOCKERHUB_USERNAME_ELIFE -p $DOCKERHUB_PASSWORD_ELIFE
+      docker pull $IMAGE_ORG/$IMAGE_NAME:latest || true
+      docker build \
+      --build-arg instance_name=elife \
+      --build-arg node_env=production \
+      --build-arg server_protocol= \
+      --build-arg server_host=localhost \
+      --build-arg server_port=3000 \
+      --build-arg client_protocol=http \
+      --build-arg client_host=0.0.0.0 \
+      --build-arg client_port=4000 \
+      --file ./Dockerfile-production \
+      --cache-from $CI_REGISTRY_IMAGE:latest \
+      --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA \
+      --tag $IMAGE_ORG/$IMAGE_NAME:latest .
+      docker build --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME-dev:latest --tag $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME-dev:latest .
+      docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
+      docker push $IMAGE_ORG/$IMAGE_NAME:latest
+      docker push $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+      docker push $IMAGE_ORG/$IMAGE_NAME-dev:latest
 
 deploy:
   stage: deploy
@@ -75,6 +88,7 @@ test-chrome:
     PGPASSWORD: kotahidev
     # this is used to ignore self signed certs
     START_SERVER_AND_TEST_INSECURE: 1
+    INSTANCE_NAME: elife
   services:
     - postgres
   script:
@@ -100,6 +114,7 @@ test-firefox:
     PGUSER: kotahidev
     PGPASSWORD: kotahidev
     START_SERVER_AND_TEST_INSECURE: 1
+    INSTANCE_NAME: elife
   services:
     - postgres
   script:

app/storage/forms/submit.json

@@ -8,7 +8,7 @@
       "id": "1616424088561",
       "component": "TextField",
       "name": "submission.articleId",
-      "description": "<p>undefined</p>",
+      "description": "",
       "validate": [
         {
           "value": "required",
@@ -74,7 +74,12 @@
       "id": "1616424092971",
       "component": "Select",
       "name": "submission.evalType",
-      "validate": []
+      "validate": [
+        {
+          "value": "required",
+          "label": "Required"
+        }
+      ]
     },
     {
       "options": [],

config/default.js

-/* eslint-disable */
 const path = require('path')
 const logger = require('winston')
 const { deferConfig } = require('config/defer')
@@ -7,13 +6,6 @@ const components = require('./components.json')
 const formComponents = require('./form-components.json')
 const journal = require('./journal')
 
-console.log('logging in config default')
-console.log('process.env')
-console.log(process.env)
-console.log('process.env.INSTANCE_NAME')
-console.log(process.env.INSTANCE_NAME)
-console.log('typeof instance name')
-console.log(typeof process.env.INSTANCE_NAME)
 module.exports = {
   teams: {
     seniorEditor: {
@@ -51,20 +43,9 @@ module.exports = {
         coko: '../app/storage/forms-coko',
       }
 
-      console.log('pubsweet-component-xpub-formbuilder')
-      console.log('process.env')
-      console.log(process.env)
-      console.log('process.env.INSTANCE_NAME')
-      console.log(process.env.INSTANCE_NAME)
-      console.log('typeof instance name')
-      console.log(typeof process.env.INSTANCE_NAME)
-
       const pathToFormTemplateFolder =
         formTemplatePath[String(process.env.INSTANCE_NAME)]
 
-      console.log('pathToFormTemplateFolder')
-      console.log(pathToFormTemplateFolder)
-
       return path.resolve(__dirname, pathToFormTemplateFolder)
     }),
     components: formComponents,