@capillarytech/creatives-library 8.0.360-beta.0.1 → 8.0.360-beta.0.2

package/constants/unified.js

@@ -59,7 +59,6 @@ export const EMAIL_UNSUBSCRIBE_TAG_MANDATORY = 'EMAIL_UNSUBSCRIBE_TAG_MANDATORY'
 export const ENABLE_AI_SUGGESTIONS = 'ENABLE_AI_SUGGESTIONS';
 export const AI_CONTENT_BOT_DISABLED = 'AI_CONTENT_BOT_DISABLED';
 export const AI_DOCUMENTATION_BOT_ENABLED = 'AI_DOCUMENTATION_BOT_ENABLED';
-export const ENABLE_NEW_LEFT_NAVIGATION = 'ENABLE_NEW_LEFT_NAVIGATION';
 export const ENABLE_PRODUCT_SUPPORT_VIDEOS = 'ENABLE_PRODUCT_SUPPORT_VIDEOS';
 export const SUPPORT_ENGAGEMENT_MODULE = 'SUPPORT_ENGAGEMENT_MODULE';
 export const EMBEDDED = 'embedded';

package/package.json

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

package/v2Components/NavigationBar/index.js

@@ -21,7 +21,6 @@ import { LOYALTY } from '../../v2Containers/App/constants';
 import {
   HELP_URL,
   LOYALTY_HELP_URL,
-  ENABLE_NEW_LEFT_NAVIGATION,
   DEFAULT_MODULE,
   AI_DOCUMENTATION_BOT_DISABLED,
 } from '../../v2Containers/Cap/constants';
@@ -68,23 +67,11 @@ export class NavigationBar extends React.Component {
         return {
           selectedProduct: formatMessage(messages.loyaltyProgram),
           helpUrl: LOYALTY_HELP_URL,
-          settingsIcon: {
-            iconType: 'settings',
-            key: 'settings',
-            placement: 'bottomRight',
-            className: 'navigation-setting-icon',
-            toolTip: formatMessage(messages.loyaltyCreativeSettings),
-          },
         };
       default:
         return {
           selectedProduct: formatMessage(messages.selectedProductDefault),
           helpUrl: HELP_URL,
-          settingsIcon: {
-            iconType: 'settings',
-            key: 'settings',
-            onClickHandler: this.onSettingsIconClick,
-          },
         };
     }
   }
@@ -96,16 +83,6 @@ export class NavigationBar extends React.Component {
     }
   };
 
-  onSettingsIconClick = () => {
-    const { settingsUrl } = this.props;
-    if (settingsUrl) {
-      const stateObj = {
-        page: "settings",
-      };
-      window.history.pushState(stateObj, 'Settings', window.location.replace(settingsUrl));
-    }
-  };
-
   onHelpIconClick = () => {
     const { helpUrl } = this.state;
     if (helpUrl) {
@@ -113,8 +90,7 @@ export class NavigationBar extends React.Component {
     }
   };
 
-  getTopbarIcons = (showDocumentationBot = false, isLatestLeftNavigationEnabled = false) => {
-    const { settingsIcon } = this.state;
+  getTopbarIcons = (showDocumentationBot = false) => {
     const ICONS = [
       {
         iconType: 'help',
@@ -122,9 +98,6 @@ export class NavigationBar extends React.Component {
         onClickHandler: this.onHelpIconClick,
       },
     ];
-    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
   };
 
@@ -177,17 +150,8 @@ export class NavigationBar extends React.Component {
     const showDocumentationBot = !accessibleDocFeatures.includes(AI_DOCUMENTATION_BOT_DISABLED);
 
     const dropdownMenuProps = this.getDropdownMenu();
-    const {
-      currentOrgDetails: {
-        accessibleFeatures = [],
-      } = {},
-    } = userData || {};
-    const isLatestLeftNavigationEnabled = accessibleFeatures?.includes(
-      ENABLE_NEW_LEFT_NAVIGATION,
-    );
-    const topbarIcons = this.getTopbarIcons(showDocumentationBot, isLatestLeftNavigationEnabled);
-    const topbarMenuDataModified = isLatestLeftNavigationEnabled ? [] : topbarMenuData;
-    const headerOverideCss = isLatestLeftNavigationEnabled && (leftNavbarExpandedProp ? CapLeftNavigatioOpenCss : CapLeftNavigationCss);
+    const topbarIcons = this.getTopbarIcons(showDocumentationBot);
+    const headerOverideCss = leftNavbarExpandedProp ? CapLeftNavigatioOpenCss : CapLeftNavigationCss;
     return (
       <CapNavigation
         className="creatives-main-container"
@@ -195,7 +159,7 @@ export class NavigationBar extends React.Component {
         userData={userData}
         loadStorageItem={loadItem}
         changeOrgEntity={this.handleOrgChange}
-        topbarMenuData={topbarMenuDataModified}
+        topbarMenuData={topbarMenuData}
         topbarSelectedMenuData={[DEFAULT_MODULE]}
         dropdownMenuProps={dropdownMenuProps}
         topbarIcons={topbarIcons}
@@ -204,7 +168,7 @@ export class NavigationBar extends React.Component {
         defaultSelectedProduct={this.productSelection()}
         skipStateForStorage
         selectOrganization={intl.formatMessage(messages.selectOrganization)}
-        isLatestLeftNavigationEnabled={isLatestLeftNavigationEnabled}
+        isLatestLeftNavigationEnabled
         history={history}
         publicPath={configPath.publicPath}
         getNavigationConfigApi={Api.getNavigationConfigApi}
@@ -232,7 +196,6 @@ NavigationBar.propTypes = {
   topbarMenuData: PropTypes.array,
   logout: PropTypes.func,
   changeOrg: PropTypes.func,
-  settingsUrl: PropTypes.string,
   children: PropTypes.node,
   orgSettingsUrl: PropTypes.string,
   intl: intlShape.isRequired,

package/v2Components/NavigationBar/messages.js

@@ -65,9 +65,5 @@ export default defineMessages({
   "selectOrganization": {
     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/v2Containers/Assets/Gallery/_gallery.scss

@@ -0,0 +1,7 @@
+@import '~@capillarytech/cap-ui-library/styles/_variables';
+
+.action-container {
+  .upload-image-gallery {
+    margin-bottom: -$CAP_SPACE_16;
+  }
+}

package/v2Containers/Cap/constants.js

@@ -42,7 +42,6 @@ export const ENABLE_AI_SUGGESTIONS = 'ENABLE_AI_SUGGESTIONS';
 export const AI_CONTENT_BOT_DISABLED = 'AI_CONTENT_BOT_DISABLED';
 export const AI_DOCUMENTATION_BOT_ENABLED = 'AI_DOCUMENTATION_BOT_ENABLED';
 export const ERROR_IN_FETCHING_TAGS = 'Error in fetching tags';
-export const ENABLE_NEW_LEFT_NAVIGATION = 'ENABLE_NEW_LEFT_NAVIGATION';
 export const AI_DOCUMENTATION_BOT_DISABLED = 'AI_DOCUMENTATION_BOT_DISABLED';
 
 export const GET_SUPPORT_VIDEOS_CONFIG_REQUEST =

package/v2Containers/Cap/index.js

@@ -18,20 +18,18 @@ import * as locationActions from '../LanguageProvider/actions';
 import * as appActions from '../App/actions';
 import config from '../../config/app';
 import NavigationBar from '../../v2Components/NavigationBar';
-import { engagePlusPublicPath, publicPath } from '../../config/path';
+import { publicPath } from '../../config/path';
 import { GTM_TRACKING_ID, CREATIVES_UI_VIEW, FAILURE } from '../App/constants';
 import { makeSelectLocale } from '../../v2Containers/LanguageProvider/selectors';
 import CapSupportVideosWrapper from '@capillarytech/cap-ui-library/CapSupportVideosWrapper';
 import { replaceDynamicAndCompare } from '@capillarytech/cap-ui-library/CapSupportVideosWrapper/utils';
 import {
   ORG_SETTINGS_URL,
-  CAMPAIGN_SETTINGS_URL,
   ORG_REFRESH_SEC,
   ORG_CHANGED,
   REQUEST,
   DEFAULT,
   ENABLE_PRODUCT_SUPPORT_VIDEOS,
-  ENABLE_NEW_LEFT_NAVIGATION,
 } from './constants';
 import './_cap.scss';
 import { Switch } from 'react-router';
@@ -79,12 +77,12 @@ GA.initialize({ accessKey: GTM_TRACKING_ID, trackUIError: true, trackLoadPerform
 const MainWrapper = styled.div`
   position: relative;
   min-height: calc(100vh - 5.29rem);
-  top: ${(props) => (props.isLatestLeftNavigationEnabled ? '1.72rem' : '5.29rem')};
+  top: 4.72rem;
 `;
 
 const ContentWrapper = styled.div`
   && {
-    margin-left: ${(props) => (props.isLatestLeftNavigationEnabled ? (props.leftNavbarExpanded ? '17rem' : '4.475rem') : 0)};
+    margin-left: ${(props) => (props.leftNavbarExpanded ? '17rem' : '4.475rem')};
   }
 `;
 
@@ -501,9 +499,6 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     const type = this.props.location.query.type;
     const toastMessages = this.props.Global.messages;
     const { isCreativesAccessible, showOrgChangeModal, showRefreshModal } = this.state;
-    const isLatestLeftNavigationEnabled = currentOrgDetails?.accessibleFeatures?.includes(
-      ENABLE_NEW_LEFT_NAVIGATION,
-    );
     return (
       <CapWrapper>
         { this.props.loader.localeLoading || this.props.Global.fetching_userdata ?
@@ -533,7 +528,6 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
                   changeOrg={this.changeOrg}
                   isCreativesAccessible={isCreativesAccessible}
                   logout={this.logout}
-                  settingsUrl={`${engagePlusPublicPath}${CAMPAIGN_SETTINGS_URL}`}
                   orgSettingsUrl={ORG_SETTINGS_URL}
                   loggedIn={isLoggedIn}
                   topbarMenuData={topbarMenuDataOptions}
@@ -542,11 +536,10 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
                   handleLeftNavBarExpanded={this.handleLeftNavBarExpanded}
                   leftNavbarExpandedProp={this.state.leftNavbarExpanded}
                 />) : ''}
-              <MainWrapper isLatestLeftNavigationEnabled={isLatestLeftNavigationEnabled} className="main">
+              <MainWrapper className="main">
 
                 <ContentWrapper
                   className={`main-content ${this.state.leftNavbarExpanded ? "contet-width-collapse" : "content-width-expanded"}`}
-                  isLatestLeftNavigationEnabled={isLatestLeftNavigationEnabled}
                   leftNavbarExpanded={this.state.leftNavbarExpanded}
                 >
                   <Switch>

package/v2Containers/Viber/index.js

@@ -616,7 +616,7 @@ export const Viber = (props) => {
       </CapColumn>
     </div>
   ) : (
-    <CapRow className="cta-section-saved">
+    <CapRow type='flex' align="middle" className="cta-section-saved">
       <CapLabel type="label4" className="cta-text">
         {ctaData?.buttonText}
       </CapLabel>

package/v2Containers/Whatsapp/index.scss

@@ -75,7 +75,7 @@
 
   .whatsapp-edit-template-message-input {
     background-color: $CAP_G10;
-    padding: 0 $CAP_SPACE_16 $CAP_SPACE_16 $CAP_SPACE_16 ;
+    padding: $CAP_SPACE_16 ;
     width: 100%;
     flex-direction: column;
     align-items: start;

package/v2Containers/mockdata.js

@@ -2402,7 +2402,6 @@ export default {
         "ENABLE_AB_TESTING_BLOCK",
         "POINTS_BUDGETING_UX_ENHANCEMENTS",
         "HOSPITALITY_BASED_SCOPE",
-        "ENABLE_NEW_LEFT_NAVIGATION",
         "ENABLE_CUSTOMER_BARCODE_TAG",
         "BADGES_UI_ENABLED",
         "ENABLE_FTP_CONNECTOR",