@capillarytech/creatives-library 7.12.83 → 7.12.84

package/components/Ckeditor/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.19.0/ckeditor.js";
+const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.14.1/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/package.json

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

package/v2Components/Ckeditor/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.19.0/ckeditor.js";
+const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.14.1/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/v2Components/NewCallTask/index.js

@@ -99,7 +99,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
   };
 
   render() {
-    const { intl, isLoading, metaEntities, selectedOfferDetails , injectedTags} = this.props;
+    const { intl, isLoading, metaEntities, selectedOfferDetails } = this.props;
     const { formatMessage } = intl;
     const { subject, messageBody, description, callTaskActionType } = this.state;
     const tags = metaEntities && metaEntities.tags ? metaEntities.tags.standard : [];
@@ -125,7 +125,6 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
                   tags={tags}
                   onTagSelect={this.onTagSelect}
                   selectedOfferDetails={selectedOfferDetails}
-                  injectedTags={injectedTags}
                 />
                 <CapInput.TextArea
                   setInputRef={this.setInputRef}

package/v2Containers/CallTask/index.js

@@ -16,7 +16,7 @@ import {
 } from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
-import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../Cap/selectors';
+import { makeSelectMetaEntities, isLoadingMetaEntities } from '../Cap/selectors';
 import * as globalActions from '../Cap/actions';
 import * as actions from "./actions";
 import makeSelectCallTask from './selectors';
@@ -71,7 +71,7 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
     };
   }
   render() {
-    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails, messageDetails, injectedTags } = this.props;
+    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails, messageDetails } = this.props;
     const { formatMessage } = intl;
     const { mode } = this.state;
     return (
@@ -85,7 +85,6 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
             onCallTaskSubmit={onCallTaskSubmit}
             selectedOfferDetails={selectedOfferDetails}
             messageDetails={messageDetails}
-            injectedTags={injectedTags || {}}
           />
           :
             <div>
@@ -145,7 +144,6 @@ const mapStateToProps = createStructuredSelector({
   CallTask: makeSelectCallTask(),
   metaEntities: makeSelectMetaEntities(),
   loadingMetaEntities: isLoadingMetaEntities(),
-  injectedTags: setInjectedTags(),
 });
 
 function mapDispatchToProps(dispatch) {

package/v2Containers/Email/index.js

@@ -322,7 +322,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       if (this.state.isEdit && nextProps.location.query.module === "library" && !_.isEmpty(nextProps.templateData) && !this.props.params.id && !nextProps.isGetFormData && _.isEmpty(_.get(this, `state.formData['template-subject']`))) {
         this.startTemplateCreation(nextProps.templateData);
       }
-      if (nextProps.location.query.module === 'library' && nextProps.isGetFormData && (this.props.isGetFormData!==nextProps.isGetFormData)) {
+      if (nextProps.location.query.module === 'library' && nextProps.isGetFormData && (this.props.isGetFormData !== nextProps.isGetFormData)) {
         const formData = this.state.formData;
         let isBeeEditor = false;
         const isBEEEnable = this.checkBeeEditorAllowedForLibrary();
@@ -679,9 +679,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         channel: EMAIL,
         timeTaken,
         content: base?.[activeTab]?.['template-content'],
-        mode: isEdit ? EDIT : CREATE
+        mode: isEdit ? EDIT : CREATE,
       });
-      
+
       // this.resetSchema();
       let message;
       if (isEdit) {
@@ -870,46 +870,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           } else {
             schema.containers[index].isActive = false;
           }
-          // const isLanguageSupport = this.props.location.query.isLanguageSupport;
-
-          _.forEach(data.selectedLanguages, (lang, langIndex) => {
-            if ((type !== 'embedded' || (type === 'embedded' && isLanguageSupport === 'true')) && lang !== this.props.currentOrgDetails.basic_details.base_language) {
-              const tabContent = _.cloneDeep(containers[0].tabContent.sections[0]);
-              const tabContentSection = tabContent.inputFields[0].cols[0];
-              const panes = containers[0].panes.slice();
-              const firstPane = _.cloneDeep(panes[0]);
-              const sections = [];
-              _.forEach(firstPane.sections, (section) => {
-                let sect = _.cloneDeep(section);
-
-                if (sect.type === 'col-label') {
-                  sect = this.cloneColLabel(sect, (langIndex + 1));
-                } else if (sect.type === 'multicols') {
-                  sect = this.cloneMultiCol(sect, (langIndex + 1));
-                } else if (sect.type === 'parent') {
-                  sect = this.cloneParent(sect, (langIndex + 1));
-                }
-
-                sections.push(sect);
-                return true;
-              });
-              //
-
-              this.map[`template-content${data.selectedLanguages.indexOf(lang) + 1}`] = this.map['template-content'];
-              tabContentSection.id = `${tabContentSection.id}${index + 1}`;
-              tabContentSection.value = `${data[lang].language}`;
-
-              firstPane.sections = sections;
-              firstPane.sectionsHeaders = [tabContent];
-
-              // panes.push(firstPane);
-
-              schema.containers[index].panes.push(firstPane);
-            } else if (lang !== this.props.currentOrgDetails.basic_details.base_language) {
-              delete data[lang];
-              data.selectedLanguages.splice(langIndex, 1);
-            }
-          });
         }
         if (data.base) {
           formData.base = data;
@@ -2371,7 +2331,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', ''),
+        id: _.get(this.props, 'Email.templateDetails._id', ''),
         value: this.transformFormData(passedData),
         validity: this.state.isFormValid,
         type: 'EMAIL',
@@ -2405,9 +2365,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const newdata = data;
 
       if (!isNaN(index) && newdata) {
-        const baseLangTabKey = newdata[baseLanguage].tabKey;
+        const baseLangTabKey = newdata[baseLanguage]?.tabKey || newdata.tabKey;
         newdata.tabKey = baseLangTabKey;
-        newdata.activeTab = baseLanguage;
         if (newdata.base) {
           baseKey = baseLangTabKey;
         }
@@ -2429,7 +2388,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     obj.versions.base = formData.base;
     obj.versions.base.tabKey = baseKey;
     obj.versions.base.subject = formData['template-subject'];
-    obj.versions.base.activeTab = baseLanguage;
+    obj.versions.base.activeTab = formData?.base?.activeTab || baseLanguage;
     _.forEach(obj.versions.base.selectedLanguages, (language) => {
       if (obj.versions.base[language].is_drag_drop) {
         delete obj.versions.base[language].edmeditorsrc;
@@ -2727,7 +2686,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   isEdit={this.state.isEdit}
                   iframeParent={parent}
                   router={this.props.router}
-                  baseLanguage={this.props.currentOrgDetails.basic_details.base_language}
+                  baseLanguage={this.state.formData[0]?.activeTab || this.props.currentOrgDetails.basic_details.base_language}
                   supportedLanguages={this.getSupportedLanguages(this.props)}
                   isSchemaChanged={this.state.isSchemaChanged}
                   cmsTemplates={this.props.Templates.cmsTemplates}