@capillarytech/creatives-library 8.0.129-alpha.5 → 8.0.130

package/config/app.js

@@ -20,7 +20,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',
     campaigns_api_org_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/org/campaign',
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',

package/containers/Templates/constants.js

@@ -47,5 +47,14 @@ export const CLEAR_TEMPLATE_STORE_DATA = "app/containers/Templates/CLEAR_TEMPLAT
 
 export const TRUE = 'true';
 export const FALSE = 'false';
+
+// Channel constants
 export const EMAIL = 'email';
-export const TYPE_EMBEDDED = 'embedded';
+export const SMS = 'sms';
+export const LINE = 'line';
+export const EBILL = 'ebill';
+export const WECHAT = 'wechat';
+export const WHATSAPP = 'whatsapp';
+export const MOBILEPUSH = 'mobilepush';
+
+export const TYPE_EMBEDDED = 'embedded';

package/containers/Templates/index.js

@@ -134,10 +134,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         case "line":
           channel = "Line";
           break;
-        case "whatsapp":
-          channel = "whatsapp";
-          this.props.actions.getWeCrmAccounts();
-          break;
         default:
           channel = '';
       }
@@ -150,7 +146,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.props.location.query.type === 'embedded' && this.isEnabledInLibraryModule("setLocale")) {
       this.setLocale();
     }
-    if (this.state.channel.toLowerCase() === 'line' || this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush' || this.state.channel.toLowerCase() === 'whatsapp') && !_.isEmpty(this.props.Templates.selectedWeChatAccount))) {
+    if (this.state.channel.toLowerCase() === 'line' || this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && !_.isEmpty(this.props.Templates.selectedWeChatAccount))) {
       const queryParams = {
         // name: this.state.searchText,
         // sortBy: this.state.sortBy,
@@ -160,13 +156,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         queryParams.wecrmToken = this.props.Templates.selectedWeChatAccount.configs.wecrm_token;
         queryParams.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
       }
-      if (this.state.channel.toLowerCase() === 'whatsapp' && !_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
-        const { configs = {}, sourceAccountIdentifier = '' } = this.props.Templates.selectedWeChatAccount;
-        queryParams.hostName = this.props.Templates.selectedWeChatAccount.hostName;
-        queryParams.wabaId = sourceAccountIdentifier;
-        queryParams.accessToken = configs.accessToken;
-        queryParams.phoneId = configs.promotionalMessagingSSID;
-      }
       if (this.state.channel.toLowerCase() === "mobilepush" && !_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
         queryParams.accountId = this.props.Templates.selectedWeChatAccount.id;
       }
@@ -215,19 +204,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
       //
       this.setState({ channel }, () => {
-        if (this.state.channel.toLowerCase() === 'line' || this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || (this.state.channel.toLowerCase() === 'wechat' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) || (this.state.channel.toLowerCase() === 'whatsapp' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount))) {
+        if (this.state.channel.toLowerCase() === 'line' || this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || (this.state.channel.toLowerCase() === 'wechat' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount))) {
           if (this.state.channel.toLowerCase() === 'wechat' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
             params.wecrmId = (nextProps.Templates.selectedWeChatAccount.configs || {}).wecrm_app_id;
             params.wecrmToken = (nextProps.Templates.selectedWeChatAccount.configs || {}).wecrm_token;
             params.originalId = nextProps.Templates.selectedWeChatAccount.sourceAccountIdentifier;
           }
-          if (this.state.channel.toLowerCase() === 'whatsapp' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
-            const { configs = {}, sourceAccountIdentifier = '' } = nextProps.Templates.selectedWeChatAccount;
-            params.hostName = nextProps.Templates.selectedWeChatAccount.hostName;
-            params.wabaId = sourceAccountIdentifier;
-            params.accessToken = configs.accessToken;
-            params.phoneId = configs.promotionalMessagingSSID;
-          }
           if (this.state.channel.toLowerCase() === "mobilepush" && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
             params.accountId = nextProps.Templates.selectedWeChatAccount.id;
           }
@@ -464,13 +446,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           queryParams.wecrmToken = this.props.Templates.selectedWeChatAccount.configs.wecrm_token;
           queryParams.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
         }
-        if (this.state.channel.toLowerCase() === 'whatsapp' && !_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
-          const { configs = {}, sourceAccountIdentifier = '' } = this.props.Templates.selectedWeChatAccount;
-          queryParams.hostName = this.props.Templates.selectedWeChatAccount.hostName;
-          queryParams.wabaId = sourceAccountIdentifier;
-          queryParams.accessToken = configs.accessToken;
-          queryParams.phoneId = configs.promotionalMessagingSSID;
-        }
         if (this.state.channel.toLowerCase() === "mobilepush" && !_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
           queryParams.accountId = this.props.Templates.selectedWeChatAccount.id;
           if (this.state.mode) {
@@ -580,13 +555,13 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const module = this.props.location.query.module ? this.props.location.query.module : 'default';
     const isLanguageSupport = this.props.location.query.isLanguageSupport ? this.props.location.query.isLanguageSupport : true;
     const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
-    
+
     if (supportedZipFormats.indexOf(fileExtension.toLowerCase()) !== -1) {
-      
+
       this.props.actions.handleZipUpload(files[0]);
       document.getElementById("filename").value = "";
     } else if (fileExtension === 'html' || fileExtension === 'htm') {
-      
+
       const reader = new FileReader();
       reader.onload = () => {
         const text = reader.result;
@@ -837,13 +812,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         params.wecrmToken = this.props.Templates.selectedWeChatAccount.configs.wecrm_token;
         params.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
       }
-      if (this.state.channel.toLowerCase() === 'whatsapp') {
-        const { configs = {}, sourceAccountIdentifier = '' } = this.props.Templates.selectedWeChatAccount;
-        params.hostName = this.props.Templates.selectedWeChatAccount.hostName;
-        params.wabaId = sourceAccountIdentifier;
-        params.accessToken = configs.accessToken;
-        params.phoneId = configs.promotionalMessagingSSID;
-      }
       if (this.state.channel.toLowerCase() === "mobilepush") {
         params.accountId = this.props.Templates.selectedWeChatAccount.id;
       }
@@ -862,13 +830,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         params.wecrmToken = this.props.Templates.selectedWeChatAccount.configs.wecrm_token;
         params.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
       }
-      if (this.state.channel.toLowerCase() === 'whatsapp') {
-        const { configs = {}, sourceAccountIdentifier = '' } = this.props.Templates.selectedWeChatAccount;
-        params.hostName = this.props.Templates.selectedWeChatAccount.hostName;
-        params.wabaId = sourceAccountIdentifier;
-        params.accessToken = configs.accessToken;
-        params.phoneId = configs.promotionalMessagingSSID;
-      }
       if (this.state.channel.toLowerCase() === "mobilepush") {
         params.accountId = this.props.Templates.selectedWeChatAccount.id;
       }

package/package.json

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

package/v2Components/CapVideoUpload/index.js

@@ -61,36 +61,6 @@ function CapVideoUpload(props) {
 
   const [isTemplateDrawerRequired, updateTemplateDrawerRequirement] = useState(false);
 
-  const {
-    formatMessage,
-  } = intl || {};
-
-  const submitVideoAction = useCallback((data, incorrectFile) => {
-    const {
-      file: {
-        size,
-      },
-      file,
-      fileParams,
-      type,
-    } = data;
-    if (incorrectFile || size > videoSize) {
-      if (errorMessage) {
-        updateVideoErrorMessage(errorMessage);
-      } else {
-        updateVideoErrorMessage(formatMessage(messages.videoIncorrectSize));
-      }
-    } else {
-      updateVideoErrorMessage('');
-      uploadAsset(
-        file,
-        type,
-        fileParams,
-        index,
-      );
-    }
-  }, [isVideoError]);
-
   const uploadVideo = useCallback((e, { files }) => {
     if (e) {
       e.preventDefault();
@@ -157,28 +127,40 @@ function CapVideoUpload(props) {
     }
   }, [uploadedAssetList]);
 
+  const submitVideoAction = useCallback((data, incorrectFile) => {
+    const {
+      file: {
+        size,
+      },
+      file,
+      fileParams,
+      type,
+    } = data;
+    if (incorrectFile || size > videoSize) {
+      if (errorMessage) {
+        updateVideoErrorMessage(errorMessage);
+      } else {
+        updateVideoErrorMessage(formatMessage(messages.videoIncorrectSize));
+      }
+    } else {
+      updateVideoErrorMessage('');
+      uploadAsset(
+        file,
+        type,
+        fileParams,
+        index,
+      );
+    }
+  }, [isVideoError]);
+
+  const {
+    formatMessage,
+    } = intl || {};
+
   const capUploaderCustomVideoRequest = useCallback((uploadData) => {
     uploadVideo(undefined, { files: [uploadData.file] });
   }, []);
 
-  const onReUpload = useCallback(() => {
-    updateVideoStatus(false);
-    updateVideoDuration(null);
-    onVideoUploadUpdateAssestList(
-      index,
-      {
-        previewUrl: "",
-        videoName: "",
-        videoHeight: "",
-        videoWidth: "",
-        videoSrc: "",
-        videoDuration: null,
-        videoId: "",
-        fileHandle: "",
-      }
-    );
-  }, []);
-
   const playVideo = useCallback((e) => {
     if (e.target.paused && !isPlaying) {
       e.target.play();
@@ -218,6 +200,23 @@ function CapVideoUpload(props) {
         )
       );
     }
+    const onReUpload = () => {
+      updateVideoStatus(false);
+      updateVideoDuration(null);
+      onVideoUploadUpdateAssestList(
+        index,
+        {
+          previewUrl: "",
+          videoName: "",
+          videoHeight: "",
+          videoWidth: "",
+          videoSrc: "",
+          videoDuration: null,
+          videoId: "",
+          fileHandle: "",
+        }
+      );
+    };
 
     const updateMetadataLoaded = () => {
       const { current: { duration, videoHeight: metaVideoHeight, videoWidth: metaVideoWidth } = {} } = videoEl;

package/v2Containers/Viber/index.js

@@ -351,7 +351,7 @@ export const Viber = (props) => {
       updateAssetList(data);
       actions.clearViberAsset(0);
     },
-    [actions]
+    [viberVideoSrcAndPreview?.viberVideoSrc]
   );
 
   const renderMediaSection = () => (

package/v2Containers/Whatsapp/index.js

@@ -1057,7 +1057,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
   );
 
   const uploadWhatsappAsset = (file, type, fileParams) => {
-    const phoneId = accountData.selectedWhatsappAccount.configs.promotionalMessagingSSID;
+    const phoneId = get(accountData, 'selectedWhatsappAccount.configs.promotionalMessagingSSID');
     const whatsappParams = {
       source: WHATSAPP.toLowerCase(),
       wabaId: accountId,
@@ -1255,7 +1255,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
       errorMessage = formatMessage(
         globalMessages.emptyTemplateNameErrorMessage,
       );
-    } else if (value.length < 3 && (host === HOST_GUPSHUP || host === HOST_HAPTIC)) {
+    } else if (value.length < 3 && [HOST_GUPSHUP, HOST_HAPTIC].includes(host)) {
       errorMessage = formatMessage(messages.templateNameMinCharacters);
     } else if (!templateNameRegex.test(value)) {
       errorMessage = formatMessage(messages.templateNameRegexErrorMessage);
@@ -1566,9 +1566,9 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
     }
 
     // Add the correct file handle based on host
-    if (isHaptic) {
-      if (hapticFileHandle) mediaParams.hapticFileHandle = hapticFileHandle;
-    } else if (karixFileHandle) {
+    if (isHaptic && hapticFileHandle) {
+      mediaParams.hapticFileHandle = hapticFileHandle;
+    } else if (!isHaptic && karixFileHandle) {
       mediaParams.karixFileHandle = karixFileHandle;
     }
     return {