diff --git a/.env.example b/.env.example index befcde463..81228f00a 100644 --- a/.env.example +++ b/.env.example @@ -257,3 +257,5 @@ AZURE_APP_SECRET= # Set to true if you want to remove stale contact inboxes # contact_inboxes with no conversation older than 90 days will be removed # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false + +# CAPTAIN_API_URL=http://localhost:3001/api diff --git a/.storybook/preview.js b/.storybook/preview.js index 3f98c2cd8..7c046d51a 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -2,7 +2,6 @@ import { addDecorator } from '@storybook/vue'; import Vue from 'vue'; import Vuex from 'vuex'; import VueI18n from 'vue-i18n'; -import Vuelidate from 'vuelidate'; import Multiselect from 'vue-multiselect'; import VueDOMPurifyHTML from 'vue-dompurify-html'; import FluentIcon from 'shared/components/FluentIcon/DashboardIcon'; @@ -14,7 +13,6 @@ import { domPurifyConfig } from 'shared/helpers/HTMLSanitizer'; import '../app/javascript/dashboard/assets/scss/storybook.scss'; Vue.use(VueI18n); -Vue.use(Vuelidate); Vue.use(WootUiKit); Vue.use(Vuex); Vue.use(VueDOMPurifyHTML, domPurifyConfig); @@ -32,7 +30,7 @@ addDecorator(() => ({ template: '', i18n: i18nConfig, store, - beforeCreate: function() { + beforeCreate: function () { this.$root._i18n = this.$i18n; }, })); diff --git a/app/controllers/api/v1/accounts/integrations/apps_controller.rb b/app/controllers/api/v1/accounts/integrations/apps_controller.rb index 358a15d87..c2284bc2e 100644 --- a/app/controllers/api/v1/accounts/integrations/apps_controller.rb +++ b/app/controllers/api/v1/accounts/integrations/apps_controller.rb @@ -10,7 +10,7 @@ class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseC private def fetch_apps - @apps = Integrations::App.all.select(&:active?) + @apps = Integrations::App.all.select { |app| app.active?(Current.account) } end def fetch_app diff --git a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss index 97535bf0d..b5182bf87 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss @@ -1,6 +1,10 @@ table { @apply border-spacing-0 text-sm w-full; + +} + +.woot-table { thead { th { @apply font-semibold tracking-[1px] text-left px-2.5 uppercase text-slate-900 dark:text-slate-200; @@ -16,9 +20,7 @@ table { @apply p-2.5 text-slate-700 dark:text-slate-100; } } -} -.woot-table { tr { .show-if-hover { transition: opacity 0.2s $swift-ease-out-function; diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue index e7de811d6..3bd08dac7 100644 --- a/app/javascript/dashboard/components/CustomAttribute.vue +++ b/app/javascript/dashboard/components/CustomAttribute.vue @@ -14,7 +14,7 @@
@@ -136,12 +136,13 @@ + - diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue index bbccf77bd..5bf1df37b 100644 --- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue +++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue @@ -3,7 +3,7 @@
{{ $t('FILTER.EMPTY_VALUE_ERROR') }} @@ -23,7 +23,7 @@
@@ -58,7 +58,7 @@
-
+
{{ $t('FILTER.CANCEL_BUTTON_LABEL') }} @@ -80,7 +80,6 @@ diff --git a/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js b/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js index 5304627c4..108461353 100644 --- a/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js +++ b/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js @@ -1,7 +1,7 @@ -import emailValidator from 'vuelidate/lib/validators/email'; +import { email as emailValidator } from '@vuelidate/validators'; export const validEmailsByComma = value => { if (!value.length) return true; const emails = value.replace(/\s+/g, '').split(','); - return emails.every(email => emailValidator(email)); + return emails.every(email => emailValidator.$validator(email)); }; diff --git a/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue b/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue index 689ec2527..e4ba7dd9e 100644 --- a/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue +++ b/app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue @@ -6,12 +6,12 @@
- + {{ confirmText }} @@ -23,9 +23,9 @@ - - diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue index c16673e96..5a7f866f9 100644 --- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue +++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue @@ -18,38 +18,38 @@
-
-