Merge branch 'develop' into feat/ui-lib

app/javascript/dashboard/composables/spec/useAutomation.spec.js

@@ -9,6 +9,8 @@ import {
   teams,
   labels,
   statusFilterOptions,
+  messageTypeOptions,
+  priorityOptions,
   campaigns,
   contacts,
   inboxes,
@@ -16,7 +18,6 @@ import {
   countries,
   slaPolicies,
 } from 'dashboard/helper/specs/fixtures/automationFixtures.js';
-import { MESSAGE_CONDITION_VALUES } from 'dashboard/constants/automation';
 
 vi.mock('dashboard/composables/store');
 vi.mock('dashboard/composables');
@@ -71,7 +72,9 @@ describe('useAutomation', () => {
         case 'country_code':
           return countries;
         case 'message_type':
-          return MESSAGE_CONDITION_VALUES;
+          return messageTypeOptions;
+        case 'priority':
+          return priorityOptions;
         default:
           return [];
       }
@@ -93,6 +96,8 @@ describe('useAutomation', () => {
           return [];
         case 'add_sla':
           return slaPolicies;
+        case 'change_priority':
+          return priorityOptions;
         default:
           return [];
       }
@@ -191,6 +196,7 @@ describe('useAutomation', () => {
     automationTypes.conversation_created = { conditions: [] };
     automationTypes.conversation_updated = { conditions: [] };
     automationTypes.conversation_opened = { conditions: [] };
+    automationTypes.conversation_resolved = { conditions: [] };
 
     automationHelper.generateCustomAttributeTypes.mockReturnValue([]);
     automationHelper.generateCustomAttributes.mockReturnValue([]);
@@ -218,8 +224,9 @@ describe('useAutomation', () => {
     expect(getConditionDropdownValues('browser_language')).toEqual(languages);
     expect(getConditionDropdownValues('country_code')).toEqual(countries);
     expect(getConditionDropdownValues('message_type')).toEqual(
-      MESSAGE_CONDITION_VALUES
+      messageTypeOptions
     );
+    expect(getConditionDropdownValues('priority')).toEqual(priorityOptions);
   });
 
   it('gets action dropdown values correctly', () => {
@@ -231,6 +238,7 @@ describe('useAutomation', () => {
     expect(getActionDropdownValues('send_email_to_team')).toEqual(teams);
     expect(getActionDropdownValues('send_message')).toEqual([]);
     expect(getActionDropdownValues('add_sla')).toEqual(slaPolicies);
+    expect(getActionDropdownValues('change_priority')).toEqual(priorityOptions);
   });
 
   it('handles event change correctly', () => {

app/javascript/dashboard/composables/spec/useMacros.spec.js

@@ -5,6 +5,9 @@ import { PRIORITY_CONDITION_VALUES } from 'dashboard/constants/automation';
 
 vi.mock('dashboard/composables/store');
 vi.mock('dashboard/helper/automationHelper.js');
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({ t: key => key }),
+}));
 
 describe('useMacros', () => {
   const mockLabels = [
@@ -148,9 +151,11 @@ describe('useMacros', () => {
 
   it('returns PRIORITY_CONDITION_VALUES for change_priority type', () => {
     const { getMacroDropdownValues } = useMacros();
-    expect(getMacroDropdownValues('change_priority')).toEqual(
-      PRIORITY_CONDITION_VALUES
-    );
+    const expectedPriority = PRIORITY_CONDITION_VALUES.map(item => ({
+      id: item.id,
+      name: `MACROS.PRIORITY_TYPES.${item.i18nKey}`,
+    }));
+    expect(getMacroDropdownValues('change_priority')).toEqual(expectedPriority);
   });
 
   it('returns an empty array for unknown types', () => {

app/javascript/dashboard/composables/useAutomationValues.js

@@ -8,6 +8,10 @@ import {
   getActionOptions,
   getConditionOptions,
 } from 'dashboard/helper/automationHelper';
+import {
+  MESSAGE_CONDITION_VALUES,
+  PRIORITY_CONDITION_VALUES,
+} from 'dashboard/constants/automation';
 
 /**
  * This is a shared composables that holds utilites used to build dropdown and file options
@@ -60,6 +64,20 @@ export default function useAutomationValues() {
     ];
   });
 
+  const messageTypeOptions = computed(() =>
+    MESSAGE_CONDITION_VALUES.map(item => ({
+      id: item.id,
+      name: t(`AUTOMATION.MESSAGE_TYPES.${item.i18nKey}`),
+    }))
+  );
+
+  const priorityOptions = computed(() =>
+    PRIORITY_CONDITION_VALUES.map(item => ({
+      id: item.id,
+      name: t(`AUTOMATION.PRIORITY_TYPES.${item.i18nKey}`),
+    }))
+  );
+
   /**
    * Adds a translated "None" option to the beginning of a list
    * @param {Array} list - The list to add "None" to
@@ -87,6 +105,8 @@ export default function useAutomationValues() {
       customAttributes: getters['attributes/getAttributes'].value,
       inboxes: inboxes.value,
       statusFilterOptions: statusFilterOptions.value,
+      priorityOptions: priorityOptions.value,
+      messageTypeOptions: messageTypeOptions.value,
       teams: teams.value,
       languages,
       countries,
@@ -108,6 +128,7 @@ export default function useAutomationValues() {
       languages,
       type,
       addNoneToListFn: addNoneToList,
+      priorityOptions: priorityOptions.value,
     });
   };
 
@@ -115,6 +136,8 @@ export default function useAutomationValues() {
     booleanFilterOptions,
     statusFilterItems,
     statusFilterOptions,
+    priorityOptions,
+    messageTypeOptions,
     getConditionDropdownValues,
     getActionDropdownValues,
     agents,

app/javascript/dashboard/composables/useCaptain.js

@@ -1,12 +1,14 @@
 import { computed } from 'vue';
 import { useStore } from 'dashboard/composables/store.js';
 import { useAccount } from 'dashboard/composables/useAccount';
+import { useConfig } from 'dashboard/composables/useConfig';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 export function useCaptain() {
   const store = useStore();
   const { isCloudFeatureEnabled, currentAccount } = useAccount();
+  const { isEnterprise } = useConfig();
 
   const captainEnabled = computed(() => {
     return isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN);
@@ -33,7 +35,9 @@ export function useCaptain() {
   });
 
   const fetchLimits = () => {
-    store.dispatch('accounts/limits');
+    if (isEnterprise) {
+      store.dispatch('accounts/limits');
+    }
   };
 
   return {

app/javascript/dashboard/composables/useMacros.js

@@ -1,4 +1,5 @@
 import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useStoreGetters } from 'dashboard/composables/store';
 import { PRIORITY_CONDITION_VALUES } from 'dashboard/constants/automation';
 
@@ -7,6 +8,7 @@ import { PRIORITY_CONDITION_VALUES } from 'dashboard/constants/automation';
  * @returns {Object} An object containing the getMacroDropdownValues function
  */
 export const useMacros = () => {
+  const { t } = useI18n();
   const getters = useStoreGetters();
 
   const labels = computed(() => getters['labels/getLabels'].value);
@@ -32,7 +34,10 @@ export const useMacros = () => {
           name: i.title,
         }));
       case 'change_priority':
-        return PRIORITY_CONDITION_VALUES;
+        return PRIORITY_CONDITION_VALUES.map(item => ({
+          id: item.id,
+          name: t(`MACROS.PRIORITY_TYPES.${item.i18nKey}`),
+        }));
       default:
         return [];
     }