@capillarytech/creatives-library 7.17.40-alpha.0 → 7.17.41

package/v2Containers/CreativesContainer/index.js

@@ -1,8 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {
-  CapSlideBox, CapHeader, CapLink, CapInput,
-} from '@capillarytech/cap-ui-library';
+  CapSlideBox,
+  CapHeader,
+  CapLink,
+  CapInput,
+  CapNotification,
+} from "@capillarytech/cap-ui-library";
 import { injectIntl, FormattedMessage } from 'react-intl';
 import classnames from 'classnames';
 import {isEmpty, get, forEach, cloneDeep} from 'lodash';
@@ -23,8 +27,10 @@ import { gtmPush } from '../../utils/gtmTrackers';
 import './index.scss';
 import * as templateActions from '../Templates/actions';
 import * as globalActions from '../Cap/actions';
+import * as zaloActions from '../Zalo/actions';
 import {isLoading as isLoadingSelector} from './selectors';
 import messages from './messages';
+import zaloMessages from '../Zalo/messages';
 import { MAP_TEMPLATE } from '../WeChat/Wrapper/constants';
 import { makeSelectFetchingCmsData } from '../Email/selectors';
 import { IMAGE as LINE_IMAGE, IMAGE_MAP, IMAGE_CAROUSEL, VIDEO as LINE_VIDEO, TEMPLATE, STICKER } from '../Line/Container/constants';
@@ -97,12 +103,35 @@ export class Creatives extends React.Component {
     }
     this.setState(data);
   };
+
+  actionCallback = () => {
+    CapNotification.error({
+      message: <FormattedMessage {...zaloMessages.zaloFailureNotificationPreview}/>,
+    });
+  };
+
   onPreviewTemplate = (template) => {
-    const templateData = template;
-    const usersList = commonUtil.getMergedUserList(this.props.templateUserList);
-    const userId = parseInt(template.updatedBy, 10);
-    templateData.updatedByName = commonUtil.getUserNameById(userId, usersList );
-    this.setState({ slidBoxContent: 'preview', templateData });
+    if (template.type !== constants.ZALO) {
+      const templateData = template;
+      const usersList = commonUtil.getMergedUserList(this.props.templateUserList);
+      const userId = parseInt(template.updatedBy, 10);
+      templateData.updatedByName = commonUtil.getUserNameById(userId, usersList );
+      this.setState({ slidBoxContent: 'preview', templateData });
+    } else {
+      const {
+        name = "",
+        sourceAccountIdentifier = "",
+        configs: { token = "" } = {},
+      } = get(this.props, "Templates.weCrmAccounts[0]", {});
+      this.props.zaloActions.getTemplateInfoById({
+        username: name,
+        oa_id: sourceAccountIdentifier,
+        token,
+        id: template?._id,
+        preview: true,
+        actionCallback: this.actionCallback,
+      });
+    }
   };
   onEditTemplate = () => {
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true, templateNameExists: true });
@@ -471,6 +500,14 @@ export class Creatives extends React.Component {
               },
             },
           };
+          break;
+        }
+        case constants.ZALO: {
+          creativesTemplateData = {
+            type: constants.ZALO,
+            ...templateData,
+          };
+          break;
         }
         default:
           break;
@@ -771,6 +808,17 @@ export class Creatives extends React.Component {
         }
       }
         break;
+      case constants.ZALO: {
+        if (template.value) {
+          templateData = {
+            ...template.value,
+          };
+          if (templateData?.type) {
+            delete templateData.type;
+          }
+        }
+      }
+        break;
       default:
         break;
     }
@@ -1205,6 +1253,7 @@ Creatives.propTypes = {
   channel: PropTypes.string,
   templateActions: PropTypes.object,
   globalActions: PropTypes.object,
+  zaloActions: PropTypes.object,
   cap: PropTypes.object,
   // isLoading: PropTypes.bool,
   templateUserList: PropTypes.array,
@@ -1233,6 +1282,7 @@ function mapDispatchToProps(dispatch) {
     templateActions: bindActionCreators(templateActions, dispatch),
     globalActions: bindActionCreators(globalActions, dispatch),
     actions: bindActionCreators(actions, dispatch),
+    zaloActions: bindActionCreators(zaloActions, dispatch),
   };
 }
 export default connect(mapStatesToProps, mapDispatchToProps)(injectIntl(Creatives));

package/v2Containers/CreativesContainer/messages.js

@@ -341,13 +341,5 @@ export default defineMessages({
   "wechat": {
     id: `${scope}.wechat`,
     defaultMessage: `Wechat`,
-  },
-  "ftp": {
-    id: `${scope}.ftp`,
-    defaultMessage: `FTP`,
-  },
-  "noCommunication": {
-    id: `${scope}.noCommunication`,
-    defaultMessage: `NO_COMMUNICATION`,
-  },
+  }
 });

package/v2Containers/TagList/index.js

@@ -22,8 +22,7 @@ import './_tagList.scss';
 import { selectCurrentOrgDetails } from '../Cap/selectors';
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
-import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature } from '../../utils/common';
-import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS } from '../../containers/App/constants';
+import { handleInjectedData } from '../../utils/common';
 
 const TreeNode = Tree.TreeNode;
 
@@ -96,24 +95,10 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
   populateTags(tagsList) {
     const mainTags = {};
-    const excludedTags = [];
-    if (!hasPromoFeature()) {
-      excludedTags.push(...PROMO_ENGINE_RELATED_TAGS);
-      //filtering PROMO_ENGINE_RELATED_TAGS if org does not have PROMO_ENGINE feature enabled
-    }
-    if (!hasGiftVoucherFeature()) {
-      //filtering GIFT_VOUCHER_RELATED_TAGS if org does not have GIFT_CARDS feature enabled
-      excludedTags.push(...GIFT_VOUCHER_RELATED_TAGS);
-    }
     //Form tags object with tag headers
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
-      const { locale: userLocale } = this.props?.intl || {};
-
-      // Check if the tag.value should be skipped based on feature control
-      if (_.includes(excludedTags, tag.value)) {
-        return; // Skip processing this tag
-      }
+      const { locale : userLocale } = this.props?.intl || {};
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
           "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
@@ -132,7 +117,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     });
 
     const mainTagsCloned = _.cloneDeep(mainTags);
-    //Insert subtags in tag headers and remove them from top level
+    //Insert subtags in tag headers and reomve them from top level
     const result = {};
     _.forEach(mainTagsCloned, (tag, key) => {
       if (tag['tag-header']) {
@@ -275,6 +260,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           modalProps={this.props.modalProps}
           currentOrgDetails={this.props.currentOrgDetails}
           channel={this.props.channel}
+          disabled={this.props.disabled}
         />
       </div>
     );
@@ -301,6 +287,7 @@ TagList.propTypes = {
   modalProps: PropTypes.any,
   currentOrgDetails: PropTypes.object,
   channel: PropTypes.string,
+  disabled: PropTypes.bool
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Templates/index.js

@@ -109,6 +109,7 @@ import { ZALO_STATUS_OPTIONS, ZALO_STATUSES } from '../Zalo/constants';
 import { getWhatsappContent, getWhatsappStatus, getWhatsappCategory, getWhatsappCta } from '../Whatsapp/utils';
 import { getRCSContent } from '../Rcs/utils';
 import zaloMessages from '../Zalo/messages'
+import { handlePreviewInNewTab } from '../../utils/common';
 
 import { MOBILE_PUSH, WECHAT, SMS, EMAIL, EBILL, LINE, VIBER, FACEBOOK, WHATSAPP, RCS, ZALO } from '../CreativesContainer/constants';
 
@@ -621,7 +622,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     }
     const zaloPreviewUrl = get(nextProps, 'Zalo.zaloTemplatePreviewData.versions.base.content.zalo.previewUrl', '');
     if (zaloPreviewUrl && this.state.channel.toLowerCase() === ZALO_LOWERCASE) {
-        window.open(zaloPreviewUrl, '_blank');
+        handlePreviewInNewTab(zaloPreviewUrl);
         this.props.zaloActions.resetTemplateInfoData();
     }
   }
@@ -869,10 +870,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   filterZaloTemplates = (templates) => {
-    const { selectedZaloStatus } = this.state;
+    let { selectedZaloStatus } = this.state;
+    selectedZaloStatus = !this.props.isFullMode ? ZALO_STATUSES.ENABLE : selectedZaloStatus;
     if (selectedZaloStatus) {
-      return templates?.filter((template) => template?.versions?.base?.content?.zalo.status === selectedZaloStatus);
-    } 
+      return templates?.filter((template) => template?.versions?.base?.content?.zalo?.status === selectedZaloStatus);
+    }
     return templates;
   }
 
@@ -1909,6 +1911,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
   selectTemplate = (id) => find(this.props.TemplatesList, {_id: id})
 
+  actionCallback = () => {
+    CapNotification.error({
+      message: this.props.intl.formatMessage(zaloMessages.zaloFailureNotificationPreview),
+    });
+  };
+
   handlePreviewClick(template, modeType) {
     if (this.state.channel.toLowerCase() !== ZALO_LOWERCASE) {
       this.togglePreview();
@@ -1951,6 +1959,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         token: token,
         id: template?._id,
         preview: true,
+        actionCallback: this.actionCallback,
       });
     }
   }
@@ -2900,6 +2909,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             ) : null
           }
 
+          {
+            channel.toLowerCase() === ZALO_LOWERCASE && !isFullMode ? (
+              <CapInfoNote message={formatMessage(messages.zaloOnlyApprovedTemplates)} />
+            ) : null
+          }
+
           <CapRow>
             <Pagination onPageChange={templates.length ? this.onPaginationChange : () => {}} paginationSelector="pagination-container">
               {this.getTemplateDataForGrid({ isLoading, loadingTip, channel: this.state.channel, templates: this.state.searchingZaloTemplate ? this.state.searchedZaloTemplates : this.props.TemplatesList, filterContent, handlers: { handlePreviewClick: this.handlePreviewClick, handleEditClick: this.handleEditClick}})}

package/v2Containers/Templates/messages.js

@@ -502,4 +502,8 @@ export default defineMessages({
     id: `${scope}.zaloPreview`,
     defaultMessage: 'Open preview in new tab',
   },
+  "zaloOnlyApprovedTemplates": {
+    id: `${scope}.zaloOnlyApprovedTemplates`,
+    defaultMessage: 'Only enabled/approved templates are shown here',
+  },
 });

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

@@ -1038,134 +1038,6 @@ exports[`Test Templates container Should render temlates when zalo templates are
             tip="Getting all templates..."
           >
             <div>
-              <div
-                className="pagination-container"
-              >
-                <CapCustomCardList
-                  cardList={
-                    Array [
-                      Object {
-                        "content": <CapLabel
-                          className="zalo-listing-content desc"
-                          type="label19"
-                        >
-                          Test1
-                        </CapLabel>,
-                        "extra": Array [
-                          <CapTooltip
-                            title="Open preview in new tab"
-                          >
-                            <CapIcon
-                              className="view-zalo"
-                              onClick={[Function]}
-                              style={
-                                Object {
-                                  "marginRight": "16px",
-                                }
-                              }
-                              type="eye"
-                            />
-                          </CapTooltip>,
-                        ],
-                        "hoverOption": <CapButton
-                          className="select-zalo"
-                          isAddBtn={false}
-                          onClick={[Function]}
-                          type="primary"
-                        >
-                          Select
-                        </CapButton>,
-                        "key": "ZALO-card-Test1",
-                        "title": <CapRow>
-                          <CapLabel
-                            className="zalo-template-name"
-                            type="label1"
-                          >
-                            
-                          </CapLabel>
-                          <CapRow
-                            align="middle"
-                            className="zalo-status-container"
-                            type="flex"
-                          >
-                            <CapStatus
-                              color=""
-                              height="0.571rem"
-                              labelType="label3"
-                              text=""
-                              type="pending"
-                              width="0.571rem"
-                            />
-                          </CapRow>
-                        </CapRow>,
-                      },
-                      Object {
-                        "content": <CapLabel
-                          className="zalo-listing-content desc"
-                          type="label19"
-                        >
-                          Test2
-                        </CapLabel>,
-                        "extra": Array [
-                          <CapTooltip
-                            title="Open preview in new tab"
-                          >
-                            <CapIcon
-                              className="view-zalo"
-                              onClick={[Function]}
-                              style={
-                                Object {
-                                  "marginRight": "16px",
-                                }
-                              }
-                              type="eye"
-                            />
-                          </CapTooltip>,
-                        ],
-                        "hoverOption": <CapButton
-                          className="select-zalo"
-                          isAddBtn={false}
-                          onClick={[Function]}
-                          type="primary"
-                        >
-                          Select
-                        </CapButton>,
-                        "key": "ZALO-card-Test2",
-                        "title": <CapRow>
-                          <CapLabel
-                            className="zalo-template-name"
-                            type="label1"
-                          >
-                            
-                          </CapLabel>
-                          <CapRow
-                            align="middle"
-                            className="zalo-status-container"
-                            type="flex"
-                          >
-                            <CapStatus
-                              color=""
-                              height="0.571rem"
-                              labelType="label3"
-                              text=""
-                              type="pending"
-                              width="0.571rem"
-                            />
-                          </CapRow>
-                        </CapRow>,
-                      },
-                    ]
-                  }
-                  fbType="list"
-                  key="ZALO-card-list"
-                  style={
-                    Object {
-                      "marginLeft": "16px",
-                    }
-                  }
-                  type="ZALO"
-                />
-              </div>
               <div
                 style={
                   Object {
@@ -1173,7 +1045,34 @@ exports[`Test Templates container Should render temlates when zalo templates are
                     "overflow": "auto",
                   }
                 }
-              />
+              >
+                <CapHeader
+                  description={
+                    <CapLabel
+                      style={
+                        Object {
+                          "textAlign": "center",
+                        }
+                      }
+                      type="label1"
+                    >
+                      Please try searching with another term or apply different filter
+                    </CapLabel>
+                  }
+                  descriptionClass=""
+                  inline={false}
+                  size="large"
+                  title={
+                    <CapHeading
+                      className="channel-specific-illustration-text"
+                      type="h3"
+                    >
+                      Sorry, we couldn’t find any matches
+                    </CapHeading>
+                  }
+                  titleClass=""
+                />
+              </div>
             </div>
           </CapSpin>
         </div>

package/v2Containers/TemplatesV2/tests/index.test.js

@@ -93,6 +93,7 @@ describe("Test TemplatesV2", () => {
     expect(getByText('Viber')).toBeInTheDocument();
     expect(getByText('Facebook')).toBeInTheDocument();
     expect(getByText('WhatsApp')).toBeInTheDocument();
+    expect(getByText('Zalo')).toBeInTheDocument();
     expect(getByText('Gallery')).toBeInTheDocument();
   });
 });

package/v2Containers/Zalo/constants.js

@@ -10,7 +10,6 @@ export const ERROR = 'ERROR';
 export const STRING = 'STRING';
 export const NUMBER = 'NUMBER';
 export const DATE = 'DATE';
-export const ENABLE = 'ENABLE';
 
 export const TAG = 'TAG';
 export const EMBEDDED = 'embedded';