diff --git a/plugin-hrm-form/src/components/teamsView/AgentColumn.tsx b/plugin-hrm-form/src/components/teamsView/AgentColumn.tsx index a036402a07..4d63037c07 100644 --- a/plugin-hrm-form/src/components/teamsView/AgentColumn.tsx +++ b/plugin-hrm-form/src/components/teamsView/AgentColumn.tsx @@ -24,7 +24,6 @@ import { AgentFullName, StyledChip } from './styles'; const MAX_NAME_LENGTH = 18; export const setUpAgentColumn = () => { - if (!getAseloFeatureFlags().enable_teams_view_enhancements) return; if (!getAseloFeatureFlags().enable_teams_view_enhancements2) return; const agentSortingFn = (a: any, b: any): number => { diff --git a/plugin-hrm-form/src/components/teamsView/SkillsColumn.tsx b/plugin-hrm-form/src/components/teamsView/SkillsColumn.tsx index cb50b93327..e7af313ad5 100644 --- a/plugin-hrm-form/src/components/teamsView/SkillsColumn.tsx +++ b/plugin-hrm-form/src/components/teamsView/SkillsColumn.tsx @@ -19,15 +19,12 @@ import { WorkersDataTable, ColumnDefinition, Template } from '@twilio/flex-ui'; import { Tooltip } from '@material-ui/core'; import { OpaqueText } from '../../styles'; -import { getAseloFeatureFlags } from '../../hrmConfig'; import { SkillsList, StyledChip } from './styles'; import { sortSkills } from './teamsViewSorting'; const MAX_SKILL_LENGTH = 12; export const setUpSkillsColumn = () => { - if (!getAseloFeatureFlags().enable_teams_view_enhancements) return; - WorkersDataTable.Content.add( { - if (!getAseloFeatureFlags().enable_teams_view_enhancements) return; if (!getAseloFeatureFlags().enable_teams_view_enhancements2) return; WorkersDataTable.Content.add( diff --git a/plugin-hrm-form/src/components/teamsView/taskCardEnhancement.ts b/plugin-hrm-form/src/components/teamsView/taskCardEnhancement.ts index 827aacfdc4..97df6eee87 100644 --- a/plugin-hrm-form/src/components/teamsView/taskCardEnhancement.ts +++ b/plugin-hrm-form/src/components/teamsView/taskCardEnhancement.ts @@ -14,7 +14,7 @@ * along with this program. If not, see https://www.gnu.org/licenses/. */ -import { getAseloFeatureFlags, getTemplateStrings } from '../../hrmConfig'; +import { getTemplateStrings } from '../../hrmConfig'; import { getInitializedCan, PermissionActions } from '../../permissions'; const TRUNCATED_IDENTIFIER_LENGTH = 4; @@ -23,8 +23,6 @@ const TRUNCATED_QUEUE_LENGTH = 10; // This function customises the TaskCard meant for Call channel export const setCallTaskCardString = channel => { - if (!getAseloFeatureFlags().enable_teams_view_enhancements) return; - const can = getInitializedCan(); const maskIdentifiers = !can(PermissionActions.VIEW_IDENTIFIERS); @@ -42,8 +40,6 @@ export const setCallTaskCardString = channel => { // This function customises the TaskCard meant for all Chat channels export const setChatTaskCardString = channel => { - if (!getAseloFeatureFlags().enable_teams_view_enhancements) return; - const can = getInitializedCan(); const maskIdentifiers = !can(PermissionActions.VIEW_IDENTIFIERS); diff --git a/plugin-hrm-form/src/components/teamsView/teamsViewFilters.ts b/plugin-hrm-form/src/components/teamsView/teamsViewFilters.ts index f1990697a3..90b6dbc70c 100644 --- a/plugin-hrm-form/src/components/teamsView/teamsViewFilters.ts +++ b/plugin-hrm-form/src/components/teamsView/teamsViewFilters.ts @@ -18,8 +18,6 @@ import type { FilterDefinitionFactory } from '@twilio/flex-ui/src/components/vie import { Manager, FiltersListItemType, TeamsView, WorkerDirectoryTabs } from '@twilio/flex-ui'; import sortBy from 'lodash/sortBy'; -import { getAseloFeatureFlags } from '../../hrmConfig'; - const activityNoOfflineByDefault: FilterDefinitionFactory = (appState, _teamFiltersPanelProps) => { const activitiesArray = Array.from(appState.flex.worker.activities.values()); @@ -74,12 +72,7 @@ const disabledSkillsFilterDefinition: FilterDefinitionFactory = () => { * The skills filter is included if the feature flag is enabled. */ export const setUpTeamsViewFilters = () => { - TeamsView.defaultProps.filters = [ - activityNoOfflineByDefault, - ...(getAseloFeatureFlags().enable_teams_view_enhancements - ? [skillsFilterDefinition, disabledSkillsFilterDefinition] - : []), - ]; + TeamsView.defaultProps.filters = [activityNoOfflineByDefault, skillsFilterDefinition, disabledSkillsFilterDefinition]; }; export const setUpWorkerDirectoryFilters = () => { diff --git a/plugin-hrm-form/src/components/teamsView/teamsViewSorting.ts b/plugin-hrm-form/src/components/teamsView/teamsViewSorting.ts index 1b30cb602a..b1ada11be8 100644 --- a/plugin-hrm-form/src/components/teamsView/teamsViewSorting.ts +++ b/plugin-hrm-form/src/components/teamsView/teamsViewSorting.ts @@ -17,8 +17,6 @@ import { AgentsDataTable, TaskHelper, Manager } from '@twilio/flex-ui'; import { SupervisorWorkerState } from '@twilio/flex-ui/src/state/State.definition'; -import { getAseloFeatureFlags } from '../../hrmConfig'; - const activities = Manager.getInstance()?.store.getState()?.flex?.worker?.activities; const WORKER_ACTIVITIES = activities ? Array.from(activities.values()).reduce((accum, activity, currIndex) => { @@ -232,8 +230,6 @@ export const sortStatusColumn = (a: SupervisorWorkerState, b: SupervisorWorkerSt // Set up the sorting for default Teams View columns (Workers, Calls, Tasks) export const setUpTeamsViewSorting = () => { - if (!getAseloFeatureFlags().enable_teams_view_enhancements) return; - AgentsDataTable.defaultProps.sortCalls = sortWorkersByCallDuration; AgentsDataTable.defaultProps.sortTasks = sortWorkersByChatDuration; AgentsDataTable.defaultProps.sortWorkers = sortWorkersByActivity; diff --git a/plugin-hrm-form/src/maskIdentifiers/index.ts b/plugin-hrm-form/src/maskIdentifiers/index.ts index f57191aa2e..b72b9fb3f9 100644 --- a/plugin-hrm-form/src/maskIdentifiers/index.ts +++ b/plugin-hrm-form/src/maskIdentifiers/index.ts @@ -17,7 +17,6 @@ import { Strings, TaskChannelDefinition, MessagingCanvas, MessageList } from '@twilio/flex-ui'; import { getInitializedCan, PermissionActions } from '../permissions'; -import { getAseloFeatureFlags } from '../hrmConfig'; // Mask identifiers in the channel strings export const maskChannelStringsWithIdentifiers = (channelType: TaskChannelDefinition) => { @@ -46,7 +45,7 @@ export const maskChannelStringsWithIdentifiers = (channelType: TaskChannelDefini Supervisor.TaskCanvasHeader.title = 'MaskIdentifiers'; // Task Status in Agents page - if (!getAseloFeatureFlags().enable_teams_view_enhancements) TaskCard.firstLine = 'MaskIdentifiers'; + TaskCard.firstLine = 'MaskIdentifiers'; Supervisor.TaskOverviewCanvas.firstLine = 'MaskIdentifiers'; }; diff --git a/plugin-hrm-form/src/types/types.ts b/plugin-hrm-form/src/types/types.ts index e71c8cab07..37c5684b86 100644 --- a/plugin-hrm-form/src/types/types.ts +++ b/plugin-hrm-form/src/types/types.ts @@ -288,7 +288,6 @@ export type FeatureFlags = { enable_save_insights: boolean; // Enables Saving Aditional Data on Insights enable_separate_timeline_view: boolean; // Enables a limited inline case timelinbe with a link to the full timeline enable_sort_cases: boolean; // Enables Sorting at Case List - enable_teams_view_enhancements: boolean; // Enables custom Teams View UI enable_teams_view_enhancements2: boolean; // Enables custom Teams View UI with labels enable_transfers: boolean; // Enables Transfering Contacts enable_twilio_transcripts: boolean; // Enables Viewing Transcripts Stored at Twilio diff --git a/twilio-iac/helplines/as/configs/service-configuration/development.json b/twilio-iac/helplines/as/configs/service-configuration/development.json index a6d1c993d0..e495629cbc 100644 --- a/twilio-iac/helplines/as/configs/service-configuration/development.json +++ b/twilio-iac/helplines/as/configs/service-configuration/development.json @@ -21,7 +21,6 @@ "enable_resources": true, "enable_resources_elastic_search": true, "enable_save_insights": true, - "enable_teams_view_enhancements": true, "enable_teams_view_enhancements2": true, "enable_voice_recordings": false }, diff --git a/twilio-iac/helplines/configs/service-configuration/defaults.json b/twilio-iac/helplines/configs/service-configuration/defaults.json index 028ef9fa71..671fe62376 100644 --- a/twilio-iac/helplines/configs/service-configuration/defaults.json +++ b/twilio-iac/helplines/configs/service-configuration/defaults.json @@ -61,7 +61,6 @@ "enable_dual_write": false, "enable_emoji_picker": true, "enable_external_transcripts": true, - "enable_twilio_transcripts": false, "enable_filter_cases": true, "enable_fullstory_monitoring": true, "enable_last_case_status_update_info": true, @@ -73,8 +72,8 @@ "enable_save_insights": true, "enable_separate_timeline_view": true, "enable_sort_cases": true, - "enable_teams_view_enhancements": true, "enable_transfers": true, + "enable_twilio_transcripts": false, "enable_upload_documents": true, "enable_voice_recordings": false }, diff --git a/twilio-iac/helplines/uk/configs/service-configuration/common.json b/twilio-iac/helplines/uk/configs/service-configuration/common.json index 371118dd65..45379a513a 100644 --- a/twilio-iac/helplines/uk/configs/service-configuration/common.json +++ b/twilio-iac/helplines/uk/configs/service-configuration/common.json @@ -7,7 +7,6 @@ "enable_csam_clc_report": false, "enable_lex": false, "enable_save_insights": true, - "enable_teams_view_enhancements": true, "enable_voice_recordings": false }, "hrm_base_url": "https://hrm-test.tl.techmatters.org",