@capillarytech/creatives-library 7.17.124 → 7.17.126-alpha.0

package/package.json

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

package/v2Components/Ckeditor/index.js

@@ -185,6 +185,23 @@ class Ckeditor extends React.Component { // eslint-disable-line react/prefer-sta
       }
     }
   }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.content !== prevProps.content) {
+      let content = '';
+      this.id = this.props.id;
+      if (this.props.content !== '') {
+        content = this.props.content;
+        content = content.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/\\&quot;/g, "\"");
+      }
+      this.setState({ content }, () => {
+        if (this.editorInstance) {
+          this.editorInstance.setData(content);
+        }
+      });
+    }
+  }
+  
   onLoad = () => {
     this.setState({ scriptLoaded: true }, () => {
       this.initializeEditor();

package/v2Components/NavigationBar/index.js

@@ -100,7 +100,7 @@ export class NavigationBar extends React.Component {
     }
   };
 
-  getTopbarIcons = (showDocumentationBot = false) => {
+  getTopbarIcons = (showDocumentationBot = false, isLatestLeftNavigationEnabled = false) => {
     const {settingsIcon} = this.state;
     const ICONS = [
       {
@@ -108,9 +108,12 @@ export class NavigationBar extends React.Component {
         key: 'help',
         onClickHandler: this.onHelpIconClick,
       },
-      settingsIcon,
     ];
+    if (!isLatestLeftNavigationEnabled) {
+      ICONS.push(settingsIcon);
+     }
     return showDocumentationBot ? ICONS.slice(1) : ICONS; // If showDocumentationBot is true, help icon will be replaced by Aira icon on UI
+
   };
 
   getDropdownMenu = () => {
@@ -147,7 +150,6 @@ export class NavigationBar extends React.Component {
     } = this.props;
     const showDocumentationBot = userData?.currentOrgDetails?.accessibleFeatures?.includes(ENABLE_AI_SUGGESTIONS);
     const dropdownMenuProps = this.getDropdownMenu();
-    const topbarIcons = this.getTopbarIcons(showDocumentationBot);
     const {
       currentOrgDetails: {
         accessibleFeatures = [],
@@ -156,6 +158,7 @@ export class NavigationBar extends React.Component {
     const isLatestLeftNavigationEnabled = accessibleFeatures?.includes(
       ENABLE_NEW_LEFT_NAVIGATION,
     );
+    const topbarIcons = this.getTopbarIcons(showDocumentationBot,isLatestLeftNavigationEnabled);
     const topbarMenuDataModified = isLatestLeftNavigationEnabled ? [] : topbarMenuData;
     const headerOverideCss = isLatestLeftNavigationEnabled && (leftNavbarExpandedProp ? CapLeftNavigatioOpenCss : CapLeftNavigationCss);
     return (

package/v2Components/NavigationBar/tests/index.test.js

@@ -8,7 +8,7 @@ import { render, screen } from '../../../utils/test-utils';
 import { NavigationBar } from '../index';
 import * as mockdata from './mockData';
 
-const { userData } = mockdata;
+const { userData} = mockdata;
 
 const ComponentToRender = injectIntl(NavigationBar);
 
@@ -48,4 +48,11 @@ describe('NavigationBar', () => {
     const ariaBotIcon = screen.queryByLabelText('open-aira');
     expect(ariaBotIcon).toBeNull();
   });
+  it('Should contains top vertical', () => {
+    const updatedProps = {...props} ;
+    delete updatedProps.userData.currentOrgDetails.accessibleFeatures;
+    renderComponent(updatedProps);
+    const topVaerticalBar = document.querySelector('.cap-top-bar-vertical');
+    expect(topVaerticalBar).toBeInTheDocument();
+  });
 });

package/v2Components/NavigationBar/tests/mockData.js

@@ -34,3 +34,4 @@ export const userData = {
     accessibleFeatures: ['ENABLE_AI_SUGGESTIONS'],
   },
 };
+

package/v2Components/Pagination/index.js

@@ -13,7 +13,7 @@ class Pagination extends React.Component { // eslint-disable-line react/prefer-s
 
   handleScroll = (e) => {
     const offset = 50;
-    if ((e.target.scrollHeight - e.target.scrollTop) - offset <= e.target.clientHeight) {
+    if ((e.target.scrollHeight - e.target.scrollTop) - offset <= e.target.clientHeight && !this.props.templateInProgress) {
       this.props.onPageChange();
     }
   };
@@ -31,6 +31,7 @@ Pagination.propTypes = {
   children: PropTypes.element,
   onPageChange: PropTypes.func,
   style: PropTypes.object,
+  templateInProgress: PropTypes.bool,
 };
 
 Pagination.defaultProps = {

package/v2Containers/Cap/sagas.js

@@ -193,8 +193,6 @@ export function* getSupportVideosConfig({ callback }) {
 
 function* watchFetchSchemaForEntity() {
   const watcher = yield takeLatest(types.GET_SCHEMA_FOR_ENTITY_REQUEST, fetchSchemaForEntity);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
 }
 
 

package/v2Containers/Templates/index.js

@@ -3084,7 +3084,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           }
 
           <CapRow>
-            <Pagination onPageChange={templates.length ? this.onPaginationChange : () => {}} paginationSelector="pagination-container">
+            <Pagination templateInProgress={this.props.Templates.getAllTemplatesInProgress} 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}})}
             </Pagination>
             {showNoTemplatesFound &&

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

@@ -107,6 +107,7 @@ exports[`Test Templates container Should render temlates when Zalo templates are
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -483,6 +484,7 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -721,6 +723,7 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -1015,6 +1018,7 @@ exports[`Test Templates container Should render temlates when zalo templates are
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -1186,6 +1190,7 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -1647,6 +1652,7 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -2090,6 +2096,7 @@ exports[`Test Templates container Test max templates warning 1`] = `
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -2533,6 +2540,7 @@ exports[`Test Templates container Test removing all whatsapp filterss 1`] = `
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -2797,6 +2805,7 @@ exports[`Test Templates container Test removing all whatsapp filterss 2`] = `
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div
@@ -3035,6 +3044,7 @@ exports[`Test Templates container Test removing single filter 1`] = `
         onPageChange={[Function]}
         paginationContainer="pagination-container"
         paginationSelector="pagination-container"
+        templateInProgress={false}
       >
         <div>
           <div