Skip to content

Commit

Permalink
chore: Account auto resolution time validation (#3651)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shivamsinghchahar
shivamsinghchahar committed Jan 19, 2022
1 parent 1b36143 commit 9617137
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/bg/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/en/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/hi/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/it/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/ja/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "あなたのアカウントでは、メールでの会話が継続できるようになっています。",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/ml/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "പ്രവർത്തനമൊന്നുമില്ലെങ്കിൽ ടിക്കറ്റിന് ശേഷമുള്ള ദിവസങ്ങളുടെ എണ്ണം യാന്ത്രികമായി പരിഹരിക്കേണ്ടതാണ്",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിലുകളുമായുള്ള സംഭാഷണ തുടർച്ച പ്രവർത്തനക്ഷമമാക്കി.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/ne/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/nl/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/ta/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/th/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "การสนทนาด้วยอีเมล์ถูกเปิดสำหรับบัญชีของคุณ",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/uk/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/vi/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "Tính liên tục của cuộc trò chuyện với email được kích hoạt cho tài khoản của bạn.",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/zh/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AUTO_RESOLVE_DURATION": {
"LABEL": "Number of days after a ticket should auto resolve if there is no activity",
"PLACEHOLDER": "30",
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
"ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
},
"FEATURES": {
"INBOUND_EMAIL_ENABLED": "您的帳戶啟用了電子信箱與對話的持續性功能。",
Expand Down
3 changes: 2 additions & 1 deletion app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</template>

<script>
import { required, minValue } from 'vuelidate/lib/validators';
import { required, minValue, maxValue } from 'vuelidate/lib/validators';
import { mapGetters } from 'vuex';
import alertMixin from 'shared/mixins/alertMixin';
import configMixin from 'shared/mixins/configMixin';
Expand Down Expand Up @@ -146,6 +146,7 @@ export default {
},
autoResolveDuration: {
minValue: minValue(1),
maxValue: maxValue(999),
},
},
computed: {
Expand Down
2 changes: 1 addition & 1 deletion app/models/account.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Account < ApplicationRecord
}.freeze

validates :name, presence: true
validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, allow_nil: true }
validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 999, allow_nil: true }

has_many :account_users, dependent: :destroy_async
has_many :agent_bot_inboxes, dependent: :destroy_async
Expand Down
1 change: 1 addition & 0 deletions spec/models/account_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
RSpec.describe Account do
it { is_expected.to validate_presence_of(:name) }
it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_greater_than_or_equal_to(1) }
it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_less_than_or_equal_to(999) }

it { is_expected.to have_many(:users).through(:account_users) }
it { is_expected.to have_many(:account_users) }
Expand Down

0 comments on commit 9617137

Please sign in to comment.