@capillarytech/creatives-library 7.7.22 → 7.7.24

package/containers/MobilePush/Edit/index.js

@@ -558,7 +558,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       });
     } else {
       selectedAccount = accounts[0];
-      formData['mobilepush-accounts'] = accounts[0].id;
+      formData['mobilepush-accounts'] = selectedAccount?.id;
     }
     this.props.actions.setWeChatAccount(selectedAccount);
     this.setState({formData, accountsOptions: accounts.map((acc) => ({key: acc.id, label: acc.name, value: acc.id}))});
@@ -573,7 +573,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
     obj.definition = {
-      accountId: selectedWeChatAccount.id,
+      accountId: selectedWeChatAccount?.id,
       licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
     };
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {

package/containers/WeChat/MapTemplates/index.js

@@ -780,7 +780,16 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
               type: "radioGroup",
               metaType: "text",
               datatype: "string",
-              options: [formatMessage(messages.redirectOptionURL), formatMessage(messages.redirectOptionMiniProgram)],
+              options: [
+                {
+                  value: URL,
+                  label: formatMessage(messages.redirectOptionURL)
+                }, 
+                {
+                  value: MINI_PROGRAM,
+                  label: formatMessage(messages.redirectOptionMiniProgram)
+                }
+              ],
               errorMessage: formatMessage(messages.redirectionOptionError),
               required: true,
               fluid: true,
@@ -871,7 +880,8 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
     if (!_.isEmpty(weCrmAccounts)) {
       _.forEach(weCrmAccounts, (account) => {
         if (account.configs && account.configs.is_wecrm_enabled) {
-          schema.standalone.sections[0].childSections[1].childSections[0].childSections[0].inputFields[0].options.push({
+          const options = schema?.standalone?.sections[0]?.childSections[1]?.childSections[0]?.childSections[0]?.inputFields[0]?.options;
+          options && options.push({
             key: account.uuid,
             label: account.name,
             value: account.name,

package/package.json

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

package/v2Components/CapImageUpload/index.js

@@ -85,6 +85,12 @@ function CapImageUpload(props) {
       };
       submitAction({file, type: 'image', fileParams}, incorrectFile);
     };
+    img.onerror = () => {
+      const fileParams = {
+        error: true,
+      };
+      submitAction({fileParams}, incorrectFile);
+    }
     if (e) {
       const event = e;
       event.target.value = null;
@@ -93,13 +99,12 @@ function CapImageUpload(props) {
 
   const submitAction = useCallback((data, incorrectFile) => {
     const {
-      file: {size},
-      fileParams: {
-          height,
-          width,
-      },
-    } = data;
-    if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth) {
+      file,
+      fileParams
+    } = data || {};
+    const { size } = file || {};
+    const { height, width, error } = fileParams || {}; 
+    if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth || error) {
       updateImageErrorMessage(formatMessage(messages.imageIncorrectSize));
     } else {
       updateImageErrorMessage('');
@@ -166,6 +171,7 @@ function CapImageUpload(props) {
         <CapUploader.CapDragger
           customRequest={capUploaderCustomRequest}
           className="form-builder-dragger"
+          showUploadList={!isImageError}
         >
           <CapHeading className="dragger-title" type="h7">
             <FormattedMessage {...messages.dragAndDrop} />
@@ -198,7 +204,7 @@ function CapImageUpload(props) {
         <FormattedMessage {...messages.imageReUpload} />
       </CapButton>
     );
-  }, []);
+  }, [isImageError]);
 
   return (
     <div style={style} className="cap-custom-image-upload">

package/v2Components/FormBuilder/index.js

@@ -2854,7 +2854,16 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     name={val.name ? val.name : `${val.id}-name`}
                     disabled={val.disabled}
                   >
-                    {val.options.map((option, index) => <CapRadio value={option} inductiveText={val.inductiveText && val.inductiveText[index]}>{option}</CapRadio>) }
+                    {val.options.map((option, index) => {
+                      const isMappedTemplateWechat = val.id === "template-redirect-options-radio";
+                      return (
+                        <CapRadio
+                          value={ isMappedTemplateWechat ? option.value : option } 
+                          inductiveText={val.inductiveText && val.inductiveText[index]}>{ isMappedTemplateWechat ? option.label : option } 
+                        </CapRadio>
+                      )
+                    }
+                    )}
 
                   </CapRadioGroup>
                   {/*{ifError ?*/}

package/v2Containers/CreativesContainer/index.js

@@ -91,7 +91,7 @@ class Creatives extends React.Component {
     this.setState({ slidBoxContent: 'preview', templateData });
   };
   onEditTemplate = () => {
-    this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true });
+    this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true, templateNameExists: true });
   };
   onCreateNew = (fbAdManager) => {
     const data = { slidBoxContent: 'createTemplate', showSlideBox: true };

package/v2Containers/MobilePush/Edit/index.js

@@ -346,7 +346,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       });
     } else {
       selectedAccount = accounts[0];
-      formData['mobilepush-accounts'] = accounts[0].id;
+      formData['mobilepush-accounts'] = selectedAccount?.id;
     }
     this.props.actions.setWeChatAccount(selectedAccount);
     this.setState({formData, accountsOptions: accounts.map((acc) => ({key: acc.id, label: acc.name, value: acc.id}))});
@@ -361,7 +361,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
     obj.definition = {
-      accountId: selectedWeChatAccount.id,
+      accountId: selectedWeChatAccount?.id,
       licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
     };
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {

package/v2Containers/MobilepushWrapper/index.js

@@ -45,7 +45,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
       },
       {
         title: <FormattedMessage {...messages.text}/>,
-        content: <WithNoImage height="124px" width={"224px"}/>,
+        content: <WithNoImage height="216px" width={"224px"}/>,
         value: 'text',
         // onClick: () => {
         //   this.emailUploader.current.click();

package/v2Containers/WeChat/MapTemplates/index.js

@@ -666,7 +666,16 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
               type: "radioGroup",
               metaType: "text",
               datatype: "string",
-              options: [intl.formatMessage(messages.redirectOptionURL), intl.formatMessage(messages.redirectOptionMiniProgram)],
+              options: [
+                {
+                  value: URL,
+                  label: intl.formatMessage(messages.redirectOptionURL)
+                }, 
+                {
+                  value: MINI_PROGRAM,
+                  label: intl.formatMessage(messages.redirectOptionMiniProgram)
+                }
+              ],
               errorMessage: intl.formatMessage(messages.redirectionOptionError),
               required: true,
               fluid: true,
@@ -764,7 +773,8 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       if (!isEmpty(weCrmAccounts)) {
         forEach(weCrmAccounts, (account) => {
           if (account.configs && account.configs.is_wecrm_enabled) {
-            schema.standalone.sections[0].childSections[1].childSections[0].childSections[0].inputFields[0].options.push({
+            const options = schema?.standalone?.sections[0]?.childSections[1]?.childSections[0]?.childSections[0]?.inputFields[0]?.options;
+            options && options.push({
               key: account.uuid,
               label: account.name,
               value: account.name,