@capillarytech/creatives-library 7.1.4 → 7.1.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.1.4",
+  "version": "7.1.6",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Components/TemplatePreview/index.js

@@ -616,7 +616,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                       'text-align': 'center',
                       "width": '140px',
                       "height": '20px',
-                      "margin-left": "2px",
+                      "margin-left": "8px",
                     }}>
                     <p
                       style={{ 'font-size': '12px',

package/v2Containers/Email/index.js

@@ -2358,6 +2358,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const response = {
         action: "getFormData",
         postAction: this.state.getFormDataValue || 'next',
+        id : _.get(this.props, 'Email.templateDetails._id', ''),
         value: this.transformFormData(passedData),
         validity: this.state.isFormValid,
         type: 'EMAIL',

package/v2Containers/FTP/index.js

@@ -373,17 +373,47 @@ export class FTP extends React.Component {
     const tags = getTreeStructuredTags({tagsList: (metaEntities.tags || {}).standard, offerDetails: selectedOfferDetails});
     const clonnedTagsTree = cloneDeep(tags);
     headerTagList.map((headerTag) => {
-      const pos = findIndex(clonnedTagsTree, {value: headerTag.tag});
-      if (pos > -1) {
-        clonnedTagsTree[pos] = {
+      clonnedTagsTree.map((tag, index) => {
+        if (!isEmpty(tag.children)) { //if we have subtags it will first resolve subtag values.
+          const subTags = this.disableUsedSubTag(tag.children, headerTag);
+          clonnedTagsTree[index] = {
+            ...clonnedTagsTree[index],
+            children: subTags,
+          };
+        } else { // If first level itself is leaf node then I will match the usedtag value and disable it accordingly.
+          const pos = findIndex(clonnedTagsTree, {value: headerTag.tag});
+          if (pos > -1) {
+            clonnedTagsTree[pos] = {
+              disabled: true,
+              ...clonnedTagsTree[pos],
+            };
+          }
+        }
+      });
+    });
+    this.setState({tagsTree: clonnedTagsTree});
+  };
+
+  disableUsedSubTag = (subTags, headerTag) => {
+    const clonnedSubTags = cloneDeep(subTags);
+    clonnedSubTags.map((tag, index) => {
+      if (!isEmpty(tag.children)) { //Using recursion here to dig deep into further level if they have subtags.
+        //if we still have subtags, it will call same function to resolved deepest subtag value first.
+        const subTags1 = this.disableUsedSubTag(tag.children, headerTag);
+        clonnedSubTags[index] = {
+          ...clonnedSubTags[index],
+          children: subTags1,
+        };
+      } else if (isEqual(tag.value, headerTag.tag)) { // when Leaf node, it will match usedtag value and disable usedtags from tags tree.
+        clonnedSubTags[index] = {
           disabled: true,
-          ...clonnedTagsTree[pos],
+          ...clonnedSubTags[index],
         };
       }
       return null;
     });
-    this.setState({tagsTree: clonnedTagsTree});
-  };
+    return clonnedSubTags;
+  }
 
   handleManageFTPSettings = () => {
     const path = `/exports/configurations`;

package/v2Containers/Viber/index.js

@@ -122,7 +122,7 @@ const Viber = (props) => {
   }, [viberData.selectedViberAccount]);
 
   useEffect(() => {
-    if ((params && params.id) || templateData.edit) {
+    if ((params && params.id) || (templateData || {}).edit) {
       const { viber: editViberContent = {} } = get(templateData, `versions.base.content`) || get(viber, `templateDetails.versions.base.content`) || {};
       const editMessageTitle = (templateData || {}).name || get(viber, 'templateDetails.name');
       updateTextMessageTitle(editMessageTitle);