From 2b48baffd28499da2d5f73a574ac8ad761865c2a Mon Sep 17 00:00:00 2001 From: murilovmachado Date: Thu, 21 Sep 2023 13:19:40 +0100 Subject: [PATCH 1/8] Fix production workflow file (#516) --- .github/workflows/deploy-all-production-accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-all-production-accounts.yml b/.github/workflows/deploy-all-production-accounts.yml index 00ec6e0b..391f754a 100644 --- a/.github/workflows/deploy-all-production-accounts.yml +++ b/.github/workflows/deploy-all-production-accounts.yml @@ -44,6 +44,6 @@ jobs: uses: ./.github/workflows/deploy-multiple-accounts.yml secrets: inherit with: - helplines: ${{ needs.configure.outputs.production_helplines }} + helplines: ${{ needs.configure.outputs.target_helplines }} environments: '[ "PROD" ]' From 9253ba1902ec64f66ddf1a8dead6559d86eec79a Mon Sep 17 00:00:00 2001 From: janorivera Date: Fri, 27 Oct 2023 09:40:34 -0300 Subject: [PATCH 2/8] Removing twitter keys from actions (#526) --- .../aselo_beta_custom/action.yml | 43 +------------------ .../aselo_development_custom/action.yml | 41 ------------------ .../thailand_staging_custom/action.yml | 42 ------------------ .../zambia_production_custom/action.yml | 43 +------------------ .../zambia_staging_custom/action.yml | 43 +------------------ 5 files changed, 4 insertions(+), 208 deletions(-) diff --git a/.github/actions/custom-actions/aselo_beta_custom/action.yml b/.github/actions/custom-actions/aselo_beta_custom/action.yml index 007d5637..e8617147 100644 --- a/.github/actions/custom-actions/aselo_beta_custom/action.yml +++ b/.github/actions/custom-actions/aselo_beta_custom/action.yml @@ -17,32 +17,7 @@ description: 'Sets up environment variables related to non-standard additional f runs: using: "composite" steps: - # Set Twitter variables - - name: Set Aselo Twitter Consumer Key - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_KEY" - env_variable_name: "TWITTER_CONSUMER_KEY" - - name: Set Aselo Twitter Consumer Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_SECRET" - env_variable_name: "TWITTER_CONSUMER_SECRET" - - name: Set helpline Twitter Access Token - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_1534172961187500033_AseloBeta" - env_variable_name: "TWITTER_ACCESS_TOKEN" - - name: Set helpline Twitter Access Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_SECRET_1534172961187500033_AseloBeta" - env_variable_name: "TWITTER_ACCESS_TOKEN_SECRET" - - name: Set helpline Twitter Flex Flow SID - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "STG_TWILIO_AS_TWITTER_FLEX_FLOW_SID" - env_variable_name: "TWITTER_FLEX_FLOW_SID" + - name: Set Aselo Facebook App Secret uses: "marvinpinto/action-inject-ssm-secrets@latest" with: @@ -59,21 +34,7 @@ runs: ssm_parameter: "STG_TWILIO_AS_INSTAGRAM_FLEX_FLOW_SID" env_variable_name: "INSTAGRAM_FLEX_FLOW_SID" # Append environment variables - - name: Add TWITTER_CONSUMER_KEY - run: echo "TWITTER_CONSUMER_KEY=${{ env.TWITTER_CONSUMER_KEY }}" >> .env - shell: bash - - name: Add TWITTER_CONSUMER_SECRET - run: echo "TWITTER_CONSUMER_SECRET=${{ env.TWITTER_CONSUMER_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN - run: echo "TWITTER_ACCESS_TOKEN=${{ env.TWITTER_ACCESS_TOKEN }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN_SECRET - run: echo "TWITTER_ACCESS_TOKEN_SECRET=${{ env.TWITTER_ACCESS_TOKEN_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_FLEX_FLOW_SID - run: echo "TWITTER_FLEX_FLOW_SID=${{ env.TWITTER_FLEX_FLOW_SID }}" >> .env - shell: bash + - name: Add FACEBOOK_APP_SECRET run: echo "FACEBOOK_APP_SECRET=${{ env.FACEBOOK_APP_SECRET }}" >> .env shell: bash diff --git a/.github/actions/custom-actions/aselo_development_custom/action.yml b/.github/actions/custom-actions/aselo_development_custom/action.yml index 3b9b7887..5057ff5d 100644 --- a/.github/actions/custom-actions/aselo_development_custom/action.yml +++ b/.github/actions/custom-actions/aselo_development_custom/action.yml @@ -64,31 +64,6 @@ runs: ssm_parameter: /development/iwf/${{inputs.account-sid}}/report_url env_variable_name: "IWF_REPORT_URL" - - name: Set Aselo Twitter Consumer Key - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_KEY" - env_variable_name: "TWITTER_CONSUMER_KEY" - - name: Set Aselo Twitter Consumer Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_SECRET" - env_variable_name: "TWITTER_CONSUMER_SECRET" - - name: Set helpline Twitter Access Token - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_1398343158954663937_AseloDev" - env_variable_name: "TWITTER_ACCESS_TOKEN" - - name: Set helpline Twitter Access Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_SECRET_1398343158954663937_AseloDev" - env_variable_name: "TWITTER_ACCESS_TOKEN_SECRET" - - name: Set helpline Twitter Flex Flow SID - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "DEV_TWILIO_AS_TWITTER_FLEX_FLOW_SID" - env_variable_name: "TWITTER_FLEX_FLOW_SID" - name: Set Aselo Facebook App Secret uses: "marvinpinto/action-inject-ssm-secrets@latest" with: @@ -140,22 +115,6 @@ runs: - name: Add IWF_REPORT_URL run: echo "IWF_REPORT_URL=${{ env.IWF_REPORT_URL }}" >> .env shell: bash - - - name: Add TWITTER_CONSUMER_KEY - run: echo "TWITTER_CONSUMER_KEY=${{ env.TWITTER_CONSUMER_KEY }}" >> .env - shell: bash - - name: Add TWITTER_CONSUMER_SECRET - run: echo "TWITTER_CONSUMER_SECRET=${{ env.TWITTER_CONSUMER_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN - run: echo "TWITTER_ACCESS_TOKEN=${{ env.TWITTER_ACCESS_TOKEN }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN_SECRET - run: echo "TWITTER_ACCESS_TOKEN_SECRET=${{ env.TWITTER_ACCESS_TOKEN_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_FLEX_FLOW_SID - run: echo "TWITTER_FLEX_FLOW_SID=${{ env.TWITTER_FLEX_FLOW_SID }}" >> .env - shell: bash - name: Add FACEBOOK_APP_SECRET run: echo "FACEBOOK_APP_SECRET=${{ env.FACEBOOK_APP_SECRET }}" >> .env shell: bash diff --git a/.github/actions/custom-actions/thailand_staging_custom/action.yml b/.github/actions/custom-actions/thailand_staging_custom/action.yml index d04cb17b..caaff17d 100644 --- a/.github/actions/custom-actions/thailand_staging_custom/action.yml +++ b/.github/actions/custom-actions/thailand_staging_custom/action.yml @@ -33,32 +33,6 @@ runs: with: ssm_parameter: "STG_LINE_TH_CHANNEL_ACCESS_TOKEN" env_variable_name: "LINE_CHANNEL_ACCESS_TOKEN" - # Set Twitter variables - - name: Set Aselo Twitter Consumer Key - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_KEY" - env_variable_name: "TWITTER_CONSUMER_KEY" - - name: Set Aselo Twitter Consumer Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_SECRET" - env_variable_name: "TWITTER_CONSUMER_SECRET" - - name: Set helpline Twitter Access Token - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_1570374172798238722_lineth_staging" - env_variable_name: "TWITTER_ACCESS_TOKEN" - - name: Set helpline Twitter Access Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_SECRET_1570374172798238722_lineth_staging" - env_variable_name: "TWITTER_ACCESS_TOKEN_SECRET" - - name: Set helpline Twitter Flex Flow SID - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "STG_TWILIO_TH_TWITTER_FLEX_FLOW_SID" - env_variable_name: "TWITTER_FLEX_FLOW_SID" # Set Instagram variables - name: Set Aselo Facebook App Secret uses: "marvinpinto/action-inject-ssm-secrets@latest" @@ -85,22 +59,6 @@ runs: - name: Add LINE_CHANNEL_ACCESS_TOKEN run: echo "LINE_CHANNEL_ACCESS_TOKEN=${{ env.LINE_CHANNEL_ACCESS_TOKEN }}" >> .env shell: bash - # Append TWITTER environment variables - - name: Add TWITTER_CONSUMER_KEY - run: echo "TWITTER_CONSUMER_KEY=${{ env.TWITTER_CONSUMER_KEY }}" >> .env - shell: bash - - name: Add TWITTER_CONSUMER_SECRET - run: echo "TWITTER_CONSUMER_SECRET=${{ env.TWITTER_CONSUMER_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN - run: echo "TWITTER_ACCESS_TOKEN=${{ env.TWITTER_ACCESS_TOKEN }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN_SECRET - run: echo "TWITTER_ACCESS_TOKEN_SECRET=${{ env.TWITTER_ACCESS_TOKEN_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_FLEX_FLOW_SID - run: echo "TWITTER_FLEX_FLOW_SID=${{ env.TWITTER_FLEX_FLOW_SID }}" >> .env - shell: bash # Append INSTAGRAM environment variables - name: Add FACEBOOK_APP_SECRET run: echo "FACEBOOK_APP_SECRET=${{ env.FACEBOOK_APP_SECRET }}" >> .env diff --git a/.github/actions/custom-actions/zambia_production_custom/action.yml b/.github/actions/custom-actions/zambia_production_custom/action.yml index f1cf26ca..054a054b 100644 --- a/.github/actions/custom-actions/zambia_production_custom/action.yml +++ b/.github/actions/custom-actions/zambia_production_custom/action.yml @@ -13,36 +13,10 @@ # along with this program. If not, see https://www.gnu.org/licenses/. name: 'Zambia PRoduction release custom action' -description: 'Adds Twitter and Instagram related environment variables to the Zambia Production environment' +description: 'Adds Instagram related environment variables to the Zambia Production environment' runs: using: "composite" steps: - # Set Twitter variables - - name: Set Aselo Twitter Consumer Key - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_KEY" - env_variable_name: "TWITTER_CONSUMER_KEY" - - name: Set Aselo Twitter Consumer Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_SECRET" - env_variable_name: "TWITTER_CONSUMER_SECRET" - - name: Set helpline Twitter Access Token - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_1272835464379105280_clzambia" - env_variable_name: "TWITTER_ACCESS_TOKEN" - - name: Set helpline Twitter Access Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_SECRET_1272835464379105280_clzambia" - env_variable_name: "TWITTER_ACCESS_TOKEN_SECRET" - - name: Set helpline Twitter Flex Flow SID - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "PROD_TWILIO_ZM_TWITTER_FLEX_FLOW_SID" - env_variable_name: "TWITTER_FLEX_FLOW_SID" # Set IWF credentials - name: Set IWF_API_USERNAME uses: "marvinpinto/action-inject-ssm-secrets@latest" @@ -75,21 +49,6 @@ runs: ssm_parameter: "PROD_ZM_IWF_API_CHANNEL_ID" env_variable_name: "IWF_API_CHANNEL_ID" # Append environment variables - - name: Add TWITTER_CONSUMER_KEY - run: echo "TWITTER_CONSUMER_KEY=${{ env.TWITTER_CONSUMER_KEY }}" >> .env - shell: bash - - name: Add TWITTER_CONSUMER_SECRET - run: echo "TWITTER_CONSUMER_SECRET=${{ env.TWITTER_CONSUMER_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN - run: echo "TWITTER_ACCESS_TOKEN=${{ env.TWITTER_ACCESS_TOKEN }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN_SECRET - run: echo "TWITTER_ACCESS_TOKEN_SECRET=${{ env.TWITTER_ACCESS_TOKEN_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_FLEX_FLOW_SID - run: echo "TWITTER_FLEX_FLOW_SID=${{ env.TWITTER_FLEX_FLOW_SID }}" >> .env - shell: bash - name: Add IWF_API_USERNAME run: echo "IWF_API_USERNAME=${{ env.IWF_API_USERNAME }}" >> .env shell: bash diff --git a/.github/actions/custom-actions/zambia_staging_custom/action.yml b/.github/actions/custom-actions/zambia_staging_custom/action.yml index ec6bcdf2..e5554e28 100644 --- a/.github/actions/custom-actions/zambia_staging_custom/action.yml +++ b/.github/actions/custom-actions/zambia_staging_custom/action.yml @@ -13,36 +13,10 @@ # along with this program. If not, see https://www.gnu.org/licenses/. name: 'Zambia Staging release custom action' -description: 'Adds Twitter and Instagram related environment variables to the Zambia Staging environment' +description: 'Adds Instagram related environment variables to the Zambia Staging environment' runs: using: "composite" steps: - # Set Twitter variables - - name: Set Aselo Twitter Consumer Key - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_KEY" - env_variable_name: "TWITTER_CONSUMER_KEY" - - name: Set Aselo Twitter Consumer Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_CONSUMER_SECRET" - env_variable_name: "TWITTER_CONSUMER_SECRET" - - name: Set helpline Twitter Access Token - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_1409531855708250112_StagingZm" - env_variable_name: "TWITTER_ACCESS_TOKEN" - - name: Set helpline Twitter Access Secret - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "TWITTER_ACCESS_TOKEN_SECRET_1409531855708250112_StagingZm" - env_variable_name: "TWITTER_ACCESS_TOKEN_SECRET" - - name: Set helpline Twitter Flex Flow SID - uses: "marvinpinto/action-inject-ssm-secrets@latest" - with: - ssm_parameter: "STG_TWILIO_ZM_TWITTER_FLEX_FLOW_SID" - env_variable_name: "TWITTER_FLEX_FLOW_SID" # Set IWF credentials - name: Set IWF_API_USERNAME uses: "marvinpinto/action-inject-ssm-secrets@latest" @@ -60,21 +34,6 @@ runs: ssm_parameter: "IWF_API_URL" env_variable_name: "IWF_API_URL" # Append environment variables - - name: Add TWITTER_CONSUMER_KEY - run: echo "TWITTER_CONSUMER_KEY=${{ env.TWITTER_CONSUMER_KEY }}" >> .env - shell: bash - - name: Add TWITTER_CONSUMER_SECRET - run: echo "TWITTER_CONSUMER_SECRET=${{ env.TWITTER_CONSUMER_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN - run: echo "TWITTER_ACCESS_TOKEN=${{ env.TWITTER_ACCESS_TOKEN }}" >> .env - shell: bash - - name: Add TWITTER_ACCESS_TOKEN_SECRET - run: echo "TWITTER_ACCESS_TOKEN_SECRET=${{ env.TWITTER_ACCESS_TOKEN_SECRET }}" >> .env - shell: bash - - name: Add TWITTER_FLEX_FLOW_SID - run: echo "TWITTER_FLEX_FLOW_SID=${{ env.TWITTER_FLEX_FLOW_SID }}" >> .env - shell: bash - name: Add IWF_API_USERNAME run: echo "IWF_API_USERNAME=${{ env.IWF_API_USERNAME }}" >> .env shell: bash From e842759215f54338a3662309d60ba4a1a479f1d2 Mon Sep 17 00:00:00 2001 From: janorivera Date: Wed, 1 Nov 2023 11:56:53 -0300 Subject: [PATCH 3/8] za messages (#530) --- assets/translations/en-ZA/flexUI.json | 12 ++++++++++++ assets/translations/en-ZA/messages.json | 7 +++++++ assets/translations/en-ZA/postSurveyMessages.json | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 assets/translations/en-ZA/flexUI.json create mode 100644 assets/translations/en-ZA/messages.json create mode 100644 assets/translations/en-ZA/postSurveyMessages.json diff --git a/assets/translations/en-ZA/flexUI.json b/assets/translations/en-ZA/flexUI.json new file mode 100644 index 00000000..68ee80b3 --- /dev/null +++ b/assets/translations/en-ZA/flexUI.json @@ -0,0 +1,12 @@ +{ + "TranslateButtonAriaLabel": "Change language", + + "CallType-child": "Child calling about self", + "CallType-caller": "Someone calling about a child", + "CallType-silent": "Silent", + "CallType-blank": "Blank", + "CallType-joke": "Joke", + "CallType-hangup": "Hang up", + "CallType-wrongnumber": "Wrong Number", + "CallType-abusive": "Abusive" +} \ No newline at end of file diff --git a/assets/translations/en-ZA/messages.json b/assets/translations/en-ZA/messages.json new file mode 100644 index 00000000..b928aa31 --- /dev/null +++ b/assets/translations/en-ZA/messages.json @@ -0,0 +1,7 @@ +{ + "WelcomeMsg": "Hi, this is the counsellor. How can I help you?", + "GoodbyeMsg": "The counselor has left the chat. Thank you for reaching out. Please contact us again if you need more help.", + "EndChatMsg": "You ended the chat. Thank you for reaching out. Please contact us again if you need more help.", + "ClosedOutOfShift": "Our counsellors are currently offline. We are here Monday – Friday, 11am-1pm & 2pm-6pm. Please note that messages sent on this platform out of these hours are not received by our team and if you need to speak to a Counsellor, call our 24 hour Tollfree Number on 116.If you feel you are in immediate danger, please call the Police on 10111.", + "ClosedHolidays": "Our counsellors are currently offline for the Public Holiday today. We are here on normal working days: Monday – Friday, 11am-1pm & 2pm-6pm. Please note that messages sent on this platform out of these hours are not received by our team and if you need to speak to a Counsellor, call our 24 hour Tollfree Number on 116. If you feel you are in immediate danger, please call the Police on 10111." +} \ No newline at end of file diff --git a/assets/translations/en-ZA/postSurveyMessages.json b/assets/translations/en-ZA/postSurveyMessages.json new file mode 100644 index 00000000..a7fe0c28 --- /dev/null +++ b/assets/translations/en-ZA/postSurveyMessages.json @@ -0,0 +1,4 @@ +{ + "triggerMessage": "Before you leave, would you be willing to answer a few questions about the service you received today? Please answer Yes or No.", + "postSurveyCompleteMessage": "Thank you for reaching out. Please contact us again if you need more help." +} From 66fe0c5aa11bec413730dbbbffdc83faf439690d Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Thu, 2 Nov 2023 13:15:50 +0000 Subject: [PATCH 4/8] Bump deploy workflow to use node 18 --- .github/workflows/deploy-multiple-accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-multiple-accounts.yml b/.github/workflows/deploy-multiple-accounts.yml index c06a41c9..f9c2019a 100644 --- a/.github/workflows/deploy-multiple-accounts.yml +++ b/.github/workflows/deploy-multiple-accounts.yml @@ -59,7 +59,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 18.x # Setup credentials to access AWS for parameters - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 From 46d3e145b55ffc941a267857af24ec343730349f Mon Sep 17 00:00:00 2001 From: janorivera Date: Mon, 6 Nov 2023 17:34:49 -0300 Subject: [PATCH 5/8] Bump deploy workflow to use node 18 (#534) Co-authored-by: Stephen Hand --- .github/workflows/deploy-multiple-accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-multiple-accounts.yml b/.github/workflows/deploy-multiple-accounts.yml index c06a41c9..f9c2019a 100644 --- a/.github/workflows/deploy-multiple-accounts.yml +++ b/.github/workflows/deploy-multiple-accounts.yml @@ -59,7 +59,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 18.x # Setup credentials to access AWS for parameters - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 From f8522e11fe141c0de4df12f2abd4609b29e81b95 Mon Sep 17 00:00:00 2001 From: janorivera Date: Wed, 13 Dec 2023 17:58:57 -0300 Subject: [PATCH 6/8] ZA:updating holidays (#547) --- assets/operatingInfo/za.private.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/operatingInfo/za.private.json b/assets/operatingInfo/za.private.json index 5c048b49..321ebc25 100644 --- a/assets/operatingInfo/za.private.json +++ b/assets/operatingInfo/za.private.json @@ -13,6 +13,8 @@ "09/24/2023":"Heritage Day", "09/25/2023":"Heritage Day Holiday", "09/26/2023":"Staff shortage", + "12/14/2023":"No capacity", + "12/15/2023":"No capacity", "12/16/2023":"Day of Reconciliation", "12/25/2023":"Christmas", "12/26/2023":"Boxing Day", From ca587d4b9e2cb8a880f453d38631abf3ed6b4fff Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Mon, 18 Dec 2023 10:54:11 +0000 Subject: [PATCH 7/8] Change healthcheck.ts custom action code to js --- .github/actions/main-action/{healthcheck.ts => healthcheck.js} | 0 .github/actions/main-action/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/actions/main-action/{healthcheck.ts => healthcheck.js} (100%) diff --git a/.github/actions/main-action/healthcheck.ts b/.github/actions/main-action/healthcheck.js similarity index 100% rename from .github/actions/main-action/healthcheck.ts rename to .github/actions/main-action/healthcheck.js diff --git a/.github/actions/main-action/package.json b/.github/actions/main-action/package.json index f818a8d6..c61f9002 100644 --- a/.github/actions/main-action/package.json +++ b/.github/actions/main-action/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "healthcheck": "npm install && npx ts-node --esm ./healthcheck.ts" + "healthcheck": "npm install && node healthcheck.js" }, "author": "", "license": "AGPL", From e28866e0da1292d26e41468444f957f47390916e Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Mon, 18 Dec 2023 11:01:27 +0000 Subject: [PATCH 8/8] Change healthcheck esm imports to requires --- .github/actions/main-action/healthcheck.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/main-action/healthcheck.js b/.github/actions/main-action/healthcheck.js index feaa52dc..cb086938 100644 --- a/.github/actions/main-action/healthcheck.js +++ b/.github/actions/main-action/healthcheck.js @@ -21,9 +21,9 @@ * For details see https://docs.github.com/en/actions/creating-actions/creating-a-javascript-action#commit-tag-and-push-your-action-to-github */ -import { setOutput, setFailed } from '@actions/core'; -import fetch from 'node-fetch'; -import Twilio from 'twilio'; +const { setOutput, setFailed } = require('@actions/core'); +const fetch = require('node-fetch'); +const Twilio = require('twilio'); async function healthCheck () { // `who-to-greet` input defined in action metadata file