From 193a531e4998b2cf0deafb7466109b094e000caf Mon Sep 17 00:00:00 2001 From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com> Date: Wed, 2 Feb 2022 19:15:02 +0530 Subject: [PATCH] feat: Edit automation modal (#3876) * Add automation modal * Fix the v-model for automations * Actions and Condition dropdowns for automations * Fix merge conflicts * Handle event change and confirmation * Appends new action * Removes actions * Automation api integration * Api integration for creating automations * Registers vuex module to the global store * Automations table * Updarted labels and actions * Integrate automation api * Fixes the mutation error - removed the data key wrapper * Fixed the automation condition models to work with respective event types * Remove temporary fixes added to the api request * Displa timestamp and automation status values * Added the clone buton * Removed uncessary helper method * Specs for automations * Handle WIP code * Remove the payload wrap * Fix the action query payload * Removed unnecessary files * Disabled Automations routes * Ability to delete automations * Fix specs * Edit automation modal * Edit automation modal and api integration * Replaced hardcoded values * Using absolute paths * Update app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> * Update app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> * Intendation fix * Disable automation route * Minor fix Co-authored-by: Muhsin Keloth Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> --- .../layout/config/sidebarItems/settings.js | 14 +- .../settings/automation/AddAutomationRule.vue | 6 +- .../automation/EditAutomationRule.vue | 479 ++++++++++++++++++ .../dashboard/settings/automation/Index.vue | 43 +- .../dashboard/store/modules/automations.js | 3 +- 5 files changed, 526 insertions(+), 19 deletions(-) create mode 100644 app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js index 176fd152caaa..577d41c6b036 100644 --- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js +++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js @@ -69,13 +69,13 @@ const settings = accountId => ({ ), toStateName: 'attributes_list', }, - { - icon: 'automation', - label: 'AUTOMATION', - hasSubMenu: false, - toState: frontendURL(`accounts/${accountId}/settings/automation/list`), - toStateName: 'automation_list', - }, + // { + // icon: 'automation', + // label: 'AUTOMATION', + // hasSubMenu: false, + // toState: frontendURL(`accounts/${accountId}/settings/automation/list`), + // toStateName: 'automation_list', + // }, { icon: 'chat-multiple', label: 'CANNED_RESPONSES', diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue index d26a5695b795..3f9d2d83e0a9 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue @@ -434,13 +434,13 @@ export default { } .event_wrapper { select { - margin: 0; + margin: var(--space-zero); } .info-message { font-size: var(--font-size-mini); - color: #868686; + color: var(--s-500); text-align: right; } - margin-bottom: 1.6rem; + margin-bottom: var(--space-medium); } diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue new file mode 100644 index 000000000000..223c9577fe72 --- /dev/null +++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue @@ -0,0 +1,479 @@ + + + + diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue index 39c83c5fe737..6c1892a284cb 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue @@ -43,7 +43,7 @@ {{ readableTime(automation.created_on) }} -