Compare commits

..
Author SHA1 Message Date
Shivam Mishra cf8efed36e debug: sync router before everything else 2024-10-08 20:44:45 +05:30
22 changed files with 39 additions and 93 deletions
+4 -14
View File
@@ -52,11 +52,8 @@ export default {
currentUser: 'getCurrentUser',
authUIFlags: 'getAuthUIFlags',
accountUIFlags: 'accounts/getUIFlags',
// currentAccountId: 'getCurrentAccountId',
currentAccountId: 'getCurrentAccountId',
}),
currentAccountId() {
return this.$route.params.accountId;
},
hasAccounts() {
const { accounts = [] } = this.currentUser || {};
return accounts.length > 0;
@@ -73,22 +70,15 @@ export default {
}
},
currentAccountId() {
console.log('THIS CALL', this.currentAccountId);
if (this.currentAccountId) {
this.initializeAccount();
} else {
console.log('NO ACCOUNT ID');
}
},
},
created() {
this.setLocale(window.chatwootConfig.selectedLocale);
},
async mounted() {
this.setLocale(window.chatwootConfig.selectedLocale);
mounted() {
this.initializeColorTheme();
this.listenToThemeChanges();
await this.$store.dispatch('accounts/get');
this.setLocale(window.chatwootConfig.selectedLocale);
},
unmounted() {
if (this.reconnectService) {
@@ -104,7 +94,7 @@ export default {
mql.onchange = e => setColorTheme(e.matches);
},
setLocale(locale) {
this.$i18n.locale = locale;
this.$root.$i18n.locale = locale;
},
async initializeAccount() {
await this.$store.dispatch('accounts/get');
@@ -120,7 +120,6 @@ export default {
this.currentUser,
this.accountId
);
const menuItems = this.sideMenuConfig.primaryMenu;
return menuItems.filter(menuItem => {
const isAvailableForTheUser = hasPermissions(
@@ -131,7 +130,6 @@ export default {
if (!isAvailableForTheUser) {
return false;
}
if (
menuItem.alwaysVisibleOnChatwootInstances &&
!this.isACustomBrandedInstance
@@ -139,12 +137,10 @@ export default {
return true;
}
if (menuItem.featureFlag) {
const isEnabled = this.isFeatureEnabledonAccount(
return this.isFeatureEnabledonAccount(
this.accountId,
menuItem.featureFlag
);
return isEnabled;
}
return true;
});
@@ -50,9 +50,6 @@ export default {
showOptionsMenu: false,
};
},
mounted() {
console.log('MENU ITEMS', this.menuItems);
},
methods: {
frontendURL,
toggleOptions() {
@@ -26,13 +26,6 @@ export default {
default: false,
},
},
mounted() {
console.log(
'MOUNTED: PRIMARY NAV ITEM',
this.name,
this.$t(`SIDEBAR.${this.name}`)
);
},
};
</script>
@@ -29,7 +29,7 @@ const showNewButton = computed(
button-route="new"
:icon="icon"
:header-title="t(headerTitle)"
:button-text="headerButtonText ? t(headerButtonText) : ''"
:button-text="t(headerButtonText)"
:show-back-button="showBackButton"
:back-url="backUrl"
:show-new-button="showNewButton"
@@ -95,8 +95,8 @@ export default {
return this.id.toString();
},
},
async mounted() {
await this.initializeAccount();
mounted() {
this.initializeAccount();
},
methods: {
async initializeAccount() {
@@ -112,7 +112,7 @@ export default {
latest_chatwoot_version: latestChatwootVersion,
} = this.getAccount(this.accountId);
this.$i18n.locale = locale;
this.$root.$i18n.locale = locale;
this.name = name;
this.locale = locale;
this.id = id;
@@ -140,7 +140,7 @@ export default {
support_email: this.supportEmail,
auto_resolve_duration: this.autoResolveDuration,
});
this.$i18n.locale = this.locale;
this.$root.$i18n.locale = this.locale;
this.getAccount(this.id).locale = this.locale;
this.updateDirectionView(this.locale);
useAlert(this.$t('GENERAL_SETTINGS.UPDATE.SUCCESS'));
@@ -43,11 +43,7 @@ export const getters = {
return diffDays <= TRIAL_PERIOD_DAYS;
},
isFeatureEnabledonAccount: $state => (id, featureName) => {
console.log('----------------------------------------------------');
console.log('CHECK ENABLED for', featureName, id);
console.log($state, findRecordById($state, id));
const { features = {} } = findRecordById($state, id);
console.log('FEATURES', features, features[featureName]);
return features[featureName] || false;
},
};
+1 -3
View File
@@ -39,10 +39,10 @@ import 'floating-vue/dist/style.css';
const i18n = createI18n({
legacy: false, // https://github.com/intlify/vue-i18n/issues/1902
locale: 'en',
fallbackLocale: 'en',
messages: i18nMessages,
});
sync(store, router);
const app = createApp(App);
app.use(i18n);
app.use(store);
@@ -98,11 +98,9 @@ app.component('fluent-icon', FluentIcon);
app.directive('resize', vResizeObserver);
app.directive('on-clickaway', onClickaway);
sync(store, router);
// load common helpers into js
commonHelpers();
window.WOOT_STORE = store;
window.dashboardApp = app;
window.WootConstants = constants;
window.axios = createAxios(axios);
// [VITE] Disabled this we don't need it, we can use `useEmitter` directly
-1
View File
@@ -25,7 +25,6 @@ import {
const i18n = createI18n({
legacy: false, // https://github.com/intlify/vue-i18n/issues/1902
locale: 'en',
fallbackLocale: 'en',
messages: i18nMessages,
});
+1 -1
View File
@@ -120,7 +120,7 @@ export default {
}
},
setLocale(locale) {
this.$i18n.locale = locale || 'en';
this.$root.$i18n.locale = locale || 'en';
},
},
};
+1 -1
View File
@@ -31,7 +31,7 @@ export default {
};
},
setLocale(locale) {
this.$i18n.locale = locale;
this.$root.$i18n.locale = locale;
},
},
};
+2 -30
View File
@@ -66,33 +66,6 @@ export default {
mounted() {
const { websiteToken, locale, widgetColor } = window.chatwootWebChannel;
this.setLocale(locale);
setTimeout(() => {
console.log('SET LOCALE AGAIN 100');
this.setLocale(locale);
}, 100);
setTimeout(() => {
console.log('SET LOCALE AGAIN 200');
this.setLocale(locale);
}, 200);
setTimeout(() => {
console.log('SET LOCALE AGAIN 300');
this.setLocale(locale);
}, 300);
setTimeout(() => {
console.log('SET LOCALE AGAIN 400');
this.setLocale(locale);
}, 400);
setTimeout(() => {
console.log('SET LOCALE AGAIN 500');
this.setLocale(locale);
}, 500);
setTimeout(() => {
console.log('SET LOCALE YET AGAIN');
this.setLocale(locale);
}, 5000);
this.setWidgetColor(widgetColor);
setHeader(window.authToken);
if (this.isIFrame) {
@@ -148,7 +121,6 @@ export default {
},
setLocale(localeWithVariation) {
if (!localeWithVariation) return;
console.log('SETTING LOCALE HAHAHAHAHA!', localeWithVariation);
const { enabledLanguages } = window.chatwootWebChannel;
const localeWithoutVariation = localeWithVariation.split('_')[0];
const hasLocaleWithoutVariation = enabledLanguages.some(
@@ -159,9 +131,9 @@ export default {
);
if (hasLocaleWithVariation) {
this.$i18n.locale = localeWithVariation;
this.$root.$i18n.locale = localeWithVariation;
} else if (hasLocaleWithoutVariation) {
this.$i18n.locale = localeWithoutVariation;
this.$root.$i18n.locale = localeWithoutVariation;
}
},
registerUnreadEvents() {
@@ -60,7 +60,12 @@ export default {
chatwootWebChannel: { websiteToken },
authToken,
} = window;
popoutChatWindow(origin, websiteToken, this.$i18n.locale, authToken);
popoutChatWindow(
origin,
websiteToken,
this.$root.$i18n.locale,
authToken
);
},
closeWindow() {
if (IFrameHelper.isIFrame()) {
@@ -37,7 +37,7 @@ export default {
},
data() {
return {
locale: this.$i18n.locale,
locale: this.$root.$i18n.locale,
hasErrorInPhoneInput: false,
message: '',
formValues: {},
@@ -75,7 +75,7 @@ export default {
messageId: this.messageId,
});
} catch (error) {
console.log(error);
// Ignore error
} finally {
this.isUpdating = false;
}
@@ -41,7 +41,7 @@ export default {
);
this.dyteAuthToken = authToken;
} catch (error) {
console.log(error);
// Ignore Error for now
} finally {
this.isLoading = false;
}
@@ -31,7 +31,7 @@ export const actions = {
const { data } = await ContactsAPI.get();
commit(SET_CURRENT_USER, data);
} catch (error) {
console.log(error);
// Ignore error
}
},
update: async ({ dispatch }, { user }) => {
@@ -39,7 +39,7 @@ export const actions = {
await ContactsAPI.update(user);
dispatch('get');
} catch (error) {
console.log(error);
// Ignore error
}
},
setUser: async ({ dispatch }, { identifier, user: userObject }) => {
@@ -91,14 +91,14 @@ export const actions = {
try {
await ContactsAPI.setCustomAttributes(customAttributes);
} catch (error) {
console.log(error);
// Ignore error
}
},
deleteCustomAttribute: async (_, customAttribute) => {
try {
await ContactsAPI.deleteCustomAttribute(customAttribute);
} catch (error) {
console.log(error);
// Ignore error
}
},
};
@@ -25,7 +25,7 @@ export const actions = {
// Emit event to notify that conversation is created and show the chat screen
emitter.emit(ON_CONVERSATION_CREATED);
} catch (error) {
console.log(error);
// Ignore error
} finally {
commit('setConversationUIFlag', { isCreating: false });
}
@@ -133,7 +133,7 @@ export const actions = {
commit('conversation/setMetaUserLastSeenAt', lastSeen, { root: true });
commit('setMissingMessagesInConversation', updatedConversation);
} catch (error) {
console.log(error);
// IgnoreError
}
},
@@ -158,7 +158,7 @@ export const actions = {
try {
await toggleTyping(data);
} catch (error) {
console.log(error);
// IgnoreError
}
},
@@ -172,7 +172,7 @@ export const actions = {
commit('setMetaUserLastSeenAt', lastSeen);
await setUserLastSeenAt({ lastSeen });
} catch (error) {
console.log(error);
// IgnoreError
}
},
@@ -184,7 +184,7 @@ export const actions = {
try {
await setCustomAttributes(customAttributes);
} catch (error) {
console.log(error);
// IgnoreError
}
},
@@ -192,7 +192,7 @@ export const actions = {
try {
await deleteCustomAttribute(customAttribute);
} catch (error) {
console.log(error);
// IgnoreError
}
},
};
@@ -22,7 +22,7 @@ export const actions = {
commit(SET_CONVERSATION_ATTRIBUTES, data);
commit('conversation/setMetaUserLastSeenAt', lastSeen, { root: true });
} catch (error) {
console.log(error);
// Ignore error
}
},
update({ commit }, data) {
@@ -9,14 +9,14 @@ export const actions = {
try {
await conversationLabels.create(label);
} catch (error) {
console.log(error);
// Ignore error
}
},
destroy: async (_, label) => {
try {
await conversationLabels.destroy(label);
} catch (error) {
console.log(error);
// Ignore error
}
},
};
@@ -5,7 +5,7 @@ const actions = {
try {
await events.create(name);
} catch (error) {
console.log(error);
// Ignore error
}
},
};
@@ -38,7 +38,7 @@ export const actions = {
);
dispatch('contacts/get', {}, { root: true });
} catch (error) {
console.log(error);
// Ignore error
}
commit('toggleUpdateStatus', false);
},