@capillarytech/creatives-library 7.17.51 → 7.17.53

package/package.json

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

package/v2Containers/CreativesContainer/index.js

@@ -122,7 +122,7 @@ export class Creatives extends React.Component {
         name = "",
         sourceAccountIdentifier = "",
         configs: { token = "" } = {},
-      } = get(this.props, "Templates.weCrmAccounts[0]", {});
+      } = get(this.props, "Templates.selectedZaloAccount", {});
       this.props.zaloActions.getTemplateInfoById({
         username: name,
         oa_id: sourceAccountIdentifier,

package/v2Containers/Templates/index.js

@@ -641,10 +641,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   onAccountSelect(e) {
     const value = e.target.value;
     this.setState({selectedAccount: value}, () => {
-      const params = {
-        name: this.state.searchText,
-        sortBy: this.state.sortBy,
-      };
+      const params = {};
+      if (this.state.channel.toLowerCase() !== ZALO_LOWERCASE) {
+        params.name = this.state.searchText;
+        params.sortBy = this.state.sortBy;
+      }
       const selectedChannel = this.state.channel.toLowerCase();
       if (selectedChannel === 'wechat') {
         params.wecrmId = this.props.Templates.weCrmAccounts[findIndex(this.props.Templates.weCrmAccounts, { name: value})].configs.wecrm_app_id;
@@ -664,8 +665,19 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         } else {
           this.setState({ selectedAccountError: false });
         }
-      } else if ([LINE.toLowerCase(), RCS_LOWERCASE].includes(selectedChannel)) {
-        this.props.actions.setChannelAccount(selectedChannel?.toUpperCase(), this.props.Templates.weCrmAccounts.find((item) => item.name === this.state.selectedAccount));
+      } else if ([LINE.toLowerCase(), RCS_LOWERCASE, ZALO_LOWERCASE].includes(selectedChannel)) {
+        const setAcc = this.props.Templates.weCrmAccounts.find((item) => item.name === this.state.selectedAccount);
+        this.props.actions.setChannelAccount(selectedChannel?.toUpperCase(), setAcc);
+        if(selectedChannel === ZALO_LOWERCASE){
+            const {
+              name = "",
+              sourceAccountIdentifier = "",
+              configs: { token = "" } = {},
+            } = setAcc;
+            params.username = name;
+            params.oa_id = sourceAccountIdentifier;
+            params.token = token;  
+        }
       }
 
       this.setState({activeMode: TEMPLATES_MODE});
@@ -805,12 +817,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
       if ((this.state.channel || '').toLowerCase() === SMS_LOWERCASE && isTraiDltFeature) {
         queryParams.traiEnable = true;
-      }
-      if (this.state.channel.toLowerCase() === ZALO_LOWERCASE) {
-        queryParams.username = this.props.Templates?.weCrmAccounts[0]?.name;
-        queryParams.oa_id = this.props.Templates?.weCrmAccounts[0]?.sourceAccountIdentifier;
-        queryParams.token = this.props.Templates?.weCrmAccounts[0]?.configs?.token;
-      }
+      }  
       this.setState({ page, templatesCount }, () => {
         queryParams.page = page;
         queryParams.perPage = this.state.perPageLimit;
@@ -1947,16 +1954,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     } else {
       const {
-        Templates: {
-          weCrmAccounts: [
-            {
-              name,
-              sourceAccountIdentifier,
-              configs: { token },
-            },
-          ],
-        },
-      } = this.props;
+        name = "",
+        sourceAccountIdentifier = "",
+        configs: { token = "" } = {},
+      } = get(this.props, "Templates.selectedZaloAccount", {});
       this.props.zaloActions.getTemplateInfoById({
         username: name,
         oa_id: sourceAccountIdentifier,
@@ -2383,9 +2384,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const isMobilePushChannel = channel === MOBILE_PUSH;
     const isFacebookChannel = channel === FACEBOOK;
 
-    if ([WECHAT, MOBILE_PUSH, LINE].includes(channel) && !isEmpty(weCrmAccounts) && !isFacebookChannel) {
+    if ([WECHAT, MOBILE_PUSH, LINE, ZALO].includes(channel) && !isEmpty(weCrmAccounts) && !isFacebookChannel) {
       forEach(weCrmAccounts, (account) => {
-        if ((isWechatChannel && account.configs && account.configs.is_wecrm_enabled) || [MOBILE_PUSH, LINE].includes(channel)) {
+        if ((isWechatChannel && account.configs && account.configs.is_wecrm_enabled) || [MOBILE_PUSH, LINE, ZALO].includes(channel)) {
           if (query.type === 'embedded' && (!query.module || (query.module && query.module !== 'library'))) {
             if (query.source_account_id && account.sourceAccountIdentifier === query.source_account_id) {
               accountOptions.push(

package/v2Containers/Templates/tests/__snapshots__/index.test.js.snap

@@ -39,7 +39,22 @@ exports[`Test Templates container Should render correct component for zalo chann
       className="select-account"
       defaultValue=""
       onChange={[Function]}
-      panes={Array []}
+      panes={
+        Array [
+          Object {
+            "icon": <CapIconAvatar
+              backgroundProps={Object {}}
+              height="2rem"
+              labelProps={Object {}}
+              text="c"
+              width="auto"
+            />,
+            "key": "fa66f53ca2bb4b93b02dfc5bd265e2fd",
+            "title": "capillary_zns",
+            "value": "capillary_zns",
+          },
+        ]
+      }
       selected=""
       size="small"
     />