fix: Conditionally fetch limits and assistants for enterprise/cloud (#12099)
# Pull Request Template ## Description ### Issue The Community Edition (CE) dashboard was making API requests to enterprise-only endpoints, causing 404 errors: * `/enterprise/api/v1/accounts/1/limits` * `/api/v1/accounts/1/captain/assistants?page=1` ### Solution 1. Added conditional checks to prevent these calls. 2. Remove unused component `app/javascript/dashboard/components/app/UpgradeBanner.vue` Fixes [CW-4695](https://linear.app/chatwoot/issue/CW-4695/440-ce-dashboard-calls-enterprise-urls), https://github.com/chatwoot/chatwoot/issues/12023 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Pranav <pranavrajs@gmail.com>
This commit is contained in:
@@ -1,94 +0,0 @@
|
|||||||
<script>
|
|
||||||
import Banner from 'dashboard/components/ui/Banner.vue';
|
|
||||||
import { mapGetters } from 'vuex';
|
|
||||||
import { useAccount } from 'dashboard/composables/useAccount';
|
|
||||||
import { differenceInDays } from 'date-fns';
|
|
||||||
|
|
||||||
export default {
|
|
||||||
components: { Banner },
|
|
||||||
setup() {
|
|
||||||
const { accountId } = useAccount();
|
|
||||||
return {
|
|
||||||
accountId,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return { conversationMeta: {} };
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
...mapGetters({
|
|
||||||
isOnChatwootCloud: 'globalConfig/isOnChatwootCloud',
|
|
||||||
getAccount: 'accounts/getAccount',
|
|
||||||
}),
|
|
||||||
bannerMessage() {
|
|
||||||
return this.$t('GENERAL_SETTINGS.LIMITS_UPGRADE');
|
|
||||||
},
|
|
||||||
actionButtonMessage() {
|
|
||||||
return this.$t('GENERAL_SETTINGS.OPEN_BILLING');
|
|
||||||
},
|
|
||||||
shouldShowBanner() {
|
|
||||||
if (!this.isOnChatwootCloud) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isTrialAccount()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.isLimitExceeded();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
if (this.isOnChatwootCloud) {
|
|
||||||
this.fetchLimits();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
fetchLimits() {
|
|
||||||
this.$store.dispatch('accounts/limits');
|
|
||||||
},
|
|
||||||
routeToBilling() {
|
|
||||||
this.$router.push({
|
|
||||||
name: 'billing_settings_index',
|
|
||||||
params: { accountId: this.accountId },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
isTrialAccount() {
|
|
||||||
// check if account is less than 15 days old
|
|
||||||
const account = this.getAccount(this.accountId);
|
|
||||||
if (!account) return false;
|
|
||||||
|
|
||||||
const createdAt = new Date(account.created_at);
|
|
||||||
|
|
||||||
const diffDays = differenceInDays(new Date(), createdAt);
|
|
||||||
|
|
||||||
return diffDays <= 15;
|
|
||||||
},
|
|
||||||
isLimitExceeded() {
|
|
||||||
const account = this.getAccount(this.accountId);
|
|
||||||
if (!account) return false;
|
|
||||||
|
|
||||||
const { limits } = account;
|
|
||||||
if (!limits) return false;
|
|
||||||
|
|
||||||
const { conversation, non_web_inboxes: nonWebInboxes } = limits;
|
|
||||||
return this.testLimit(conversation) || this.testLimit(nonWebInboxes);
|
|
||||||
},
|
|
||||||
testLimit({ allowed, consumed }) {
|
|
||||||
return consumed > allowed;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<!-- eslint-disable-next-line vue/no-root-v-if -->
|
|
||||||
<template>
|
|
||||||
<Banner
|
|
||||||
v-if="shouldShowBanner"
|
|
||||||
color-scheme="alert"
|
|
||||||
:banner-message="bannerMessage"
|
|
||||||
:action-button-label="actionButtonMessage"
|
|
||||||
has-action-button
|
|
||||||
@primary-action="routeToBilling"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
@@ -4,6 +4,7 @@ import { useStore } from 'dashboard/composables/store';
|
|||||||
import Copilot from 'dashboard/components-next/copilot/Copilot.vue';
|
import Copilot from 'dashboard/components-next/copilot/Copilot.vue';
|
||||||
import { useMapGetter } from 'dashboard/composables/store';
|
import { useMapGetter } from 'dashboard/composables/store';
|
||||||
import { useUISettings } from 'dashboard/composables/useUISettings';
|
import { useUISettings } from 'dashboard/composables/useUISettings';
|
||||||
|
import { useConfig } from 'dashboard/composables/useConfig';
|
||||||
import { useWindowSize } from '@vueuse/core';
|
import { useWindowSize } from '@vueuse/core';
|
||||||
import { vOnClickOutside } from '@vueuse/components';
|
import { vOnClickOutside } from '@vueuse/components';
|
||||||
import { FEATURE_FLAGS } from 'dashboard/featureFlags';
|
import { FEATURE_FLAGS } from 'dashboard/featureFlags';
|
||||||
@@ -18,6 +19,7 @@ defineProps({
|
|||||||
|
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
const { uiSettings, updateUISettings } = useUISettings();
|
const { uiSettings, updateUISettings } = useUISettings();
|
||||||
|
const { isEnterprise } = useConfig();
|
||||||
const { width: windowWidth } = useWindowSize();
|
const { width: windowWidth } = useWindowSize();
|
||||||
|
|
||||||
const currentUser = useMapGetter('getCurrentUser');
|
const currentUser = useMapGetter('getCurrentUser');
|
||||||
@@ -82,6 +84,9 @@ const setAssistant = async assistant => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const shouldShowCopilotPanel = computed(() => {
|
const shouldShowCopilotPanel = computed(() => {
|
||||||
|
if (!isEnterprise) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const isCaptainEnabled = isFeatureEnabledonAccount.value(
|
const isCaptainEnabled = isFeatureEnabledonAccount.value(
|
||||||
currentAccountId.value,
|
currentAccountId.value,
|
||||||
FEATURE_FLAGS.CAPTAIN
|
FEATURE_FLAGS.CAPTAIN
|
||||||
@@ -113,7 +118,9 @@ const sendMessage = async message => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
store.dispatch('captainAssistants/get');
|
if (isEnterprise) {
|
||||||
|
store.dispatch('captainAssistants/get');
|
||||||
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
import { useStore } from 'dashboard/composables/store.js';
|
import { useStore } from 'dashboard/composables/store.js';
|
||||||
import { useAccount } from 'dashboard/composables/useAccount';
|
import { useAccount } from 'dashboard/composables/useAccount';
|
||||||
|
import { useConfig } from 'dashboard/composables/useConfig';
|
||||||
import { useCamelCase } from 'dashboard/composables/useTransformKeys';
|
import { useCamelCase } from 'dashboard/composables/useTransformKeys';
|
||||||
import { FEATURE_FLAGS } from 'dashboard/featureFlags';
|
import { FEATURE_FLAGS } from 'dashboard/featureFlags';
|
||||||
|
|
||||||
export function useCaptain() {
|
export function useCaptain() {
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
const { isCloudFeatureEnabled, currentAccount } = useAccount();
|
const { isCloudFeatureEnabled, currentAccount } = useAccount();
|
||||||
|
const { isEnterprise } = useConfig();
|
||||||
|
|
||||||
const captainEnabled = computed(() => {
|
const captainEnabled = computed(() => {
|
||||||
return isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN);
|
return isCloudFeatureEnabled(FEATURE_FLAGS.CAPTAIN);
|
||||||
@@ -33,7 +35,9 @@ export function useCaptain() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const fetchLimits = () => {
|
const fetchLimits = () => {
|
||||||
store.dispatch('accounts/limits');
|
if (isEnterprise) {
|
||||||
|
store.dispatch('accounts/limits');
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { useStore } from 'dashboard/composables/store';
|
|||||||
import { useMapGetter } from 'dashboard/composables/store.js';
|
import { useMapGetter } from 'dashboard/composables/store.js';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import { useAccount } from 'dashboard/composables/useAccount';
|
import { useAccount } from 'dashboard/composables/useAccount';
|
||||||
|
import { useConfig } from 'dashboard/composables/useConfig';
|
||||||
import { differenceInDays } from 'date-fns';
|
import { differenceInDays } from 'date-fns';
|
||||||
import { useAdmin } from 'dashboard/composables/useAdmin';
|
import { useAdmin } from 'dashboard/composables/useAdmin';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
@@ -22,6 +23,7 @@ const router = useRouter();
|
|||||||
const store = useStore();
|
const store = useStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { accountId, currentAccount } = useAccount();
|
const { accountId, currentAccount } = useAccount();
|
||||||
|
const { isEnterprise } = useConfig();
|
||||||
const { isAdmin } = useAdmin();
|
const { isAdmin } = useAdmin();
|
||||||
|
|
||||||
const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
|
const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
|
||||||
@@ -100,7 +102,11 @@ const routeToBilling = () => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => fetchLimits());
|
onMounted(() => {
|
||||||
|
if (isEnterprise) {
|
||||||
|
fetchLimits();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
defineExpose({ shouldShowUpgradePage });
|
defineExpose({ shouldShowUpgradePage });
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user