@capillarytech/creatives-library 8.0.275 → 8.0.276

package/package.json

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

package/v2Containers/Email/index.js

@@ -26,7 +26,7 @@ import * as globalActions from '../Cap/actions';
 import './_email.scss';
 import {getMessageObject} from '../../utils/messageUtils';
 import EmailPreview from '../../v2Components/EmailPreview';
-import { getDecodedFileName, hasLiquidSupportFeature, hasSupportCKEditor } from '../../utils/common';
+import { getDecodedFileName ,hasLiquidSupportFeature} from '../../utils/common';
 import Pagination from '../../v2Components/Pagination';
 import * as creativesContainerActions from '../CreativesContainer/actions';
 import withCreatives from '../../hoc/withCreatives';
@@ -325,7 +325,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     }
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.schema)) {
       const newSchema = this.injectEvents(nextProps.metaEntities.layouts[0].definition);
-      this.applyTabOptionIconVisibility(newSchema);
 
       this.setState({schema: newSchema, loadingStatus: this.state.loadingStatus + 1});
       if (this.props.location.query.module !== 'library' || (this.props.location.query.module === 'library' && this.props.getDefaultTags)) {
@@ -1753,16 +1752,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                 newTabPopoverSection.cols[0].style.display = isDragDrop ? "" : "none";
               }
             });
-            // Hide tab-option-icon (switch editor trigger) when SUPPORT_CK_EDITOR is disabled
-            if (containerInputFieldCol.value && containerInputFieldCol.value.sections) {
-              _.forEach(containerInputFieldCol.value.sections[0].inputFields, (valueInputField) => {
-                _.forEach(valueInputField.cols, (valueCol) => {
-                  if (valueCol.id === 'tab-option-icon') {
-                    valueCol.colStyle = { ...valueCol.colStyle, display: hasSupportCKEditor() ? 'flex' : 'none' };
-                  }
-                });
-              });
-            }
           }
         });
       }
@@ -1771,28 +1760,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     this.setState({schema, isSchemaChanged: true});
   }
 
-  /**
-   * Hides the tab-option-icon (switch editor trigger) in schema when SUPPORT_CK_EDITOR is disabled,
-   * so users cannot switch editor if the feature is not enabled.
-   */
-  applyTabOptionIconVisibility = (schema) => {
-    if (!schema || !schema.containers) return;
-    _.forEach(schema.containers, (container) => {
-      if (!container.isActive || !container.tabBarExtraContent?.sections?.[0]?.inputFields?.[0]?.cols) return;
-      _.forEach(container.tabBarExtraContent.sections[0].inputFields[0].cols, (col) => {
-        if (col.id === 'tab-options-popover' && col.value?.sections?.[0]?.inputFields) {
-          _.forEach(col.value.sections[0].inputFields, (inputField) => {
-            _.forEach(inputField.cols, (c) => {
-              if (c.id === 'tab-option-icon') {
-                c.colStyle = { ...(c.colStyle || {}), display: hasSupportCKEditor() ? 'flex' : 'none' };
-              }
-            });
-          });
-        }
-      });
-    });
-  };
-
   showInsertImageButton = (passedSchema) => {
     const schema = passedSchema || _.cloneDeep(this.state.schema);
     _.forEach(schema.containers, (container) => {

package/v2Containers/EmailWrapper/components/__tests__/EmailHTMLEditor.test.js

@@ -1897,117 +1897,6 @@ describe('EmailHTMLEditor', () => {
     });
   });
 
-  describe('Template content extraction (lines 291-309)', () => {
-    it('extracts content and subject from templateDataProp.base branch', async () => {
-      const ref = React.createRef();
-      const templateData = {
-        base: {
-          'template-content': '<p>Base branch content</p>',
-          "subject": 'Base branch subject',
-        },
-      };
-      render(
-        <IntlProvider locale="en" messages={{}}>
-          <EmailHTMLEditor
-            {...defaultProps}
-            ref={ref}
-            params={{ id: '123' }}
-            templateData={templateData}
-            Email={{
-              templateDetails: { _id: '123' },
-              getTemplateDetailsInProgress: false,
-              fetchingCmsData: false,
-            }}
-          />
-        </IntlProvider>
-      );
-      await waitFor(() => {
-        expect(ref.current).toBeTruthy();
-      }, { timeout: 3000 });
-      await waitFor(() => {
-        const content = ref.current.getContentForPreview();
-        const formData = ref.current.getFormDataForPreview();
-        expect(content).toBe('<p>Base branch content</p>');
-        expect(formData['template-subject']).toBe('Base branch subject');
-      }, { timeout: 3000 });
-    });
-
-    it('extracts content and subject from templateDataProp.versions.base branch with activeTab', async () => {
-      const ref = React.createRef();
-      const templateData = {
-        versions: {
-          base: {
-            activeTab: 'en',
-            en: {
-              'template-content': '<p>Versions base en content</p>',
-              "html_content": '<p>fallback html_content</p>',
-            },
-            subject: 'Versions base subject',
-            emailSubject: 'Fallback email subject',
-          },
-        },
-      };
-      render(
-        <IntlProvider locale="en" messages={{}}>
-          <EmailHTMLEditor
-            {...defaultProps}
-            ref={ref}
-            params={{ id: '123' }}
-            templateData={templateData}
-            Email={{
-              templateDetails: { _id: '123' },
-              getTemplateDetailsInProgress: false,
-              fetchingCmsData: false,
-            }}
-          />
-        </IntlProvider>
-      );
-      await waitFor(() => {
-        expect(ref.current).toBeTruthy();
-      }, { timeout: 3000 });
-      await waitFor(() => {
-        const content = ref.current.getContentForPreview();
-        const formData = ref.current.getFormDataForPreview();
-        expect(content).toBe('<p>Versions base en content</p>');
-        expect(formData['template-subject']).toBe('Versions base subject');
-      }, { timeout: 3000 });
-    });
-
-    it('extracts content and subject from flat templateDataProp (else branch)', async () => {
-      const ref = React.createRef();
-      const templateData = {
-        'template-content': '<p>Flat content</p>',
-        "emailSubject": 'Flat email subject',
-        "html_content": '<p>flat html_content</p>',
-        "subject": 'Flat subject',
-      };
-      render(
-        <IntlProvider locale="en" messages={{}}>
-          <EmailHTMLEditor
-            {...defaultProps}
-            ref={ref}
-            params={{ id: '123' }}
-            templateData={templateData}
-            Email={{
-              templateDetails: { _id: '123' },
-              getTemplateDetailsInProgress: false,
-              fetchingCmsData: false,
-            }}
-          />
-        </IntlProvider>
-      );
-      await waitFor(() => {
-        expect(ref.current).toBeTruthy();
-      }, { timeout: 3000 });
-      await waitFor(() => {
-        const content = ref.current.getContentForPreview();
-        const formData = ref.current.getFormDataForPreview();
-        expect(content).toBe('<p>Flat content</p>');
-        expect(formData['template-subject']).toBe('Flat email subject');
-      }, { timeout: 3000 });
-    });
-  });
-
   describe('setIsLoadingContent callback', () => {
     it('should call setIsLoadingContent when uploaded content is available', async () => {
       const setIsLoadingContent = jest.fn();
@@ -2044,37 +1933,6 @@ describe('EmailHTMLEditor', () => {
     });
   });
 
-  describe('location.query and tagList (lines 127, 129, 185)', () => {
-    it('should handle missing location.query (destructure from empty object)', () => {
-      renderWithIntl({
-        location: {},
-        supportedTags: [],
-        metaEntities: { tags: { standard: [{ name: 'standard.tag' }] } },
-      });
-      expect(screen.getByTestId('html-editor')).toBeInTheDocument();
-    });
-
-    it('should handle null location (query defaults to {})', () => {
-      renderWithIntl({
-        location: null,
-        supportedTags: [],
-        metaEntities: { tags: { standard: [] } },
-      });
-      expect(screen.getByTestId('html-editor')).toBeInTheDocument();
-    });
-
-    it('should use tagList from supportedTags when type=embedded, module=library and no getDefaultTags (line 129)', () => {
-      const supportedTags = [{ name: 'custom.a' }, { name: 'custom.b' }];
-      renderWithIntl({
-        location: { query: { type: 'embedded', module: 'library' } },
-        getDefaultTags: null,
-        supportedTags,
-        metaEntities: { tags: { standard: [{ name: 'standard.only' }] } },
-      });
-      expect(screen.getByTestId('html-editor')).toBeInTheDocument();
-    });
-  });
-
   describe('tags useMemo (lines 125-132)', () => {
     it('should use supportedTags when in EMBEDDED mode with LIBRARY module and no getDefaultTags', () => {
       const supportedTags = [{ name: 'custom.tag1' }, { name: 'custom.tag2' }];
@@ -2192,7 +2050,7 @@ describe('EmailHTMLEditor', () => {
       expect(formData).toBeDefined();
       expect(formData['0']).toBeDefined();
       expect(formData['0'].fr).toBeDefined(); // Uses base_language 'fr'
-      expect(formData['0'].fr.is_drag_drop).toBe(false);
+      expect(formData['0'].fr['is_drag_drop']).toBe(false);
       expect(formData['0'].activeTab).toBe('fr');
       expect(formData['0'].selectedLanguages).toEqual(['fr']);
       expect(formData['0'].base).toBe(true);

package/v2Containers/Facebook/Advertisement/index.js

@@ -73,7 +73,7 @@ export const Advertisement = (props) => {
   const FbAdFooter = styled.div`
     background-color: ${CAP_WHITE};
     position: fixed;
-    bottom: 0;
+    bottom: 20px;
     width: 100%;
     margin-left: -32px;
     padding: ${CAP_SPACE_32} ${CAP_SPACE_24};

package/v2Containers/Line/Container/_lineCreate.scss

@@ -40,7 +40,6 @@
 .create-msg,
 .cancel-msg {
   position: fixed;
-  bottom: 20px;
 }
 .cancel-msg {
   margin-left: 100px;

package/v2Containers/Line/Container/style.js

@@ -38,7 +38,7 @@ export default css`
     .action-section {
       background-color: ${CAP_WHITE};
       position: fixed;
-      bottom: 0;
+      bottom: 20px;
       width: 100%;
       margin-left: -32px;
       padding: ${CAP_SPACE_32} ${CAP_SPACE_24};

package/v2Containers/SmsTrai/Create/index.scss

@@ -98,5 +98,5 @@
 }
 
 .create-dlt-msg {
-  margin-left: 170px;
+  margin-left: 120px;
 }

package/v2Containers/SmsTrai/Edit/index.js

@@ -106,6 +106,7 @@ export const SmsTraiEdit = (props) => {
     padding: ${CAP_SPACE_32} ${CAP_SPACE_24};
     position: fixed;
     bottom: 2rem;
+    margin-left: -2rem;
     .ant-btn {
       margin-right: ${CAP_SPACE_16};
     }
@@ -687,24 +688,17 @@ export const SmsTraiEdit = (props) => {
           <CapButton
             onClick={handleTestAndPreview}
             type="secondary"
-            className="create-msg"
+            className="create-msg create-dlt-msg"
           >
             <FormattedMessage {...messages.testAndPreviewButtonLabel} />
           </CapButton>
           <CapButton
             onClick={isLiquidSupportFeatureEnabled ? onSubmitWrapper : onDoneCallback}
-            className="create-msg create-dlt-msg"
+            className="create-msg"
             disabled={isTagValidationError || (isLiquidSupportFeatureEnabled && !isObject(metaEntities?.tagLookupMap))}
           >
             <FormattedMessage {...messages.saveButtonLabel} />
           </CapButton>
-          <CapButton
-            onClick={handleClose}
-            className="cancel-dlt-msg"
-            type="secondary"
-          >
-            <FormattedMessage {...messages.cancelButtonLabel} />
-          </CapButton>
         </SMSTraiFooter>
         <TestAndPreviewSlidebox
           show={showTestAndPreviewSlidebox}