@capillarytech/creatives-library 8.0.38 → 8.0.39

package/package.json

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

package/v2Containers/TemplatesV2/index.js

@@ -33,7 +33,7 @@ import styles, { CapTabStyle } from './TemplatesV2.style';
 import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCALE_HIDE_FEATURE, ZALO, INAPP } from '../App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
-import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../Cap/selectors";
+import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
 import injectSaga from '../../utils/injectSaga';
 import injectReducer from '../../utils/injectReducer';
 
@@ -67,12 +67,12 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       email: {content: <></>, tab: intl.formatMessage(messages.email), key: 'email'},
       //'wechat': {content: this.getTemplatesComponent('wechat'), tab: 'Wechat', key: 'wechat'},
       mPush: {content: <></>, tab: intl.formatMessage(messages.pushNotification), key: 'mobilepush'},
+      viber: {content: <></>, tab: intl.formatMessage(messages.viber), key: 'viber'},
       whatsapp: { content: <></>, tab: intl.formatMessage(messages.whatsapp), key: WHATSAPP },
       zalo: { content: <div></div>, tab: intl.formatMessage(messages.zalo), key: ZALO },
-      viber: {content: <></>, tab: intl.formatMessage(messages.viber), key: 'viber'},
-      inApp: { content: <div></div>, tab: intl.formatMessage(messages.inapp), key: INAPP },
       facebook: {content: <div></div>, tab: intl.formatMessage(messages.facebook), key: 'facebook'},
       rcs: { content: <></>, tab: intl.formatMessage(messages.rcs), key: RCS },
+      inApp: { content: <div></div>, tab: intl.formatMessage(messages.inapp), key: INAPP },
       line: {content: <></>, tab: intl.formatMessage(messages.line), key: 'line'},
     };
     //Hiding we chat for all orgs across UI for now and enabling it based on feature 'ENABLE_WECHAT'
@@ -120,12 +120,12 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         pane.disabled = true;
         if (pane.key === 'facebook' && showDisabledFBInfo) {
           pane.tab = (<CapTooltip
-              title={
-                intl.formatMessage(messages.facebookDisableinfo)
-              }
-            >
-              {intl.formatMessage(messages.facebook)}
-            </CapTooltip>);
+            title={
+            intl.formatMessage(messages.facebookDisableinfo)
+          }
+        >
+            {intl.formatMessage(messages.facebook)}
+          </CapTooltip>);
         }
       }
       return pane;
@@ -178,16 +178,16 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       this.setState({selectedChannel: nextProps.channel, panes });
     }
   }
-getTemplateDataForGrid = ({templates, handlers, filterContent, channel, isLoading, loadingTip}) => {
+  getTemplateDataForGrid = ({templates, handlers, filterContent, channel, isLoading, loadingTip}) => {
     const currentChannel = channel.toUpperCase();
     const cardDataList = templates.map((template) => {
       const templateData =
         {
-        key: `${currentChannel}-card-${template.name}`,
-        title: <span title={template.name} >{template.name}</span>,
-        extra: [<CapIcon type="eye" onClick={() => { if (this.props.isFullMode) { handlers.handlePreviewClick(template); } else { this.props.handlePeviewTemplate(template); } }} />],
-        hoverOption: <CapButton onClick={(e) => handlers.handleEditClick(e, template._id)}>{this.props.intl.formatMessage(this.props.isFullMode ? messages.edit : messages.select)}</CapButton>,
-      };
+          key: `${currentChannel}-card-${template.name}`,
+          title: <span title={template.name} >{template.name}</span>,
+          extra: [<CapIcon type="eye" onClick={() => { if (this.props.isFullMode) { handlers.handlePreviewClick(template); } else { this.props.handlePeviewTemplate(template); } }} />],
+          hoverOption: <CapButton onClick={(e) => handlers.handleEditClick(e, template._id)}>{this.props.intl.formatMessage(this.props.isFullMode ? messages.edit : messages.select)}</CapButton>,
+        };
       if (currentChannel === "SMS") {
         templateData.content = template.versions.base['sms-editor'];
       } else if (currentChannel === "EMAIL") {
@@ -196,16 +196,16 @@ getTemplateDataForGrid = ({templates, handlers, filterContent, channel, isLoadin
       return templateData;
     });
     return (<div>
-        {filterContent}
-        <CapSpin spinning={isLoading} tip={loadingTip}>
-          <div className="pagination-container">
-            <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={currentChannel} />
-          </div>
-        </CapSpin>
+      {filterContent}
+      <CapSpin spinning={isLoading} tip={loadingTip}>
+        <div className="pagination-container">
+          <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={currentChannel} />
+        </div>
+      </CapSpin>
 
-      </div>);
+    </div>);
   }
-getGalleryComponent = (location) => <Gallery location={location} isFullMode={this.props.isFullMode}/>
+  getGalleryComponent = (location) => <Gallery location={location} isFullMode={this.props.isFullMode}/>
   getCallTaskComponent = () => (
     <CallTask
       onCreateNew={this.props.createNew}
@@ -243,8 +243,8 @@ getGalleryComponent = (location) => <Gallery location={location} isFullMode={thi
     <Line
       {...this.props}
       isCreateFlow
-    />
-  )
+      />
+    )
 
   getFTPComponent = () => (
     <FTP mode={this.props.FTPMode} {...this.props} />
@@ -276,19 +276,19 @@ getGalleryComponent = (location) => <Gallery location={location} isFullMode={thi
         return this.getGalleryComponent(location);
       default:
         return (<Templates
-            key={channel}
-            location={location}
-            route={{name: channel}}
-            router={this.props.router}
-            isFullMode={this.props.isFullMode}
-            createNew={this.props.createNew}
-            onSelectTemplate={(id) => this.props.onSelectTemplate(this.selectTemplate(id))}
-            renderNewCardGrid={this.getTemplateDataForGrid}
-            handlePeviewTemplate={this.props.handlePeviewTemplate}
-            messageStrategy={this.props.messageStrategy}
-            smsRegister={smsRegister}
-            hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
-          />);
+          key={channel}
+          location={location}
+          route={{name: channel}}
+          router={this.props.router}
+          isFullMode={this.props.isFullMode}
+          createNew={this.props.createNew}
+          onSelectTemplate={(id) => this.props.onSelectTemplate(this.selectTemplate(id))}
+          renderNewCardGrid={this.getTemplateDataForGrid}
+          handlePeviewTemplate={this.props.handlePeviewTemplate}
+          messageStrategy={this.props.messageStrategy}
+          smsRegister={smsRegister}
+          hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
+    />);
     }
   }
 
@@ -316,8 +316,8 @@ getGalleryComponent = (location) => <Gallery location={location} isFullMode={thi
     return this.props.Templates.loadingTemplates;
   }
   render() {
-    const { isFullMode, className, cap = {}, authData = {}} = this.props;
-    const { accessiblePermissions = []} = cap.user || authData.user || {};
+    const { isFullMode, className, cap = {}, Global = {}} = this.props;
+    const { accessiblePermissions = []} = cap.user || Global.user || {};
     let isCreativeAccessible = true;
     if (!accessiblePermissions.includes(CREATIVES_UI_VIEW)) {
       isCreativeAccessible = false;
@@ -377,7 +377,7 @@ TemplatesV2.defaultProps = {
 };
 
 const mapStateToProps = createStructuredSelector({
-  cap: makeSelectAuthenticated(),
+  Global: makeSelectAuthenticated(),
   Templates: makeSelectTemplates(),
   TemplatesList: makeSelectTemplatesResponse(),
   currentOrgDetails: selectCurrentOrgDetails(),

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

@@ -55,6 +55,9 @@ describe("Test TemplatesV2", () => {
     setWeChatAccount: jest.fn(),
   };
   const props = {
+    cap: {
+     user:{ accessiblePermissions: ['CREATIVES_UI_VIEW']}
+    },
     actions: { defaultAction: jest.fn(), getTemplates: jest.fn() },
     Templates,
     TemplatesList: Templates?.templates,