Merge pull request #3725 from techmatters/gian_CHI-3475

gpaoloni · web-flow · commit cf761a4f525a · 2025-12-02T19:37:16.000-03:00
feat: bulk skills - assign/unassign flow [CHI-3475]
diff --git a/lambdas/account-scoped/src/router.ts b/lambdas/account-scoped/src/router.ts
@@ -19,7 +19,7 @@ import { AccountScopedRoute, FunctionRoute, HttpRequest } from './httpTypes';
 import { validateRequestMethod } from './validation/method';
 import { isAccountSID } from '@tech-matters/twilio-types';
 import { handleTaskRouterEvent } from './taskrouter';
-import { updateWorkersSkills } from './taskrouter/updateWorkersSkills';
+import { handleUpdateWorkersSkills } from './taskrouter/updateWorkersSkills';
 import { handleGetProfileFlagsForIdentifier } from './hrm/getProfileFlagsForIdentifier';
 import { handleToggleSwitchboardQueue } from './hrm/toggleSwitchboardQueue';
 import {
@@ -119,7 +119,7 @@ const ROUTES: Record<string, FunctionRoute> = {
   },
   updateWorkersSkills: {
     requestPipeline: [validateFlexTokenRequest({ tokenMode: 'supervisor' })],
-    handler: updateWorkersSkills,
+    handler: handleUpdateWorkersSkills,
   },
 };
 
diff --git a/lambdas/account-scoped/src/taskrouter/updateWorkersSkills.ts b/lambdas/account-scoped/src/taskrouter/updateWorkersSkills.ts
@@ -22,74 +22,176 @@ import {
   getTwilioWorkspaceSid,
 } from '@tech-matters/twilio-configuration';
 
-const validOperations = ['enable', 'disable'] as const;
+const validOperations = ['enable', 'disable', 'assign', 'unassign'] as const;
 type ValidOperations = (typeof validOperations)[number];
 
 const moveElementsBetweenArrays = ({
   from,
   to,
   elements,
 }: {
-  from: Array<string>;
-  to: Array<string>;
-  elements: Array<string>;
+  from: string[];
+  to: string[];
+  elements: string[];
 }) => {
   const updatedFrom = from.filter(e => !elements.includes(e));
   const updatedTo = Array.from(new Set([...to, ...elements]));
 
   return { updatedFrom, updatedTo };
 };
 
+const mergeAttributes = ({
+  attributes,
+  enabledSkills,
+  disabledSkills,
+}: {
+  attributes: { [k: string]: any };
+  enabledSkills: string[];
+  disabledSkills: string[];
+}) => {
+  return {
+    ...attributes,
+    routing: {
+      ...attributes?.routing,
+      skills: enabledSkills,
+    },
+    disabled_skills: {
+      ...attributes.disabled_skills,
+      skills: disabledSkills,
+    },
+  };
+};
+
+const setSkillsEnable = ({
+  attributes,
+  enabledSkills,
+  disabledSkills,
+  skills,
+}: {
+  attributes: { [k: string]: any };
+  enabledSkills: string[];
+  disabledSkills: string[];
+  skills: string[];
+}) => {
+  const { updatedFrom, updatedTo } = moveElementsBetweenArrays({
+    from: disabledSkills,
+    to: enabledSkills,
+    elements: skills,
+  });
+
+  return mergeAttributes({
+    attributes,
+    enabledSkills: updatedTo,
+    disabledSkills: updatedFrom,
+  });
+};
+
+const setSkillsDisable = ({
+  attributes,
+  enabledSkills,
+  disabledSkills,
+  skills,
+}: {
+  attributes: { [k: string]: any };
+  enabledSkills: string[];
+  disabledSkills: string[];
+  skills: string[];
+}) => {
+  const { updatedFrom, updatedTo } = moveElementsBetweenArrays({
+    from: enabledSkills,
+    to: disabledSkills,
+    elements: skills,
+  });
+
+  return mergeAttributes({
+    attributes,
+    enabledSkills: updatedFrom,
+    disabledSkills: updatedTo,
+  });
+};
+
+const setSkillsAssign = ({
+  attributes,
+  enabledSkills,
+  disabledSkills,
+  skills,
+}: {
+  attributes: { [k: string]: any };
+  enabledSkills: string[];
+  disabledSkills: string[];
+  skills: string[];
+}) => {
+  const assignedSkills = new Set([...enabledSkills, ...disabledSkills]);
+
+  const updatedEnabledSkills = skills.reduce((accum, skill) => {
+    if (assignedSkills.has(skill)) {
+      return accum;
+    }
+
+    return [...accum, skill];
+  }, enabledSkills);
+
+  return mergeAttributes({
+    attributes,
+    enabledSkills: updatedEnabledSkills,
+    disabledSkills,
+  });
+};
+
+const setSkillsUnassign = ({
+  attributes,
+  enabledSkills,
+  disabledSkills,
+  skills,
+}: {
+  attributes: { [k: string]: any };
+  enabledSkills: string[];
+  disabledSkills: string[];
+  skills: string[];
+}) => {
+  const updatedEnabledSkills = enabledSkills.filter(s => !skills.includes(s));
+  const updatedDisabledSkills = disabledSkills.filter(s => !skills.includes(s));
+
+  return mergeAttributes({
+    attributes,
+    enabledSkills: updatedEnabledSkills,
+    disabledSkills: updatedDisabledSkills,
+  });
+};
+
 const updateSkillsOperation = ({
   attributes,
   operation,
   skills,
 }: {
-  attributes: any;
-  skills: Array<string>;
+  attributes: { [k: string]: any };
+  skills: string[];
   operation: ValidOperations;
 }) => {
   const enabledSkills = attributes?.routing?.skills || [];
   const disabledSkills = attributes?.disabled_skills?.skills || [];
+  const params = {
+    attributes,
+    enabledSkills,
+    disabledSkills,
+    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,
-      },
-    };
+  switch (operation) {
+    case 'enable': {
+      return setSkillsEnable(params);
+    }
+    case 'disable': {
+      return setSkillsDisable(params);
+    }
+    case 'assign': {
+      return setSkillsAssign(params);
+    }
+    case 'unassign': {
+      return setSkillsUnassign(params);
+    }
+    default:
+      return attributes;
   }
 };
 
@@ -131,28 +233,35 @@ const updateWorkerSkills = async ({
   }
 };
 
-export const updateWorkersSkills: AccountScopedHandler = async ({ body }, accountSid) => {
-  const { workers, skills, operation } = body;
+export const handleUpdateWorkersSkills: AccountScopedHandler = async (
+  { body },
+  accountSid,
+) => {
+  try {
+    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');
+    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 workspaceSid = await getTwilioWorkspaceSid(accountSid);
 
-  const client = await getTwilioClient(accountSid);
+    const client = await getTwilioClient(accountSid);
 
-  const result = await Promise.all(
-    workers.map(workerSid =>
-      updateWorkerSkills({ operation, skills, workerSid, workspaceSid, client }),
-    ),
-  );
+    const result = await Promise.all(
+      workers.map(workerSid =>
+        updateWorkerSkills({ operation, skills, workerSid, workspaceSid, client }),
+      ),
+    );
 
-  console.debug(`Skills ${skills} ${operation} for workers ${workers}`);
+    console.debug(`Skills ${skills} ${operation} for workers ${workers}`);
 
-  return newOk({
-    message: `Skills ${skills} ${operation} for workers ${workers}`,
-    result,
-  });
+    return newOk({
+      message: `Skills ${skills} ${operation} for workers ${workers}`,
+      result,
+    });
+  } catch (error: any) {
+    return newErr({ message: error.message, error: { statusCode: 500, cause: error } });
+  }
 };
diff --git a/plugin-hrm-form/src/components/teamsView/SkillsColumn.tsx b/plugin-hrm-form/src/components/teamsView/SkillsColumn.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { createPortal } from 'react-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { WorkersDataTable, ColumnDefinition, Template, styled } from '@twilio/flex-ui';
-import { Tooltip } from '@material-ui/core';
+import { Divider, Tooltip } from '@material-ui/core';
 import { ArrowDropDown, ArrowDropUp, KeyboardArrowRight } from '@material-ui/icons';
 
 import { Flex, Column, OpaqueText, Row, Box } from '../../styles';
@@ -197,6 +197,15 @@ const DropdownPortal: React.FC<{
           <Template code="Disable Skills" />
           <KeyboardArrowRight style={{ marginLeft: '20px' }} />
         </DropDownButton>
+        <Divider variant="middle" />
+        <DropDownButton onClick={onClickAction('assign')}>
+          <Template code="Assign Skills" />
+          <KeyboardArrowRight style={{ marginLeft: '20px' }} />
+        </DropDownButton>
+        <DropDownButton onClick={onClickAction('unassign')}>
+          <Template code="Unassign Skills" />
+          <KeyboardArrowRight style={{ marginLeft: '20px' }} />
+        </DropDownButton>
       </Column>
     </div>,
     document.body,
diff --git a/plugin-hrm-form/src/components/teamsView/UpdateWorkersSkillsModal.tsx b/plugin-hrm-form/src/components/teamsView/UpdateWorkersSkillsModal.tsx
@@ -192,6 +192,24 @@ const ConfirmUpdatesModal: React.FC<Props> = () => {
               .length;
           }
 
+          if (operation === 'assign') {
+            return selectedWorkersFlexState.filter(
+              w =>
+                !(
+                  w.worker.attributes.routing?.skills?.includes(skill) ||
+                  w.worker.attributes.disabled_skills?.skills?.includes(skill)
+                ),
+            ).length;
+          }
+
+          if (operation === 'unassign') {
+            return selectedWorkersFlexState.filter(
+              w =>
+                w.worker.attributes.routing?.skills?.includes(skill) ||
+                w.worker.attributes.disabled_skills?.skills?.includes(skill),
+            ).length;
+          }
+
           return 0;
         };
 
diff --git a/plugin-hrm-form/src/services/twilioWorkerService.ts b/plugin-hrm-form/src/services/twilioWorkerService.ts
@@ -18,6 +18,7 @@ import { getHrmConfig } from '../hrmConfig';
 import fetchProtectedApi from './fetchProtectedApi';
 import { TaskSID } from '../types/twilio';
 import { ApiError } from './fetchApi';
+import { TeamsViewState } from '../states/teamsView';
 
 type PopulateCounselorsReturn = { sid: string; fullName: string }[];
 
@@ -74,5 +75,5 @@ export const getWorkerAttributes = async (workerSid: string) => {
 export const updateWorkersSkills = async (payload: {
   workers: Array<string>;
   skills: Array<string>;
-  operation: 'enable' | 'disable';
+  operation: Required<TeamsViewState['operation']>;
 }) => fetchProtectedApi('/updateWorkersSkills', payload, { useTwilioLambda: true, useJsonEncode: true });
diff --git a/plugin-hrm-form/src/states/teamsView/index.ts b/plugin-hrm-form/src/states/teamsView/index.ts
@@ -21,7 +21,7 @@ import { updateWorkersSkills } from '../../services/twilioWorkerService';
 export type TeamsViewState = {
   selectedWorkers: Set<string>;
   selectedSkills: Set<string>;
-  operation?: 'enable' | 'disable';
+  operation?: 'enable' | 'disable' | 'assign' | 'unassign';
   status: {
     loading: boolean;
     error: any;
