Merge branch 'dev' into test

bcgov · Dec 18, 2023 · c3d417a · c3d417a
2 parents a070d5f + ed92088
commit c3d417a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci-build-deploy.yaml b/.github/workflows/ci-build-deploy.yaml
@@ -312,7 +312,7 @@ jobs:
               - 'state=\$(curl -XGET -m 2 --silent -f -H \"Accept: application/json\" http://localhost:3000/health | jq -r \".status | ascii_downcase\"); if [ ! \"\$state\" == \"ready\" ]; then exit 1; fi'
             timeoutSeconds: 3
             periodSeconds: 10
-        
+
           " > values.yaml
 
           helm repo add bcgov http://bcgov.github.io/helm-charts
@@ -361,6 +361,7 @@ jobs:
         if: github.ref == 'refs/heads/test'
         run: |
           oc rollout restart deployment/bcgov-aps-portal-generic-api -n ${{ secrets.OPENSHIFT_GOLD_TEST_NAMESPACE }}
+          oc rollout restart deployment/bcgov-aps-portal-batch-generic-api -n ${{ secrets.OPENSHIFT_GOLD_TEST_NAMESPACE }}
 
       - name: 'Create Pull Request for Release'
         if: github.ref == 'refs/heads/test'

diff --git a/feeds/Dockerfile b/feeds/Dockerfile
@@ -1,4 +1,5 @@
-FROM node:lts-alpine3.17
+#FROM node:lts-alpine3.17
+FROM node:16.14.2-alpine3.15
 
 RUN apk add curl jq
 
@@ -18,5 +19,4 @@ COPY --chown=node . ./
 
 ENV HOME=/home/node
 
-ENTRYPOINT [ "npm", "run" ]
-CMD [ "start"]
+CMD [ "node", "index.js" ]
diff --git a/feeds/index.js b/feeds/index.js
@@ -171,12 +171,12 @@ if (process.env.SCHEDULE == 'true') {
   runTimedJob('prometheus', 120, { numDays: 1 });
   runTimedJob('prometheus', 24 * 60 + 5, { numDays: 5 });
   runTimedJob('kong', 1 * 60, {});
-  runTimedJob('ckan', (24 * 60) + 30, {});
+  runTimedJob('ckan', 24 * 60 + 30, {});
   runTimedJob('ckan_org', 24 * 60, {});
 }
 
-const server = app.listen(port, () => {
+app.listen(port, () => {
   logger.info(`Listening at http://localhost:${port}`);
 });
 
-process.on('SIGINT', () => process.kill(process.pid, 'SIGTERM'));
+process.on('SIGINT', () => process.exit(0));
diff --git a/src/nextapp/components/access-request-form/access-request-dialog.tsx b/src/nextapp/components/access-request-form/access-request-dialog.tsx
@@ -47,7 +47,7 @@ const AccessRequestDialog: React.FC<AccessRequestDialogProps> = ({
   name,
   preview,
   open,
-  variant = 'button',
+  variant,
 }) => {
   const client = useQueryClient();
   const auth = useAuth();