@capillarytech/creatives-library 7.17.164-alpha.1 → 7.17.165

package/package.json

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

package/v2Components/NavigationBar/index.js

@@ -140,20 +140,6 @@ export class NavigationBar extends React.Component {
     }
   };
 
-  productSelection = () => {
-    const { location, intl: { formatMessage } } = this.props;
-    const { pathname } = location;
-    const parentModule = pathname.substring(pathname.lastIndexOf('/') + 1);
-    console.log("parent module in product selection", parentModule);
-    switch (parentModule) { 
-      case LOYALTY:
-        return formatMessage(messages.loyaltyProgram);
-      default:
-        return formatMessage(messages.selectedProductDefault)
-
-    }
-  }
-
   render() {
     const {
       topbarMenuData,
@@ -192,7 +178,7 @@ export class NavigationBar extends React.Component {
         topbarIcons={topbarIcons}
         sidebarMenuData={[]}
         sidebarMenuItemsPosition={null}
-        defaultSelectedProduct={this.productSelection()}
+        defaultSelectedProduct={intl.formatMessage(messages.selectedProductDefault)}
         skipStateForStorage
         selectOrganization={intl.formatMessage(messages.selectOrganization)}
         isLatestLeftNavigationEnabled={isLatestLeftNavigationEnabled}
@@ -213,7 +199,6 @@ export class NavigationBar extends React.Component {
           </CapWrapper>
         </div>
       </CapNavigation>
-
     );
   }
 }

package/v2Containers/App/constants.js

@@ -20,11 +20,12 @@ export const getLoyaltyTopbarMenuDataValue = () => [
     link: 'loyalty/ui/',
     key: 'programs',
   },
-  {
-    label: <FormattedMessage {...globalMessages.promotions} />,
-    link: 'loyalty/ui/promotions/',
-    key: 'promotions',
-  },
+  //commented as promotions are not supported in loyalty v2 flow
+  // {
+  //   label: <FormattedMessage {...globalMessages.promotions} />,
+  //   link: 'loyalty/ui/promotions/',
+  //   key: 'promotions',
+  // },
   {
     label: <FormattedMessage {...globalMessages.creatives} />,
     link: '/creatives/ui/v2/loyalty',

package/v2Containers/CreativesContainer/index.js

@@ -1105,8 +1105,9 @@ export class Creatives extends React.Component {
     onChange={(ev) => {
       const value = ev.currentTarget.value;
       const isEmptyTemplateName = value.trim() ? false : true;
+
+      const newFormData = {...formData, 'template-name': value, 'isTemplateNameEdited': true};
       this.setState({isTemplateNameEmpty: isEmptyTemplateName});
-      const newFormData = {...formData, 'template-name': value};
       onFormDataChange(newFormData);
     }}
     />)

package/v2Containers/Email/index.js

@@ -220,6 +220,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     }
   }
 
+
   checkBeeEditorAllowedForLibrary = () => {
     const { isFullMode = false, editor } = this.props || {};
     if ((editor === "BEE" && !isFullMode) || isFullMode) {
@@ -552,20 +553,18 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   onFormDataChange = (updatedFormData, tabCount, currentTab) => {
     // this.transformFormData(formData);
     const formData = {...updatedFormData};
-    const {defaultData = {}, isFullMode, showTemplateName, syncTemplateName} = this.props;
+    const {defaultData = {}, isFullMode, showTemplateName} = this.props;
     const templateName = formData['template-name'];
     const defaultTemplateName = _.get(defaultData, 'template-name', "");
 
-    //sync back template name from from editing in create flow to wrapper when  edited
-    if (syncTemplateName) {
-      syncTemplateName(_.isEmpty(templateName) && defaultTemplateName ? defaultTemplateName : templateName);
-    }
 
-    if (defaultData && _.isEmpty(templateName) && defaultTemplateName?.length >1 && isFullMode) {
+    if (defaultData && _.isEmpty(templateName) && isFullMode && !updatedFormData?.isTemplateNameEdited) {
       formData['template-name'] = defaultTemplateName;
     } else {
       formData['template-name'] = templateName;
     }
+
+
     this.setState({formData, tabCount, isSchemaChanged: false}, () => {
       if (this.props.isFullMode && showTemplateName) {
         showTemplateName({formData, onFormDataChange: this.onFormDataChange});
@@ -2778,7 +2777,6 @@ Email.propTypes = {
   getDefaultTags: PropTypes.string,
   currentOrgDetails: PropTypes.object,
   isLoadingMetaEntities: PropTypes.bool,
-  syncTemplateName: PropTypes.func,
   // creativesContainerActions: PropTypes.object,
   isFullMode: PropTypes.bool,
   setIsLoadingContent: PropTypes.func,

package/v2Containers/EmailWrapper/index.js

@@ -190,9 +190,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
   useEditor = (id) => {
     this.setState({ modeContent: { id } }, this.props.showNextStep);
   }
-  onSyncTemplateName=(tempName) => {
-    this.setState({templateName: tempName});
-  }
+
   isShowEmailCreate = () => !_.isEmpty(this.state.selectedCreateMode) && (!_.isEmpty(this.props.EmailLayout) || this.props.SelectedEdmDefaultTemplate)
   render() {
     const {
@@ -278,7 +276,6 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 getDefaultTags={type}
                 isFullMode={isFullMode}
                 defaultData={{ 'template-name': templateName }}
-                syncTemplateName={this.onSyncTemplateName}
                 cap={cap}
                 showTemplateName={showTemplateName}
                 onValidationFail={onValidationFail}

package/v2Containers/MobilePush/Create/index.js

@@ -149,7 +149,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   onFormDataChange = (formData, tabCount, currentTab, inputField) => {
     const newFormData = cloneDeep(formData);
     const {templateCta} = this.state;
-    const {syncTemplateName, defaultData = {}, isFullMode, showTemplateName} = this.props;
+    const { defaultData = {}, isFullMode, showTemplateName} = this.props;
 
     if (!isEmpty(templateCta)) {
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-label`] = get(templateCta, 'name');
@@ -160,14 +160,10 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       }
     }
 
-    //sync back template name from from editing in create flow to wrapper when  edited
+
     const templateName = formData['template-name'];
     const defaultTemplateName = get(defaultData, 'template-name', '');
-    //sync back template name from from editing in create flow to wrapper when  edited
 
-    if (syncTemplateName) {
-      syncTemplateName(isEmpty(templateName) && defaultTemplateName ? defaultTemplateName : templateName);
-    }
 
     // copy content code
     // if (newFormData[0]['copy-iphone-content'] === "") {
@@ -191,11 +187,10 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     //   }
     // }
      //assign newFormData['template-name'] to default name only once in inital render, if edited use latest form data
-    if (isFullMode && defaultData && isEmpty(templateName) && defaultTemplateName?.length>1) {
+    if (isFullMode && defaultData && isEmpty(templateName) && !formData?.isTemplateNameEdited) {
       newFormData['template-name'] = defaultTemplateName;
-    } else {
-      newFormData['template-name'] = templateName;
     }
+
     if (inputField && inputField.id === "add-sec-cta") {
       if (!newFormData[0]["add-sec-cta"]) {
         newFormData[0]["add-sec-cta-2"] = false;
@@ -1879,7 +1874,6 @@ Create.propTypes = {
   iosCtasData: PropTypes.array,
   injectedTags: PropTypes.object,
   defaultData: PropTypes.object,
-  syncTemplateName: PropTypes.func,
   showTemplateName: PropTypes.func,
   isGetFormData: PropTypes.bool,
   onValidationFail: PropTypes.func,

package/v2Containers/MobilepushWrapper/index.js

@@ -70,9 +70,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
       onRemoveTemplateName();
     }
   }
-  onSyncTemplateName=(tempName) => {
-    this.setState({templateName: tempName});
-  }
+
   render() {
     const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData} = this.props;
     const {templateName} = this.state;
@@ -106,7 +104,6 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
               getFormLibraryData={getFormData}
               setIsLoadingContent={setIsLoadingContent}
               defaultData={{"template-name": templateName}}
-              syncTemplateName={this.onSyncTemplateName}
               location={{
                 pathname: `/mobilepush/create/${mobilePushCreateMode}`,
                 query,