diff --git a/.eslintrc.js b/.eslintrc.js index ec7b48107..e1c6720cc 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -41,6 +41,7 @@ module.exports = { }, ], 'vue/component-options-name-casing': ['error', 'PascalCase'], + 'vue/custom-event-name-casing': ['error', 'camelCase'], 'vue/max-attributes-per-line': [ 'error', { diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 4c39e6b08..9f09f5a85 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -612,7 +612,7 @@ export default { } }, emitConversationLoaded() { - this.$emit('conversation-load'); + this.$emit('conversationLoad'); this.$nextTick(() => { // Addressing a known issue in the virtual list library where dynamically added items // might not render correctly. This workaround involves a slight manual adjustment @@ -879,11 +879,11 @@ export default { :has-applied-filters="hasAppliedFilters" :has-active-folders="hasActiveFolders" :active-status="activeStatus" - @add-folders="onClickOpenAddFoldersModal" - @delete-folders="onClickOpenDeleteFoldersModal" - @filters-modal="onToggleAdvanceFiltersModal" - @reset-filters="resetAndFetchData" - @basic-filter-change="onBasicFilterChange" + @addFolders="onClickOpenAddFoldersModal" + @deleteFolders="onClickOpenDeleteFoldersModal" + @filtersModal="onToggleAdvanceFiltersModal" + @resetFilters="resetAndFetchData" + @basicFilterChange="onBasicFilterChange" />
{ - emits('basic-filter-change', value, type); + emits('basicFilterChange', value, type); }; const hasAppliedFiltersOrActiveFolders = computed(() => { @@ -68,7 +68,7 @@ const hasAppliedFiltersOrActiveFolders = computed(() => { variant="smooth" color-scheme="secondary" icon="save" - @click="emits('add-folders')" + @click="emits('addFolders')" /> { variant="smooth" color-scheme="alert" icon="dismiss-circle" - @click="emits('reset-filters')" + @click="emits('resetFilters')" />
@@ -86,7 +86,7 @@ const hasAppliedFiltersOrActiveFolders = computed(() => { variant="smooth" color-scheme="secondary" icon="edit" - @click="emits('filters-modal')" + @click="emits('filtersModal')" /> { variant="smooth" color-scheme="alert" icon="delete" - @click="emits('delete-folders')" + @click="emits('deleteFolders')" />
{ color-scheme="secondary" icon="filter" size="tiny" - @click="emits('filters-modal')" + @click="emits('filtersModal')" /> diff --git a/app/javascript/dashboard/components/CustomSnoozeModal.vue b/app/javascript/dashboard/components/CustomSnoozeModal.vue index 6538e574e..76330fe55 100644 --- a/app/javascript/dashboard/components/CustomSnoozeModal.vue +++ b/app/javascript/dashboard/components/CustomSnoozeModal.vue @@ -22,7 +22,7 @@ export default { this.$emit('close'); }, chooseTime() { - this.$emit('choose-time', this.snoozeTime); + this.$emit('chooseTime', this.snoozeTime); }, disabledDate(date) { // Disable all the previous dates @@ -53,7 +53,7 @@ export default { :disabled-time="disabledTime" :popup-style="{ width: '100%' }" /> -
+
{{ $t('CONVERSATION.CUSTOM_SNOOZE.CANCEL') }} diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue index c30dcbbc4..e87ecbea0 100644 --- a/app/javascript/dashboard/components/layout/Sidebar.vue +++ b/app/javascript/dashboard/components/layout/Sidebar.vue @@ -133,10 +133,10 @@ export default { } }, toggleKeyShortcutModal() { - this.$emit('open-key-shortcut-modal'); + this.$emit('openKeyShortcutModal'); }, closeKeyShortcutModal() { - this.$emit('close-key-shortcut-modal'); + this.$emit('closeKeyShortcutModal'); }, getKeyboardEvents() { return { @@ -168,13 +168,13 @@ export default { window.$chatwoot.toggle(); }, toggleAccountModal() { - this.$emit('toggle-account-modal'); + this.$emit('toggleAccountModal'); }, showAddLabelPopup() { - this.$emit('show-add-label-popup'); + this.$emit('showAddLabelPopup'); }, openNotificationPanel() { - this.$emit('open-notification-panel'); + this.$emit('openNotificationPanel'); }, }, }; @@ -189,9 +189,9 @@ export default { :account-id="accountId" :menu-items="primaryMenuItems" :active-menu-item="activePrimaryMenu.key" - @toggle-accounts="toggleAccountModal" - @key-shortcut-modal="toggleKeyShortcutModal" - @open-notification-panel="openNotificationPanel" + @toggleAccounts="toggleAccountModal" + @openKeyShortcutModal="toggleKeyShortcutModal" + @openNotificationPanel="openNotificationPanel" /> diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue index c29020472..a85eac5d6 100644 --- a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue +++ b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue @@ -27,27 +27,27 @@ export default {