diff --git a/app/javascript/dashboard/components/app/UpgradeBanner.vue b/app/javascript/dashboard/components/app/UpgradeBanner.vue deleted file mode 100644 index d41ce3438..000000000 --- a/app/javascript/dashboard/components/app/UpgradeBanner.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - diff --git a/app/javascript/dashboard/components/copilot/CopilotContainer.vue b/app/javascript/dashboard/components/copilot/CopilotContainer.vue index 41ffa6b61..da0e69492 100644 --- a/app/javascript/dashboard/components/copilot/CopilotContainer.vue +++ b/app/javascript/dashboard/components/copilot/CopilotContainer.vue @@ -4,6 +4,7 @@ import { useStore } from 'dashboard/composables/store'; import Copilot from 'dashboard/components-next/copilot/Copilot.vue'; import { useMapGetter } from 'dashboard/composables/store'; import { useUISettings } from 'dashboard/composables/useUISettings'; +import { useConfig } from 'dashboard/composables/useConfig'; import { useWindowSize } from '@vueuse/core'; import { vOnClickOutside } from '@vueuse/components'; import { FEATURE_FLAGS } from 'dashboard/featureFlags'; @@ -18,6 +19,7 @@ defineProps({ const store = useStore(); const { uiSettings, updateUISettings } = useUISettings(); +const { isEnterprise } = useConfig(); const { width: windowWidth } = useWindowSize(); const currentUser = useMapGetter('getCurrentUser'); @@ -82,6 +84,9 @@ const setAssistant = async assistant => { }; const shouldShowCopilotPanel = computed(() => { + if (!isEnterprise) { + return false; + } const isCaptainEnabled = isFeatureEnabledonAccount.value( currentAccountId.value, FEATURE_FLAGS.CAPTAIN @@ -113,7 +118,9 @@ const sendMessage = async message => { }; onMounted(() => { - store.dispatch('captainAssistants/get'); + if (isEnterprise) { + store.dispatch('captainAssistants/get'); + } }); diff --git a/app/javascript/dashboard/composables/useCaptain.js b/app/javascript/dashboard/composables/useCaptain.js index d28560944..3f93cfc58 100644 --- a/app/javascript/dashboard/composables/useCaptain.js +++ b/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 { diff --git a/app/javascript/dashboard/routes/dashboard/upgrade/UpgradePage.vue b/app/javascript/dashboard/routes/dashboard/upgrade/UpgradePage.vue index bd028779d..a650aac37 100644 --- a/app/javascript/dashboard/routes/dashboard/upgrade/UpgradePage.vue +++ b/app/javascript/dashboard/routes/dashboard/upgrade/UpgradePage.vue @@ -4,6 +4,7 @@ import { useStore } from 'dashboard/composables/store'; import { useMapGetter } from 'dashboard/composables/store.js'; import { useRouter } from 'vue-router'; import { useAccount } from 'dashboard/composables/useAccount'; +import { useConfig } from 'dashboard/composables/useConfig'; import { differenceInDays } from 'date-fns'; import { useAdmin } from 'dashboard/composables/useAdmin'; import { useI18n } from 'vue-i18n'; @@ -22,6 +23,7 @@ const router = useRouter(); const store = useStore(); const { t } = useI18n(); const { accountId, currentAccount } = useAccount(); +const { isEnterprise } = useConfig(); const { isAdmin } = useAdmin(); const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud'); @@ -100,7 +102,11 @@ const routeToBilling = () => { }); }; -onMounted(() => fetchLimits()); +onMounted(() => { + if (isEnterprise) { + fetchLimits(); + } +}); defineExpose({ shouldShowUpgradePage });