@capillarytech/creatives-library 7.17.108-alpha.0 → 7.17.108

package/package.json

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

package/services/api.js

@@ -84,7 +84,7 @@ function checkStatus(response) {
       statusCode: status,
     });
   }
-  if ((status >= 200 && status < 300) || [500, 409, 413].includes(response.status)) {
+  if ((status >= 200 && status < 300) || [400, 409, 413, 500].includes(response.status)) {
     return response;
   }
   const isLoginPage = window.location.pathname.indexOf('/login') !== -1;

package/v2Containers/CreativesContainer/SlideBoxHeader.js

@@ -17,7 +17,7 @@ import { formatString } from '../../utils/Formatter';
 import {
   CAP_SPACE_12,
 } from '@capillarytech/cap-ui-library/styled/variables';
-import { WHATSAPP_HELP_DOC_LINK, JOURNEY } from './constants';
+import { WHATSAPP_HELP_DOC_LINK } from './constants';
 
 const { CapLabelInline } = CapLabel;
 const StyledLabel = styled(CapLabelInline)`
@@ -33,7 +33,7 @@ const renderData = (type, value, channel) => (
 );
 
 export function SlideBoxHeader(props) {
-  const { slidBoxContent, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix, shouldShowTemplateName, channel, templateNameRenderProp, weChatTemplateType, onWeChatMaptemplateStepChange, weChatMaptemplateStep, templateStep, smsRegister, handleClose, moduleType } = props;
+  const { slidBoxContent, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix, shouldShowTemplateName, channel, templateNameRenderProp, weChatTemplateType, onWeChatMaptemplateStepChange, weChatMaptemplateStep, templateStep, smsRegister } = props;
   const showTemplateNameHeader = isFullMode && shouldShowTemplateName;
   const mapTemplateCreate = !showTemplateNameHeader && slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
   const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
@@ -86,11 +86,6 @@ export function SlideBoxHeader(props) {
         description={![NO_COMMUNICATION, FTP].includes(channel) &&
           <FormattedMessage {...messages.creativeTemplatesDesc} />
             }
-        prefix={!isFullMode && moduleType === JOURNEY &&
-          <PrefixWrapper>
-            <CapIcons.backIcon onClick={handleClose} />
-          </PrefixWrapper>
-        }
           />
         )}
       {showTemplateNameHeader && templateNameRenderProp()}

package/v2Containers/CreativesContainer/constants.js

@@ -22,7 +22,6 @@ export const ZALO = "ZALO";
 export const INAPP = "INAPP";
 export const PREVIEW = "preview";
 export const EDIT_TEMPLATE = "editTemplate";
-export const JOURNEY = "journey";
 
 export const SHOW_CONTANER_LOADER = "app/CreativesContainer/SHOW_CONTANER_LOADER";
 export const HIDE_CONTAINER_LOADER = "app/CreativesContainer/HIDE_CONTAINER_LOADER";

package/v2Containers/CreativesContainer/index.js

@@ -1199,8 +1199,6 @@ export class Creatives extends React.Component {
               showPrefix={!isUploading} // not show back button when email template is being uploaded
               templateStep={this.creativesTemplateSteps[templateStep]}
               smsRegister={smsRegister}
-              handleClose={this.handleCloseSlideBox}
-              moduleType={this.props.messageDetails?.type}
             />}
           content={
             <SlideBoxContent

package/v2Containers/CreativesContainer/tests/SlideBoxHeader.test.js

@@ -23,7 +23,6 @@ describe('Test SlideBoxHeader container', () => {
         templateData={templateData}
         onCreateComplete={onCreateComplete}
         isFullMode={isFullMode}
-        moduleType="journey"
       />
     );
   };

package/v2Containers/CreativesContainer/tests/__snapshots__/SlideBoxHeader.test.js.snap

@@ -98,11 +98,6 @@ exports[`Test SlideBoxHeader container Should render correct component for rcs c
     }
     descriptionClass=""
     inline={false}
-    prefix={
-      <SlideBoxHeader__PrefixWrapper>
-        <SvgBack />
-      </SlideBoxHeader__PrefixWrapper>
-    }
     size="large"
     title={
       <FormattedMessage
@@ -308,11 +303,6 @@ exports[`Test SlideBoxHeader container Should render correct component for whats
     }
     descriptionClass=""
     inline={false}
-    prefix={
-      <SlideBoxHeader__PrefixWrapper>
-        <SvgBack />
-      </SlideBoxHeader__PrefixWrapper>
-    }
     size="large"
     title={
       <FormattedMessage

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

@@ -50,7 +50,6 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
     header={
       <SlideBoxHeader
         channel="RCS"
-        handleClose={[Function]}
         isLoadingContent={true}
         onShowTemplates={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
@@ -124,7 +123,6 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
     header={
       <SlideBoxHeader
         channel="WHATSAPP"
-        handleClose={[Function]}
         isLoadingContent={true}
         onShowTemplates={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
@@ -205,7 +203,6 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
     header={
       <SlideBoxHeader
         channel="WHATSAPP"
-        handleClose={[Function]}
         isLoadingContent={true}
         onShowTemplates={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
@@ -281,7 +278,6 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
     header={
       <SlideBoxHeader
         channel="WHATSAPP"
-        handleClose={[Function]}
         isLoadingContent={true}
         onShowTemplates={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
@@ -357,7 +353,6 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
     header={
       <SlideBoxHeader
         channel="WHATSAPP"
-        handleClose={[Function]}
         isLoadingContent={true}
         onShowTemplates={[Function]}
         onWeChatMaptemplateStepChange={[Function]}

package/v2Containers/Whatsapp/sagas.js

@@ -1,5 +1,7 @@
 import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
 import { LOCATION_CHANGE } from 'react-router-redux';
+import isEmpty from 'lodash/isEmpty';
+import get from 'lodash/get';
 import * as Api from '../../services/api';
 import {
   TEMPLATE_CREATE_REQUEST,
@@ -44,7 +46,19 @@ export function* sendForApprovalCreate({ payload, callback, gupshupMediaFile })
   try {
     const result = yield call(Api.createWhatsappTemplate, { payload, gupshupMediaFile });
     if (result?.status?.code && result.status.code >= 400) {
-      errorMsg = result?.message || result.status.code;
+      const { message, status } = result || {};
+      const errorMessageObj = get(message?.error, 'errorMessage', {});
+      if (!isEmpty(errorMessageObj)) {
+        try {
+          // If the errorMessageObj is plain JS and JSON.parse fails, catch block will assign the error msg
+          const parsedErrorMsgObj = JSON.parse(errorMessageObj);
+          errorMsg = parsedErrorMsgObj?.error?.message;
+        } catch (error) {
+          errorMsg = message;
+        }
+      } else {
+        errorMsg = message || status.code;
+      }
       throw errorMsg;
     }
     yield put({

package/v2Containers/Whatsapp/tests/mockData.js

@@ -251,4 +251,75 @@ export const mockData = {
     description: 'sample',
     url: "https://capillarytech.com",
   },
+  sendForApprovalCreatePayload: {
+    name: 'dffdf',
+    versions: {
+      base: {
+        content: {
+          whatsapp: {
+            category: 'UTILITY',
+            languages: [
+              {
+                language: 'sq',
+                content: 'fdfd',
+              },
+            ],
+            buttonType: 'CTA',
+            buttons: [
+              {
+                index: 0,
+                type: 'PHONE_NUMBER',
+                text: 'tt',
+                phone_number: '+913333333333333',
+              },
+            ],
+            mediaType: 'TEXT',
+            varMapped: {},
+            templateEditor: false,
+            accountId: '123456789',
+            accessToken: '12345',
+            hostName: 'karixwhatsappbulk',
+            whatsappMedia: {
+              header: '',
+              headerVarMapped: {},
+              headerTemplate: false,
+              footer: '',
+            },
+          },
+        },
+      },
+    },
+    type: "WHATSAPP",
+  },
+  sendForApprovalCreateResult1: {
+    success: false,
+    status: {
+      isError: true,
+      code: 400,
+    },
+    message: {
+      name: "StatusCodeError",
+      statusCode: 500,
+      error: {
+        errorCode: "1004",
+        errorMessage: "{\"error\":{\"message\":\"(#192) Param components[1]['buttons'][0]['phone_number'] is not a valid phone number.\",\"type\":\"OAuthException\",\"code\":192,\"fbtrace_id\":\"12345\"}}",
+      },
+    },
+  },
+  sendForApprovalCreateResult2: {
+    success: false,
+    status: {
+      isError: true,
+      code: 400,
+    },
+    message: {
+      name: "StatusCodeError",
+      statusCode: 500,
+      message: "500 - Invalid params",
+      error: {
+        errorCode: "1004",
+        errorMessage: 'Invalid params',
+      },
+    },
+  },
 };

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

@@ -1,13 +1,16 @@
 import { expectSaga, testSaga } from "redux-saga-test-plan";
 import * as matchers from "redux-saga-test-plan/matchers";
 import { takeLatest } from "redux-saga/effects";
-import { getMetaTagsDetails, watchGetMetaTagsDetails } from "../sagas";
+import { getMetaTagsDetails, watchGetMetaTagsDetails, sendForApprovalCreate } from "../sagas";
 import {
   URL_META_TAGS_REQUEST,
   URL_META_TAGS_SUCCESS,
   URL_META_TAGS_FAILURE,
+  TEMPLATE_CREATE_SUCCESS,
+  TEMPLATE_CREATE_FAILURE,
 } from "../constants";
 import * as Api from "../../../services/api";
+import { mockData } from "./mockData";
 
 describe("Whatsapp saga", () => {
   const error = new Error("error");
@@ -26,11 +29,11 @@ describe("Whatsapp saga", () => {
           },
         ],
       ])
-      .put({
-        type: URL_META_TAGS_SUCCESS,
-        result: {},
-      })
-      .run();
+        .put({
+          type: URL_META_TAGS_SUCCESS,
+          result: {},
+        })
+        .run();
     });
 
     it("handle success false response from getMetaTagsDetails", () => {
@@ -47,11 +50,11 @@ describe("Whatsapp saga", () => {
           },
         ],
       ])
-      .put({
-        type: URL_META_TAGS_FAILURE,
-        error: 'error',
-      })
-      .run();
+        .put({
+          type: URL_META_TAGS_FAILURE,
+          error: 'error',
+        })
+        .run();
     });
 
     it("handle success false response from getMetaTagsDetails when callback not present", () => {
@@ -67,11 +70,11 @@ describe("Whatsapp saga", () => {
           },
         ],
       ])
-      .put({
-        type: URL_META_TAGS_FAILURE,
-        error: 'error',
-      })
-      .run();
+        .put({
+          type: URL_META_TAGS_FAILURE,
+          error: 'error',
+        })
+        .run();
     });
 
     it("handles error thrown", () => {
@@ -87,4 +90,112 @@ describe("Whatsapp saga", () => {
       );
     });
   });
+
+  describe("whatsapp test saga for sendForApprovalCreate", () => {
+    // const callBack = jest.fn();
+    it("handle success response from sendForApprovalCreate", () => {
+      expectSaga(sendForApprovalCreate, {
+        payload: mockData.sendForApprovalCreatePayload,
+        callBack,
+      }).provide([
+        [
+          matchers.call.fn(Api.createWhatsappTemplate),
+          {
+            success: true,
+            result: { response: "Test data"},
+          },
+        ],
+      ])
+        .put({
+          type: TEMPLATE_CREATE_SUCCESS,
+          result: {},
+        })
+        .run();
+    });
+
+    it("handle error response with json string for sendForApprovalCreate", () => {
+      expectSaga(sendForApprovalCreate, {
+        payload: mockData.sendForApprovalCreatePayload,
+        callBack,
+      }).provide([
+        [
+          matchers.call.fn(Api.createWhatsappTemplate),
+          mockData.sendForApprovalCreateResult1,
+        ],
+      ])
+        .put({
+          type: TEMPLATE_CREATE_FAILURE,
+          error: "(#192) Param components[1]['buttons'][0]['phone_number'] is not a valid phone number.",
+        })
+        .run();
+    });
+
+    it("handle error response for sendForApprovalCreate even if json parsing fails", () => {
+      expectSaga(sendForApprovalCreate, {
+        payload: mockData.sendForApprovalCreatePayload,
+        callBack,
+      }).provide([
+        [
+          matchers.call.fn(Api.createWhatsappTemplate),
+          mockData.sendForApprovalCreateResult2,
+        ],
+      ])
+        .put({
+          type: TEMPLATE_CREATE_FAILURE,
+          error: 'Invalid params',
+        })
+        .run();
+    });
+
+    it("handle error response for sendForApprovalCreate", () => {
+      expectSaga(sendForApprovalCreate, {
+        payload: mockData.sendForApprovalCreatePayload,
+        callBack,
+      }).provide([
+        [
+          matchers.call.fn(Api.createWhatsappTemplate),
+          {
+            success: false,
+            status: {
+              isError: true,
+              code: 500,
+            },
+            message: 'error',
+          },
+        ],
+      ])
+        .put({
+          type: TEMPLATE_CREATE_FAILURE,
+          error: 'error',
+        })
+        .run();
+    });
+
+    it("handle error response for sendForApprovalCreate with status code if error message empty", () => {
+      expectSaga(sendForApprovalCreate, {
+        payload: mockData.sendForApprovalCreatePayload,
+        callBack,
+      }).provide([
+        [
+          matchers.call.fn(Api.createWhatsappTemplate),
+          {
+            success: false,
+            status: {
+              isError: true,
+              code: 500,
+            },
+          },
+        ],
+      ])
+        .put({
+          type: TEMPLATE_CREATE_FAILURE,
+          error: 500,
+        })
+        .run();
+    });
+
+    it("handles error thrown", () => {
+      testSaga(sendForApprovalCreate, { callBack }).next().throw(error).next().isDone();
+    });
+  });
 });