akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Draft

Browse Source
This commit is contained in:
Fayaz Ahmed
2024-07-22 15:10:58 +05:30
parent 2a2cd30c6b
commit 353e2d0330
7 changed files with 94 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
+1 -1
View File
@@ -97,7 +97,7 @@ import { filterAttributeGroups } from '../contactFilterItems';
import filterMixin from 'shared/mixins/filterMixin';
import * as OPERATORS from 'dashboard/components/widgets/FilterInput/FilterOperatorTypes.js';
import { CONTACTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
import { validateConversationOrContactFilters } from 'dashboard/helper/conversationAdvancedFilterValidation.js';
import { validateConversationOrContactFilters } from 'dashboard/helper/validations.js';
export default {
components: {
app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+5 -13
View File
@@ -8,11 +8,7 @@
:label="$t('AUTOMATION.ADD.FORM.NAME.LABEL')"
type="text"
:class="{ error: $v.automation.name.$error }"
:error="
$v.automation.name.$error
? $t('AUTOMATION.ADD.FORM.NAME.ERROR')
: ''
"
:error="errors.name || ''"
:placeholder="$t('AUTOMATION.ADD.FORM.NAME.PLACEHOLDER')"
@blur="$v.automation.name.$touch"
/>
@@ -21,11 +17,7 @@
:label="$t('AUTOMATION.ADD.FORM.DESC.LABEL')"
type="text"
:class="{ error: $v.automation.description.$error }"
:error="
$v.automation.description.$error
? $t('AUTOMATION.ADD.FORM.DESC.ERROR')
: ''
"
:error="errors.description || ''"
:placeholder="$t('AUTOMATION.ADD.FORM.DESC.PLACEHOLDER')"
@blur="$v.automation.description.$touch"
/>
@@ -73,7 +65,7 @@
:custom-attribute-type="
getCustomAttributeType(automation.conditions[i].attribute_key)
"
:v="$v.automation.conditions.$each[i]"
:error-message="errors[`condition_${i}`] || ''"
@resetFilter="resetFilter(i, automation.conditions[i])"
@removeFilter="removeFilter(i)"
/>
@@ -147,7 +139,6 @@
import { mapGetters } from 'vuex';
import alertMixin from 'shared/mixins/alertMixin';
import automationMethodsMixin from 'dashboard/mixins/automations/methodsMixin';
import automationValidationsMixin from 'dashboard/mixins/automations/validationsMixin';
import filterInputBox from 'dashboard/components/widgets/FilterInput/Index.vue';
import automationActionInput from 'dashboard/components/widgets/AutomationActionInput.vue';
@@ -161,7 +152,7 @@ export default {
filterInputBox,
automationActionInput,
},
mixins: [alertMixin, automationMethodsMixin, automationValidationsMixin],
mixins: [alertMixin, automationMethodsMixin],
props: {
onClose: {
type: Function,
@@ -199,6 +190,7 @@ export default {
showDeleteConfirmationModal: false,
allCustomAttributes: [],
mode: 'create',
errors: {},
};
},
computed: {