@capillarytech/creatives-library 7.17.165 → 7.17.167

package/package.json

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

package/v2Components/NavigationBar/index.js

@@ -61,7 +61,7 @@ export class NavigationBar extends React.Component {
             key: 'settings',
             placement: 'bottomRight',
             className: 'navigation-setting-icon',
-            toolTip: formatMessage(messages.noProductSetting),
+            toolTip: formatMessage(messages.loyaltyCreativeSettings),
           },
         };
       default:
@@ -140,6 +140,19 @@ export class NavigationBar extends React.Component {
     }
   };
 
+  productSelection = () => {
+    const { location, intl: { formatMessage } } = this.props;
+    const { pathname } = location;
+    const parentModule = pathname.substring(pathname.lastIndexOf('/') + 1);
+    switch (parentModule) { 
+      case LOYALTY:
+        return formatMessage(messages.loyaltyProgram);
+      default:
+        return formatMessage(messages.selectedProductDefault)
+
+    }
+  }
+
   render() {
     const {
       topbarMenuData,
@@ -178,7 +191,7 @@ export class NavigationBar extends React.Component {
         topbarIcons={topbarIcons}
         sidebarMenuData={[]}
         sidebarMenuItemsPosition={null}
-        defaultSelectedProduct={intl.formatMessage(messages.selectedProductDefault)}
+        defaultSelectedProduct={this.productSelection()}
         skipStateForStorage
         selectOrganization={intl.formatMessage(messages.selectOrganization)}
         isLatestLeftNavigationEnabled={isLatestLeftNavigationEnabled}
@@ -199,6 +212,7 @@ export class NavigationBar extends React.Component {
           </CapWrapper>
         </div>
       </CapNavigation>
+
     );
   }
 }

package/v2Components/NavigationBar/messages.js

@@ -66,4 +66,8 @@ export default defineMessages({
     id: `${scope}.selectOrganization`,
     defaultMessage: 'Select organization',
   },
+  "loyaltyCreativeSettings": {
+    id: `${scope}.loyaltyCreativeSettings`,
+    defaultMessage: 'There are no settings for creatives within Loyalty+. Channel-related settings are available within organisation settings',
+  }
 });

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

@@ -62,4 +62,11 @@ describe('NavigationBar', () => {
     const topVaerticalBar = document.querySelector('.cap-top-bar-vertical');
     expect(topVaerticalBar).toBeInTheDocument();
   });
+  it('Should have loyalty product selected', () => {
+    const updatedProps = {...props};
+    updatedProps.location.pathname = '/creatives/ui/v2/loyalty';
+    renderComponent(updatedProps);
+    const loyaltyProduct = screen.getByText('Loyalty+');
+    expect(loyaltyProduct).toBeInTheDocument();
+  });
 });

package/v2Containers/App/constants.js

@@ -20,12 +20,11 @@ export const getLoyaltyTopbarMenuDataValue = () => [
     link: 'loyalty/ui/',
     key: 'programs',
   },
-  //commented as promotions are not supported in loyalty v2 flow
-  // {
-  //   label: <FormattedMessage {...globalMessages.promotions} />,
-  //   link: 'loyalty/ui/promotions/',
-  //   key: 'promotions',
-  // },
+  {
+    label: <FormattedMessage {...globalMessages.promotions} />,
+    link: 'loyalty/ui/promotions/list',
+    key: 'promotions',
+  },
   {
     label: <FormattedMessage {...globalMessages.creatives} />,
     link: '/creatives/ui/v2/loyalty',