@capillarytech/creatives-library 7.17.38 → 7.17.39-alpha.1

package/v2Containers/Zalo/saga.js

@@ -8,23 +8,29 @@ import {
 } from "./constants";
 
 export function* getTemplateInfoById({ payload }) {
+  const { preview = "", actionCallback } = payload;
   try {
     const res = yield call(Api.getTemplateInfoById, payload);
     if (res?.success) {
       yield put({
-        type: payload?.preview
-          ? ZALO_TEMPLATE_PREVIEW_INFO
-          : ZALO_TEMPLATE_INFO_SUCCESS,
+        type: preview ? ZALO_TEMPLATE_PREVIEW_INFO : ZALO_TEMPLATE_INFO_SUCCESS,
         result: res?.response || {},
       });
     } else {
+      const errorMsg = res?.message || res?.status?.message;
       yield put({
         type: ZALO_TEMPLATE_INFO_ERROR,
-        error: res?.error || res?.message,
+        error: errorMsg,
       });
+      if (actionCallback) {
+        actionCallback(errorMsg);
+      }
     }
   } catch (error) {
     yield put({ type: ZALO_TEMPLATE_INFO_ERROR, error });
+    if (actionCallback) {
+      actionCallback(error);
+    }
   }
 }
 

package/v2Containers/Zalo/selectors.js

@@ -1,14 +1,12 @@
 import { createSelector } from "reselect";
-import { fromJS } from "immutable";
 
-const selectZaloDomain = (state = fromJS({})) => state.get("zalo");
+const selectZaloDomain = () => (state) => state.get('zalo');
+const selectAccountDomain = () => (state) => state.get('templates');
 
 const makeSelectZalo = () =>
-  createSelector(selectZaloDomain, (substate = fromJS({})) => ({
-    zaloTemplateInfoStatus: substate.get("zaloTemplateInfoStatus"),
-    zaloTemplateInfoValue: substate.get("zaloTemplateInfoValue"),
-    zaloTemplateInfoError: substate.get("zaloTemplateInfoError"),
-    zaloTemplatePreviewData: substate.get("zaloTemplatePreviewData"),
-  }));
-
-export { makeSelectZalo, selectZaloDomain };
+  createSelector(selectZaloDomain(), (substate) => substate && substate.toJS());
+
+const makeSelectAccount = () =>
+  createSelector(selectAccountDomain(), (substate) => substate && substate.toJS());
+
+export { makeSelectZalo, makeSelectAccount };

package/v2Containers/Zalo/tests/index.test.js

@@ -1,27 +1,25 @@
-import React from "react";
-import { injectIntl } from "react-intl";
-import { browserHistory } from "react-router";
-import "@testing-library/jest-dom";
-import { Provider } from "react-redux";
-import configureStore from "../../../store";
-import { Zalo } from "..";
+import React from 'react';
+import { injectIntl } from 'react-intl';
+import { browserHistory } from 'react-router';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import configureStore from '../../../store';
+import { Zalo } from '..';
 import {
   metaEntities,
-  zaloTemplateInfoData,
+  editData,
   location,
   getDefaultTags,
   injectedTags,
-  template,
+  accountData,
   templateData,
-} from "./mockData";
-import {
-  render,
-  screen,
-  fireEvent,
-} from "../../../utils/test-utils";
+} from './mockData';
+import { render, screen, fireEvent } from '../../../utils/test-utils';
 
 const mockActions = {
   getTemplateInfoById: jest.fn(),
+};
+const mockGlobalActions = {
   fetchSchemaForEntity: jest.fn(),
 };
 
@@ -31,97 +29,146 @@ beforeAll(() => {
 });
 
 const ComponentToRender = injectIntl(Zalo);
-const renderComponent = (props) => render(
-  <Provider store={store}>
-    <ComponentToRender {...props} />
-  </Provider>
+const renderComponent = (props) =>
+  render(
+    <Provider store={store}>
+      <ComponentToRender {...props} />
+    </Provider>,
   );
 
-
-describe("Test activity zalo container", () => {
-  it("test case for zalo template", async () => {
+describe('Test activity zalo container', () => {
+  it('test case for zalo template', async () => {
     renderComponent({
       actions: mockActions,
-      zaloTemplateInfoData,
+      globalActions: mockGlobalActions,
+      editData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      template,
+      accountData,
       templateData,
+      isFullMode: true,
     });
-    const inputBox = await screen.findAllByPlaceholderText('Add labels or text or combination of both');
-    fireEvent.change(inputBox[0], { target: { value: "Hello, welcome" } });
+    const inputBox = await screen.findAllByPlaceholderText(
+      'Add labels or text or combination of both',
+    );
+    fireEvent.change(inputBox[0], { target: { value: 'Hello, welcome' } });
     inputBox[0].focus();
-    const previewButton = screen.getByTestId("preview-link-button");
+    const previewButton = screen.getByTestId('preview-link-button');
     previewButton.click();
     expect(
-      screen.getByText("This template has been enabled")
+      screen.getByText('This template has been enabled'),
+    ).toBeInTheDocument();
+  });
+
+  it('test case for text field curly braces error', async () => {
+    renderComponent({
+      actions: mockActions,
+      globalActions: mockGlobalActions,
+      editData,
+      metaEntities,
+      location,
+      getDefaultTags,
+      injectedTags,
+      accountData,
+      templateData,
+      isFullMode: true,
+    });
+    const inputBox = await screen.findAllByPlaceholderText(
+      'Add labels or text or combination of both',
+    );
+    fireEvent.change(inputBox[0], { target: { value: 'Hello, welcome {{' } });
+    inputBox[0].focus();
+    expect(
+      screen.getByText('Invalid label, please close all curly braces'),
     ).toBeInTheDocument();
   });
 
-  it("test case for text field curly braces error", async () => {
+  it('test case for unsupported tag', async () => {
     renderComponent({
       actions: mockActions,
-      zaloTemplateInfoData,
+      globalActions: mockGlobalActions,
+      editData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      template,
+      accountData,
       templateData,
+      isFullMode: true,
+    });
+    const inputBox = await screen.findAllByPlaceholderText(
+      'Add labels or text or combination of both',
+    );
+    fireEvent.change(inputBox[0], {
+      target: { value: 'Hello, welcome {{fsdaf}}' },
     });
-    const inputBox = await screen.findAllByPlaceholderText('Add labels or text or combination of both');
-    fireEvent.change(inputBox[0], { target: { value: "Hello, welcome {{" } });
     inputBox[0].focus();
     expect(
-      screen.getByText("Invalid label, please close all curly braces")
+      screen.getByText(
+        'Unsupported tags: fsdaf. Please remove them from this message.',
+      ),
     ).toBeInTheDocument();
   });
 
-  it("test case for unsupported tag", async () => {
+  it('test case for length check', async () => {
     renderComponent({
       actions: mockActions,
-      zaloTemplateInfoData,
+      globalActions: mockGlobalActions,
+      editData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      template,
+      accountData,
       templateData,
+      isFullMode: false,
     });
-    const inputBox = await screen.findAllByPlaceholderText('Add labels or text or combination of both');
+    const inputBox = await screen.findAllByPlaceholderText(
+      'Add labels or text or combination of both',
+    );
     fireEvent.change(inputBox[0], {
-      target: { value: "Hello, welcome {{fsdaf}}" },
+      target: {
+        value:
+          'Hello, welcome user. Habata itara modoranai to ittta Mezashita no wa aoi aoi ano sora',
+      },
     });
     inputBox[0].focus();
     expect(
       screen.getByText(
-        "Unsupported tags: fsdaf. Please remove them from this message."
-      )
+        'Character count for this variable should be in between 0 to 30',
+      ),
     ).toBeInTheDocument();
   });
 
-  it("test case for length check", async () => {
+  it('test case for length check', async () => {
     renderComponent({
       actions: mockActions,
-      zaloTemplateInfoData,
+      globalActions: mockGlobalActions,
+      editData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      template,
+      accountData,
       templateData,
+      isFullMode: true,
     });
-    const inputBox = await screen.findAllByPlaceholderText('Add labels or text or combination of both');
+    const inputBox = await screen.findAllByPlaceholderText(
+      'Add labels or text or combination of both',
+    );
     fireEvent.change(inputBox[0], {
       target: {
-        value: "Hello, welcome user. Habata itara modoranai to ittta Mezashita no wa aoi aoi ano sora",
+        value:
+          'Hello, welcome user. Habata itara modoranai to ittta Mezashita no wa aoi aoi ano sora',
       },
     });
     inputBox[0].focus();
     expect(
-      screen.getByText("Character count for this variable should be in between 0 to 30")
+      screen.getByText(
+        'Character count for this variable should be in between 0 to 30',
+      ),
     ).toBeInTheDocument();
   });
 });