@capillarytech/creatives-library 8.0.349 → 8.0.350

package/constants/unified.js

@@ -52,6 +52,7 @@ export const EXTENDED_TAG = 'ExtendedTagMessage';
 export const BADGES_UI_ENABLED = 'BADGES_UI_ENABLED';
 export const JP_LOCALE_HIDE_FEATURE = 'JP_LOCALE_HIDE_FEATURE';
 export const ENABLE_WECHAT = 'ENABLE_WECHAT';
+export const ENABLE_CREATIVES_ARCHIVAL = 'ENABLE_CREATIVES_ARCHIVAL';
 export const ENABLE_WEBPUSH = 'ENABLE_WEBPUSH';
 export const ENABLE_CUSTOMER_BARCODE_TAG = 'ENABLE_CUSTOMER_BARCODE_TAG';
 export const EMAIL_UNSUBSCRIBE_TAG_MANDATORY = 'EMAIL_UNSUBSCRIBE_TAG_MANDATORY';

package/package.json

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

package/utils/common.js

@@ -27,6 +27,7 @@ import {
   ENABLE_NEW_MPUSH,
   ENABLE_NEW_EDITOR_FLOW_INAPP,
   SUPPORT_ENGAGEMENT_MODULE,
+  ENABLE_CREATIVES_ARCHIVAL,
 } from '../constants/unified';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -122,6 +123,11 @@ export const hasWechatFeatureEnabled = Auth.hasFeatureAccess.bind(
   ENABLE_WECHAT,
 );
 
+export const hasCreativesArchivalEnabled = Auth.hasFeatureAccess.bind(
+  null,
+  ENABLE_CREATIVES_ARCHIVAL,
+);
+
 export const hasWebPushFeatureEnabled = Auth.hasFeatureAccess.bind(
   null,
   ENABLE_WEBPUSH,

package/v2Containers/CreativesContainer/index.js

@@ -260,7 +260,7 @@ export class Creatives extends React.Component {
   };
 
   onEditTemplate = () => {
-    if (this.props.templateData?.isArchived) {
+    if (commonUtil.hasCreativesArchivalEnabled() && this.props.templateData?.isArchived) {
       CapNotification.error({ message: this.props.intl.formatMessage(messages.cannotEditArchivedTemplate) });
       return;
     }
@@ -2140,7 +2140,7 @@ export class Creatives extends React.Component {
               onSave={this.saveMessage}
               onDiscard={this.discardMessage}
               onEditTemplate={this.onEditTemplate}
-              isTemplateArchived={!!(this.props.templateData && this.props.templateData.isArchived)}
+              isTemplateArchived={!!(commonUtil.hasCreativesArchivalEnabled() && this.props.templateData && this.props.templateData.isArchived)}
               slidBoxContent={slidBoxContent}
               onCreateNextStep={this.onCreateNextStep}
               currentChannel={currentChannel.toUpperCase()}

package/v2Containers/Templates/_templates.scss

@@ -1216,6 +1216,7 @@
   justify-content: space-between;
   align-items: center;
   gap: $CAP_SPACE_08;
+  margin-right: $CAP_SPACE_32;
 }
 
 .template-listing-more-btn {

package/v2Containers/Templates/index.js

@@ -1938,9 +1938,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       // Archive eligibility per template: Zalo never; WhatsApp/RCS not when pending/awaiting
       const cardWhatsappStatus = get(template, `versions.base.content.${WHATSAPP_LOWERCASE}.status`, '');
       const cardRcsStatus = get(template, 'versions.base.content.RCS.rcsContent.cardContent[0].Status', '');
-      const isCardArchiveEligible = this.isChannelArchiveEligible(currentChannel, cardWhatsappStatus, cardRcsStatus);
-      const isArchivedMode = get(this.props, 'Templates.isArchivedMode', false);
-      const isAnyArchiveInProgress = !!(get(this.props, 'Templates.archiveInProgress') || get(this.props, 'Templates.unarchiveInProgress') || get(this.props, 'Templates.bulkArchiveInProgress') || get(this.props, 'Templates.bulkUnarchiveInProgress'));
+      const isArchivalEnabled = commonUtil.hasCreativesArchivalEnabled();
+      const isCardArchiveEligible = isArchivalEnabled && this.isChannelArchiveEligible(currentChannel, cardWhatsappStatus, cardRcsStatus);
+      const isArchivedMode = isArchivalEnabled && get(this.props, 'Templates.isArchivedMode', false);
+      const isAnyArchiveInProgress = isArchivalEnabled && !!(get(this.props, 'Templates.archiveInProgress') || get(this.props, 'Templates.unarchiveInProgress') || get(this.props, 'Templates.bulkArchiveInProgress') || get(this.props, 'Templates.bulkUnarchiveInProgress'));
       const templateData = {
         key: `${currentChannel}-card-${template?.name}`,
         title: (
@@ -2077,7 +2078,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                     </CapMenu.Item>
                   )}
                 {/* Archive/Unarchive menu item (full mode only, not for Zalo, not for WhatsApp/RCS awaiting/pending) */}
-                {(() => {
+                {commonUtil.hasCreativesArchivalEnabled() && (() => {
                   const channelUp = this.state.channel.toUpperCase();
                   if (!this.isChannelArchiveEligible(channelUp, status, rcsStatus)) return null;
                   return !template?.isArchived ? (
@@ -2626,11 +2627,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     
     const noLoaderAndSearchText = isEmpty(this.state.searchText) && !isLoading;
 
-    const isArchivedModeLocal = get(this.props, 'Templates.isArchivedMode', false);
+    const isArchivalEnabledLocal = commonUtil.hasCreativesArchivalEnabled();
+    const isArchivedModeLocal = isArchivalEnabledLocal && get(this.props, 'Templates.isArchivedMode', false);
     const selectedIdsLocal = get(this.props, 'Templates.selectedTemplateIds', []);
     const selectedIdsArrayLocal = selectedIdsLocal && typeof selectedIdsLocal.toJS === 'function' ? selectedIdsLocal.toJS() : (Array.isArray(selectedIdsLocal) ? selectedIdsLocal : []);
     const selectedCountLocal = selectedIdsArrayLocal.length;
-    const hasSelectionLocal = this.props.isFullMode && selectedCountLocal > 0;
+    const hasSelectionLocal = isArchivalEnabledLocal && this.props.isFullMode && selectedCountLocal > 0;
 
     return (<div>
       {[WECHAT, MOBILE_PUSH, WEBPUSH, INAPP, WHATSAPP, ZALO, RCS].includes(currentChannel) && this.showAccountName()}
@@ -3840,7 +3842,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
               <span className="template-name" style={{ fontWeight: `${this.state.channel.toLowerCase() === 'wechat' ? '400' : '600'}` }}>
                 { template && template.versions && template.versions.history && template.versions.history.length > 1 && this.state.channel.toLowerCase() !== 'mobilepush' && <i style={{fontSize: '16px', margin: '0 8px 0 0', verticalAlign: 'middle'}} className="material-icons">filter_none</i>}
                 {template?.name}
-                {template.isArchived && <CapColoredTag tagColor={CAP_G08} tagTextColor={CAP_G05} className="archived-tag">{this.props.intl.formatMessage(messages.archivedTag)}</CapColoredTag>}
+                {commonUtil.hasCreativesArchivalEnabled() && template.isArchived && <CapColoredTag tagColor={CAP_G08} tagTextColor={CAP_G05} className="archived-tag">{this.props.intl.formatMessage(messages.archivedTag)}</CapColoredTag>}
               </span>
               {this.props.location.query.type !== EMBEDDED && <CapPopover
                 trigger="click"
@@ -3851,7 +3853,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                         {this.props.intl.formatMessage(messages.duplicateButton)}
                       </CapButton>
                     </div>}
-                    {this.props.isFullMode && isTemplateArchiveEligible && !template.isArchived && <div className="popover-action-container">
+                    {commonUtil.hasCreativesArchivalEnabled() && this.props.isFullMode && isTemplateArchiveEligible && !template.isArchived && <div className="popover-action-container">
                       <CapButton
                         type="link"
                         onClick={() => this.handleTemplateArchiveAction({ templateId: template._id, templateName: template.name })}
@@ -3861,7 +3863,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                         <CapLabel.CapLabelInline type="label1">{this.props.intl.formatMessage(messages.archiveButton)}</CapLabel.CapLabelInline>
                       </CapButton>
                     </div>}
-                    {this.props.isFullMode && isTemplateArchiveEligible && template.isArchived && <div className="popover-action-container">
+                    {commonUtil.hasCreativesArchivalEnabled() && this.props.isFullMode && isTemplateArchiveEligible && template.isArchived && <div className="popover-action-container">
                       <CapButton
                         type="link"
                         onClick={() => this.handleTemplateArchiveAction({ templateId: template._id, templateName: template.name, isUnarchive: true })}
@@ -4478,10 +4480,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (([WHATSAPP_LOWERCASE, ZALO_LOWERCASE, RCS_LOWERCASE].includes(this.state?.channel?.toLocaleLowerCase()) && isEmpty(this.state?.hostName))) {
       isfilterContentVisisble = false;
     }
-    const _isArchivedMode = get(this.props, 'Templates.isArchivedMode', false);
+    const _isArchivalEnabled = commonUtil.hasCreativesArchivalEnabled();
+    const _isArchivedMode = _isArchivalEnabled && get(this.props, 'Templates.isArchivedMode', false);
     const _renderSelectedIds = get(this.props, 'Templates.selectedTemplateIds', []);
     const _renderSelectedIdsArray = _renderSelectedIds && typeof _renderSelectedIds.toJS === 'function' ? _renderSelectedIds.toJS() : (Array.isArray(_renderSelectedIds) ? _renderSelectedIds : []);
-    const _renderHasSelection = this.props.isFullMode && _renderSelectedIdsArray.length > 0;
+    const _renderHasSelection = _isArchivalEnabled && this.props.isFullMode && _renderSelectedIdsArray.length > 0;
 
     const filterContent = (( isfilterContentVisisble || [WECHAT, MOBILE_PUSH, INAPP].includes(this.state.channel.toUpperCase())) && <div className="action-container">
       {isfilterContentVisisble && <CapInput.Search
@@ -4650,8 +4653,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           )
             : isfilterContentVisisble && !isWechatEmbedded && !this.props.isDltFromRcs && createButton
         )}
-        {/* More (⋯) menu: full mode only, not archived mode, not Zalo (no archive support), not when selection active */}
-        {!_isArchivedMode && !_renderHasSelection && this.props.isFullMode && this.props.location.query.type !== EMBEDDED && channelLowerCase !== ZALO_LOWERCASE && (
+        {/* More (⋯) menu: full mode only, not archived mode, not Zalo (no archive support), not when selection active, archive flag enabled */}
+        {commonUtil.hasCreativesArchivalEnabled() && !_isArchivedMode && !_renderHasSelection && this.props.isFullMode && this.props.location.query.type !== EMBEDDED && channelLowerCase !== ZALO_LOWERCASE && (
           <CapDropdown
             trigger={['click']}
             overlay={
@@ -4720,8 +4723,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             }
           />
 
-          {/* Archived mode header with back arrow (full mode only) */}
-          {this.props.isFullMode && get(this.props, 'Templates.isArchivedMode', false) && (
+          {/* Archived mode header with back arrow (full mode only, archive flag enabled) */}
+          {commonUtil.hasCreativesArchivalEnabled() && this.props.isFullMode && get(this.props, 'Templates.isArchivedMode', false) && (
             <CapRow type="flex" align="middle" className="archived-mode-header">
               <CapIcon
                 type="back"

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

@@ -831,37 +831,6 @@ exports[`Test Templates container Should render temlates when whatsapp templates
                   >
                     Create new
                   </CapButton>
-                  <CapDropdown
-                    overlay={
-                      <CapMenu>
-                        <withItemHOC
-                          onClick={[Function]}
-                        >
-                          <FormattedMessage
-                            defaultMessage="Archived templates"
-                            id="creatives.containersV2.Templates.archivedTemplates"
-                            values={Object {}}
-                          />
-                        </withItemHOC>
-                      </CapMenu>
-                    }
-                    placement="bottomRight"
-                    trigger={
-                      Array [
-                        "click",
-                      ]
-                    }
-                  >
-                    <CapButton
-                      className="template-listing-more-btn"
-                      isAddBtn={false}
-                      type="flat"
-                    >
-                      <CapIcon
-                        type="more"
-                      />
-                    </CapButton>
-                  </CapDropdown>
                 </div>
               </div>
             </div>
@@ -1282,37 +1251,6 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
                   >
                     Create new
                   </CapButton>
-                  <CapDropdown
-                    overlay={
-                      <CapMenu>
-                        <withItemHOC
-                          onClick={[Function]}
-                        >
-                          <FormattedMessage
-                            defaultMessage="Archived templates"
-                            id="creatives.containersV2.Templates.archivedTemplates"
-                            values={Object {}}
-                          />
-                        </withItemHOC>
-                      </CapMenu>
-                    }
-                    placement="bottomRight"
-                    trigger={
-                      Array [
-                        "click",
-                      ]
-                    }
-                  >
-                    <CapButton
-                      className="template-listing-more-btn"
-                      isAddBtn={false}
-                      type="flat"
-                    >
-                      <CapIcon
-                        type="more"
-                      />
-                    </CapButton>
-                  </CapDropdown>
                 </div>
               </div>
             </div>
@@ -1786,37 +1724,6 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
                   >
                     Create new
                   </CapButton>
-                  <CapDropdown
-                    overlay={
-                      <CapMenu>
-                        <withItemHOC
-                          onClick={[Function]}
-                        >
-                          <FormattedMessage
-                            defaultMessage="Archived templates"
-                            id="creatives.containersV2.Templates.archivedTemplates"
-                            values={Object {}}
-                          />
-                        </withItemHOC>
-                      </CapMenu>
-                    }
-                    placement="bottomRight"
-                    trigger={
-                      Array [
-                        "click",
-                      ]
-                    }
-                  >
-                    <CapButton
-                      className="template-listing-more-btn"
-                      isAddBtn={false}
-                      type="flat"
-                    >
-                      <CapIcon
-                        type="more"
-                      />
-                    </CapButton>
-                  </CapDropdown>
                 </div>
               </div>
             </div>
@@ -2290,37 +2197,6 @@ exports[`Test Templates container Test max templates warning 1`] = `
                   >
                     Create new
                   </CapButton>
-                  <CapDropdown
-                    overlay={
-                      <CapMenu>
-                        <withItemHOC
-                          onClick={[Function]}
-                        >
-                          <FormattedMessage
-                            defaultMessage="Archived templates"
-                            id="creatives.containersV2.Templates.archivedTemplates"
-                            values={Object {}}
-                          />
-                        </withItemHOC>
-                      </CapMenu>
-                    }
-                    placement="bottomRight"
-                    trigger={
-                      Array [
-                        "click",
-                      ]
-                    }
-                  >
-                    <CapButton
-                      className="template-listing-more-btn"
-                      isAddBtn={false}
-                      type="flat"
-                    >
-                      <CapIcon
-                        type="more"
-                      />
-                    </CapButton>
-                  </CapDropdown>
                 </div>
               </div>
             </div>