From 8d84ed8e007ff7b9e67728cd16dbfd4a7e24707d Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 8 Nov 2022 10:13:04 -0800 Subject: [PATCH 1/2] Updated CI --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e5391ce6..ef8ec6675 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,9 +32,9 @@ jobs: name: Execute migration command: | npm install hasura-cli -g - hasura migrate apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET - hasura metadata apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET - hasura metadata reload --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET + hasura migrate apply --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET} + hasura metadata apply --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET} + hasura metadata reload --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET} app-build: docker: @@ -78,9 +78,9 @@ jobs: name: Execute migration command: | npm install hasura-cli -g - hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET - hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET - hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET + hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET} + hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET} + hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET} test-app-build: docker: From 3fa38822f371a1af266c83b8d6c693c766d7b3af Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 8 Nov 2022 10:35:26 -0800 Subject: [PATCH 2/2] IO-2096 Fix grouping for CT report. --- client/src/utils/TemplateConstants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index ed6ea6a6b..410cc0e2e 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -1692,7 +1692,7 @@ export const TemplateList = (type, context) => { object: i18n.t("reportcenter.labels.objects.jobs"), field: i18n.t("jobs.fields.actual_completion"), }, - group: "job", + group: "jobs", }, } : {}),