@capillarytech/creatives-library 6.12.8 → 6.12.11

package/config/app.js

@@ -14,7 +14,7 @@ const config = {
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
-    api_endpoint: 'http://localhost:2022/arya/api/v1/creatives',
+    api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/creatives',
     campaigns_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/campaigns',
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',
     arya_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1',

package/package.json

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

package/services/api.js

@@ -319,11 +319,12 @@ export const getCmsTemplateSettings = (cmsType, projectId, cmsMode, langId, isEd
   return API.get(url);
 };
 
-export const getCmsTemplateSettingsV2 = (cmsType, projectId, cmsMode, langId, isEdmSupport, disableBEE) => {
-  const url = `${API_ENDPOINT}/cms/v2/getDetails/?type=${cmsType}&projectId=${projectId}&cmsMode=${cmsMode}&langId=${langId}&isEdmSupport=${isEdmSupport ? 1 : 0}&disableBEE=${disableBEE}`;
+export const getCmsTemplateSettingsV2 = (cmsType, projectId, cmsMode, langId, isEdmSupport) => {
+  const url = `${API_ENDPOINT}/cms/v2/getDetails/?type=${cmsType}&projectId=${projectId}&cmsMode=${cmsMode}&langId=${langId}&isEdmSupport=${isEdmSupport ? 1 : 0}`;
   return API.get(url);
 };
 
+
 export const getCmsTemplateData = (cmsType, projectId, langId) => {
   const url = `${API_ENDPOINT}/cms/getContent?type=${cmsType}&projectId=${projectId}&langId=${langId}`;
   return API.get(url);

package/telepresence.log

@@ -0,0 +1,57 @@
+   0.0 TEL | Telepresence 0.104 launched at Tue Oct  6 11:57:13 2020
+   0.0 TEL |   /usr/local/bin/telepresence --also-proxy 10.250.0.0/16 --deployment telepresence-perm
+   0.0 TEL | uname: uname_result(system='Darwin', node='CAP-LAP-997.local', release='19.6.0', version='Darwin Kernel Version 19.6.0: Thu Jun 18 20:49:00 PDT 2020; root:xnu-6153.141.1~1/RELEASE_X86_64', machine='x86_64', processor='i386')
+   0.0 TEL | Platform: darwin
+   0.0 TEL | WSL: False
+   0.0 TEL | Python 3.6.8 (v3.6.8:3c6b436a57, Dec 24 2018, 02:04:31)
+   0.0 TEL | [GCC 4.2.1 Compatible Apple LLVM 6.0 (clang-600.0.57)]
+   0.1 TEL | BEGIN SPAN main.py:40(main)
+   0.1 TEL | BEGIN SPAN startup.py:83(set_kube_command)
+   0.1 TEL | Found kubectl -> /usr/local/bin/kubectl
+   0.1 TEL | [1] Capturing: kubectl config current-context
+   0.1 TEL | [1] captured in 0.06 secs.
+   0.1 TEL | [2] Capturing: kubectl --context default-context version --short
+   1.9 TEL | [2] captured in 1.80 secs.
+   1.9 TEL | [3] Capturing: kubectl --context default-context config view -o json
+   2.0 TEL | [3] captured in 0.06 secs.
+   2.0 TEL | [4] Capturing: kubectl --context default-context get ns default
+   3.9 TEL | [4] captured in 1.96 secs.
+   3.9 TEL | [5] Capturing: kubectl --context default-context api-versions
+   6.1 TEL | [5] captured in 2.15 secs.
+   6.1 TEL | Command: kubectl 1.18.8
+   6.1 TEL | Context: default-context, namespace: default, version: 1.14.10
+   6.1 >>> | Warning: kubectl 1.18.8 may not work correctly with cluster version 1.14.10 due to the version discrepancy. See https://kubernetes.io/docs/setup/version-skew-policy/ for more information.
+   6.1 >>> | 
+   6.1 TEL | END SPAN startup.py:83(set_kube_command)    6.0s
+   6.1 TEL | Found ssh -> /usr/bin/ssh
+   6.1 TEL | [6] Capturing: ssh -V
+   6.1 TEL | [6] captured in 0.01 secs.
+   6.1 TEL | Found bash -> /bin/bash
+   6.1 TEL | Found sshuttle-telepresence -> /usr/local/Cellar/telepresence/0.104/libexec/sshuttle-telepresence
+   6.1 TEL | Found pfctl -> /sbin/pfctl
+   6.1 TEL | Found sudo -> /usr/bin/sudo
+   6.1 TEL | [7] Running: sudo -n echo -n
+   6.2 TEL | [7] ran in 0.05 secs.
+   6.2 >>> | Starting proxy with method 'vpn-tcp', which has the following limitations: All processes are affected, only one telepresence can run per machine, and you can't use other VPNs. You may need to add cloud hosts and headless services with --also-proxy. For a full list of method limitations see https://telepresence.io/reference/methods.html
+   6.2 TEL | Found sshfs -> /usr/local/bin/sshfs
+   6.2 TEL | Found umount -> /sbin/umount
+   6.2 >>> | Volumes are rooted at $TELEPRESENCE_ROOT. See https://telepresence.io/howto/volumes.html for details.
+   6.2 TEL | [8] Running: kubectl --context default-context --namespace default get pods telepresence-connectivity-check --ignore-not-found
+   7.8 TEL | [8] ran in 1.67 secs.
+   8.4 TEL | Scout info: {'latest_version': '0.104', 'FAILED': '<urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:852)>'}
+   8.4 >>> | Starting network proxy to cluster using the existing proxy Deployment telepresence-perm
+   8.4 TEL | [9] Running: kubectl --context default-context --namespace default get deployment telepresence-perm
+  10.3   9 | Error from server (NotFound): deployments.extensions "telepresence-perm" not found
+  10.3 TEL | [9] exit 1 in 1.85 secs.
+  10.3 >>> | 
+  10.3 >>> | Failed to find deployment telepresence-perm:
+  10.3 >>> | Error from server (NotFound): deployments.extensions "telepresence-perm" not found
+  10.3 >>> | 
+  10.3 TEL | EXITING with status code 255
+  10.3 >>> | Exit cleanup in progress
+  10.3 TEL | (Cleanup) Kill sudo privileges holder
+  10.3 TEL | (Cleanup) Stop time tracking
+  10.3 TEL | END SPAN main.py:40(main)   10.2s
+  10.3 TEL | (Cleanup) Remove temporary directory
+  10.3 TEL | (Cleanup) Save caches
+  11.2 TEL | (sudo privileges holder thread exiting)

package/v2Components/BeeEditor/index.js

@@ -0,0 +1,263 @@
+/**
+*
+* Beeeditor
+*
+*/
+import React, { useEffect, useState, useRef, useCallback } from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
+import TagList from '../../v2Containers/TagList';
+import
+{
+  CapModal,
+  CapButton,
+  CapInput,
+  CapSelect,
+}
+from '@capillarytech/cap-ui-library';
+import messages from './messages';
+import './index.scss';
+
+function BeeEditor(props) {
+  const {
+    uid,
+    beeJson,
+    tokenData,
+    id,
+    location = {},
+    moduleFilterEnabled,
+    label,
+    className,
+    userLocale,
+    selectedOfferDetails,
+    tags,
+    injectedTags,
+    saveBeeInstance,
+    saveBeeData,
+    intl,
+    onContextChange,
+  } = props;
+  const {formatMessage} = intl;
+  const UNSUBSCRIBE = 'unsubscribe';
+  let beePluginInstance = null;
+  const categoryOptions = [{key: 'cta', value: 'cta', label: formatMessage(messages.cta)},
+  {key: 'footer', value: 'footer', label: formatMessage(messages.footer)},
+  {key: 'header', value: 'header', label: formatMessage(messages.header)},
+  {key: 'sp', value: 'sp', label: formatMessage(messages.socialPlatform)},
+  {key: 'others', value: 'others', label: formatMessage(messages.others)},
+  ];
+  const [visibleTaglist, setVisibleTaglist] = useState(false);
+  const [showRowMetaModal, setRowMetaModal] = useState(false);
+  const [selectedTag, setSelectedTag] = useState({});
+  const [rowMetaInfo, setRowMetaInfo] = useState({});
+  const [rowName, setRowName] = useState('');
+  const [rowCategory, setRowCategory] = useState('');
+
+  const savedCallback = useRef();
+  const filteredTags = (tags || []).filter((obj) => obj.definition.value !== UNSUBSCRIBE);
+  let intervalTimer;
+
+  useEffect(() => {
+    savedCallback.current = Object.keys(selectedTag).length > 0 ? selectedTag : rowMetaInfo;
+  }, [selectedTag, rowMetaInfo]);
+
+  useEffect(() => {
+    const beeConfig = {
+      uid,
+      container: 'bee-plugin-container',
+      rowsConfiguration: {
+        emptyRows: true,
+        defaultRows: true,
+      },
+      contentDialog: {
+        specialLinks: {
+          label: UNSUBSCRIBE,
+          handler(resolve) {
+            resolve({
+              type: 'custom',
+              label: UNSUBSCRIBE,
+              link: `{{${UNSUBSCRIBE}}}`,
+            });
+          },
+        },
+        mergeTags: {
+          label: formatMessage(messages.addLabel),
+          handler: async (resolve, reject) => {
+            // this will open tag modal
+            await setVisibleTaglist(true);
+            // until tag modal will not open promise will not execute
+            // once tag modal is opened it will start 2 sec interval to wait use has selected any tag or cancel the tag selection
+            const promise = new Promise((resolveP) => {
+              intervalTimer = setInterval(() => {
+                // this will execute, if user cancel the tag selection
+                if ((savedCallback.current || {}).close === true) {
+                  reject();
+                  clearInterval(intervalTimer);
+                  return;
+                }
+                // this block is checking use has selected any tag or not
+                if (Object.keys(savedCallback.current || {}).length > 0) {
+                  resolveP(savedCallback.current);
+                  setSelectedTag({});
+                  clearInterval(intervalTimer);
+                }
+              }, 2000);
+            });
+            // once prmise will resolve , pass the resolve data to handler to show tags in bee edior
+            const result = await promise;
+            resolve(result);
+          },
+        },
+        saveRow: {
+          handler: async (resolve, reject) => {
+            await setRowMetaModal(true);
+            const promise = new Promise((resolveP) => {
+              intervalTimer = setInterval(() => {
+                if ((savedCallback.current || {}).close === true) {
+                  reject();
+                  clearInterval(intervalTimer);
+                  setRowMetaInfo({});
+                  setRowName('');
+                  setRowCategory('');
+                  return;
+                }
+                if (Object.keys(savedCallback.current || {}).length > 0) {
+                  resolveP(savedCallback.current);
+                }
+              }, 2000);
+            });
+            const result = await promise;
+            resolve(result); // "done!"
+            setRowMetaInfo({});
+            setRowName('');
+            setRowCategory('');
+            clearInterval(intervalTimer);
+          },
+        },
+      },
+      onSave: (jsonFile, htmlFile) => {
+        saveBeeData(jsonFile, htmlFile);
+      },
+        // will use this function on save row feature
+      onSaveRow: (rowJSON) => {
+        console.log('bee-plugin-container onSaveRows', rowJSON);
+      },
+    };
+    window.BeePlugin.create(tokenData, beeConfig, (instance) => {
+      beePluginInstance = instance;
+      const parseJson = JSON.parse(beeJson);
+      beePluginInstance.start(parseJson);
+      saveBeeInstance(beePluginInstance);
+    });
+    return () => clearInterval(intervalTimer);
+  }, []);
+
+  const onTagSelect = (result) => {
+    const msg = {
+      name: result,
+      value: `{{${result}}}`,
+    };
+    setSelectedTag(msg);
+    setVisibleTaglist(false);
+  };
+
+  const onCancelTagList = () => {
+    setVisibleTaglist(false);
+    setSelectedTag({close: true});
+  };
+
+  const handleCancel = () => {
+    setRowMetaModal(false);
+    setRowMetaInfo({close: true});
+  };
+
+  const handleOk = () => {
+    const rowInfo = {};
+    if (rowCategory !== '') {
+      rowInfo.category = rowCategory;
+    }
+    setRowMetaInfo({
+      name: rowName,
+      ...rowInfo,
+    });
+    setRowMetaModal(false);
+  };
+  const isDisableSave = () => rowName === '';
+
+  const onRowChange = useCallback((e) => {
+    setRowName(e.target.value);
+  });
+  const onChangeCategoy = (e) => {
+    setRowCategory(e);
+  };
+  const contentSection = <>
+    <CapInput
+      label={<FormattedMessage {...messages.rowName} />}
+      placeholder={formatMessage(messages.rowPlaceHolder)}
+      onChange={onRowChange}
+      value={rowName}
+      maxLength={50}
+      style={{ width: '324px', paddingBottom: '16px' }}
+    />
+    <CapSelect
+      label="Category"
+      style={{ width: 250, paddingBottom: '16px'}}
+      options={categoryOptions}
+      selectPlaceholder={formatMessage(messages.select)}
+      placeholder={
+        <FormattedMessage {...messages.selectCategoyPlaceholder} />
+              }
+      onChange={onChangeCategoy}
+    />
+
+  </>;
+  return (
+    <>
+      <div id="bee-plugin-container" style={{ height: '500px'}}>
+      </div>
+      <TagList
+        moduleFilterEnabled={moduleFilterEnabled}
+        label={label}
+        onTagSelect={onTagSelect}
+        location={location}
+        tags={filteredTags}
+        injectedTags={injectedTags}
+        className={className}
+        id={id}
+        userLocale={userLocale}
+        selectedOfferDetails={selectedOfferDetails}
+        visibleTaglist={visibleTaglist}
+        hidePopover
+        modalProps={{
+          onCancel: onCancelTagList,
+          style: { left: 135, top: 250 },
+          className: "bee-editor-tag-list",
+        }}
+        onContextChange={onContextChange}
+      />
+      <CapModal
+        visible={showRowMetaModal}
+        onCancel={handleCancel}
+        title={formatMessage(messages.customRows)}
+        footer={[
+          <CapButton key="back" onClick={handleCancel}>{formatMessage(messages.cancel)}</CapButton>,
+          <CapButton key="submit" type="primary" id="delete-version" onClick={handleOk} disabled={isDisableSave()}>
+            {formatMessage(messages.save)}
+          </CapButton>,
+        ]}
+          >
+        {contentSection}
+      </CapModal>
+      </>
+  );
+}
+
+BeeEditor.propTypes = {
+  beeJson: PropTypes.object.isRequired,
+  tokenData: PropTypes.object.isRequired,
+  uid: PropTypes.string.isRequired,
+  showTagsPopover: PropTypes.func.isRequired,
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(BeeEditor);

package/v2Components/BeeEditor/index.scss

@@ -0,0 +1,11 @@
+.cap-modal-v2.bee-editor-tag-list {
+  .ant-modal-content {
+    .ant-modal-body {
+      padding-top: 20px;
+      padding-bottom: 10px;
+    }
+    .ant-modal-footer {
+      display: none;
+    }
+  }
+}

package/v2Components/BeeEditor/messages.js

@@ -0,0 +1,71 @@
+/*
+ * BeeEditor Messages
+ *
+ * This contains all the text for the BeeEditor component.
+ */
+import { defineMessages } from 'react-intl';
+
+const prefix = 'creatives.componentsV2.BeeEditor';
+
+export default defineMessages({
+  cancel: {
+    id: `${prefix}.cancel`,
+    defaultMessage: 'Cancel',
+  },
+  save: {
+    id: `${prefix}.save`,
+    defaultMessage: 'Save',
+  },
+  rowPlaceHolder: {
+    id: `${prefix}.rowPlaceHolder`,
+    defaultMessage: 'Enter Row name',
+  },
+  rowName: {
+    id: `${prefix}.rowName`,
+    defaultMessage: 'Row name',
+  },
+  select: {
+    id: `${prefix}.select`,
+    defaultMessage: 'Select',
+  },
+  customRows: {
+    id: `${prefix}.customRows`,
+    defaultMessage: 'Custom rows',
+  },
+  selectCategoyPlaceholder: {
+    id: `${prefix}.selectCategoyPlaceholder`,
+    defaultMessage: 'Select category',
+  },
+  tags: {
+    id: `${prefix}.tags`,
+    defaultMessage: 'Tags (optional)',
+  },
+  tagPlaceHolder: {
+    id: `${prefix}.tagPlaceHolder`,
+    defaultMessage: 'Enter tags',
+  },
+  addLabel: {
+    id: `${prefix}.addLabel`,
+    defaultMessage: 'Add label',
+  },
+  cta: {
+    id: `${prefix}.cta`,
+    defaultMessage: 'CTA',
+  },
+  header: {
+    id: `${prefix}.header`,
+    defaultMessage: 'Header',
+  },
+  footer: {
+    id: `${prefix}.footer`,
+    defaultMessage: 'Footer',
+  },
+  others: {
+    id: `${prefix}.others`,
+    defaultMessage: 'Others',
+  },
+  socialPlatform: {
+    id: `${prefix}.socialPlatform`,
+    defaultMessage: 'Social platform',
+  },
+});

package/v2Components/BeeEditor/tests/index.test.js

@@ -0,0 +1,10 @@
+// import React from 'react';
+// import { shallow } from 'enzyme';
+
+// import Beeeditor from '../index';
+
+describe('<Beeeditor />', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});

package/v2Components/FormBuilder/index.js

@@ -1470,6 +1470,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           } else if (key === this.props.baseLanguage) {
             formData[newTabIndex][key] = {};
             _.forEach(val, (subVal, index) => {
+                // if (subVal === 'is_drag_drop' || subVal === 'lang_id' || subVal === 'iso_code' === 'language') {
+                //
+                //   formData[newTabIndex][key][index] = formData[0][this.props.baseLanguage][subVal];
+                // } else {
               if (index === 'tabKey') {
                 formData[newTabIndex][key][index] = _.uniqueId();
               } else if (index === 'template-content') {
@@ -3176,6 +3180,10 @@ 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'] : '');
+              console.log('ckeditor current lang', currentLang, content);
+              if (this.state.formData[`${this.state.currentTab - 1}`][currentLang].is_drag_drop) {
+                // content = "";
+              }
               columns.push(
                 <CapColumn style={val.colStyle ? val.colStyle : {}} span={val.width}>
                   <CKEditor

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -69,7 +69,7 @@ const getLineType = ({
     }
   }
   return {};
-};
+}
 
 function SlideBoxContent(props) {
   const {
@@ -96,7 +96,6 @@ function SlideBoxContent(props) {
       cap,
       onResetStep,
       isFullMode,
-      editor,
       onCallTaskSubmit,
       setIsLoadingContent,
       showTemplateName,
@@ -185,7 +184,7 @@ function SlideBoxContent(props) {
           } = {},
           template,
         }) => {
-          const previewContent = {};
+          let previewContent = {};
           previewContent.messageContent = text;
           previewContent.previewImageUrl = previewImageUrl;
           previewContent.selectedSticker = selectedSticker || {
@@ -367,7 +366,6 @@ function SlideBoxContent(props) {
         step={templateStep}
         showNextStep={onCreateNextStep}
         isFullMode={isFullMode}
-        editor={editor}
         cap={cap}
         onResetStep={onResetStep}
         showTemplateName={showTemplateName}
@@ -394,7 +392,6 @@ function SlideBoxContent(props) {
         getFormSubscriptionData={getFormData}
         getDefaultTags={type}
         isFullMode={isFullMode}
-        editor={editor}
         cap={cap}
         showTemplateName={showTemplateName}
         onValidationFail={onValidationFail}
@@ -459,7 +456,6 @@ function SlideBoxContent(props) {
             messageDetails={messageDetails}
             cap={cap}
             onFacebookSubmit={onFacebookSubmit}
-            isFullMode={isFullMode}
           />
         )
       }

package/v2Containers/CreativesContainer/index.js

@@ -225,9 +225,9 @@ class Creatives extends React.Component {
           const messagesDefinition = JSON.parse(messages);
           let lineContent = JSON.parse(messageBody || '{}').messages || [{}];
           lineContent = lineContent.map((content, index) => ({
-            ...content,
-            ...(messagesDefinition[index] || {}),
-          }));
+              ...content,
+              ...(messagesDefinition[index] || {})
+            }));
           creativesTemplateData = {
             type: constants.LINE,
             isDefault,
@@ -529,7 +529,7 @@ class Creatives extends React.Component {
   }
   render() {
     const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent, mobilePushCreateMode, isDiscardMessage, weChatTemplateType, weChatMaptemplateStep} = this.state;
-    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails, onTestContentClicked, onPreviewContentClicked, getCreativesData, fetchingCmsData, editor} = this.props;
+    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails, onTestContentClicked, onPreviewContentClicked, getCreativesData, fetchingCmsData} = this.props;
     const mapTemplateCreate = slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
     /* TODO: Instead of passing down same props separately to each component down, write common function to these props and pass it accordingly */
     return (
@@ -602,7 +602,6 @@ class Creatives extends React.Component {
               selectedAccount={this.props.selectedAccount}
               onShowTemplates={this.onShowTemplates}
               handleClose={this.handleCloseSlideBox}
-              editor={editor}
           />
           }
           footer={this.shouldShowFooter() &&

package/v2Containers/Email/actions.js

@@ -38,7 +38,7 @@ export function getAllAssets(assetType, queryParams) {
   };
 }
 
-export function getCmsSetting(cmsType, projectId, cmsMode, langId, isEdmSupport, disableBEE) {
+export function getCmsSetting(cmsType, projectId, cmsMode, langId, isEdmSupport) {
   return {
     type: types.GET_CMS_EDITOR_DETAILS_REQUEST,
     cmsType,
@@ -46,7 +46,6 @@ export function getCmsSetting(cmsType, projectId, cmsMode, langId, isEdmSupport,
     cmsMode,
     langId,
     isEdmSupport,
-    disableBEE,
   };
 }