@capillarytech/creatives-library 8.0.340-0 → 8.0.340-beta.0.1

package/v2Containers/Viber/tests/saga.test.js

@@ -1,258 +1,50 @@
 import { expectSaga } from 'redux-saga-test-plan';
-import * as matchers from 'redux-saga-test-plan/matchers';
-import { call } from 'redux-saga/effects';
+import { call, put } from 'redux-saga/effects';
 import { throwError } from 'redux-saga-test-plan/providers';
 import * as Api from '../../../services/api';
 import * as sagas from '../sagas';
+import { v2ViberSagas } from '../sagas';
 import * as types from '../constants';
-import { pollAssetStatus } from '../../../sagas/assetPolling';
-import { ASSET_STATUS } from '../../../utils/assetStatusConstants';
 
 describe('Viber Sagas', () => {
+  
   describe('uploadViberAsset Saga', () => {
-    const mockAsset = {
-      _id: 'asset-123',
-      type: 'IMAGE',
-      url: 'https://example.com/image.jpg',
-    };
+    const file = new Blob(['file contents'], { type: 'text/plain' });
+    const assetType = 'image';
+    const fileParams = { directory: 'profile', templateType: 'viber' };
 
-    const mockParams = {
-      file: new File(['test'], 'test.jpg', { type: 'image/jpeg' }),
-      assetType: 'image',
-      fileParams: {},
-      templateType: 0,
-    };
-
-    it('handles async upload (202) with polling', () => {
-      const mockResponse = {
-        status: { code: 202 },
-        response: {
-          assetId: 'asset-123',
-          asset: mockAsset,
-          processingStatus: ASSET_STATUS.PROCESSING,
-        },
-      };
-
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-          [matchers.call.fn(pollAssetStatus), undefined],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_PROCESSING,
-          payload: {
-            assetId: 'asset-123',
-            asset: mockAsset,
-            processingStatus: ASSET_STATUS.PROCESSING,
-          },
-        })
-        .call.fn(Api.uploadFile)
-        .call.fn(pollAssetStatus)
-        .run();
-    });
-
-    it('handles async when processingStatus is processing with 200 status', () => {
-      const mockResponse = {
-        status: { code: 200 },
-        response: {
-          assetId: 'asset-123',
-          asset: mockAsset,
-          processingStatus: ASSET_STATUS.PROCESSING,
-        },
-      };
-
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-          [matchers.call.fn(pollAssetStatus), undefined],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_PROCESSING,
-          payload: {
-            assetId: 'asset-123',
-            asset: mockAsset,
-            processingStatus: ASSET_STATUS.PROCESSING,
-          },
-        })
-        .call.fn(pollAssetStatus)
-        .run();
-    });
-
-    it('handles sync upload (201) without polling', () => {
-      const mockResponse = {
-        status: { code: 201 },
-        response: {
-          asset: mockAsset,
-        },
+    it('handles uploading asset successfully', () => {
+      const fakeResponse = {
+        response: { asset: { id: 1, url: 'http://example.com/image.png' } },
+        status: { code: 200 }
       };
 
-      return expectSaga(sagas.uploadViberAsset, mockParams)
+      return expectSaga(sagas.uploadViberAsset, file, assetType, fileParams)
         .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
+          [call(Api.uploadFile, file, assetType, fileParams), fakeResponse]
         ])
         .put({
           type: types.UPLOAD_VIBER_ASSET_SUCCESS,
-          data: mockAsset,
-          statusCode: 201,
-          templateType: 0,
-        })
-        .not.call(pollAssetStatus)
-        .run();
-    });
-
-    it('extracts assetId from asset._id when assetId omitted', () => {
-      const mockResponse = {
-        status: { code: 202 },
-        response: {
-          asset: { ...mockAsset, _id: 'asset-456' },
-          processingStatus: ASSET_STATUS.PROCESSING,
-        },
-      };
-
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-          [matchers.call.fn(pollAssetStatus), undefined],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_PROCESSING,
-          payload: {
-            assetId: 'asset-456',
-            asset: { ...mockAsset, _id: 'asset-456' },
-            processingStatus: ASSET_STATUS.PROCESSING,
-          },
-        })
-        .run();
-    });
-
-    it('dispatches FAILED when assetId missing on async response', () => {
-      const mockResponse = {
-        status: { code: 202 },
-        response: {
-          processingStatus: ASSET_STATUS.PROCESSING,
-        },
-      };
-
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_FAILED,
-          payload: {
-            assetId: undefined,
-            error: 'Asset upload initiated but no asset ID was returned from the server. Unable to track processing status.',
-          },
-          templateType: 0,
+          data: fakeResponse.response.asset,
+          statusCode: fakeResponse.status.code,
+          templateType: undefined
         })
-        .not.call(pollAssetStatus)
         .run();
     });
 
-    it('handles upload error', () => {
-      const uploadError = new Error('Upload failed');
+    it('handles asset upload failure', () => {
+      const error = new Error('Upload failed');
 
-      return expectSaga(sagas.uploadViberAsset, mockParams)
+      return expectSaga(sagas.uploadViberAsset, file, assetType, fileParams)
         .provide([
-          [matchers.call.fn(Api.uploadFile), throwError(uploadError)],
+          [call(Api.uploadFile, file, assetType, fileParams), throwError(error)]
         ])
         .put({
           type: types.UPLOAD_VIBER_ASSET_FAILURE,
-          error: uploadError,
-        })
-        .run();
-    });
-
-    it('falls back to statusCode on response when status object missing', () => {
-      const mockResponse = {
-        statusCode: 201,
-        response: { asset: mockAsset },
-      };
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_SUCCESS,
-          data: mockAsset,
-          statusCode: 201,
-          templateType: 0,
+          error
         })
         .run();
     });
-
-    it('defaults statusCode to 200 when no status info present', () => {
-      const mockResponse = { response: { asset: mockAsset } };
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_SUCCESS,
-          data: mockAsset,
-          statusCode: 200,
-          templateType: 0,
-        })
-        .run();
-    });
-
-    it('handles empty response object', () => {
-      const mockResponse = { status: { code: 201 } };
-      return expectSaga(sagas.uploadViberAsset, mockParams)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-        ])
-        .put({
-          type: types.UPLOAD_VIBER_ASSET_SUCCESS,
-          data: undefined,
-          statusCode: 201,
-          templateType: 0,
-        })
-        .run();
-    });
-
-    it('derives assetType from asset.type when params.assetType omitted', () => {
-      const paramsWithoutType = {
-        file: new File(['v'], 'v.mp4', { type: 'video/mp4' }),
-        fileParams: {},
-        templateType: 1,
-      };
-      const mockResponse = {
-        status: { code: 202 },
-        response: {
-          assetId: 'asset-vid',
-          asset: { _id: 'asset-vid', type: 'VIDEO' },
-        },
-      };
-      return expectSaga(sagas.uploadViberAsset, paramsWithoutType)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-          [matchers.call.fn(pollAssetStatus), undefined],
-        ])
-        .call.fn(pollAssetStatus)
-        .run();
-    });
-
-    it('defaults assetType to image when no type info available', () => {
-      const paramsWithoutType = {
-        file: new File(['x'], 'x', { type: '' }),
-        fileParams: {},
-        templateType: 0,
-      };
-      const mockResponse = {
-        status: { code: 202 },
-        response: {
-          assetId: 'asset-noop',
-        },
-      };
-      return expectSaga(sagas.uploadViberAsset, paramsWithoutType)
-        .provide([
-          [matchers.call.fn(Api.uploadFile), mockResponse],
-          [matchers.call.fn(pollAssetStatus), undefined],
-        ])
-        .call.fn(pollAssetStatus)
-        .run();
-    });
   });
 
   describe('createViberTemplate Saga', () => {
@@ -262,18 +54,18 @@ describe('Viber Sagas', () => {
     it('handles creating template successfully', () => {
       const fakeResponse = {
         response: { id: 2, content: template.content },
-        status: { code: 201 },
+        status: { code: 201 }
       };
 
       return expectSaga(sagas.createViberTemplate, { template, callback })
         .provide([
-          [call(Api.createViberTemplate, { template }), fakeResponse],
+          [call(Api.createViberTemplate, { template }), fakeResponse]
         ])
         .put({
           type: types.CREATE_VIBER_TEMPLATE_SUCCESS,
           data: fakeResponse.response,
           statusCode: fakeResponse.status.code,
-          errorMsg: undefined,
+          errorMsg: undefined
         })
         .run()
         .then(() => {
@@ -284,74 +76,21 @@ describe('Viber Sagas', () => {
     it('handles failure in creating template', () => {
       const error = new Error({ message: 'Creation failed', status: { code: 400 } });
 
+        const errorMsg = 'Creation failed';
       return expectSaga(sagas.createViberTemplate, { template, callback })
         .provide([
-          [call(Api.createViberTemplate, { template }), throwError(error)],
+          [call(Api.createViberTemplate, { template }), throwError(error)]
         ])
         .put({
           type: types.CREATE_VIBER_TEMPLATE_FAILURE,
           error,
-          errorMsg: undefined,
+          errorMsg : undefined
         })
         .run()
         .then(() => {
           expect(callback).toHaveBeenCalledWith(null, undefined);
         });
     });
-
-    it('handles 4xx API response (treated as failure)', () => {
-      const cb = jest.fn();
-      const fakeResponse = {
-        response: {},
-        status: { code: 400 },
-        message: 'bad request',
-      };
-      return expectSaga(sagas.createViberTemplate, { template, callback: cb })
-        .provide([
-          [call(Api.createViberTemplate, { template }), fakeResponse],
-        ])
-        .put({
-          type: types.CREATE_VIBER_TEMPLATE_FAILURE,
-          error: 'bad request',
-          errorMsg: 'bad request',
-        })
-        .run()
-        .then(() => {
-          expect(cb).toHaveBeenCalledWith(null, 'bad request');
-        });
-    });
-
-    it('handles success when no callback is supplied', () => {
-      const fakeResponse = {
-        response: { id: 42 },
-        status: { code: 201 },
-      };
-      return expectSaga(sagas.createViberTemplate, { template })
-        .provide([
-          [call(Api.createViberTemplate, { template }), fakeResponse],
-        ])
-        .put({
-          type: types.CREATE_VIBER_TEMPLATE_SUCCESS,
-          data: fakeResponse.response,
-          statusCode: 201,
-          errorMsg: undefined,
-        })
-        .run();
-    });
-
-    it('handles failure when no callback is supplied', () => {
-      const error = new Error('Creation failed');
-      return expectSaga(sagas.createViberTemplate, { template })
-        .provide([
-          [call(Api.createViberTemplate, { template }), throwError(error)],
-        ])
-        .put({
-          type: types.CREATE_VIBER_TEMPLATE_FAILURE,
-          error,
-          errorMsg: undefined,
-        })
-        .run();
-    });
   });
 
   describe('editTemplate Saga', () => {
@@ -361,18 +100,18 @@ describe('Viber Sagas', () => {
     it('handles editing template successfully', () => {
       const fakeResponse = {
         response: { updated: true },
-        status: { code: 200 },
+        status: { code: 200 }
       };
 
       return expectSaga(sagas.editTemplate, { template, callback })
         .provide([
-          [call(Api.createViberTemplate, { template }), fakeResponse],
+          [call(Api.createViberTemplate, { template }), fakeResponse]
         ])
         .put({
           type: types.EDIT_VIBER_TEMPLATE_SUCCESS,
           data: fakeResponse.response,
           statusCode: fakeResponse.status.code,
-          errorMsg: undefined,
+          errorMsg: undefined
         })
         .run()
         .then(() => {
@@ -384,7 +123,7 @@ describe('Viber Sagas', () => {
       const errorMsg = 'Error in editing template';
       return expectSaga(sagas.editTemplate, { template, callback })
         .provide([
-          [call(Api.createViberTemplate, { template }), throwError({ message: errorMsg, status: { code: 400 } })],
+          [call(Api.createViberTemplate, { template }), throwError({ message: errorMsg, status: { code: 400 } })]
         ])
         .put({
           type: types.EDIT_VIBER_TEMPLATE_FAILURE,
@@ -396,60 +135,6 @@ describe('Viber Sagas', () => {
           expect(callback).toHaveBeenCalledWith(null, undefined);
         });
     });
-
-    it('handles 4xx API response (treated as failure)', () => {
-      const cb = jest.fn();
-      const fakeResponse = {
-        response: {},
-        status: { code: 422 },
-        message: 'invalid payload',
-      };
-      return expectSaga(sagas.editTemplate, { template, callback: cb })
-        .provide([
-          [call(Api.createViberTemplate, { template }), fakeResponse],
-        ])
-        .put({
-          type: types.EDIT_VIBER_TEMPLATE_FAILURE,
-          error: 'invalid payload',
-          errorMsg: 'invalid payload',
-        })
-        .run()
-        .then(() => {
-          expect(cb).toHaveBeenCalledWith(null, 'invalid payload');
-        });
-    });
-
-    it('handles success when no callback is supplied', () => {
-      const fakeResponse = {
-        response: { updated: true },
-        status: { code: 200 },
-      };
-      return expectSaga(sagas.editTemplate, { template })
-        .provide([
-          [call(Api.createViberTemplate, { template }), fakeResponse],
-        ])
-        .put({
-          type: types.EDIT_VIBER_TEMPLATE_SUCCESS,
-          data: fakeResponse.response,
-          statusCode: 200,
-          errorMsg: undefined,
-        })
-        .run();
-    });
-
-    it('handles failure when no callback is supplied', () => {
-      const error = new Error('Edit failed');
-      return expectSaga(sagas.editTemplate, { template })
-        .provide([
-          [call(Api.createViberTemplate, { template }), throwError(error)],
-        ])
-        .put({
-          type: types.EDIT_VIBER_TEMPLATE_FAILURE,
-          error,
-          errorMsg: undefined,
-        })
-        .run();
-    });
   });
 
   describe('getTemplateDetails Saga', () => {
@@ -458,16 +143,16 @@ describe('Viber Sagas', () => {
 
     it('handles fetching template details successfully', () => {
       const fakeResponse = {
-        response: { id, name: 'Detailed Template' },
+        response: { id: id, name: 'Detailed Template' }
       };
 
       return expectSaga(sagas.getTemplateDetails, { id, callback })
         .provide([
-          [call(Api.getTemplateDetails, { id, channel: 'VIBER' }), fakeResponse],
+          [call(Api.getTemplateDetails, { id, channel: 'VIBER' }), fakeResponse]
         ])
         .put({
           type: types.GET_VIBER_TEMPLATE_DETAILS_SUCCESS,
-          data: fakeResponse.response,
+          data: fakeResponse.response
         })
         .run()
         .then(() => {
@@ -480,33 +165,23 @@ describe('Viber Sagas', () => {
 
       return expectSaga(sagas.getTemplateDetails, { id, callback })
         .provide([
-          [call(Api.getTemplateDetails, { id, channel: 'VIBER' }), throwError(error)],
+          [call(Api.getTemplateDetails, { id, channel: 'VIBER' }), throwError(error)]
         ])
         .put({
           type: types.GET_VIBER_TEMPLATE_DETAILS_FAILURE,
-          error,
+          error
         })
         .run()
         .then(() => {
           expect(callback).not.toHaveBeenCalledWith();
         });
     });
-
-    it('handles success without a callback', () => {
-      const fakeResponse = { response: { id, name: 'No CB' } };
-      return expectSaga(sagas.getTemplateDetails, { id })
-        .provide([
-          [call(Api.getTemplateDetails, { id, channel: 'VIBER' }), fakeResponse],
-        ])
-        .put({
-          type: types.GET_VIBER_TEMPLATE_DETAILS_SUCCESS,
-          data: fakeResponse.response,
-        })
-        .run();
-    });
   });
 
   describe('v2ViberSagas Combined', () => {
-    it('should initialize all Viber-related watcher sagas without error', () => expectSaga(sagas.v2ViberSagas).run());
+    it('should initialize all Viber-related watcher sagas without error', () => {
+      return expectSaga(v2ViberSagas).run();
+    });
   });
-});
+
+});

package/v2Containers/WeChat/RichmediaTemplates/Create/_createRichmedia.scss

@@ -147,7 +147,7 @@
   }
   .embedded-mode {
     .cover-image-row {
-      display: none;
+      display: none !important;
     }
   }
 }

package/v2Containers/WeChat/RichmediaTemplates/Create/index.js

@@ -500,12 +500,12 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       if (id === 0) {
         returnObj.push(
           <div style={{ width: "100%", height: 116, position: "relative" }}>
-            <CapRow>
+            <CapRow useLegacy>
               <img alt="default" width="100%" height="110px" src={contentData.imageUrl} />
               <div style={{ position: "absolute", bottom: "5%", left: "5%" }}>{contentData.formData['title-value'] ? contentData.formData['title-value'] : ""}</div>
             </CapRow>
             {Object.keys(templateData).length === 1 ?
-              <CapRow style={{ height: 32 }}>
+              <CapRow useLegacy style={{ height: 32 }}>
                 {contentData.formData['cover-abstract-value'] ? contentData.formData['cover-abstract-value'] : ""}
               </CapRow>
               :

package/v2Containers/WebPush/Create/components/BrandIconSection.js

@@ -56,7 +56,7 @@ export const BrandIconSection = ({
         />
       </CapRow>
       {brandIconOption === BRAND_ICON_OPTIONS.UPLOAD_IMAGE && (
-        <CapRow
+        <CapRow useLegacy
           className="webpush-brand-icon-upload-section"
           style={isLocked ? { pointerEvents: 'none', opacity: 0.5 } : undefined}
           aria-disabled={isLocked}

package/v2Containers/WebPush/Create/components/ButtonForm.js

@@ -98,7 +98,7 @@ const ButtonForm = ({
 
   return (
     <div className="webpush-button-form" onKeyDown={handleKeyDown}>
-      <CapRow className="button-form-row">
+      <CapRow useLegacy className="button-form-row">
         <CapHeading type="h4" className="button-form-heading">
           <FormattedMessage {...messages.buttonText} />
         </CapHeading>
@@ -116,7 +116,7 @@ const ButtonForm = ({
           />
         </div>
       </CapRow>
-      <CapRow className="button-form-row">
+      <CapRow useLegacy className="button-form-row">
         <CapHeading type="h4" className="button-form-heading">
           <FormattedMessage {...messages.buttonUrlLabel} />
         </CapHeading>

package/v2Containers/WebPush/Create/components/ButtonList.js

@@ -83,9 +83,9 @@ const ButtonList = ({
         );
       })}
       {showAddPrimary && (
-        <CapRow className="button-list-add-button">
+        <CapRow useLegacy className="button-list-add-button">
           <CapButton
-            type="flat"
+            type="link"
             onClick={onAddPrimary}
             className="add-primary-button button-add-trigger"
             icon="plus"
@@ -96,9 +96,9 @@ const ButtonList = ({
         </CapRow>
       )}
       {showAddSecondary && (
-        <CapRow className="button-list-add-button">
+        <CapRow useLegacy className="button-list-add-button">
           <CapButton
-            type="flat"
+            type="link"
             onClick={onAddSecondary}
             className="add-secondary-button button-add-trigger"
             icon="plus"

package/v2Containers/WebPush/Create/components/ButtonsLinksSection.js

@@ -82,7 +82,7 @@ export const ButtonsLinksSection = ({
           />
         )}
       </CapRow>
-      <CapRow className="creatives-webpush-buttons-section">
+      <CapRow useLegacy className="creatives-webpush-buttons-section">
         <CapHeading type="h5" className="webpush-buttons-section-heading">
           <FormattedMessage {...messages.buttons} />{' '}
           <span className="optional-text">
@@ -109,7 +109,7 @@ export const ButtonsLinksSection = ({
           <div className="button-add-controls">
             {showAddPrimaryButton && (
               <CapButton
-                type="flat"
+                type="link"
                 onClick={handleAddPrimaryButton}
                 className="add-primary-button button-add-trigger"
                 icon="plus"
@@ -119,7 +119,7 @@ export const ButtonsLinksSection = ({
             )}
             {showAddSecondaryButton && (
               <CapButton
-                type="flat"
+                type="link"
                 onClick={handleAddSecondaryButton}
                 className="add-secondary-button button-add-trigger"
                 icon="plus"
@@ -129,7 +129,7 @@ export const ButtonsLinksSection = ({
             )}
             {showDisabledSecondaryDuringPrimary && (
               <CapButton
-                type="flat"
+                type="link"
                 className="add-secondary-button button-add-trigger"
                 icon="plus"
                 disabled

package/v2Containers/WebPush/Create/components/FormActions.js

@@ -16,18 +16,18 @@ export const FormActions = ({
   messages,
 }) => (
   <>
-    <CapRow className="creatives-webpush-actions">
+    <CapRow useLegacy className="creatives-webpush-actions">
       <CapButton type="primary" onClick={onSave} disabled={isSaveDisabled}>
         {formatMessage(messages.saveTemplate)}
       </CapButton>
     </CapRow>
     {errorText && (
-      <CapRow>
+      <CapRow useLegacy>
         <CapError className="webpush-template-error">{errorText}</CapError>
       </CapRow>
     )}
     {accountErrorText && (
-      <CapRow>
+      <CapRow useLegacy>
         <CapError className="webpush-template-account-error">
           {accountErrorText}
         </CapError>

package/v2Containers/WebPush/Create/components/MessageSection.js

@@ -92,8 +92,8 @@ export const MessageSection = ({
 
   return (
     <>
-      <CapRow className="creatives-webpush-message">
-        <CapRow className="tooltip-add-label-container webpush-message-taglist">
+      <CapRow useLegacy className="creatives-webpush-message">
+        <CapRow useLegacy className="tooltip-add-label-container webpush-message-taglist">
           {tagList}
         </CapRow>
         <CapHeading type="h4" className="webpush-message">