@capillarytech/creatives-library 7.18.0-beta.0 → 8.0.0

package/v2Containers/Line/Container/Wrapper/tests/index.test.js

@@ -1,15 +1,17 @@
 import React from 'react';
-import { browserHistory } from 'react-router';
 import { Provider } from 'react-redux';
-import configureStore from '../../../../../store';
+import { createBrowserHistory } from 'history';
+import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils';
+import { initialReducer } from '../../../../../initialReducer';
 import { mountWithIntl } from '../../../../../helpers/intl-enzym-test-helpers';
 import { LineWrapper } from '../index';
 import { mockData } from './mockData';
 import {isValidText} from '../utils';
 
 let store;
+let browserHistory = createBrowserHistory();
 beforeAll(() => {
-  store = configureStore({}, browserHistory);
+  store = configureStore({}, initialReducer, browserHistory);
 });
 
 jest.mock('../../ImageCarousel/Content', () => ({

package/v2Containers/Line/Container/Wrapper/utils.js

@@ -68,7 +68,7 @@ export const getTabPanes = (props) => {
 };
 
 export const isUrl = (url) => {
-  const res = url.match(/(http(s)?:\/\/.)(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
+  const res = url.match(/(http(s)?:\/\/)(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
   return res;
 };
 

package/v2Containers/Line/Container/index.js

@@ -34,6 +34,7 @@ import * as templateActionsConfig from '../../Templates/actions';
 import withCreatives from '../../../hoc/withCreatives';
 import { gtmPush } from '../../../utils/gtmTrackers';
 import { LINE } from '../../CreativesContainer/constants';
+import * as commonUtil from '../../../utils/common';
 
 const { stopTimer } = GA.timeTracker;
 
@@ -71,6 +72,8 @@ export const LineContainer = ({
     const [uploadedAssetList, updateUploadedAssetList] = useState({});
     const [selectedAccount, updateSelectedAccount] = useState('');
 
+    const hasJPLocaleHideFeatureEnabled = commonUtil?.hasJPLocaleHideFeatureEnabled();
+
     useEffect(() => {
         if  (!isFullMode) {
             templateActions.getWeCrmAccounts('Line');
@@ -689,6 +692,7 @@ export const LineContainer = ({
                 channel="LINE"
                 content={templateContent}
                 LineAccountName={accountName[0]}
+                hasJPLocaleHideFeatureEnabled={hasJPLocaleHideFeatureEnabled}
             />
         )
     }

package/v2Containers/Line/Container/sagas.js

@@ -1,7 +1,6 @@
 // Line Sagas
 
-import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 
@@ -35,15 +34,15 @@ export function* uploadAsset(file, assetType, fileParams ) {
 
 function* watchCreateTemplate() {
   
-  const watcher = yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
+  
+  
 }
 function* watchUploadAsset() {
   
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 
 // edit
@@ -108,27 +107,27 @@ export function* getLineStickers() {
 }
 
 function* watchEditTemplate() {
-  const watcher = yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchLineTemplatesList() {
-  const watcher = yield takeLatest(types.GET_LINE_TEMPLATES_LIST_REQUEST, getLineTemplatesList);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_LINE_TEMPLATES_LIST_REQUEST, getLineTemplatesList);
+  
+  
 }
 
 function* watchGetLineStickers() {
-  const watcher = yield takeLatest(types.GET_STICKER_REQUEST, getLineStickers);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_STICKER_REQUEST, getLineStickers);
+  
+  
 }
 
 // All sagas to be loaded
@@ -140,3 +139,14 @@ export default [
   watchLineTemplatesList,
   watchGetLineStickers,
 ];
+
+export function* v2LineContainerSagas() {
+  yield all([
+    watchCreateTemplate(),
+    watchUploadAsset(),
+    watchEditTemplate(),
+    watchGetTemplateDetails(),
+    watchLineTemplatesList(),
+    watchGetLineStickers(),
+  ]);
+}