@capillarytech/creatives-library 3.3.0 → 3.3.1

package/package.json

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

package/translations/en.json

@@ -127,11 +127,18 @@
   "creatives.componentsV2.Header.save": "Save",
   "creatives.componentsV2.ImagePreview.close": "close",
   "creatives.componentsV2.ImagePreview.loadingImage": "Loading images !!!!",
+  "creatives.componentsV2.NavigationBar.businessProcesses": "Workbench",
+  "creatives.componentsV2.NavigationBar.campaign": "Campaigns",
   "creatives.componentsV2.NavigationBar.header": "This is the NavigationBar component!",
   "creatives.componentsV2.NavigationBar.insights": "Insights+",
   "creatives.componentsV2.NavigationBar.logout": "Logout",
+  "creatives.componentsV2.NavigationBar.loyaltyProgram": "Loyalty+",
+  "creatives.componentsV2.NavigationBar.memberCare": "Member Care",
   "creatives.componentsV2.NavigationBar.orgSettings": "Organisation settings",
   "creatives.componentsV2.NavigationBar.selectedProductDefault": "Engage+",
+  "creatives.componentsV2.NavigationBar.storeCare": "Store Care",
+  "creatives.componentsV2.NavigationBar.storePerformance": "Store Performance",
+  "creatives.componentsV2.NavigationBar.wecrm": "Wecrm",
   "creatives.componentsV2.NewCallTask.callTaskTitle": "Call Task title",
   "creatives.componentsV2.NewCallTask.description": "Description",
   "creatives.componentsV2.NewCallTask.done": "Done",
@@ -909,6 +916,7 @@
   "creatives.containersV2.Email.Save": "Save",
   "creatives.containersV2.Email.Subject": "Subject",
   "creatives.containersV2.Email.Tags": "Tags",
+  "creatives.containersV2.Email.addLabel": "Add label",
   "creatives.containersV2.Email.alert": "Alert",
   "creatives.containersV2.Email.alertMessage": "Alert",
   "creatives.containersV2.Email.alphabetically": "Alphabetically",
@@ -934,6 +942,7 @@
   "creatives.containersV2.Email.emailSubject": "Enter email subject",
   "creatives.containersV2.Email.emailSubjectNotEmplty": "Email subject cannot be empty.",
   "creatives.containersV2.Email.emailText": "Email",
+  "creatives.containersV2.Email.english": "English",
   "creatives.containersV2.Email.goBackTemporaryChangesLost": "Do you really want to go back? All your temporary changes will be lost!",
   "creatives.containersV2.Email.h3emailPreview": "Email preview",
   "creatives.containersV2.Email.h3imageSelection": "Image selection",

package/translations/zh.json

@@ -127,11 +127,18 @@
   "creatives.componentsV2.Header.save": "",
   "creatives.componentsV2.ImagePreview.close": "",
   "creatives.componentsV2.ImagePreview.loadingImage": "",
+  "creatives.componentsV2.NavigationBar.businessProcesses": "",
+  "creatives.componentsV2.NavigationBar.campaign": "",
   "creatives.componentsV2.NavigationBar.header": "",
   "creatives.componentsV2.NavigationBar.insights": "",
   "creatives.componentsV2.NavigationBar.logout": "",
+  "creatives.componentsV2.NavigationBar.loyaltyProgram": "",
+  "creatives.componentsV2.NavigationBar.memberCare": "",
   "creatives.componentsV2.NavigationBar.orgSettings": "",
   "creatives.componentsV2.NavigationBar.selectedProductDefault": "",
+  "creatives.componentsV2.NavigationBar.storeCare": "",
+  "creatives.componentsV2.NavigationBar.storePerformance": "",
+  "creatives.componentsV2.NavigationBar.wecrm": "",
   "creatives.componentsV2.NewCallTask.callTaskTitle": "",
   "creatives.componentsV2.NewCallTask.description": "",
   "creatives.componentsV2.NewCallTask.done": "",
@@ -909,6 +916,7 @@
   "creatives.containersV2.Email.Save": "",
   "creatives.containersV2.Email.Subject": "",
   "creatives.containersV2.Email.Tags": "",
+  "creatives.containersV2.Email.addLabel": "",
   "creatives.containersV2.Email.alert": "",
   "creatives.containersV2.Email.alertMessage": "",
   "creatives.containersV2.Email.alphabetically": "",
@@ -934,6 +942,7 @@
   "creatives.containersV2.Email.emailSubject": "",
   "creatives.containersV2.Email.emailSubjectNotEmplty": "",
   "creatives.containersV2.Email.emailText": "",
+  "creatives.containersV2.Email.english": "",
   "creatives.containersV2.Email.goBackTemporaryChangesLost": "",
   "creatives.containersV2.Email.h3emailPreview": "",
   "creatives.containersV2.Email.h3imageSelection": "",

package/v2Components/NavigationBar/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { isEmpty, forEach, find } from 'lodash';
+import { isEmpty, forEach } from 'lodash';
 import { loadItem } from 'services/localStorageApi';
 import { intlShape, injectIntl } from 'react-intl';
 import TopBar from '../TopBar';
@@ -86,14 +86,16 @@ class NavigationBar extends React.Component {
 
   getProductsList = () => {
     const { formatMessage } = this.props.intl;
-    const { campaignOrgV2Status } = this.props;
     const { currentOrgDetails } = this.props.userData;
     const productsList = [];
     if (!isEmpty(currentOrgDetails)) {
       forEach(currentOrgDetails.module_details, (module) => {
         if (module.name.toLowerCase() !== PRODUCT_MASTERS) {
+          const productName = module.code;
+          const intlProductName = messages[productName];
+          const moduleName = intlProductName ? formatMessage(intlProductName) : module.name.toLowerCase();
           productsList.push({
-            value: module.name.toLowerCase(),
+            value: moduleName,
             url: module.url,
             key: module.code,
           });
@@ -101,12 +103,6 @@ class NavigationBar extends React.Component {
       });
       //below changes are temporary and should be fixed once we get correct modules list
       //changing campaigns module name to engage+
-      if ( !campaignOrgV2Status ) {
-        const campaignsModule = find(productsList, ['value', 'campaigns']);
-        if (campaignsModule) {
-          campaignsModule.value = 'Engage+';
-        }
-      }
       //adding insights+ to module list
       productsList.push({
         value: formatMessage(messages.insights),
@@ -224,7 +220,6 @@ NavigationBar.propTypes = {
   intl: intlShape.isRequired,
   location: PropTypes.object,
   type: PropTypes.string,
-  campaignOrgV2Status: PropTypes.bool,
 };
 
 export default injectIntl(NavigationBar);

package/v2Components/NavigationBar/messages.js

@@ -29,4 +29,32 @@ export default defineMessages({
     id: `${scope}.logout`,
     defaultMessage: 'Logout',
   },
+  businessProcesses: {
+    id: `${scope}.businessProcesses`,
+    defaultMessage: 'Workbench',
+  },
+  campaign: {
+    id: `${scope}.campaign`,
+    defaultMessage: 'Engage+',
+  },
+  wecrm: {
+    id: `${scope}.wecrm`,
+    defaultMessage: 'Wecrm',
+  },
+  loyaltyProgram: {
+    id: `${scope}.loyaltyProgram`,
+    defaultMessage: 'Loyalty+',
+  },
+  storePerformance: {
+    id: `${scope}.storePerformance`,
+    defaultMessage: 'Store Performance',
+  },
+  memberCare: {
+    id: `${scope}.memberCare`,
+    defaultMessage: 'Member Care',
+  },
+  storeCare: {
+    id: `${scope}.storeCare`,
+    defaultMessage: 'Store Care',
+  },
 });

package/v2Containers/Assets/Gallery/index.js

@@ -120,15 +120,18 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
   getAllAssets = ({params, getNextPage, resetPage}, isReRender = false) => {
     let queryParams = params;
     let page = this.state.page;
+    let shouldFetchGalleryAssets = false;
     if (!this.props.Gallery.fetchingAllAssets && ((resetPage || (page === 1 && this.state.totalCount === 0) || page <= (this.state.totalCount / this.state.perPageLimit)) || isReRender )) {
       if (getNextPage) {
         page += 1;
+        shouldFetchGalleryAssets = true;
       }
 
       let totalCount = this.state.totalCount;
       if (resetPage) {
         page = 1;
         totalCount = 0;
+        shouldFetchGalleryAssets = true;
       }
       if ((!params || _.isEmpty(params))) {
         queryParams = {
@@ -137,12 +140,15 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
       }
       if (this.state.searchText !== "") {
         queryParams = {...queryParams, name: this.state.searchText};
+        shouldFetchGalleryAssets = true;
+      }
+      if (!this.props.Gallery.fetchingAllAssets && (_.isEmpty(this.props.Gallery.assetList) || shouldFetchGalleryAssets)) {
+        this.setState({page, totalCount}, () => {
+          queryParams.page = page;
+          queryParams.perPage = this.state.perPageLimit;
+          this.props.actions.getAllAssets('image', queryParams);
+        });
       }
-      this.setState({page, totalCount}, () => {
-        queryParams.page = page;
-        queryParams.perPage = this.state.perPageLimit;
-        this.props.actions.getAllAssets('image', queryParams);
-      });
     }
   };
   handleGallery = (e) => {

package/v2Containers/Email/messages.js

@@ -286,4 +286,12 @@ export default defineMessages({
     id: 'creatives.containersV2.Email.h3imageSelection',
     defaultMessage: 'Image selection',
   },
+  "English": {
+    id: 'creatives.containersV2.Email.english',
+    defaultMessage: 'English',
+  },
+  "Add label": {
+    id: 'creatives.containersV2.Email.addLabel',
+    defaultMessage: 'Add label',
+  },
 });

package/v2Containers/Templates/index.js

@@ -1572,7 +1572,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       });
     }
     return (<CapSpin spinning={fetchingWeCrmAccounts}>
-      {isEmpty(weCrmAccounts) && !fetchingWeCrmAccounts ? <FormattedMessage {...messages.noAccountsPresentWeChat} /> :
+      {isEmpty(weCrmAccounts) && !fetchingWeCrmAccounts ? <FormattedMessage {...(channel === WECHAT ? messages.noAccountsPresentWeChat : messages.noAccountsPresent)} /> :
       <div style={{ overflowX: "auto", paddingBottom: CAP_SPACE_16 }}>
         <CapHeader
           title={isMobilePushChannel ? this.props.intl.formatMessage(messages.mobilepushAccount) : this.props.intl.formatMessage(messages.wechatAccount)}