@capillarytech/creatives-library 7.17.169-alpha.4 → 7.17.169

package/index.js

@@ -3,6 +3,9 @@ import capReducer from './v2Containers/Cap/reducer';
 import capSaga from './v2Containers/Cap/sagas';
 import Cap from './v2Containers/Cap/index';
 
+
+
+
 import LanguageProvider from './v2Containers/LanguageProvider';
 import LanguageProviderReducer from './v2Containers/LanguageProvider/reducer';
 import LanguageProviderSaga from './v2Containers/LanguageProvider/sagas';
@@ -16,6 +19,9 @@ import smsCreateReducer from './v2Containers/Sms/Create/reducer';
 import smsCreateSaga from './v2Containers/Sms/Create/sagas';
 
 import SmsEdit from './v2Containers/Sms/Edit/index';
+
+
+
 import smsEditReducer from './v2Containers/Sms/Edit/reducer';
 import smsEditSaga from './v2Containers/Sms/Edit/sagas';
 

package/package.json

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

package/v2Components/FormBuilder/_formBuilder.scss

@@ -77,7 +77,6 @@
   }
 }
 
-
 .form-builder-dragger  {
   .ant-upload-drag {
     background-color: white;

package/v2Containers/CreativesContainer/index.js

@@ -41,7 +41,6 @@ import { WHATSAPP_STATUSES, WHATSAPP_MEDIA_TYPES } from '../Whatsapp/constants';
 
 import { updateImagesInHtml } from '../../utils/cdnTransformation';
 import { IOS } from '../InApp/constants';
-import { VIET_GUYS } from '../Zalo/constants';
 
 const classPrefix = 'add-creatives-section';
 const CREATIVES_CONTAINER = 'creativesContainer';
@@ -125,19 +124,14 @@ export class Creatives extends React.Component {
         sourceAccountIdentifier = "",
         configs: { token = "" } = {},
       } = get(this.props, "Templates.selectedZaloAccount", {});
-      const { hostName = ''} = get(this.props, "Templates.senderDetails", {});
-      if (hostName === VIET_GUYS) {
-        this.props.zaloActions.getTemplateInfoById({
-          username: name,
-          oa_id: sourceAccountIdentifier,
-          token,
-          id: template?._id,
-          preview: true,
-          actionCallback: this.actionCallback,
-        });
-      } else {
-        window.open(get(template, 'versions.base.content.zalo.previewUrl'), '_blank');
-      }
+      this.props.zaloActions.getTemplateInfoById({
+        username: name,
+        oa_id: sourceAccountIdentifier,
+        token,
+        id: template?._id,
+        preview: true,
+        actionCallback: this.actionCallback,
+      });
     }
   };
   onEditTemplate = () => {

package/v2Containers/Templates/index.js

@@ -110,7 +110,7 @@ import {
   HOST_GUPSHUP,
 } from '../Whatsapp/constants';
 import { INAPP_LAYOUT_DETAILS } from '../InApp/constants';
-import { VIET_GUYS, ZALO_STATUS_OPTIONS, ZALO_STATUSES } from '../Zalo/constants';
+import { ZALO_STATUS_OPTIONS, ZALO_STATUSES } from '../Zalo/constants';
 import { getWhatsappContent, getWhatsappStatus, getWhatsappCategory, getWhatsappCta, getWhatsappQuickReply, getWhatsappAutoFill } from '../Whatsapp/utils';
 import { getRCSContent } from '../Rcs/utils';
 import zaloMessages from '../Zalo/messages';
@@ -305,10 +305,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           channel = 'Zalo';
           activeMode = ACCOUNT_SELECTION_MODE;
           this.props.actions.getWeCrmAccounts(channel);
-          this.props.actions.getSenderDetails({
-            channel: ZALO,
-            orgUnitId: -1,
-          });
           break;
         default:
           channel = '';
@@ -635,7 +631,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             paramsDefault.username = name;
             paramsDefault.oa_id = sourceAccountIdentifier;
             paramsDefault.token = token;
-            paramsDefault.host = hostName;
           } else {
             paramsDefault.wecrmId = wecrm_app_id;
             paramsDefault.wecrmToken = wecrm_token;
@@ -700,13 +695,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
               name = "",
               sourceAccountIdentifier = "",
               configs: { token = "" } = {},
-              hostName = "",
             } = setAcc || {};
             params.username = name;
             params.oa_id = sourceAccountIdentifier;
             params.token = token;
             params.isAccountSelection = true;
-            params.host = hostName;
         }
       }
 
@@ -860,12 +853,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           name = "",
           sourceAccountIdentifier = "",
           configs: { token = "" } = {},
-          hostName = "",
         } = get(this.props, "Templates.selectedZaloAccount", {});
         queryParams.username = name;
         queryParams.oa_id = sourceAccountIdentifier;
         queryParams.token = token;
-        queryParams.host = hostName;
       }
       this.setState({ page, templatesCount }, () => {
         queryParams.page = page;
@@ -2112,14 +2103,14 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         sourceAccountIdentifier = "",
         configs: { token = "" } = {},
       } = get(this.props, "Templates.selectedZaloAccount", {});
-      this.state.hostName === VIET_GUYS ? this.props.zaloActions.getTemplateInfoById({
+      this.props.zaloActions.getTemplateInfoById({
         username: name,
         oa_id: sourceAccountIdentifier,
         token: token,
         id: template?._id,
         preview: true,
         actionCallback: this.actionCallback,
-      }) : window.open(get(template, 'versions.base.content.zalo.previewUrl'), '_blank');
+      });
     }
   }
 

package/v2Containers/Templates/sagas.js

@@ -1,4 +1,3 @@
-import get from 'lodash/get';
 import { call, put, takeLatest, take, cancel, select } from 'redux-saga/effects';
 import { LOCATION_CHANGE } from 'react-router-redux';
 // import { schema, normalize } from 'normalizr';
@@ -177,7 +176,7 @@ export function* getSenderDetails({
     if (!apiResponse?.errors?.length) {
       yield put({
         type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: get(apiResponse, `entity.${channel}[0].domainProperties.hostName`, ''),
+        payload: apiResponse?.entity?.WHATSAPP[0]?.domainProperties?.hostName || '',
       });
     } else {
       yield put({

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

@@ -69,7 +69,6 @@ describe('Test Templates container', () => {
           setChannelAccount,
           getAllTemplates,
           getUserList,
-          getSenderDetails,
         }}
         location={{
           pathname: '/Zalo',

package/v2Containers/Templates/tests/sagas.test.js

@@ -1,5 +1,5 @@
 import { expectSaga } from 'redux-saga-test-plan';
-import { take, call, takeLatest, takeEvery, put } from 'redux-saga/effects';
+import { take, call, takeLatest, takeEvery } from 'redux-saga/effects';
 import * as matchers from 'redux-saga-test-plan/matchers';
 import * as api from '../../../services/api';
 import * as types from '../constants';
@@ -10,12 +10,9 @@ import {
   getAllTemplates,
   watchGetCdnTransformationConfig,
   watchGetAllTemplates,
-  getSenderDetails,
 } from '../sagas';
 
 import * as mockData from './mockData';
-import { ZALO } from '../../CreativesContainer/constants';
-import { VIET_GUYS } from '../../Zalo/constants';
 
 describe('getCdnTransformationConfig saga', () => {
   it("handle valid response from api", () => {
@@ -137,53 +134,3 @@ describe('watchForTemplates saga', () => {
     );
   });
 });
-
-describe('getSenderDetails Saga', () => {
-  const channel = 'someChannel';
-  const orgUnitId = 'someOrgUnitId';
-  const action = { channel, orgUnitId };
-
-  it('should handle apiResponse with hostName', () => {
-    const apiResponse = {
-      entity: {
-        [channel]: [
-          {
-            domainProperties: {
-              hostName: 'example.com',
-            },
-          },
-        ],
-      },
-    };
-
-    const generator = getSenderDetails(action);
-    expect(generator.next().value).toEqual(call(api.getSenderDetails, channel, orgUnitId));
-    expect(generator.next(apiResponse).value).toEqual(
-      put({
-        type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: 'example.com',
-      })
-    );
-  });
-
-  it('should handle apiResponse without hostName', () => {
-    const apiResponse = {
-      entity: {
-        [channel]: [
-          {
-            domainProperties: {},
-          },
-        ],
-      },
-    };
-
-    const generator = getSenderDetails(action);
-    expect(generator.next().value).toEqual(call(api.getSenderDetails, channel, orgUnitId));
-    expect(generator.next(apiResponse).value).toEqual(
-      put({
-        type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: '',
-      })
-    );
-  });
-});

package/v2Containers/Whatsapp/index.js

@@ -839,7 +839,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
     setUnsubscribeRequired(checked);
     if (isAuthenticationTemplate) {
       if (checked && !templateMessage?.includes(formatMessage(messages.securitySuffix))) {
-        setTemplateMessage(`${templateMessage} ${formatMessage(messages.securitySuffix)}`);
+        setTemplateMessage(`${templateMessage}${formatMessage(messages.securitySuffix)}`);
       } else {
         setTemplateMessage(formatMessage(messages.authenticationMsg));
       }
@@ -1088,21 +1088,14 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
     setTemplateNameError(errorMessage);
   };
 
-  const resetCategoryRelatedStates = () => {
-    setTemplateHeader('');
-    setTemplateFooter('');
-    setExpiryMinutes(0);
-    setUnsubscribeRequired(false);
-    setCtadata({});
-    setQuickReplyData({});
-    setTemplateMediaType(WHATSAPP_MEDIA_TYPES.TEXT)
-    setGupshupMediaFile();
-    setKarixFileHandle('');
-  };
-
   const onTemplateCategoryChange = (value) => {
     if (value === WHATSAPP_CATEGORIES.authentication) {
-      resetCategoryRelatedStates();
+      setTemplateHeader('');
+      setTemplateFooter('');
+      setExpiryMinutes(0);
+      setUnsubscribeRequired(false);
+      setCtadata({});
+      setQuickReplyData({});
       setTemplateMessage(formatMessage(messages.authenticationMsg));
     } else {
       setTemplateMessage('');

package/v2Containers/Zalo/constants.js

@@ -18,7 +18,6 @@ export const LIBRARY = 'library';
 export const FULL = 'full';
 export const ALL = 'all';
 export const OUTBOUND = 'outbound';
-export const VIET_GUYS = 'vietguyszalotrans';
 
 const prefix = 'app/v2Containers/Zalo';
 export const ZALO_TEMPLATE_INFO_REQUEST = `${prefix}/ZALO_TEMPLATE_INFO_REQUEST`;

package/v2Containers/Zalo/index.js

@@ -4,7 +4,7 @@ import React, { useState, useEffect } from 'react';
 import { bindActionCreators } from 'redux';
 import { createStructuredSelector } from 'reselect';
 import { injectIntl, FormattedMessage } from 'react-intl';
-import { get, isEmpty, update } from 'lodash';
+import { get, isEmpty } from 'lodash';
 import styled from 'styled-components';
 import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 import CapRow from '@capillarytech/cap-ui-library/CapRow';
@@ -23,7 +23,7 @@ import {
   CAP_SPACE_32,
   CAP_WHITE,
 } from '@capillarytech/cap-ui-library/styled/variables';
-import { makeSelectZalo, makeSelectAccount, makeSelectGapitTemplates } from './selectors';
+import { makeSelectZalo, makeSelectAccount } from './selectors';
 import { makeSelectMetaEntities, setInjectedTags } from '../Cap/selectors';
 import * as zaloActions from './actions';
 import './index.scss';
@@ -40,7 +40,6 @@ import {
   ERROR_ALERT,
   WARNING_ALERT,
   ZALO_STATUSES,
-  VIET_GUYS,
 } from './constants';
 import { SMS, ZALO } from '../CreativesContainer/constants';
 import messages from './messages';
@@ -57,7 +56,7 @@ export const Zalo = (props) => {
     isFullMode,
     templateData = {},
     editData = {},
-    accountData: { selectedZaloAccount = {}, senderDetails = {} } = {},
+    accountData: { selectedZaloAccount = {} } = {},
     globalActions,
     location,
     getDefaultTags,
@@ -66,30 +65,18 @@ export const Zalo = (props) => {
     injectedTags,
     getFormData,
     selectedOfferDetails,
-    gapItTemplateData,
   } = props || {};
-  const {hostName = ''} = senderDetails;
   const { formatMessage } = intl;
   const [oa_id, setOaId] = useState('');
   const [token, setToken] = useState('');
   const [username, setUsername] = useState('');
   const [templateName, setTemplateName] = useState('');
   const [templateId, setTemplateId] = useState('');
-// Initialize the state for templateListParams based on the nested properties of templateData.
-// If templateData.versions.base.content.zalo.listParams is available, use it.
-// Otherwise, if hostName is VIET_GUYS and templateData.templateConfigs.varMapped is available,
-// convert it to an array of entries. If not, use templateData.templateConfigs.varMapped or an empty array.
-  const [templateListParams, setTemplateListParams] = useState(
-      (templateData?.versions?.base?.content?.zalo?.listParams ||
-      ((hostName === VIET_GUYS && templateData?.templateConfigs?.varMapped)
-        ? Object.entries(templateData?.templateConfigs?.varMapped)
-        : templateData?.templateConfigs?.varMapped)) ?? []
-    );
+  const [templateListParams, setTemplateListParams] = useState([]);
   const [templatePreviewUrl, setTemplatePreviewUrl] = useState('');
   const [templateStatus, setZaloTemplateStatus] = useState(
     ZALO_STATUSES.ENABLE,
   );
-  const [gapitAllTemplateData, setGapitAllTemplateData] = useState([]);
   const [tags, updateTags] = useState([]);
   const [textAreaId, updateTextAreaId] = useState('');
   const { zaloTemplateInfoValue = {}, zaloTemplateInfoStatus = REQUEST } =
@@ -130,21 +117,11 @@ export const Zalo = (props) => {
       setToken(accessToken || zaloToken);
       setUsername(name || accountName);
     }
-    setGapitAllTemplateData(gapItTemplateData);
-  }, [selectedZaloAccount, templateData, gapItTemplateData]);
-
-  const updateTemplateData = (gapitTemplateId, templateName, listParams, previewUrl, status) => {
-    setTemplateName(templateName);
-    setTemplateId(gapitTemplateId);
-    setTemplateListParams(listParams);
-    setTemplatePreviewUrl(previewUrl);
-    setZaloTemplateStatus(status);
-    updateTextAreaId(listParams[0]?.name);
-  };
+  }, [selectedZaloAccount, templateData]);
 
   //gets template details
   useEffect(() => {
-    if (zaloTempId && oa_id && token && username && hostName === VIET_GUYS) {
+    if (zaloTempId && oa_id && token && username) {
       actions.getTemplateInfoById({
         username,
         oa_id,
@@ -152,17 +129,6 @@ export const Zalo = (props) => {
         id: zaloTempId,
         actionCallback,
       });
-    } else if (hostName !== VIET_GUYS) {
-      const { _id: gapitTemplateId = '' } = templateData;
-      if (gapitTemplateId) {
-        const data = gapitAllTemplateData.find(template => template._id == gapitTemplateId);
-        const { templateName = "", listParams = [], previewUrl = "", status = "" } = data?.versions?.base?.content?.zalo || {};
-        updateTemplateData(gapitTemplateId, templateName, listParams, previewUrl, status);
-      } else {
-        const { id: gapitTemplateId = '', name: templateName = '', template: previewUrl = '', varMapped: listParams = {} } = templateData?.templateConfigs || {};
-        const handledListParams = handleSetValues(Object.entries(listParams));
-        updateTemplateData(gapitTemplateId, templateName, handledListParams, previewUrl, ZALO_STATUSES.ENABLE);
-      }
     }
     //cleanup code
     return () => {
@@ -171,7 +137,7 @@ export const Zalo = (props) => {
   }, [zaloTempId, oa_id, token, username]);
 
   const handleSetValues = (paramsData = []) =>
-    paramsData?.map((paramData) => {
+    paramsData.map((paramData) => {
       for (const key in varMapped) {
         if (paramData?.name === key) {
           paramData.value = varMapped[key];
@@ -181,36 +147,27 @@ export const Zalo = (props) => {
     });
 
   const setDataForEdit = (setValues) => {
-    if(hostName === VIET_GUYS) {
-      const {
-        name = '',
-        _id: zaloId = '',
-        versions: {
-          base: {
-            content: {
-              zalo: {
-                listParams: paramsData = [],
-                previewUrl = '',
-                status = '',
-              } = {},
+    const {
+      name = '',
+      _id: zaloId = '',
+      versions: {
+        base: {
+          content: {
+            zalo: {
+              listParams: paramsData = [],
+              previewUrl = '',
+              status = '',
             } = {},
           } = {},
         } = {},
-      } = zaloTemplateInfoValue;
-      const handledListParams = setValues ? handleSetValues(paramsData) : paramsData;
-      updateTemplateData(zaloId, name, handledListParams, previewUrl, status);
-    } else {
-      if (setValues) {
-        const { id: gapitTemplateId = '', name: templateName = '', template: previewUrl = '', varMapped: listParams = {} } = templateData?.templateConfigs || {};
-        const handledListParams = handleSetValues(listParams);
-        updateTemplateData(gapitTemplateId, templateName, handledListParams, previewUrl, ZALO_STATUSES.ENABLE);
-      } else {
-        const { _id: gapitTemplateId = '' } = templateData;
-        let data = gapitAllTemplateData?.find(template => template?._id == gapitTemplateId);
-        const { templateName = "", listParams = [], previewUrl = "", status = "" } = data?.versions?.base?.content?.zalo || {};
-        updateTemplateData(gapitTemplateId, templateName, listParams, previewUrl, status);
-      }
-    }
+      } = {},
+    } = zaloTemplateInfoValue;
+    setTemplateName(name);
+    setTemplateId(zaloId);
+    setTemplateListParams(setValues ? handleSetValues(paramsData) : paramsData);
+    setTemplatePreviewUrl(previewUrl);
+    setZaloTemplateStatus(status);
+    updateTextAreaId(paramsData[0]?.name);
   };
 
   useEffect(() => {
@@ -382,7 +339,7 @@ export const Zalo = (props) => {
 
   const isEditDoneDisabled = () => {
     let disableCheck = false;
-    templateListParams?.forEach((listParams) => {
+    templateListParams.forEach((listParams) => {
       const { error, value } = listParams;
       const errorMessage = !error
         ? handleErrorValidation(value, listParams)
@@ -394,16 +351,11 @@ export const Zalo = (props) => {
     return disableCheck;
   };
   const createPayload = () => {
-    let varMap = {};
-    if (hostName !== VIET_GUYS) {
-      varMap = templateListParams;
-    } else {
-      templateListParams?.forEach((listParam) => {
-        const { name = '', value = '' } = listParam;
-        varMap[name] = value;
-      }
-      );
-    }
+    const varMap = {};
+    templateListParams.forEach((listParam) => {
+      const { name, value } = listParam;
+      varMap[name] = value;
+    });
     const payload = {
       channel: ZALO,
       accountId: oa_id,
@@ -418,7 +370,6 @@ export const Zalo = (props) => {
         varMapped: varMap,
       },
       token,
-      host: hostName,
     };
     return payload;
   };
@@ -456,7 +407,7 @@ export const Zalo = (props) => {
     });
 
   return (
-    <CapSpin spinning={zaloTemplateInfoStatus === REQUEST && hostName === VIET_GUYS}>
+    <CapSpin spinning={zaloTemplateInfoStatus === REQUEST}>
       <CapRow type="flex" className="cap-zalo-creatives">
         <CapColumn span={14}>
           {templateStatus && (
@@ -534,7 +485,6 @@ const mapStateToProps = createStructuredSelector({
   accountData: makeSelectAccount(),
   metaEntities: makeSelectMetaEntities(),
   injectedTags: setInjectedTags(),
-  gapItTemplateData: makeSelectGapitTemplates(),
 });
 
 const mapDispatchToProps = (dispatch) => ({

package/v2Containers/Zalo/selectors.js

@@ -9,11 +9,4 @@ const makeSelectZalo = () =>
 const makeSelectAccount = () =>
   createSelector(selectAccountDomain(), (substate) => substate && substate.toJS());
 
-const makeSelectGapitTemplates = () =>
-  createSelector(selectAccountDomain(), (substate) => {
-    const getAllTemplates = substate && substate.toJS();
-    const { templates = []} = getAllTemplates;
-    return templates;
-  });
-
-export { makeSelectZalo, makeSelectAccount, makeSelectGapitTemplates };
+export { makeSelectZalo, makeSelectAccount };

package/v2Containers/Zalo/tests/mockData.js

@@ -11462,9 +11462,6 @@ export const accountData = {
       modifiedDate: '2023-10-16T00:00:00+05:30',
     },
   },
-  senderDetails: {
-    hostName: 'vietguyszalotrans',
-  },
 };
 
 export const templateData = {
@@ -11482,46 +11479,3 @@ export const templateConfigs = {
     ma_so1: '4',
   },
 };
-
-export const mockGapItTemplateData = [
-  {
-    _id: '354701',
-    versions: {
-      base: {
-        content: {
-          zalo: {
-            templateName: 'Test',
-            listParams: [
-              {
-                name: "Name",
-                type: "STRING",
-                require: true,
-                maxLength: 80,
-                minLength: 0,
-                acceptNull: false,
-              },
-              {
-                name: "So_dien_thoai",
-                type: "STRING",
-                require: true,
-                maxLength: 30,
-                minLength: 0,
-                acceptNull: false,
-              },
-              {
-                name: "so_du",
-                type: "STRING",
-                require: true,
-                maxLength: 30,
-                minLength: 0,
-                acceptNull: false,
-              },
-            ],
-            previewUrl: 'https://account.zalo.cloud/znspreview/h84m64E6ST_owPQVFzTilg==',
-            status: 'ENABLE',
-          },
-        },
-      },
-    },
-  },
-];

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

@@ -1,5 +1,5 @@
 import { fromJS } from "immutable";
-import { makeSelectZalo, makeSelectAccount, makeSelectGapitTemplates } from "../selectors";
+import { makeSelectZalo, makeSelectAccount } from "../selectors";
 
 describe("makeSelectZalo", () => {
   it("returns the expected object with default values when substate is empty", () => {
@@ -25,27 +25,4 @@ describe("makeSelectZalo", () => {
     // Assert
     expect(result).toEqual(expected);
   });
-});
-
-describe('makeSelectGapitTemplates', () => {
-  it('should return an empty array if templates are not present', () => {
-    const state = fromJS({ templates: {} });
-    const selector = makeSelectGapitTemplates();
-    const result = selector(state);
-    expect(result).toEqual([]);
-  });
-
-  it('should return an array of templates if present', () => {
-    const state = fromJS({ templates: { templates: ['template1', 'template2'] } });
-    const selector = makeSelectGapitTemplates();
-    const result = selector(state);
-    expect(result).toEqual(['template1', 'template2']);
-  });
-
-  it('should return an empty array if templates is null', () => {
-    const state = fromJS({ templates: {} });
-    const selector = makeSelectGapitTemplates();
-    const result = selector(state);
-    expect(result).toEqual([]);
-  });
-});
+});