@capillarytech/creatives-library 7.17.39-alpha.5 → 7.17.40-alpha.0

package/v2Containers/Zalo/messages.js

@@ -16,19 +16,19 @@ export default defineMessages({
   },
   variableType: {
     id: `${prefix}.variableType`,
-    defaultMessage: "Variable type: <{name}>",
+    defaultMessage: "Variable type: <{fieldName}>",
   },
   charactersCount: {
     id: `${prefix}.charactersCount`,
-    defaultMessage: "Characters count {variableLength}/{maxLength}",
+    defaultMessage: "Characters count {variableLength}/{fixedLength}",
   },
   maxMinLengthMessage: {
-    id: `${prefix}.maxMinLengthMessage`,
+    id: `${prefix}.maxLengthMessage`,
     defaultMessage:
       "Character count for this variable should be in between {minLength} to {maxLength}",
   },
   previewHead: {
-    id: `${prefix}.previewHead`,
+    id: `${prefix}.previewText`,
     defaultMessage: "Preview",
   },
   previewText: {
@@ -70,17 +70,5 @@ export default defineMessages({
   PENDING_REVIEW: {
     id: `${prefix}.PENDING_REVIEW`,
     defaultMessage: 'pending review',
-  },
-  zaloFailureNotificationTemplate: {
-    id: `${prefix}.zaloFailureNotificationTemplate`,
-    defaultMessage: 'Unable to load zalo template',
-  },
-  zaloFailureNotificationPreview: {
-    id: `${prefix}.zaloFailureNotificationPreview`,
-    defaultMessage: 'Unable to load zalo preview',
-  },
-  btnDisabledTooltip: {
-    id: `${prefix}.btnDisabledTooltip`,
-    defaultMessage: 'Please add all mandatory fields to proceed further',
-  },
+  }
 });

package/v2Containers/Zalo/saga.js

@@ -8,29 +8,23 @@ 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: preview ? ZALO_TEMPLATE_PREVIEW_INFO : ZALO_TEMPLATE_INFO_SUCCESS,
+        type: payload?.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: errorMsg,
+        error: res?.error || res?.message,
       });
-      if (actionCallback) {
-        actionCallback(errorMsg);
-      }
     }
   } catch (error) {
     yield put({ type: ZALO_TEMPLATE_INFO_ERROR, error });
-    if (actionCallback) {
-      actionCallback(error);
-    }
   }
 }
 

package/v2Containers/Zalo/selectors.js

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

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

@@ -1,26 +1,27 @@
-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,
-  editData,
+  zaloTemplateInfoData,
   location,
   getDefaultTags,
   injectedTags,
-  accountData,
+  template,
   templateData,
-  templateConfigs,
-} 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(),
 };
 
@@ -30,117 +31,97 @@ 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,
-      globalActions: mockGlobalActions,
-      editData,
+      zaloTemplateInfoData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      accountData,
+      template,
       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 () => {
+  it("test case for text field curly braces error", async () => {
     renderComponent({
       actions: mockActions,
-      globalActions: mockGlobalActions,
-      editData,
+      zaloTemplateInfoData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      accountData,
+      template,
       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();
     expect(
-      screen.getByText('Invalid label, please close all curly braces'),
+      screen.getByText("Invalid label, please close all curly braces")
     ).toBeInTheDocument();
   });
 
-  it('test case for unsupported tag', async () => {
+  it("test case for unsupported tag", async () => {
     renderComponent({
       actions: mockActions,
-      globalActions: mockGlobalActions,
-      editData,
+      zaloTemplateInfoData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      accountData,
+      template,
       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 {{fsdaf}}' },
+      target: { value: "Hello, welcome {{fsdaf}}" },
     });
     inputBox[0].focus();
     expect(
       screen.getByText(
-        'Unsupported tags: fsdaf. Please remove them from this message.',
-      ),
+        "Unsupported tags: fsdaf. Please remove them from this message."
+      )
     ).toBeInTheDocument();
   });
 
-  it('test case for set template data', async () => {
-    templateData.templateConfigs = templateConfigs;
+  it("test case for length check", async () => {
     renderComponent({
       actions: mockActions,
-      globalActions: mockGlobalActions,
-      editData,
+      zaloTemplateInfoData,
       metaEntities,
       location,
       getDefaultTags,
       injectedTags,
-      accountData,
+      template,
       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 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();
   });
-});
+});