From 5ad6db07b4cf21a705e8b9c84f44930228fd33f4 Mon Sep 17 00:00:00 2001 From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com> Date: Tue, 15 Feb 2022 23:36:29 +0530 Subject: [PATCH] fix: Automation Bugs and minor enhancements (#3936) --- .../layout/config/sidebarItems/settings.js | 14 ++--- .../sidebarComponents/SecondaryNavItem.vue | 20 +++++++ .../dashboard/i18n/locale/en/automation.json | 10 +++- .../settings/automation/AddAutomationRule.vue | 26 +++++++--- .../automation/EditAutomationRule.vue | 51 ++++++++++++------ .../dashboard/settings/automation/Index.vue | 4 +- .../settings/automation/constants.js | 42 +++++++-------- .../dashboard/store/modules/automations.js | 2 +- .../modules/specs/automations/actions.spec.js | 4 +- .../modules/specs/automations/fixtures.js | 52 +++++-------------- .../specs/automations/mutations.spec.js | 38 +++----------- app/listeners/automation_rule_listener.rb | 10 ++++ app/models/conversation.rb | 5 ++ .../conditions_filter_service.rb | 4 +- .../partials/_automation_rule.json.jbuilder | 2 +- lib/events/types.rb | 1 + .../automation_rule_listener_spec.rb | 47 +++++++++++++++++ 17 files changed, 203 insertions(+), 129 deletions(-) diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js index 577d41c6b..176fd152c 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/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue index bc4cd3091..3a344d985 100644 --- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue +++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue @@ -15,6 +15,13 @@ size="14" /> {{ $t(`SIDEBAR.${menuItem.label}`) }} + Beta +