From 4027c026e3e0ba1759e64dc8101cea45db23127b Mon Sep 17 00:00:00 2001 From: Fayaz Ahmed Date: Wed, 21 Aug 2024 09:21:40 +0530 Subject: [PATCH] Revert "chore: Repalce Hook Mixin with useHook composable [CW-3454]" This reverts commit 5d91bb4ffceafad0c2699d6c0bf5fd607fc19c72. --- .../integrations/IntegrationHooks.vue | 8 ++---- .../integrations/MultipleIntegrationHooks.vue | 7 ++--- .../settings/integrations/NewHook.vue | 7 ++--- .../integrations/SingleIntegrationHooks.vue | 7 ++--- .../settings/integrations/useHook.js | 26 ------------------- 5 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/useHook.js diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHooks.vue index a0185498b..ad2daa5f3 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHooks.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHooks.vue @@ -2,7 +2,7 @@ import { isEmptyObject } from '../../../../helper/commons'; import { mapGetters } from 'vuex'; import { useAlert } from 'dashboard/composables'; -import { useHook } from './useHook'; +import hookMixin from './hookMixin'; import NewHook from './NewHook.vue'; import SingleIntegrationHooks from './SingleIntegrationHooks.vue'; import MultipleIntegrationHooks from './MultipleIntegrationHooks.vue'; @@ -13,17 +13,13 @@ export default { SingleIntegrationHooks, MultipleIntegrationHooks, }, + mixins: [hookMixin], props: { integrationId: { type: [String, Number], required: true, }, }, - setup(props) { - const { integrationId } = props; - const { isHookTypeInbox } = useHook(integrationId); - return { isHookTypeInbox }; - }, data() { return { loading: {}, diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/MultipleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/MultipleIntegrationHooks.vue index 51aa8190f..38deab634 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/integrations/MultipleIntegrationHooks.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/MultipleIntegrationHooks.vue @@ -1,17 +1,14 @@ diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/useHook.js b/app/javascript/dashboard/routes/dashboard/settings/integrations/useHook.js deleted file mode 100644 index c813d5fb0..000000000 --- a/app/javascript/dashboard/routes/dashboard/settings/integrations/useHook.js +++ /dev/null @@ -1,26 +0,0 @@ -import { computed, ref } from 'vue'; -import { useStore } from 'dashboard/composables/store'; - -export const useHook = (integrationObj, integrationId) => { - const store = useStore(); - const integration = ref(null); - if (integrationId) { - integration.value = - store.getters['integrations/getIntegration'](integrationId); - } else { - integration.value = integrationObj; - } - - const isHookTypeInbox = computed(() => { - return integration.value.hook_type === 'inbox'; - }); - - const hasConnectedHooks = computed(() => { - return !!integration.value.hooks.length; - }); - - return { - isHookTypeInbox, - hasConnectedHooks, - }; -};