Bug fixes and cleanup

src/containers/Template/Form/HSM/HSM.tsx

@@ -32,7 +32,7 @@ export const HSM = () => {
   const [newShortcode, setNewShortcode] = useState('');
   const [category, setCategory] = useState<any>(undefined);
   const [languageVariant, setLanguageVariant] = useState<boolean>(false);
-  const [allowTemplateCategoryChange, setAllowTemplateCategoryChange] = useState<boolean>(false);
+  const [allowTemplateCategoryChange, setAllowTemplateCategoryChange] = useState<boolean>(true);
 
   const { t } = useTranslation();
   const params = useParams();

src/containers/Template/Form/Template.test.tsx

@@ -71,7 +71,6 @@ const hsmProps = {
     isHsm: true,
   },
   icon: null,
-  getShortcode: '',
   category: {
     label: 'ACCOUNT_UPDATE',
     id: 'ACCOUNT_UPDATE',

src/containers/Template/Form/Template.tsx

@@ -115,36 +115,29 @@
   });
 };
 
-const getVariables = (body: string, example?: string) => {
-  const variablePattern = /\{\{(\d+)\}\}/g;
-  const examplePattern = /\[([^\]]+)\]/g;
-  let match;
-  let foundIds = new Set();
-  let examples = [];
-  let variables: any = [];
+const getVariables = (message: string, variables: any) => {
+  const regex = /{{\d+}}/g;
+  const matches = message.match(regex);
 
-  // Extract {{id}} patterns from body
-  while ((match = variablePattern.exec(body)) !== null) {
-    foundIds.add(parseInt(match[1], 10));
+  if (!matches) {
+    return [];
   }
 
-  // Extract example values if example string is provided
-  if (example) {
-    while ((match = examplePattern.exec(example)) !== null) {
-      examples.push(match[1]);
-    }
-  }
+  return matches.map((match, index) =>
+    variables[index]?.text ? variables[index] : { text: '', id: index + 1 }
+  );
+};
 
-  // Sort the IDs
-  let sortedIds = Array.from(foundIds).sort((a: any, b: any) => a - b);
+const getExampleValue = (example: string) => {
+  const regex = /\[([^\]]+)\]/g;
+  let match;
+  const variables = [];
+  let id = 1;
 
-  // Create variables array with ids and examples or empty text
-  sortedIds.forEach((id, index) => {
-    variables.push({
-      text: examples[index] || '',
-      id: index + 1,
-    });
-  });
+  while ((match = regex.exec(example)) !== null) {
+    variables.push({ text: match[1], id });
+    id++;
+  }
 
   return variables;
 };
@@ -324,15 +317,15 @@
 
     if (exampleValue) {
       if (hasButtons) {
-        setTemplateType(templateButtonType);
         const { buttons: buttonsVal } = getTemplateAndButtons(
           templateButtonType,
           exampleValue,
           buttons
         );
         setTemplateButtons(buttonsVal);
+        setTemplateType(templateButtonType);
       }
-      variables = getVariables(bodyValue, exampleValue);
+      variables = getExampleValue(exampleValue);
       setVariables(variables);
       onExampleChange(getExampleFromBody(bodyValue, variables));
     }
@@ -540,22 +533,20 @@
   }, [type]);
 
   useEffect(() => {
-    if (templateType) {
+    if (templateType && !isEditing) {
       addTemplateButtons(false);
     }
   }, [templateType]);
 
   // Removing buttons when checkbox is checked or unchecked
   useEffect(() => {
-    if (isEditing) {
-      const { message }: any = getTemplateAndButton(getExampleFromBody(body, variables));
-      onExampleChange(message || '');
-    }
+    const { message }: any = getTemplateAndButton(getExampleFromBody(body, variables));
+    onExampleChange(message || '');
   }, [isAddButtonChecked]);
 
   // Converting buttons to template and vice-versa to show realtime update on simulator
   useEffect(() => {
-    if (templateButtons.length > 0 && !isEditing) {
+    if (templateButtons.length > 0) {
       const parse = convertButtonsToTemplate(templateButtons, templateType);
 
       const parsedText = parse.length ? `| ${parse.join(' | ')}` : null;
@@ -575,6 +566,10 @@
     }
   }, [body, variables]);
 
+  useEffect(() => {
+    setVariables(getVariables(body, variables));
+  }, [body]);
+
   if (languageLoading || templateLoading || tagLoading) {
     return <Loading />;
   }
@@ -803,7 +798,6 @@
       message: body,
       variables: variables,
       setVariables: setVariables,
-      getVariables: getVariables,
       isEditing: isEditing,
     },
   ];
@@ -877,6 +871,7 @@
             const templateButtonData = getButtonTemplatePayload();
             Object.assign(payloadCopy, { ...templateButtonData });
           }
+          payloadCopy.shortcode = newShortCode;
         } else {
           delete payloadCopy.example;
           delete payloadCopy.shortcode;
@@ -943,20 +938,14 @@
         }
       } else {
         delete payloadCopy.example;
-        delete payloadCopy.isActive;
         delete payloadCopy.shortcode;
         delete payloadCopy.category;
         delete payloadCopy.allowTemplateCategoryChange;
       }
 
-      delete payloadCopy.languageVariant;
-      delete payloadCopy.getShortcode;
       delete payloadCopy.isAddButtonChecked;
       delete payloadCopy.templateButtons;
       delete payloadCopy.language;
-      delete payloadCopy.variables;
-      delete payloadCopy.existingShortCode;
-      delete payloadCopy.newShortCode;
 
       if (payloadCopy.type === 'TEXT') {
         delete payloadCopy.attachmentURL;
@@ -967,6 +956,12 @@
     if (tagId) {
       payloadCopy.tagId = payload.tagId.id;
     }
+
+    delete payloadCopy.languageVariant;
+    delete payloadCopy.variables;
+    delete payloadCopy.existingShortCode;
+    delete payloadCopy.newShortCode;
+
     return payloadCopy;
   };
 

src/containers/Template/TemplateVariables/TemplateVariables.tsx

@@ -5,7 +5,6 @@ import { FormHelperText, OutlinedInput } from '@mui/material';
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
 import { setDefaultValue } from 'common/RichEditor';
 import DeleteIcon from 'assets/images/icons/CrossIcon.svg?react';
-import { useEffect } from 'react';
 
 export interface TemplateOptionsProps {
   form: { touched: any; errors: any; values: any; setFieldValue: any };
@@ -21,7 +20,6 @@ export const TemplateVariables = ({
   message,
   variables,
   setVariables,
-  getVariables,
   isEditing,
 }: TemplateOptionsProps) => {
   const [editor] = useLexicalComposerContext();
@@ -42,10 +40,6 @@ export const TemplateVariables = ({
     setVariables(newVariables);
   };
 
-  useEffect(() => {
-    setVariables(getVariables(message));
-  }, [message]);
-
   return (
     <div className={styles.AddVariablesContainer}>
       <Button