From 09ce85b30db5f4356c857b52679ea6baddcf9c45 Mon Sep 17 00:00:00 2001 From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:50:46 +0530 Subject: [PATCH] Chore: moves localstorage helper as a shared utility (#6838) * Chore: moves localstorage helper as a shared utility and refactors constants * Refactors constants file * Fixes merge conflicts * Delete constants.js --------- Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> --- app/javascript/dashboard/api/testimonials.js | 2 +- app/javascript/dashboard/components/ChatList.vue | 2 +- app/javascript/dashboard/components/app/UpdateBanner.vue | 3 ++- .../dashboard/components/buttons/ResolveAction.vue | 2 +- .../dashboard/components/layout/AvailabilityStatus.vue | 2 +- .../components/layout/sidebarComponents/Primary.vue | 2 +- .../dashboard/components/widgets/ChatTypeTabs.vue | 2 +- .../components/widgets/conversation/ChatFilter.vue | 2 +- .../components/widgets/conversation/ConversationHeader.vue | 2 +- .../dashboard/components/widgets/conversation/ReplyBox.vue | 5 +++-- .../components/widgets/conversation/contextMenu/Index.vue | 2 +- .../dashboard/{constants.js => constants/globals.js} | 0 app/javascript/dashboard/constants/localStorage.js | 5 +++++ app/javascript/dashboard/helper/URLHelper.js | 2 +- app/javascript/dashboard/routes/auth/Confirmation.vue | 2 +- app/javascript/dashboard/routes/auth/PasswordEdit.vue | 2 +- .../dashboard/routes/auth/components/Signup/Form.vue | 2 +- app/javascript/dashboard/routes/dashboard/Dashboard.vue | 2 +- .../routes/dashboard/commands/conversationHotKeys.js | 2 +- .../routes/dashboard/conversation/ConversationView.vue | 2 +- .../helpcenter/components/Header/EditArticleHeader.vue | 2 +- .../dashboard/helpcenter/pages/articles/EditArticle.vue | 2 +- .../routes/dashboard/settings/agents/EditAgent.vue | 2 +- .../routes/dashboard/settings/inbox/WidgetBuilder.vue | 6 ++---- .../dashboard/store/modules/conversations/index.js | 2 +- app/javascript/dashboard/store/utils/api.js | 3 ++- app/javascript/packs/application.js | 2 +- .../{dashboard/helper => shared/helpers}/localStorage.js | 6 ------ app/javascript/shared/mixins/filterMixin.js | 2 +- 29 files changed, 36 insertions(+), 36 deletions(-) rename app/javascript/dashboard/{constants.js => constants/globals.js} (100%) create mode 100644 app/javascript/dashboard/constants/localStorage.js rename app/javascript/{dashboard/helper => shared/helpers}/localStorage.js (81%) diff --git a/app/javascript/dashboard/api/testimonials.js b/app/javascript/dashboard/api/testimonials.js index 705b7aabb..2d24945a5 100644 --- a/app/javascript/dashboard/api/testimonials.js +++ b/app/javascript/dashboard/api/testimonials.js @@ -1,5 +1,5 @@ /* global axios */ -import wootConstants from 'dashboard/constants'; +import wootConstants from 'dashboard/constants/globals'; export const getTestimonialContent = () => { return axios.get(wootConstants.TESTIMONIAL_URL); diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 32718ee23..dd9e353b8 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -173,7 +173,7 @@ import ConversationCard from './widgets/conversation/ConversationCard'; import timeMixin from '../mixins/time'; import eventListenerMixins from 'shared/mixins/eventListenerMixins'; import conversationMixin from '../mixins/conversations'; -import wootConstants from '../constants'; +import wootConstants from 'dashboard/constants/globals'; import advancedFilterTypes from './widgets/conversation/advancedFilterItems'; import filterQueryGenerator from '../helper/filterQueryGenerator.js'; import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews'; diff --git a/app/javascript/dashboard/components/app/UpdateBanner.vue b/app/javascript/dashboard/components/app/UpdateBanner.vue index 49a1f988a..e9e41b6cb 100644 --- a/app/javascript/dashboard/components/app/UpdateBanner.vue +++ b/app/javascript/dashboard/components/app/UpdateBanner.vue @@ -12,7 +12,8 @@