@capillarytech/creatives-library 6.13.1 → 6.13.2

package/app.js

@@ -25,6 +25,7 @@ import initialState from './initialState';
 import './styles/vendor/semantic/dist/semantic.min.css';
 import './styles/main.scss';
 import pathConfig from './config/path';
+import ignoredErrorMessages from './utils/ignoredErrorMessages';
 // addLocaleData([...en, ...es, ...fr, ...it, ...zh]);
 
 const browserHistory = useRouterHistory(createHistory)({
@@ -38,10 +39,12 @@ const history = syncHistoryWithStore(browserHistory, store, {
 });
 
 const bugSnagErrorCallback = (event) => {
-  const { app: { releaseStage } = {} } = event || {};
+  const { app: { releaseStage } = {}, error } = event || {};
+  const errorMessage = error && error.message;
   if (
     (releaseStage || '').includes('nightly') ||
-    process.env.NODE_ENV !== 'production'
+    process.env.NODE_ENV !== 'production' ||
+    ignoredErrorMessages.include[errorMessage]
   ) {
     return false;
   }

package/components/FormBuilder/index.js

@@ -204,7 +204,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
     if (!_.isEmpty(nextProps.formData) && !_.isEqual(this.state.formData, nextProps.formData)) {
       if (nextProps.isNewVersionFlow) {
-        const tabKey = (this.state.tabKey !== nextProps.formData[nextProps.currentTab - 1].tabKey) ? nextProps.formData[nextProps.currentTab - 1].tabKey : this.state.tabKey;
+        const nextPropsFormData = nextProps.formData[nextProps.currentTab - 1];
+        const nextPropsTabKey = nextPropsFormData && nextPropsFormData.tabKey;
+        const tabKey = (this.state.tabKey !== nextPropsTabKey) ? nextPropsTabKey: this.state.tabKey;
 
         this.setState({tabKey});
       }
@@ -1841,7 +1843,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             formData.base.tabKey = `${data}`;
           }
 
-          that.setState({formData, currentLangTab: formData[(this.state.currentTab - 1)].activeTab, tabKey: formData[(this.state.currentTab - 1)][formData[(this.state.currentTab - 1)].activeTab].tabKey}, () => {
+          const formDataActiveKey = formData[(this.state.currentTab - 1)][formData[(this.state.currentTab - 1)].activeTab];
+          const formDataTabKey = formDataActiveKey && formDataActiveKey.tabKey;
+          that.setState({formData, currentLangTab: formData[(this.state.currentTab - 1)].activeTab, tabKey: formDataTabKey}, () => {
             val.injectedEvents[event].call(that.props.parent, this.state.currentTab, formData);
           });
         } else {

package/containers/Ebill/index.js

@@ -908,6 +908,9 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   injectEvents(schema) {
     console.log('now injecting events', schema);
     const temp = schema;
+    if (!temp.standalone) {
+      temp.standalone = {};
+    }
     temp.standalone.sections = this.injectSections(temp.standalone.sections);
     _.forEach(temp.containers, (container) => {
       let tempContainer = container;

package/containers/Email/index.js

@@ -1155,8 +1155,11 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const msgString = JSON.stringify(msg);
       const langId = formData[this.state.currentTab - 1].activeTab;
       const langIndex = formData[this.state.currentTab - 1].selectedLanguages.indexOf(langId);
-      const win = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`).contentWindow;
-      win.postMessage(msgString, '*');
+      const elementToSelect = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`);
+      if (elementToSelect) {
+        const win = elementToSelect.contentWindow;
+        win.postMessage(msgString, '*');
+      }
     } else {
       console.log('tag', this.state, this.state.editorInstanse);
       if (this.state.editorInstanse) {
@@ -1415,7 +1418,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
   getMappedEvent = (id, event) => {
     console.log('Map ', this.map, id, event);
-    return this.map[id][event];
+    const mapIdObject = this.map[id];
+    return mapIdObject && mapIdObject[event] ? mapIdObject[event] : () => {};
   }
 
   getCurrentWindow = (e) => {
@@ -1511,8 +1515,11 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         _.forEach(data.selectedLanguages, (language, langIndex) => {
           if (data[language].is_drag_drop) {
             console.log('saving edm template', document.getElementById("edmeditor"), `edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`);
-            const win = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`).contentWindow;
-            win.postMessage("saveProject", '*');
+            const elementToSelect = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`);
+            if (elementToSelect) {
+              const win = elementToSelect.contentWindow;
+              win.postMessage("saveProject", '*');
+            }
           }
         });
       });
@@ -2501,7 +2508,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           const tempEl = containerInputFieldCol;
           if (containerInputFieldCol.id === "tab-header") {
             const baseLanguage = this.props.Global.currentOrgDetails && this.props.Global.currentOrgDetails.basic_details && this.props.Global.currentOrgDetails.basic_details.base_language && this.props.Global.currentOrgDetails.basic_details.base_language !== "" ? this.props.Global.currentOrgDetails.basic_details.base_language : 'en';
-            const supportedLanguages = this.props.Global.currentOrgDetails.basic_details.supported_languages;
+            const supportedLanguages = this.props.Global.currentOrgDetails && this.props.Global.currentOrgDetails.basic_details && this.props.Global.currentOrgDetails.basic_details.supported_languages;
             if (!supportedLanguages) {
               tempEl.value = baseLanguage || 'English';
               return;
@@ -2655,12 +2662,13 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         if (languageIndex === -1) {
           languageIndex = 0;
         }
+        const dataBase = data.base;
         const tempData = {
-          "is_drag_drop": data.base.is_drag_drop,
+          "is_drag_drop": dataBase && dataBase.is_drag_drop,
           "lang_id": this.supportedLanguages[languageIndex].lang_id,
           "iso_code": this.supportedLanguages[languageIndex].iso_code,
           "language": this.supportedLanguages[languageIndex].language,
-          "template-content": !data.base.is_drag_drop && data.base.is_drag_drop !== 1 ? data.base.html_content : "",
+          "template-content": dataBase && !dataBase.is_drag_drop && dataBase.is_drag_drop !== 1 ? dataBase.html_content : "",
         };
         formData[0].base = true;
         formData[0].selectedLanguages.push(this.supportedLanguages[languageIndex].iso_code);

package/containers/Sms/Create/index.js

@@ -297,7 +297,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         onTabChange: this.onTabChange,
       },
     };
-    return map[id][event];
+    const mappedIdObject = map[id];
+    return mappedIdObject && mappedIdObject[event] ? mappedIdObject[event] : () => {};
   }
 
   setFormValidity(isFormValid) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "6.13.1",
+  "version": "6.13.2",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -15,7 +15,7 @@
     "@babel/polyfill": "7.4.3",
     "@bugsnag/js": "^7.2.1",
     "@bugsnag/plugin-react": "^7.2.1",
-    "@capillarytech/cap-ui-utils": "1.3.2",
+    "@capillarytech/cap-ui-utils": "1.3.3",
     "@mailupinc/bee-plugin": "^1.2.0",
     "babel-cli": "^6.26.0",
     "chalk": "1.1.3",

package/utils/ignoredErrorMessages.js

@@ -0,0 +1,4 @@
+export default [
+  // ref: https://stackoverflow.com/questions/49384120/resizeobserver-loop-limit-exceeded
+  'ResizeObserver loop limit exceeded'
+];

package/v2Components/FormBuilder/index.js

@@ -2362,7 +2362,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           this.renderTextAreaContent(styling, columns, val, isVersionEnable, rows, cols, val.offset);
           break;
         case "contentPreview":
-          content = isVersionEnable ? this.state.formData[this.state.currentTab - 1]['sms-editor'] : this.state.formData['sms-editor'];
+          const { formData , currentTab } = this.state || {};
+          const tab = formData && formData[currentTab - 1];
+          content = isVersionEnable ? tab && tab['sms-editor'] : formData && formData['sms-editor'];
           charList = updateCharCount(content).char_list;
           columns.push(<CapColumn id={val.id} className={"preview-chars"} span={val.width}>
             {charList.map((char) => char)}
@@ -3175,7 +3177,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               }
               console.log('CKEditor Data 2', this.state.formData, this.state.formData[`${this.state.currentTab - 1}`], val, this.state.currentTab, this.state.currentLangTab, langIndex);
               const currentLang = ((!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage) || 'en';
-              const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] ? this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] : '');
+              const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`] && this.state.formData[`${this.state.currentTab - 1}`][currentLang] && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] || '');
               columns.push(
                 <CapColumn style={val.colStyle ? val.colStyle : {}} span={val.width}>
                   <CKEditor
@@ -3198,7 +3200,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               }
             }
             const { currentTab, formData } = this.state;
-            const supportedLanguages = formData[currentTab - 1].selectedLanguages;
+            const supportedLanguages = (formData[currentTab - 1] || {}).selectedLanguages || {};
             const currentLang = supportedLanguages[langTab - 1];
 
             let beeJson = '',

package/v2Containers/Cap/index.js

@@ -33,7 +33,7 @@ import './_cap.scss';
 const gtm = window.dataLayer || [];
 const {
   logNewTab,
-  getOrgNameFromId,
+  utilsGetOrgNameFromId,
   tabBeforeUnloadEventHandler,
   utilsHandleStorageChange,
   isMultipleTabsOpen,
@@ -297,18 +297,36 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     }
   };
 
+  getOrgNameFromId = orgId => {
+    const {
+      Global: {
+        user: {
+          proxyOrgList,
+          orgName: defaultOrgName,
+          orgID: defaultOrgID,
+        } = {},
+      } = {},
+    } = this.props;
+    return utilsGetOrgNameFromId(
+      orgId,
+      proxyOrgList,
+      defaultOrgID,
+      defaultOrgName,
+    );
+  };
+
   renderOrgRefreshModal = () => {
     const {
       localStorageOrgInfo: { oldValue: oldOrgId, newValue: newOrgId } = {},
       showRefreshModal,
       refreshSeconds,
     } = this.state;
-    const {
-      Global: { user: { proxyOrgList } = {} } = {},
-      intl: { formatMessage } = {},
-    } = this.props;
-    const oldOrgName = getOrgNameFromId(Number(oldOrgId), proxyOrgList);
-    const newOrgName = getOrgNameFromId(Number(newOrgId), proxyOrgList);
+    const { intl: { formatMessage } = {} } = this.props;
+    const oldOrgName = this.getOrgNameFromId(Number(oldOrgId));
+    const newOrgName = this.getOrgNameFromId(Number(newOrgId));
+    // some users do not have entry for their default org in proxyOrgList.
+    // getOrgNameFromId returns back orgID if no matching entry is present in proxyOrgList
+    // so replacing with defaultOrgName if defaultOrgID is returned
     const modalData = (
       <CapModal
         title={formatMessage(messages.orgRefreshHeading)}
@@ -339,12 +357,15 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   renderOrgChangeModal = () => {
     const { selectedOrgId, showOrgChangeModal } = this.state;
     const {
-      Global: { user: { proxyOrgList } = {},
+      Global: { 
       currentOrgDetails: { basic_details: { name: oldOrgName } = {} } = {},
       },
       intl: { formatMessage } = {},
     } = this.props; 
-    const newOrgName = getOrgNameFromId(selectedOrgId, proxyOrgList);
+    const newOrgName = this.getOrgNameFromId(selectedOrgId);
+    // some users do not have entry for their default org in proxyOrgList.
+    // getOrgNameFromId returns back orgID if no matching entry is present in proxyOrgList
+    // so replacing with defaultOrgName if defaultOrgID is returned
     return (
       <CapModal
         className="change-org-confirm"

package/v2Containers/WeChat/MapTemplates/index.js

@@ -876,7 +876,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
     }
     
     getMappedEvent(id, event) {
-      return this.state.map[id][event];
+      return (this.state.map[id] && this.state.map[id][event] ?  this.state.map[id][event] : () => {});
     }
     
     handleOnTagsContextChange = (data) => {