@capillarytech/creatives-library 7.17.36 → 7.17.37-alpha.1

package/index.js

@@ -124,8 +124,8 @@ const ViberContainer = {Viber, viberReducer, viberSaga};
 const FacebookPreviewContainer = { FacebookPreview, facebookPreviewReducer, facebookPreviewSaga };
 const SmsTraiContainer = {SmsTraiCreate, SmsTraiCreateReducer, SmsTraiCreateSaga};
 const WhatsappContainer = { Whatsapp, whatsappReducer, whatsappSaga };
-const zaloContainer = { Zalo, zaloReducer, zaloSaga };
 const RcsContainer = { Rcs, rcsReducer, rcsSaga };
+const ZaloContainer = { Zalo, zaloReducer, zaloSaga };
 
 const GalleryContainer = {Gallery, galleryReducer, gallerySagas};
 const FTPContainer = {FTP, FTPReducer, FTPSagas};
@@ -173,6 +173,6 @@ export { CapContainer,
   FacebookPreviewContainer,
   SmsTraiContainer,
   WhatsappContainer,
-  zaloContainer,
   RcsContainer,
+  ZaloContainer,
 };

package/package.json

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

package/v2Containers/CreativesContainer/index.js

@@ -23,6 +23,7 @@ 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 { MAP_TEMPLATE } from '../WeChat/Wrapper/constants';
@@ -98,11 +99,26 @@ export class Creatives extends React.Component {
     this.setState(data);
   };
   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.toLowerCase()) {
+      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,
+      });
+    }
   };
   onEditTemplate = () => {
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true, templateNameExists: true });
@@ -1202,6 +1218,7 @@ Creatives.propTypes = {
   channel: PropTypes.string,
   templateActions: PropTypes.object,
   globalActions: PropTypes.object,
+  zaloActions: PropTypes.object,
   cap: PropTypes.object,
   // isLoading: PropTypes.bool,
   templateUserList: PropTypes.array,
@@ -1230,6 +1247,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/Templates/index.js

@@ -869,10 +869,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;
   }
 
@@ -2900,6 +2901,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 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/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';

package/v2Containers/Zalo/index.js

@@ -36,7 +36,6 @@ import {
   ERROR_ALERT,
   WARNING_ALERT,
   ZALO_STATUSES,
-  ENABLE,
 } from "./constants";
 import "./index.scss";
 import { makeSelectZalo } from "./selectors";
@@ -68,7 +67,7 @@ export const Zalo = ({
   const [templatePreviewUrl, setTemplatePreviewUrl] = useState("");
   const [tags, updateTags] = useState([]);
   const [textAreaId, updateTextAreaId] = useState("");
-  const [templateStatus, setZaloTemplateStatus] = useState(ENABLE);
+  const [templateStatus, setZaloTemplateStatus] = useState(ZALO_STATUSES.ENABLE);
 
   const ZaloFooter = styled.div`
     background-color: ${CAP_WHITE};

package/v2Containers/Zalo/messages.js

@@ -70,5 +70,5 @@ export default defineMessages({
   PENDING_REVIEW: {
     id: `${prefix}.PENDING_REVIEW`,
     defaultMessage: 'pending review',
-  }
+  },
 });