@capillarytech/creatives-library 7.17.129 → 7.17.130

package/config/app.js

@@ -16,13 +16,13 @@ const config = {
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
-    api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/creatives',
-    campaigns_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/campaigns',
-    campaigns_api_org_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/org/campaign',
-    auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',
-    arya_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1',
-    subscription_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/org-settings/subscription',
-    exports_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/export/data',
+    api_endpoint: 'https://nightly.intouch.capillarytech.com/arya/api/v1/creatives',
+    campaigns_api_endpoint: 'https://nightly.intouch.capillarytech.com/iris/v2/campaigns',
+    campaigns_api_org_endpoint: 'https://nightly.intouch.capillarytech.com/iris/v2/org/campaign',
+    auth_endpoint: 'https://nightly.intouch.capillarytech.com/arya/api/v1/auth',
+    arya_endpoint: 'https://nightly.intouch.capillarytech.com/arya/api/v1',
+    subscription_api_endpoint: 'https://nightly.intouch.capillarytech.com/arya/api/v1/org-settings/subscription',
+    exports_api_endpoint: 'https://nightly.intouch.capillarytech.com/arya/api/v1/export/data',
     login_url: '/auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',

package/package.json

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

package/styles/components/navigation/_leftnav.scss

@@ -211,3 +211,16 @@
   }
 }
 
+.cap-collapsible-new-nav {
+  .l2-quick-link-heading, .l2-item-submodule {
+    width: 11.25rem;
+  }
+}
+
+.l1-enabled-popover-container .l2-item-submodule {
+  width: 11.25rem;  
+}
+
+.l1-enabled-popover-container .ant-popover-inner-content .l2-quick-link-container {
+  padding: 0.571rem 0.471rem;
+}

package/v2Containers/Cap/sagas.js

@@ -191,7 +191,7 @@ export function* getSupportVideosConfig({ callback }) {
   }
 }
 
-function* watchFetchSchemaForEntity() {
+export function* watchFetchSchemaForEntity() {
   yield takeLatest(types.GET_SCHEMA_FOR_ENTITY_REQUEST, fetchSchemaForEntity);
 }
 

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

@@ -1,7 +1,7 @@
 import { take, fork, cancel, takeLatest } from 'redux-saga/effects';
 import { expectSaga } from 'redux-saga-test-plan';
 import * as matchers from 'redux-saga-test-plan/matchers';
-import { authorize, loginFlow, fetchSchemaForEntity, getSupportVideosConfig, watchForGetVideosConfig } from '../sagas';
+import { authorize, loginFlow, fetchSchemaForEntity, getSupportVideosConfig, watchForGetVideosConfig, watchFetchSchemaForEntity } from '../sagas';
 import { throwError } from 'redux-saga-test-plan/providers';
 import * as api from '../../../services/api';
 import {
@@ -13,6 +13,7 @@ import {
   GET_SUPPORT_VIDEOS_CONFIG_REQUEST,
   GET_SUPPORT_VIDEOS_CONFIG_SUCCESS,
   GET_SUPPORT_VIDEOS_CONFIG_FAILURE,
+  GET_SCHEMA_FOR_ENTITY_REQUEST,
 } from '../constants';
 import { callback, error, error2, videoConfigData } from '../../mockdata';
 
@@ -196,4 +197,14 @@ describe('watchForGetVideosConfig saga', () => {
       takeLatest(GET_SUPPORT_VIDEOS_CONFIG_REQUEST, getSupportVideosConfig),
     );
   });
+});
+
+describe('watchFetchSchemaForEntity saga', () => {
+  
+  it('test watchFetchSchemaForEntity', () => {
+    let generator = watchFetchSchemaForEntity();
+    expect(generator.next().value).toEqual(
+      takeLatest(GET_SCHEMA_FOR_ENTITY_REQUEST, fetchSchemaForEntity),
+    );
+  });
 });

package/v2Containers/CreativesContainer/index.js

@@ -596,9 +596,19 @@ export class Creatives extends React.Component {
           const channelTemplate = template.value;
           templateData.accountId = get(channelTemplate, 'definition.accountId');
           const type = (get(this.props, "messageDetails.type") || '').toLowerCase();
+          const sourceType = get(channelTemplate, 'definition.sourceType');
           if (type === LOYALTY) {
-            templateData.licenseCode = get(channelTemplate, 'definition.licenseCode');
-            templateData.templateId = get(channelTemplate, '_id');
+            if(sourceType === 'MAPP_SDK') {
+              templateData.templateId = get(channelTemplate, '_id');
+              templateData.licenseCode = get(channelTemplate, 'definition.licenseCode');
+              templateData.gatewayId = get(channelTemplate, 'definition.gatewayId');
+              templateData.gatewayAccountId = get(channelTemplate, 'definition.gatewayAccountId');
+              templateData.sourceType = get(channelTemplate, 'definition.sourceType');
+            } else {
+              templateData.templateId = get(channelTemplate, '_id');
+              templateData.licenseCode = get(channelTemplate, 'definition.licenseCode');
+              templateData.sourceType = get(channelTemplate, 'definition.sourceType');
+            }
           }
           const androidContent = channel === constants.INAPP ? get(channelTemplate, 'versions.base.content.ANDROID') : get(channelTemplate, 'versions.base.ANDROID');
           if (!isEmpty(androidContent)) {

package/v2Containers/MobilePush/Create/index.js

@@ -368,11 +368,23 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     };
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
-    obj.definition = {
-      accountId: this.props.Templates.selectedWeChatAccount.id,
-      licenseCode: this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier,
-      mode: this.props.params.mode,
-    };
+    if(this.props?.Templates?.selectedWeChatAccount?.sourceTypeName === 'MAPP_SDK') {
+      obj.definition = {
+        accountId: this.props.Templates.selectedWeChatAccount.id,
+        licenseCode: this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier,
+        gatewayId: this.props.Templates.selectedWeChatAccount.configs.gatewayId,
+        gatewayAccountId: this.props.Templates.selectedWeChatAccount.configs.gatewayAccountId,
+        mode: this.props.params.mode,
+        sourceType: this.props.Templates.selectedWeChatAccount.sourceTypeName,
+      };
+    } else {
+      obj.definition = {
+        accountId: this.props.Templates.selectedWeChatAccount.id,
+        licenseCode: this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier,
+        mode: this.props.params.mode,
+        sourceType: this.props.Templates.selectedWeChatAccount.sourceTypeName,
+      };
+    }
     const android = {};
     Object.keys(formData[0]).forEach((data) => {
       if (!!formData[0][data] && data !== "tabKey") {

package/v2Containers/MobilePush/Edit/index.js

@@ -338,10 +338,21 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     };
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
-    obj.definition = {
-      accountId: selectedWeChatAccount?.id,
-      licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
-    };
+    if(this.props?.Templates?.selectedWeChatAccount?.sourceTypeName === 'MAPP_SDK') {
+      obj.definition = {
+        accountId: selectedWeChatAccount.id,
+        licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
+        gatewayId: selectedWeChatAccount.configs.gatewayId,
+        gatewayAccountId: selectedWeChatAccount.configs.gatewayAccountId,
+        sourceType: selectedWeChatAccount.sourceTypeName,
+      };
+    } else {
+      obj.definition = {
+        accountId: selectedWeChatAccount?.id,
+        licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
+        sourceType: selectedWeChatAccount.sourceTypeName,
+      };
+    }
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {
       obj.definition.mode = get(this, 'props.Edit.templateDetails.mode', '') || get(this, 'props.Edit.templateDetails.definition.mode', '');
     }