@capillarytech/creatives-library 7.17.37-alpha.3 → 7.17.37-beta.0

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -321,7 +321,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           trigger="click"
           placement={translationLang === "ja-JP" && channel === 'EMAIL' ? "bottom" : "rightTop"}
           >
-          <CapButton disabled={this?.props?.disabled} isAddBtn type="flat">{label || ''}</CapButton>
+          <CapButton isAddBtn type="flat">{label || ''}</CapButton>
         </CapPopover>
         }
         <CapModal
@@ -358,7 +358,6 @@ CapTagList.propTypes = {
   disableTagsDetails: PropTypes.object,
   currentOrgDetails: PropTypes.object,
   channel: PropTypes.string,
-  disabled: PropTypes.bool
 };
 
 CapTagList.defaultValue = {

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -213,7 +213,7 @@ export function SlideBoxContent(props) {
     isEmailPreview = slidBoxContent === 'preview' && channel === constants.EMAIL;
     isMpushPreview = slidBoxContent === 'preview' && channel === constants.MOBILE_PUSH;
     isEditFTP = isEdit && [constants.NO_COMMUNICATION, constants.FTP].includes(channel);
-    isEditZalo = isEdit && channel === constants.ZALO;
+    isEditZalo = isEdit && channel === constants.ZALO
   }
   const isDltEnabled = commonUtil.isTraiDLTEnable(isFullMode, smsRegister);
   const hasJPLocaleHideFeatureEnabled = commonUtil?.hasJPLocaleHideFeatureEnabled();
@@ -510,12 +510,11 @@ export function SlideBoxContent(props) {
       {
         isEditZalo &&
         <Zalo
-          templateData={templateData}
-          location={creativesLocationProps}
-          selectedOfferDetails={selectedOfferDetails}
-          getDefaultTags={type}
-          channel={channel}
-          isFullMode={isFullMode}
+            templateData={templateData}
+            location={creativesLocationProps}
+            selectedOfferDetails={selectedOfferDetails}
+            getDefaultTags={type}
+            channel={channel}
         />
       }
       {

package/v2Containers/CreativesContainer/index.js

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

@@ -260,7 +260,6 @@ 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>
     );
@@ -287,7 +286,6 @@ TagList.propTypes = {
   modalProps: PropTypes.any,
   currentOrgDetails: PropTypes.object,
   channel: PropTypes.string,
-  disabled: PropTypes.bool
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Templates/index.js

@@ -869,11 +869,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   filterZaloTemplates = (templates) => {
-    let { selectedZaloStatus } = this.state;
-    selectedZaloStatus = !this.props.isFullMode ? ZALO_STATUSES.ENABLE : selectedZaloStatus;
+    const { selectedZaloStatus } = this.state;
     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;
   }
 
@@ -2901,12 +2900,6 @@ 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,8 +502,4 @@ 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,6 +1038,134 @@ 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 {
@@ -1045,34 +1173,7 @@ 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,6 +10,7 @@ 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

@@ -4,7 +4,7 @@ import { injectIntl } from "react-intl";
 import { createStructuredSelector } from "reselect";
 import { bindActionCreators } from "redux";
 import { get } from "lodash";
-import styled from "styled-components";
+import styled from 'styled-components';
 import {
   CapSpin,
   CapRow,
@@ -21,7 +21,7 @@ import {
   CAP_SPACE_24,
   CAP_SPACE_32,
   CAP_WHITE,
-} from "@capillarytech/cap-ui-library/styled/variables";
+} from '@capillarytech/cap-ui-library/styled/variables';
 import messages from "./messages";
 import withCreatives from "../../hoc/withCreatives";
 import {
@@ -36,6 +36,7 @@ import {
   ERROR_ALERT,
   WARNING_ALERT,
   ZALO_STATUSES,
+  ENABLE,
 } from "./constants";
 import "./index.scss";
 import { makeSelectZalo } from "./selectors";
@@ -48,6 +49,7 @@ import { makeSelectMetaEntities, setInjectedTags } from "../Cap/selectors";
 import * as globalActions from "../Cap/actions";
 import { validateTags } from "../../utils/tagValidations";
 
+
 export const Zalo = ({
   intl,
   actions,
@@ -60,16 +62,13 @@ export const Zalo = ({
   injectedTags,
   selectedOfferDetails,
   template,
-  isFullMode,
 }) => {
   const { formatMessage } = intl;
   const [zaloTemplateListParams, setZaloTemplateListParams] = useState([]);
   const [templatePreviewUrl, setTemplatePreviewUrl] = useState("");
   const [tags, updateTags] = useState([]);
   const [textAreaId, updateTextAreaId] = useState("");
-  const [templateStatus, setZaloTemplateStatus] = useState(
-    ZALO_STATUSES.ENABLE
-  );
+  const [templateStatus, setZaloTemplateStatus] = useState(ENABLE);
 
   const ZaloFooter = styled.div`
     background-color: ${CAP_WHITE};
@@ -258,7 +257,6 @@ export const Zalo = ({
         value={value || ""}
         size="default"
         onFocus={() => setTextAreaId(name)}
-        disabled={isFullMode}
       />
     );
   };
@@ -314,7 +312,6 @@ export const Zalo = ({
                     onContextChange={handleOnTagsContextChange}
                     injectedTags={injectedTags || {}}
                     selectedOfferDetails={selectedOfferDetails}
-                    disabled={isFullMode}
                   />
                 }
               />
@@ -344,28 +341,26 @@ export const Zalo = ({
             </CapRow>
           </CapRow>
         </CapColumn>
-        <CapColumn span={10}>
-          <CapRow className="zalo-preview-container">
-            <CapRow>
-              <CapLabel className="preview-head">
-                {formatMessage(messages.previewHead)}
-              </CapLabel>
-            </CapRow>
-            <CapRow>
-              <CapLabel className="preview-text">
-                {formatMessage(messages.previewText)}
-              </CapLabel>
-            </CapRow>
-            <CapRow>
-              <CapLabel
-                data-testid="preview-link-button"
-                onClick={handlePreview}
-                className="preview-link"
-              >
-                {formatMessage(messages.openPreview)}{" "}
-                <CapIcon type="open-in-new-light"></CapIcon>
-              </CapLabel>
-            </CapRow>
+        <CapColumn type="flex" span={10} className="zalo-preview-container">
+          <CapRow>
+            <CapLabel className="preview-head">
+              {formatMessage(messages.previewHead)}
+            </CapLabel>
+          </CapRow>
+          <CapRow>
+            <CapLabel className="preview-text">
+              {formatMessage(messages.previewText)}
+            </CapLabel>
+          </CapRow>
+          <CapRow>
+            <CapLabel
+              data-testid="preview-link-button"
+              onClick={handlePreview}
+              className="preview-link"
+            >
+              {formatMessage(messages.openPreview)}{" "}
+              <CapIcon type="open-in-new-light"></CapIcon>
+            </CapLabel>
           </CapRow>
         </CapColumn>
       </CapRow>

package/v2Containers/Zalo/index.scss

@@ -42,10 +42,11 @@
   }
 
   .zalo-preview-container {
-    position: fixed;
     text-align: center;
-    padding-left: 72px;
-    padding-right: 110px;
+    position: fixed;
+    right: 0;
+    padding-left: 194px;
+    padding-right: 116px;
 
     .preview-head {
       font-weight: 500;

package/v2Containers/Zalo/messages.js

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