Merge branch 'develop' into feat/github-integration

app/javascript/dashboard/routes/dashboard/conversation/Macros/List.vue

@@ -104,7 +104,6 @@ onMounted(() => {
           :key="element.id"
           :macro="element"
           :conversation-id="conversationId"
-          class="drag-handle cursor-grab"
         />
       </template>
     </Draggable>

app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue

@@ -54,6 +54,7 @@ const closeMacroPreview = () => {
 <template>
   <div
     class="relative flex items-center justify-between leading-4 rounded-md h-10 pl-3 pr-2"
+    :class="showPreview ? 'cursor-default' : 'drag-handle cursor-grab'"
   >
     <span
       class="overflow-hidden whitespace-nowrap text-ellipsis font-medium text-n-slate-12"

app/javascript/dashboard/routes/dashboard/settings/automation/constants.js

@@ -32,6 +32,30 @@ export const AUTOMATIONS = {
         inputType: 'multi_select',
         filterOperators: OPERATOR_TYPES_1,
       },
+      {
+        key: 'status',
+        name: 'STATUS',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'assignee_id',
+        name: 'ASSIGNEE_NAME',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_3,
+      },
+      {
+        key: 'team_id',
+        name: 'TEAM_NAME',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_3,
+      },
+      {
+        key: 'priority',
+        name: 'PRIORITY',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
       {
         key: 'conversation_language',
         name: 'CONVERSATION_LANGUAGE',
@@ -82,7 +106,10 @@ export const AUTOMATIONS = {
         key: 'snooze_conversation',
         name: 'SNOOZE_CONVERSATION',
       },
-
+      {
+        key: 'open_conversation',
+        name: 'OPEN_CONVERSATION',
+      },
       {
         key: 'resolve_conversation',
         name: 'RESOLVE_CONVERSATION',
@@ -508,6 +535,11 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'RESOLVE_CONVERSATION',
     inputType: null,
   },
+  {
+    key: 'open_conversation',
+    label: 'OPEN_CONVERSATION',
+    inputType: null,
+  },
   {
     key: 'send_webhook_event',
     label: 'SEND_WEBHOOK_EVENT',