@capillarytech/creatives-library 8.0.223-alpha.4 → 8.0.223-alpha.6

package/package.json

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

package/v2Components/CapPageSpinner/index.js

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import { CapSpin } from "@capillarytech/cap-ui-library";
 import React from "react";
 import { injectIntl } from "react-intl";
@@ -6,18 +7,26 @@ import "./index.scss";
 
 export const CapPageSpinner = (props) => {
 
-    const renderedContent = () => {
-        return (
-            <div className="cap-custom-page-spinner">
-                <CapSpin spinning={props.spinning}>
-                    {props.children}
-                </CapSpin>
-                {<span className="cap-custom-page-spinner-text">{props.spinning &&  props.intl.formatMessage(messages.text)}</span>}
-            </div>
-        )
-    }
+    return (
+        <div className="cap-custom-page-spinner">
+            <CapSpin spinning={true}>
+                {props.children}
+            </CapSpin>
+            {true && <span className="cap-custom-page-spinner-text">{props.intl.formatMessage(messages.text)}</span>}
+        </div>
+    );
+};
+
+CapPageSpinner.propTypes = {
+    spinning: PropTypes.bool,
+    children: PropTypes.node,
+    intl: PropTypes.object.isRequired,
+};
 
-    return renderedContent();
+CapPageSpinner.defaultProps = {
+    spinning: false,
+    children: null,
 };
 
-export default injectIntl(CapPageSpinner);
+ export default injectIntl(CapPageSpinner);
+ 

package/v2Components/CapPageSpinner/index.scss

@@ -12,4 +12,10 @@
     color: #5E6C84;
     font-size: 16px;
   }
+
+  .ant-spin.ant-spin-spinning {
+    height: 24px;
+    width: 24px;
+    position: relative;
+  }
 }

package/v2Containers/Templates/_templates.scss

@@ -658,8 +658,8 @@
     background-image: url("https://s3.amazonaws.com/test_files_cache_bkp/intouch_creative_assets/1720b7f7e78860c1f905.svg");
   }
 }
-.v2-pagination-container{
-  height: calc(100vh - 340px);
+.v2-pagination-container-half{
+  height: calc(100vh - 310px);
   overflow-y: auto;
   overflow-x: hidden;
 }

package/v2Containers/Templates/index.js

@@ -1743,7 +1743,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const getAllTemplatesInProgress = get(this.props, 'Templates.getAllTemplatesInProgress');
 
     const noWhatsappZaloTemplates = this.isFullMode() && isEmpty(templates) || !this.state.hostName;
-
     const noApprovedWhatsappZaloTemplates = filteredEmptyAndFullModeAs(false) && !isEmpty(this.state?.hostName);
     const showWhatsappIllustration = accountWithNoHostWhatsapp(WHATSAPP_LOWERCASE);
     const showZaloIllustration = accountWithNoHostZalo(ZALO_LOWERCASE)
@@ -1756,7 +1755,7 @@ return (<div>
       {[WHATSAPP, ZALO].includes(currentChannel) && this.selectedFilters()}
         {<div>
           {!isEmpty(filteredTemplates) || !isEmpty(this.state.searchText) || !isEmpty(this.props.Templates.templateError) ? (
-            <div className={!isEmpty(this.state.searchText) && isEmpty(cardDataList) ? '' : "v2-pagination-container"}>
+            <div className={!isEmpty(this.state.searchText) && isEmpty(cardDataList) ? '' : this.isFullMode() ? "v2-pagination-container" : "v2-pagination-container-half"}>
               <CapCustomCardList
                 key={`${currentChannel}-card-list`}
                 cardList={cardDataList}

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

@@ -203,8 +203,8 @@ exports[`Test Templates container Should render sms illustration when no templat
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
       >
         <div>
           <div
@@ -382,8 +382,8 @@ exports[`Test Templates container Should render temlates when whatsapp templates
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -641,8 +641,8 @@ exports[`Test Templates container Should render temlates when whatsapp templates
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -1066,8 +1066,8 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -1272,7 +1272,7 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
           />
           <div>
             <div
-              className="pagination-container"
+              className="v2-pagination-container"
             >
               <CapCustomCardList
                 cardList={
@@ -1554,8 +1554,8 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -1760,7 +1760,7 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
           />
           <div>
             <div
-              className="pagination-container"
+              className="v2-pagination-container"
             >
               <CapCustomCardList
                 cardList={
@@ -2042,8 +2042,8 @@ exports[`Test Templates container Test max templates warning 1`] = `
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -2248,7 +2248,7 @@ exports[`Test Templates container Test max templates warning 1`] = `
           />
           <div>
             <div
-              className="pagination-container"
+              className="v2-pagination-container"
             >
               <CapCustomCardList
                 cardList={
@@ -2530,8 +2530,8 @@ exports[`Test Templates container Test removing all whatsapp filterss 1`] = `
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -2815,8 +2815,8 @@ exports[`Test Templates container Test removing all whatsapp filterss 2`] = `
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>
@@ -3074,8 +3074,8 @@ exports[`Test Templates container Test removing single filter 1`] = `
     <CapRow>
       <Pagination
         onPageChange={[Function]}
-        paginationContainer="pagination-container"
-        paginationSelector="pagination-container"
+        paginationContainer="v2-pagination-container"
+        paginationSelector="v2-pagination-container"
         templateInProgress={false}
       >
         <div>