Skip to content

fix(ui): improve conditional chatwoot usage #4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged

fix(ui): improve conditional chatwoot usage #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ui/src/components/AppBar/AppBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ const userId = computed(() => store.getters["auth/id"]);
const identifier = computed(() => store.getters["support/getIdentifier"]);
const currentUser = computed(() => store.getters["auth/currentUser"]);
const isDarkMode = ref(getStatusDarkMode.value === "dark");
const billingActive = computed(() => store.getters["billing/active"]);

const showNavigationDrawer = defineModel<boolean>();

Expand Down Expand Up @@ -168,7 +169,7 @@ const toggleDarkMode = () => {
};

const openShellhubHelp = async () => {
if (envVariables.isCloud || envVariables.isEnterprise) {
if ((envVariables.isCloud || envVariables.isEnterprise) && billingActive) {
await store.dispatch("support/get", tenant.value);
}
if (identifier.value.length === 0) {
Expand Down
36 changes: 17 additions & 19 deletions ui/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,8 @@ import { loadFonts } from "./plugins/webfontloader";
import SnackbarComponent from "./components/Snackbar/Snackbar.vue";
import { SnackbarPlugin } from "./plugins/snackbar";

/* import the fontawesome core */

/* import font awesome icon component */

const app = createApp(App);

const chatwoot = createChatWoot({
init: {
websiteToken: envVariables.chatWootWebsiteToken,
baseUrl: envVariables.chatWootBaseURL,
},
settings: {
locale: "en",
position: "right",
hideMessageBubble: true,
},
partytown: false,
});

Sentry.init({
app,
dsn: envVariables.sentryDsn || "",
Expand All @@ -56,9 +39,24 @@ app.use(store, key);
app.use(VueGtag, {
config: { id: envVariables.googleAnalyticsID || "" },
});
if (envVariables.isCloud || envVariables.isEnterprise) {
app.use(chatwoot);

if ((envVariables.isCloud || envVariables.isEnterprise) && (envVariables.chatWootWebsiteToken && envVariables.chatWootBaseURL)) {
app.use(
createChatWoot({
init: {
websiteToken: envVariables.chatWootWebsiteToken,
baseUrl: envVariables.chatWootBaseURL,
},
settings: {
locale: "en",
position: "right",
hideMessageBubble: true,
},
partytown: false,
}),
);
}

app.use(SnackbarPlugin);
app.component("SnackbarComponent", SnackbarComponent);
app.mount("#app");
Loading