refactor: Consolidate WhatsApp template components and improve naming (#12299)
This commit is contained in:
@@ -1,177 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { computed, ref, onMounted } from 'vue';
|
|
||||||
import { useVuelidate } from '@vuelidate/core';
|
|
||||||
import { requiredIf } from '@vuelidate/validators';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
|
|
||||||
import Input from 'dashboard/components-next/input/Input.vue';
|
|
||||||
import Button from 'dashboard/components-next/button/Button.vue';
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
template: {
|
|
||||||
type: Object,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const emit = defineEmits(['sendMessage', 'back']);
|
|
||||||
|
|
||||||
const { t } = useI18n();
|
|
||||||
|
|
||||||
const processedParams = ref({});
|
|
||||||
|
|
||||||
const templateName = computed(() => {
|
|
||||||
return props.template?.name || '';
|
|
||||||
});
|
|
||||||
|
|
||||||
const templateString = computed(() => {
|
|
||||||
return props.template?.components?.find(
|
|
||||||
component => component.type === 'BODY'
|
|
||||||
).text;
|
|
||||||
});
|
|
||||||
|
|
||||||
const processVariable = str => {
|
|
||||||
return str.replace(/{{|}}/g, '');
|
|
||||||
};
|
|
||||||
|
|
||||||
const processedString = computed(() => {
|
|
||||||
return templateString.value.replace(/{{([^}]+)}}/g, (match, variable) => {
|
|
||||||
const variableKey = processVariable(variable);
|
|
||||||
return processedParams.value[variableKey] || `{{${variable}}}`;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const processedStringWithVariableHighlight = computed(() => {
|
|
||||||
const variables = templateString.value.match(/{{([^}]+)}}/g) || [];
|
|
||||||
|
|
||||||
return variables.reduce((result, variable) => {
|
|
||||||
const variableKey = processVariable(variable);
|
|
||||||
const value = processedParams.value[variableKey] || variable;
|
|
||||||
return result.replace(
|
|
||||||
variable,
|
|
||||||
`<span class="break-all text-n-slate-12">${value}</span>`
|
|
||||||
);
|
|
||||||
}, templateString.value);
|
|
||||||
});
|
|
||||||
|
|
||||||
const rules = computed(() => {
|
|
||||||
const paramRules = {};
|
|
||||||
Object.keys(processedParams.value).forEach(key => {
|
|
||||||
paramRules[key] = { required: requiredIf(true) };
|
|
||||||
});
|
|
||||||
return {
|
|
||||||
processedParams: paramRules,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
const v$ = useVuelidate(rules, { processedParams });
|
|
||||||
|
|
||||||
const getFieldErrorType = key => {
|
|
||||||
if (!v$.value.processedParams[key]?.$error) return 'info';
|
|
||||||
return 'error';
|
|
||||||
};
|
|
||||||
|
|
||||||
const generateVariables = () => {
|
|
||||||
const matchedVariables = templateString.value.match(/{{([^}]+)}}/g);
|
|
||||||
if (!matchedVariables) return;
|
|
||||||
|
|
||||||
const finalVars = matchedVariables.map(i => processVariable(i));
|
|
||||||
processedParams.value = finalVars.reduce((acc, variable) => {
|
|
||||||
acc[variable] = '';
|
|
||||||
return acc;
|
|
||||||
}, {});
|
|
||||||
};
|
|
||||||
|
|
||||||
const sendMessage = async () => {
|
|
||||||
const isValid = await v$.value.$validate();
|
|
||||||
if (!isValid) return;
|
|
||||||
|
|
||||||
const payload = {
|
|
||||||
message: processedString.value,
|
|
||||||
templateParams: {
|
|
||||||
name: props.template.name,
|
|
||||||
category: props.template.category,
|
|
||||||
language: props.template.language,
|
|
||||||
namespace: props.template.namespace,
|
|
||||||
processed_params: processedParams.value,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
emit('sendMessage', payload);
|
|
||||||
};
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
generateVariables();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div
|
|
||||||
class="absolute top-full mt-1.5 max-h-[30rem] overflow-y-auto ltr:left-0 rtl:right-0 flex flex-col gap-4 px-4 pt-6 pb-5 items-start w-[28.75rem] h-auto bg-n-solid-2 border border-n-strong shadow-sm rounded-lg"
|
|
||||||
>
|
|
||||||
<span class="text-sm text-n-slate-12">
|
|
||||||
{{
|
|
||||||
t(
|
|
||||||
'COMPOSE_NEW_CONVERSATION.FORM.WHATSAPP_OPTIONS.TEMPLATE_PARSER.TEMPLATE_NAME',
|
|
||||||
{ templateName: templateName }
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</span>
|
|
||||||
<p
|
|
||||||
class="mb-0 text-sm text-n-slate-11"
|
|
||||||
v-html="processedStringWithVariableHighlight"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<span
|
|
||||||
v-if="Object.keys(processedParams).length"
|
|
||||||
class="text-sm font-medium text-n-slate-12"
|
|
||||||
>
|
|
||||||
{{
|
|
||||||
t(
|
|
||||||
'COMPOSE_NEW_CONVERSATION.FORM.WHATSAPP_OPTIONS.TEMPLATE_PARSER.VARIABLES'
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="(variable, key) in processedParams"
|
|
||||||
:key="key"
|
|
||||||
class="flex items-center w-full gap-2"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="block h-8 text-sm min-w-6 text-start truncate text-n-slate-10 leading-8"
|
|
||||||
:title="key"
|
|
||||||
>
|
|
||||||
{{ key }}
|
|
||||||
</span>
|
|
||||||
<Input
|
|
||||||
v-model="processedParams[key]"
|
|
||||||
custom-input-class="!h-8 w-full !bg-transparent"
|
|
||||||
class="w-full"
|
|
||||||
:message-type="getFieldErrorType(key)"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-end justify-between w-full gap-3 h-14">
|
|
||||||
<Button
|
|
||||||
:label="
|
|
||||||
t(
|
|
||||||
'COMPOSE_NEW_CONVERSATION.FORM.WHATSAPP_OPTIONS.TEMPLATE_PARSER.BACK'
|
|
||||||
)
|
|
||||||
"
|
|
||||||
color="slate"
|
|
||||||
variant="faded"
|
|
||||||
class="w-full font-medium"
|
|
||||||
@click="emit('back')"
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
:label="
|
|
||||||
t(
|
|
||||||
'COMPOSE_NEW_CONVERSATION.FORM.WHATSAPP_OPTIONS.TEMPLATE_PARSER.SEND_MESSAGE'
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="w-full font-medium"
|
|
||||||
@click="sendMessage"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
@@ -1,4 +1,13 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
|
/**
|
||||||
|
* This component handles parsing and sending WhatsApp message templates.
|
||||||
|
* It works as follows:
|
||||||
|
* 1. Displays the template text with variable placeholders.
|
||||||
|
* 2. Generates input fields for each variable in the template.
|
||||||
|
* 3. Validates that all variables are filled before sending.
|
||||||
|
* 4. Replaces placeholders with user-provided values.
|
||||||
|
* 5. Emits events to send the processed message or reset the template.
|
||||||
|
*/
|
||||||
import { ref, computed, onMounted, watch } from 'vue';
|
import { ref, computed, onMounted, watch } from 'vue';
|
||||||
import { useVuelidate } from '@vuelidate/core';
|
import { useVuelidate } from '@vuelidate/core';
|
||||||
import { requiredIf } from '@vuelidate/validators';
|
import { requiredIf } from '@vuelidate/validators';
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<script>
|
<script>
|
||||||
import TemplatesPicker from './TemplatesPicker.vue';
|
import TemplatesPicker from './TemplatesPicker.vue';
|
||||||
import TemplateParser from './TemplateParser.vue';
|
import WhatsAppTemplateReply from './WhatsAppTemplateReply.vue';
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
TemplatesPicker,
|
TemplatesPicker,
|
||||||
TemplateParser,
|
WhatsAppTemplateReply,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
show: {
|
show: {
|
||||||
@@ -68,7 +68,7 @@ export default {
|
|||||||
:inbox-id="inboxId"
|
:inbox-id="inboxId"
|
||||||
@on-select="pickTemplate"
|
@on-select="pickTemplate"
|
||||||
/>
|
/>
|
||||||
<TemplateParser
|
<WhatsAppTemplateReply
|
||||||
v-else
|
v-else
|
||||||
:template="selectedWaTemplate"
|
:template="selectedWaTemplate"
|
||||||
@reset-template="onResetTemplate"
|
@reset-template="onResetTemplate"
|
||||||
|
|||||||
@@ -1,13 +1,4 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
/**
|
|
||||||
* This component handles parsing and sending WhatsApp message templates.
|
|
||||||
* It works as follows:
|
|
||||||
* 1. Displays the template text with variable placeholders.
|
|
||||||
* 2. Generates input fields for each variable in the template.
|
|
||||||
* 3. Validates that all variables are filled before sending.
|
|
||||||
* 4. Replaces placeholders with user-provided values.
|
|
||||||
* 5. Emits events to send the processed message or reset the template.
|
|
||||||
*/
|
|
||||||
import WhatsAppTemplateParser from 'dashboard/components-next/whatsapp/WhatsAppTemplateParser.vue';
|
import WhatsAppTemplateParser from 'dashboard/components-next/whatsapp/WhatsAppTemplateParser.vue';
|
||||||
import NextButton from 'dashboard/components-next/button/Button.vue';
|
import NextButton from 'dashboard/components-next/button/Button.vue';
|
||||||
|
|
||||||
Reference in New Issue
Block a user