Merge branch 'master' into CHI-3545-incoming_transfer_breaks_chats

Author: stephenhand

lambdas/TwilioErrorReporter/index.ts

@@ -19,57 +19,61 @@ import { URLSearchParams } from 'url';
 import type { ALBEvent, ALBResult } from 'aws-lambda';
 
 const productionAccountMap = {
-  ZA_PRODUCTION: 'AC988e78b713be4a04246b39835de37ad4',
-  ZM_PRODUCTION: 'ACf0b04d307d8f20074dc09cdb3b4f0a83',
-  MW_PRODUCTION: 'AC926d9077405d7f5b4c7129d3087d7814',
-  ET_PRODUCTION: 'AC16aa1fb9123860efd3bdde74de556e21',
+  AS_PRODUCTION: 'AC4858840776b1f98a1367c9c6a401bd2c',
   BR_PRODUCTION: 'AC98b66f5541f81de7050c7254cf5c96c9',
+  CA_PRODUCTION: 'AC9f951863c83dc61cf94bdc12a12270a5',
+  CL_PRODUCTION: 'AC13e88b6577da29a0b35c0ea7939c3c22',
+  CO_PRODUCTION: 'AC520ec62dcfa4ab4105c2f5850caf52b0',
+  ET_PRODUCTION: 'AC16aa1fb9123860efd3bdde74de556e21',
+  HU_PRODUCTION: 'AC378f491732fc29691b4126a2287cea9a',
   IN_PRODUCTION: 'AC64efffad72dccd812ca0c156355217ed',
   JM_PRODUCTION: 'AC9fd261078d40fcfa06f0e374921af7a5',
+  MT_PRODUCTION: 'AC7854f6126459347434a8e659295ebb79',
+  MW_PRODUCTION: 'AC926d9077405d7f5b4c7129d3087d7814',
+  NZ_PRODUCTION: 'AC2825ea172ea83c2e422a9772a27beb29',
   PH_PRODUCTION: 'ACd9d59ab87f24d9086b25a7e3c67b2231',
-  CO_PRODUCTION: 'AC520ec62dcfa4ab4105c2f5850caf52b0',
-  HU_PRODUCTION: 'AC378f491732fc29691b4126a2287cea9a',
+  SG_PRODUCTION: 'AC0751f021d17d50f0ee5af094acdee7c8',
   TH_PRODUCTION: 'AC77e853192a62159196decc2468243518',
-  CA_PRODUCTION: 'AC9f951863c83dc61cf94bdc12a12270a5',
-  ZW_PRODUCTION: 'ACd0db81cffec7eb658f6ee176a06dc902',
-  CL_PRODUCTION: 'AC13e88b6577da29a0b35c0ea7939c3c22',
-  AS_PRODUCTION: 'AC4858840776b1f98a1367c9c6a401bd2c',
-  NZ_PRODUCTION: 'AC2825ea172ea83c2e422a9772a27beb29',
-  USCR_PRODUCTION: 'AC34800d0cf642c95ce1f17785d239333c',
   TZ_PRODUCTION: 'AC24b2e69a74f051b368f4ec17f51ddbbc',
   UKMH_PRODUCTION: 'AC10edaafc5e4a4b6017d758b2f011142b',
-  MT_PRODUCTION: 'AC7854f6126459347434a8e659295ebb79',
-  SG_PRODUCTION: 'AC0751f021d17d50f0ee5af094acdee7c8',
+  USCH_PRODUCTION: 'AC9eeaba1a6d959e0cc1befda3884a2bc1',
+  USCR_PRODUCTION: 'AC34800d0cf642c95ce1f17785d239333c',
+  ZA_PRODUCTION: 'AC988e78b713be4a04246b39835de37ad4',
+  ZM_PRODUCTION: 'ACf0b04d307d8f20074dc09cdb3b4f0a83',
+  ZW_PRODUCTION: 'ACd0db81cffec7eb658f6ee176a06dc902',
+  // Alphabetize! Don't just add new helplines at the bottom!
 };
 
 const productionAccounts = Object.values(productionAccountMap);
 
 const stagingAccountMap = {
   ASELO_BETA: 'AC6b99858a6faf7af1b572c83988b50eb1',
-  ZA_STAGING: 'AC16dd71c6fd135ee250bd213ad1efa2e8',
-  ZM_STAGING: 'ACc59300c7ca018e8652e4d6d86c2d50e6',
-  MW_STAGING: 'AC874af45ec4a696d5d4dca07b0036e2bf',
-  ET_STAGING: 'ACfd932bd76669f9cc2145e67e6c3e03ea',
+  AS_STAGING: 'AC1ca120bc71593bbe9ca78e2232a31e0d',
   BR_STAGING: 'AC4a92fba4d8040b1d6dbe2bbceee87cbf',
+  CA_STAGING: 'ACeb335f4685aa874fddf00cdd7c2946bd',
+  CL_STAGING: 'AC6ca34b61e7bf2d7cf8b8ca24e7efe65f',
+  CO_STAGING: 'AC76b8bd2798b01b067a1be7f17d36c894',
+  ET_STAGING: 'ACfd932bd76669f9cc2145e67e6c3e03ea',
+  EUMC_STAGING: 'AC6fbdd2a933a559283445c5e527c3cfe3',
+  HU_STAGING: 'ACbdbee34ef7d099e71cf095d540ff3270',
   IN_STAGING: 'AC3ee345e8fe8213010ff81fbe54b1414e',
   JM_STAGING: 'ACbc27263c18e621f3deb57cf1998a4e04',
-  CA_STAGING: 'ACeb335f4685aa874fddf00cdd7c2946bd',
+  MT_STAGING: 'ACfb0ccf10880289d67f5c4e85ae26402b',
+  MW_STAGING: 'AC874af45ec4a696d5d4dca07b0036e2bf',
+  NZ_STAGING: 'AC3ee873a0431086e5b1166db5f5e29860',
   PH_STAGING: 'ACa10989d583df770649051aee1430fce9',
+  PL_STAGING: 'ACb3da2ab24338c616db45ba3b4afce61a',
   RO_STAGING: 'ACbeffd85714fecd060d38aa4d84c3fc03',
-  HU_STAGING: 'ACbdbee34ef7d099e71cf095d540ff3270',
-  CO_STAGING: 'AC76b8bd2798b01b067a1be7f17d36c894',
+  SG_STAGING: 'ACa00e3e32f7ba405cc0f5906906d88e97',
   TH_STAGING: 'AC58ec02594f3ca5225db71913b1cda612',
-  CL_STAGING: 'AC6ca34b61e7bf2d7cf8b8ca24e7efe65f',
-  ZW_STAGING: 'AC48d146ce2460184b8944cc7fdf8c5d25',
-  PL_STAGING: 'ACb3da2ab24338c616db45ba3b4afce61a',
-  MT_STAGING: 'ACfb0ccf10880289d67f5c4e85ae26402b',
-  USCR_STAGING: 'AC3edc359b6a45de1a2f6078c7091c8fef',
-  NZ_STAGING: 'AC3ee873a0431086e5b1166db5f5e29860',
-  USCH_STAGING: 'AC147e360e21386797593c3893bf4def12',
   TZ_STAGING: 'AC94cb43c61dbc082094fb34cb147896eb',
   UKMH_STAGING: 'AC9eb11b6c714d785db648b6ea6a85c13f',
-  SG_STAGING: 'ACa00e3e32f7ba405cc0f5906906d88e97',
-  EUMC_STAGING: 'AC6fbdd2a933a559283445c5e527c3cfe3',
+  USCH_STAGING: 'AC147e360e21386797593c3893bf4def12',
+  USCR_STAGING: 'AC3edc359b6a45de1a2f6078c7091c8fef',
+  ZA_STAGING: 'AC16dd71c6fd135ee250bd213ad1efa2e8',
+  ZM_STAGING: 'ACc59300c7ca018e8652e4d6d86c2d50e6',
+  ZW_STAGING: 'AC48d146ce2460184b8944cc7fdf8c5d25',
+  // Alphabetize! Don't just add new helplines at the bottom!
 };
 
 const stagingAccounts = Object.values(stagingAccountMap);

lambdas/account-scoped/src/router.ts

@@ -19,6 +19,7 @@ import { AccountScopedRoute, FunctionRoute, HttpRequest } from './httpTypes';
 import { validateRequestMethod } from './validation/method';
 import { isAccountSID } from './twilioTypes';
 import { handleTaskRouterEvent } from './taskrouter';
+import { updateWorkersSkills } from './taskrouter/updateWorkersSkills';
 import { handleGetProfileFlagsForIdentifier } from './hrm/getProfileFlagsForIdentifier';
 import { handleToggleSwitchboardQueue } from './hrm/toggleSwitchboardQueue';
 import {
@@ -106,6 +107,10 @@ const ROUTES: Record<string, FunctionRoute> = {
     requestPipeline: [],
     handler: handleOperatingHours,
   },
+  updateWorkersSkills: {
+    requestPipeline: [validateFlexTokenRequest({ tokenMode: 'supervisor' })],
+    handler: updateWorkersSkills,
+  },
 };
 
 export const lookupRoute = (event: HttpRequest): AccountScopedRoute | undefined => {

lambdas/account-scoped/src/taskrouter/updateWorkersSkills.ts

@@ -0,0 +1,158 @@
+/**
+ * Copyright (C) 2021-2023 Technology Matters
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+import { AccountScopedHandler } from '../httpTypes';
+import { newErr, newOk } from '../Result';
+import { newMissingParameterResult } from '../httpErrors';
+import {
+  getTwilioClient,
+  getTwilioWorkspaceSid,
+} from '../configuration/twilioConfiguration';
+
+const validOperations = ['enable', 'disable'] as const;
+type ValidOperations = (typeof validOperations)[number];
+
+const moveElementsBetweenArrays = ({
+  from,
+  to,
+  elements,
+}: {
+  from: Array<string>;
+  to: Array<string>;
+  elements: Array<string>;
+}) => {
+  const updatedFrom = from.filter(e => !elements.includes(e));
+  const updatedTo = Array.from(new Set([...to, ...elements]));
+
+  return { updatedFrom, updatedTo };
+};
+
+const updateSkillsOperation = ({
+  attributes,
+  operation,
+  skills,
+}: {
+  attributes: any;
+  skills: Array<string>;
+  operation: ValidOperations;
+}) => {
+  const enabledSkills = attributes?.routing?.skills || [];
+  const disabledSkills = attributes?.disabled_skills?.skills || [];
+
+  if (operation === 'enable') {
+    const { updatedFrom, updatedTo } = moveElementsBetweenArrays({
+      from: disabledSkills,
+      to: enabledSkills,
+      elements: skills,
+    });
+
+    return {
+      ...attributes,
+      routing: {
+        ...attributes?.routing,
+        skills: updatedTo,
+      },
+      disabled_skills: {
+        ...attributes.disabled_skills,
+        skills: updatedFrom,
+      },
+    };
+  }
+
+  if (operation === 'disable') {
+    const { updatedFrom, updatedTo } = moveElementsBetweenArrays({
+      from: enabledSkills,
+      to: disabledSkills,
+      elements: skills,
+    });
+
+    return {
+      ...attributes,
+      routing: {
+        ...attributes?.routing,
+        skills: updatedFrom,
+      },
+      disabled_skills: {
+        ...attributes.disabled_skills,
+        skills: updatedTo,
+      },
+    };
+  }
+};
+
+const updateWorkerSkills = async ({
+  client,
+  skills,
+  operation,
+  workerSid,
+  workspaceSid,
+}: {
+  workerSid: string;
+  workspaceSid: string;
+  skills: string[];
+  operation: ValidOperations;
+  client: Awaited<ReturnType<typeof getTwilioClient>>;
+}) => {
+  try {
+    const worker = await client.taskrouter.v1
+      .workspaces(workspaceSid)
+      .workers(workerSid)
+      .fetch();
+
+    const workerAttributes = JSON.parse(worker.attributes);
+    const updatedAttributes = updateSkillsOperation({
+      attributes: workerAttributes,
+      skills,
+      operation,
+    });
+
+    await worker.update({ attributes: JSON.stringify(updatedAttributes) });
+
+    return newOk(workerSid);
+  } catch (err) {
+    return newErr({
+      error: err,
+      message: 'Failed to update worker skills',
+      extraProperties: { workerSid },
+    });
+  }
+};
+
+export const updateWorkersSkills: AccountScopedHandler = async ({ body }, accountSid) => {
+  const { workers, skills, operation } = body;
+
+  if (!workers || !Array.isArray(workers)) return newMissingParameterResult('workers');
+  if (!skills || !Array.isArray(skills)) return newMissingParameterResult('skills');
+  if (!operation || !validOperations.includes(operation))
+    return newMissingParameterResult('operation');
+
+  const workspaceSid = await getTwilioWorkspaceSid(accountSid);
+
+  const client = await getTwilioClient(accountSid);
+
+  const result = await Promise.all(
+    workers.map(workerSid =>
+      updateWorkerSkills({ operation, skills, workerSid, workspaceSid, client }),
+    ),
+  );
+
+  console.debug(`Skills ${skills} ${operation} for workers ${workers}`);
+
+  return newOk({
+    message: `Skills ${skills} ${operation} for workers ${workers}`,
+    result,
+  });
+};

lambdas/packages/hrm-form-definitions/form-definitions/ca/v1/customStrings/Substitutions.json

@@ -170,7 +170,9 @@
   "Switchboard-ModalTitleTurnOffSwitchboard": "Are you sure you want to turn off switchboarding?",
   "Switchboard-ButtonTurnOffSwitchboard": "Turn off switchboard",
   "Switchboard-ActivateSwitchboarding": "Activate switchboarding",
-  "Switchboard-PleaseSelectQueue": "Please select a queue"
+  "Switchboard-PleaseSelectQueue": "Please select a queue",
+
+  "QueuesStatsHeaderAvgWaitTime": "ASA"
 
   },
   "fr": {
@@ -392,6 +394,8 @@
   "Switchboard-StatusInactive": "Commutation : désactivé",
   "Switchboard-ModalTitleTurnOffSwitchboard": "Êtes-vous sûr de vouloir désactiver la commutation?",
   "Switchboard-ButtonTurnOffSwitchboard": "Désactiver",
-  "Switchboard-ActivateSwitchboarding": "Activer la commutation"
+  "Switchboard-ActivateSwitchboarding": "Activer la commutation",
+
+  "QueuesStatsHeaderAvgWaitTime": "ASA"
   }
 }

lambdas/packages/hrm-form-definitions/form-definitions/ukmh/v1/CannedResponses.json

@@ -38,5 +38,13 @@
   {
   "label": "Bye - Survey link",
   "text": "Just before you go, here at The Mix, we want to make sure we’re providing services that suit your needs and preferences. To get that right we’d love to ask you a few questions about your preferences when it comes to services and your experience with them. Could we contact you after this conversation via email to send you a link to our short survey?"
+  },
+  {
+  "label": "Moving into signposting",
+  "text": "hank you for everything you've shared today. Here at The Mix, as well as offering emotional support and a space to talk, something else we can offer is to look for some further resources or services that might be able to support you with some of the themes and topics we've explored today. Is that something you'd be interested in?"
+  },
+  {
+  "label": "Pre-signposting questions",
+  "text": "Just before I take a look on our resource data-base, may I ask you to kindly confirm your age, gender identity, as well as your nearest city or town? This is to help us locate services that are as relevant as possible for yourself.\n\nIf you do not wish me to look for local services, or you don't want to share your nearest city or town, sharing the name of the county you live in or the wider area (either England, Wales, Scotland, or Northern Ireland) would be helpful."
   }
   ]

lambdas/packages/hrm-form-definitions/form-definitions/ukmh/v1/PrepopulateMappings.json

@@ -7,7 +7,7 @@
     "anxietyScale": "ChildInformationTab.anxietyScale",
     "moodhappinessBefore": "ChildInformationTab.moodhappinessBefore",
     "bookingReference": "ChildInformationTab.bookingReference",
-    "consentForResearchEvaluation": "ChildInformationTab.consentForResearchEvaluation",
+    "consentForResearchEvaluation": "CaseInformationTab.consentForResearchEvaluation",
     "ip": "CaseInformationTab.ip"
   },
   "survey":{}

lambdas/packages/hrm-form-definitions/form-definitions/ukmh/v1/customStrings/Messages.json

@@ -1,7 +1,7 @@
 {
   "en": {
     "WelcomeMsg": "You’re now connected to The PeerChat Service. Your PeerChat Supporter will be with you shortly.",
-    "GoodbyeMsg": "The Peer Supporter has left the chat. Thank you for reaching out. Please contact us again if you need more help.",
+    "GoodbyeMsg": "The PeerChat Supporter has left the chat. Thank you for reaching out. Please contact us again if you need more help.",
     "EndChatMsg": "The Young person left the conversation.",
     "UnsupportedMediaErrorMsg": "Sorry, the message you just sent is unsupported and could not be delivered."
   }

lambdas/packages/hrm-form-definitions/form-definitions/ukmh/v1/customStrings/Substitutions.json

@@ -1,32 +1,32 @@
 {
     "en": {
-        "Counsellor": "Peer Supporter",
-        "CallSummary-Counselor": "Peer Supporter: ",
+        "Counsellor": "PeerChat Supporter",
+        "CallSummary-Counselor": "PeerChat Supporter: ",
         "CallType-child": "Young Person calling about self",
         "CallType-caller": "Someone calling about a Young Person",
         "ConnectDialog-Child": "Copy Young Person information from this record to new contact?",
-        "SearchForm-Counselor": "Peer Supporter",
-        "SearchResults-CounselorName": "Peer Supporter Name:",
+        "SearchForm-Counselor": "PeerChat Supporter",
+        "SearchResults-CounselorName": "PeerChat Supporter Name:",
         "CaseHeader-CopyChildInfo": "Copy Young Person Information into Current Contact",
-        "SharedStateLoadFormError": "The information stored in the form by previous Peer Supporter couldn't be retrieved. Starting current task with clear contact form.",
+        "SharedStateLoadFormError": "The information stored in the form by previous PeerChat Supporter couldn't be retrieved. Starting current task with clear contact form.",
         "TabbedForms-AddChildInfoTab": "Young Person",
         "TabbedForms-ReportsChildLink": "Create link for Young Person",
-        "TabbedForms-ReportsCounselorReport": "Report as Peer Supporter",
+        "TabbedForms-ReportsCounselorReport": "Report as PeerChat Supporter",
         "Case-CaseDetailsChildName": "Young Person Name",
-        "Case-CaseDetailsOwner": "Peer Supporter",
+        "Case-CaseDetailsOwner": "PeerChat Supporter",
         "Case-EditCaseOverview": "Edit Case Information",
-        "CSAMCLC-ActionHeaderAdded": "Added {{date}} at {{time}}    Peer Supporter: {{counsellor}}",
-        "Case-ActionHeaderCounselor": "Peer Supporter:",
+        "CSAMCLC-ActionHeaderAdded": "Added {{date}} at {{time}}    PeerChat Supporter: {{counsellor}}",
+        "Case-ActionHeaderCounselor": "PeerChat Supporter:",
         "Case-PerpetratorRelationship": "Relationship to Young Person: ",
-        "Case-Peer Supporter": "Peer Supporter",
+        "Case-Peer Supporter": "PeerChat Supporter",
         "Case-ChildIsAtRisk": "Young Person is at risk",
         "CaseList-THChildName": "Young Person",
-        "CaseList-THCounselor": "Peer Supporter",
-        "CaseList-Filters-Counselor": "Peer Supporter",
-        "CaseList-Filters-SearchForCounselor": "Search for Peer Supporter by name",
+        "CaseList-THCounselor": "PeerChat Supporter",
+        "CaseList-Filters-Counselor": "PeerChat Supporter",
+        "CaseList-Filters-SearchForCounselor": "Search for PeerChat Supporter by name",
         "CallerForm-RelationshipToChild": "Relationship to Young Person",
         "CallerSection-RelationshipToChild": "Relationship to Young Person",
-        "ContactDetails-GeneralDetails-Counselor": "Peer Supporter",
+        "ContactDetails-GeneralDetails-Counselor": "PeerChat Supporter",
         "ContactDetails-GeneralDetails-ChildHearAboutUs": "How did the Young Person hear about us?",
         "ContactDetails-GeneralDetails-DiscussRights": "Did you discuss rights with the Young Person?",
         "ContactDetails-GeneralDetails-SolvedProblem": "Did the Young Person feel we solved their problem?",
@@ -69,9 +69,9 @@
         "CaseList-Filters-Categories": "Topics",
         "CaseList-Filters-SearchByCategory": "Search by topic",
         "Contact-EditCategories": "Edit Topics",
-        "GeneralizedSearchForm-Counselor": "Peer Supporter",
-        "CaseHeader-Counsellor": "Peer Supporter",
-        "Case-DetailsHeaderCounselor": "Peer Supporter",
+        "GeneralizedSearchForm-Counselor": "PeerChat Supporter",
+        "CaseHeader-Counsellor": "PeerChat Supporter",
+        "Case-DetailsHeaderCounselor": "PeerChat Supporter",
         "Categories-Title": "Choose appropriate topic(s) for this contact",
         "CaseList-THCategory": "Topic"
     }