Refactor methods
This commit is contained in:
Fayaz Ahmed
parent
bfc61ab0f7
commit
7c338d0b68
4 changed files with 59 additions and 66 deletions
|
|
@ -3,7 +3,8 @@ import {
|
|||
OPERATOR_TYPES_3,
|
||||
OPERATOR_TYPES_4,
|
||||
} from '../routes/dashboard/settings/automation/operators';
|
||||
|
||||
import filterQueryGenerator from './filterQueryGenerator.js';
|
||||
import actionQueryGenerator from './actionQueryGenerator.js';
|
||||
const MESSAGE_CONDITION_VALUES = [
|
||||
{
|
||||
id: 'incoming',
|
||||
|
|
@ -190,3 +191,20 @@ export const filterCustomAttributes = customAttributes => {
|
|||
};
|
||||
});
|
||||
};
|
||||
|
||||
export const getStandardAttributeInputType = (automationTypes, event, key) => {
|
||||
return automationTypes[event].conditions.find(item => item.key === key)
|
||||
.inputType;
|
||||
};
|
||||
|
||||
export const generateAutomationPayload = payload => {
|
||||
const automation = JSON.parse(JSON.stringify(payload));
|
||||
automation.conditions[automation.conditions.length - 1].query_operator = null;
|
||||
automation.conditions = filterQueryGenerator(automation.conditions).payload;
|
||||
automation.actions = actionQueryGenerator(automation.actions);
|
||||
return automation;
|
||||
};
|
||||
|
||||
export const isCustomAttribute = (attrs, key) => {
|
||||
return attrs.find(attr => attr.key === key);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import filterQueryGenerator from '../../helper/filterQueryGenerator.js';
|
||||
import actionQueryGenerator from '../../helper/actionQueryGenerator.js';
|
||||
import languages from '../../../dashboard/components/widgets/conversation/advancedFilterItems/languages.js';
|
||||
import countries from '../../../shared/constants/countries.js';
|
||||
import {
|
||||
generateCustomAttributeTypes,
|
||||
getActionOptions,
|
||||
|
|
@ -11,6 +11,9 @@ import {
|
|||
getDefaultConditions,
|
||||
getDefaultActions,
|
||||
filterCustomAttributes,
|
||||
generateAutomationPayload,
|
||||
getStandardAttributeInputType,
|
||||
isCustomAttribute,
|
||||
} from '../../helper/automationHelper.js';
|
||||
import { mapGetters } from 'vuex';
|
||||
|
||||
|
|
@ -115,20 +118,12 @@ export default {
|
|||
labels,
|
||||
statusFilterOptions,
|
||||
teams,
|
||||
languages,
|
||||
countries,
|
||||
type,
|
||||
});
|
||||
},
|
||||
appendNewCondition() {
|
||||
if (this.mode === 'edit') {
|
||||
if (
|
||||
!this.automation.conditions[this.automation.conditions.length - 1]
|
||||
.query_operator
|
||||
) {
|
||||
this.automation.conditions[
|
||||
this.automation.conditions.length - 1
|
||||
].query_operator = 'and';
|
||||
}
|
||||
}
|
||||
this.automation.conditions.push(
|
||||
...getDefaultConditions(this.automation.event_name)
|
||||
);
|
||||
|
|
@ -153,19 +148,8 @@ export default {
|
|||
submitAutomation() {
|
||||
this.$v.$touch();
|
||||
if (this.$v.$invalid) return;
|
||||
const automation = JSON.parse(JSON.stringify(this.automation));
|
||||
automation.conditions[
|
||||
automation.conditions.length - 1
|
||||
].query_operator = null;
|
||||
automation.conditions = filterQueryGenerator(
|
||||
automation.conditions
|
||||
).payload;
|
||||
automation.actions = actionQueryGenerator(automation.actions);
|
||||
this.$emit(
|
||||
'saveAutomation',
|
||||
automation,
|
||||
this.mode === 'edit' ? 'EDIT' : null
|
||||
);
|
||||
const automation = generateAutomationPayload(this.automation);
|
||||
this.$emit('saveAutomation', automation, this.mode);
|
||||
},
|
||||
resetFilter(index, currentCondition) {
|
||||
this.automation.conditions[index].filter_operator = this.automationTypes[
|
||||
|
|
@ -175,19 +159,15 @@ export default {
|
|||
).filterOperators[0].value;
|
||||
this.automation.conditions[index].values = '';
|
||||
},
|
||||
showUserInput(operatorType) {
|
||||
if (operatorType === 'is_present' || operatorType === 'is_not_present')
|
||||
return false;
|
||||
return true;
|
||||
showUserInput(type) {
|
||||
return !(type === 'is_present' || type === 'is_not_present');
|
||||
},
|
||||
showActionInput(actionName) {
|
||||
if (actionName === 'send_email_to_team' || actionName === 'send_message')
|
||||
showActionInput(action) {
|
||||
if (action === 'send_email_to_team' || action === 'send_message')
|
||||
return false;
|
||||
const type = this.automationActionTypes.find(
|
||||
action => action.key === actionName
|
||||
).inputType;
|
||||
if (type === null) return false;
|
||||
return true;
|
||||
const type = this.automationActionTypes.find(i => i.key === action)
|
||||
.inputType;
|
||||
return !!type;
|
||||
},
|
||||
resetAction(index) {
|
||||
this.automation.actions[index].action_params = [];
|
||||
|
|
@ -195,17 +175,19 @@ export default {
|
|||
manifestConditions(automation) {
|
||||
const customAttributes = filterCustomAttributes(this.allCustomAttributes);
|
||||
const conditions = automation.conditions.map(condition => {
|
||||
const isCustomAttribute = customAttributes.find(
|
||||
attr => attr.key === condition.attribute_key
|
||||
const customAttr = isCustomAttribute(
|
||||
customAttributes,
|
||||
condition.attribute_key
|
||||
);
|
||||
let inputType = 'plain_text';
|
||||
if (isCustomAttribute) {
|
||||
inputType = getCustomAttributeInputType(isCustomAttribute.type);
|
||||
if (customAttr) {
|
||||
inputType = getCustomAttributeInputType(customAttr.type);
|
||||
} else {
|
||||
inputType = this.automationTypes[
|
||||
automation.event_name
|
||||
].conditions.find(item => item.key === condition.attribute_key)
|
||||
.inputType;
|
||||
inputType = getStandardAttributeInputType(
|
||||
this.automationTypes,
|
||||
automation.event_name,
|
||||
condition.attribute_key
|
||||
);
|
||||
}
|
||||
if (inputType === 'plain_text' || inputType === 'date') {
|
||||
return {
|
||||
|
|
@ -215,6 +197,7 @@ export default {
|
|||
}
|
||||
return {
|
||||
...condition,
|
||||
query_operator: condition.query_operator || 'and',
|
||||
values: [
|
||||
...this.getConditionDropdownValues(condition.attribute_key),
|
||||
].filter(item => [...condition.values].includes(item.id)),
|
||||
|
|
@ -223,6 +206,7 @@ export default {
|
|||
return conditions;
|
||||
},
|
||||
generateActionsArray(action) {
|
||||
const params = action.action_params;
|
||||
let actionParams = [];
|
||||
const inputType = this.automationActionTypes.find(
|
||||
item => item.key === action.action_name
|
||||
|
|
@ -230,17 +214,15 @@ export default {
|
|||
if (inputType === 'multi_select') {
|
||||
actionParams = [
|
||||
...this.getActionDropdownValues(action.action_name),
|
||||
].filter(item => [...action.action_params].includes(item.id));
|
||||
].filter(item => [...params].includes(item.id));
|
||||
} else if (inputType === 'team_message') {
|
||||
actionParams = {
|
||||
team_ids: [
|
||||
...this.getActionDropdownValues(action.action_name),
|
||||
].filter(item =>
|
||||
[...action.action_params[0].team_ids].includes(item.id)
|
||||
),
|
||||
message: action.action_params[0].message,
|
||||
].filter(item => [...params[0].team_ids].includes(item.id)),
|
||||
message: params[0].message,
|
||||
};
|
||||
} else actionParams = [...action.action_params];
|
||||
} else actionParams = [...params];
|
||||
return actionParams;
|
||||
},
|
||||
manifestActions(automation) {
|
||||
|
|
|
|||
|
|
@ -224,9 +224,9 @@ export default {
|
|||
async submitAutomation(payload, mode) {
|
||||
try {
|
||||
const action =
|
||||
mode === 'EDIT' ? 'automations/update' : 'automations/create';
|
||||
mode === 'edit' ? 'automations/update' : 'automations/create';
|
||||
const successMessage =
|
||||
mode === 'EDIT'
|
||||
mode === 'edit'
|
||||
? this.$t('AUTOMATION.EDIT.API.SUCCESS_MESSAGE')
|
||||
: this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE');
|
||||
await await this.$store.dispatch(action, payload);
|
||||
|
|
@ -235,7 +235,7 @@ export default {
|
|||
this.hideEditPopup();
|
||||
} catch (error) {
|
||||
const errorMessage =
|
||||
mode === 'EDIT'
|
||||
mode === 'edit'
|
||||
? this.$t('AUTOMATION.EDIT.API.ERROR_MESSAGE')
|
||||
: this.$t('AUTOMATION.ADD.API.ERROR_MESSAGE');
|
||||
this.showAlert(errorMessage);
|
||||
|
|
|
|||
|
|
@ -17,29 +17,22 @@ const i18nConfig = new VueI18n({
|
|||
|
||||
describe('Automation Mixin function', () => {
|
||||
let addAutomationRule = null;
|
||||
let actions = null;
|
||||
let modules = null;
|
||||
let getters = null;
|
||||
let store = null;
|
||||
|
||||
beforeEach(() => {
|
||||
actions = {};
|
||||
|
||||
modules = {
|
||||
auth: {
|
||||
getters: {
|
||||
'attributes/getAttributes': () => customAttributes,
|
||||
},
|
||||
},
|
||||
getters = {
|
||||
'attributes/getAttributesByModel': () => customAttributes,
|
||||
};
|
||||
store = new Vuex.Store({
|
||||
actions,
|
||||
modules,
|
||||
getters,
|
||||
});
|
||||
|
||||
addAutomationRule = shallowMount(AddAutomationRule, {
|
||||
localVue,
|
||||
i18n: i18nConfig,
|
||||
mixins: [methodsMixin],
|
||||
store,
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue