@capillarytech/creatives-library 6.10.2 → 6.10.4

package/v2Containers/CreativesContainer/sagas.js

@@ -1,11 +1,11 @@
-// import { take, call, put, select } from 'redux-saga/effects';
-
-// Individual exports for testing
-export function* defaultSaga() {
-  // See example in v2Containers/HomePage/sagas.js
-}
-
-// All sagas to be loaded
-export default [
-  defaultSaga,
-];
+// import { take, call, put, select } from 'redux-saga/effects';
+
+// Individual exports for testing
+export function* defaultSaga() {
+  // See example in v2Containers/HomePage/sagas.js
+}
+
+// All sagas to be loaded
+export default [
+  defaultSaga,
+];

package/v2Containers/CreativesContainer/selectors.js

@@ -1,30 +1,30 @@
-import { createSelector } from 'reselect';
-
-/**
- * Direct selector to the creativesContainer state domain
- */
-const selectCreativesContainerDomain = () => (state) => state.get('creativesContainer');
-
-/**
- * Other specific selectors
- */
-
-
-/**
- * Default selector used by CreativesContainer
- */
-
-const makeSelectCreativesContainer = () => createSelector(
-  selectCreativesContainerDomain(),
-  (substate) => substate.toJS()
-);
-const isLoading = () => createSelector(
-  makeSelectCreativesContainer(),
-  (substate) => substate.containerLoader
-);
-
-export default makeSelectCreativesContainer;
-export {
-  selectCreativesContainerDomain,
-  isLoading,
-};
+import { createSelector } from 'reselect';
+
+/**
+ * Direct selector to the creativesContainer state domain
+ */
+const selectCreativesContainerDomain = () => (state) => state.get('creativesContainer');
+
+/**
+ * Other specific selectors
+ */
+
+
+/**
+ * Default selector used by CreativesContainer
+ */
+
+const makeSelectCreativesContainer = () => createSelector(
+  selectCreativesContainerDomain(),
+  (substate) => substate.toJS()
+);
+const isLoading = () => createSelector(
+  makeSelectCreativesContainer(),
+  (substate) => substate.containerLoader
+);
+
+export default makeSelectCreativesContainer;
+export {
+  selectCreativesContainerDomain,
+  isLoading,
+};

package/v2Containers/CreativesContainer/tests/actions.test.js

@@ -1,18 +1,18 @@
-
-import {
-  defaultAction,
-} from '../actions';
-import {
-  DEFAULT_ACTION,
-} from '../constants';
-
-describe('CreativesContainer actions', () => {
-  describe('Default Action', () => {
-    it('has a type of DEFAULT_ACTION', () => {
-      const expected = {
-        type: DEFAULT_ACTION,
-      };
-      expect(defaultAction()).toEqual(expected);
-    });
-  });
-});
+
+import {
+  defaultAction,
+} from '../actions';
+import {
+  DEFAULT_ACTION,
+} from '../constants';
+
+describe('CreativesContainer actions', () => {
+  describe('Default Action', () => {
+    it('has a type of DEFAULT_ACTION', () => {
+      const expected = {
+        type: DEFAULT_ACTION,
+      };
+      expect(defaultAction()).toEqual(expected);
+    });
+  });
+});

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

@@ -1,10 +1,10 @@
-// import React from 'react';
-// import { shallow } from 'enzyme';
-
-// import { CreativesContainer } from '../index';
-
-describe('<CreativesContainer />', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(true);
-  });
-});
+// import React from 'react';
+// import { shallow } from 'enzyme';
+
+// import { CreativesContainer } from '../index';
+
+describe('<CreativesContainer />', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(true);
+  });
+});

package/v2Containers/CreativesContainer/tests/reducer.test.js

@@ -1,9 +1,9 @@
-
-import { fromJS } from 'immutable';
-import creativesContainerReducer from '../reducer';
-
-describe('creativesContainerReducer', () => {
-  it('returns the initial state', () => {
-    expect(creativesContainerReducer(undefined, {})).toEqual(fromJS({}));
-  });
-});
+
+import { fromJS } from 'immutable';
+import creativesContainerReducer from '../reducer';
+
+describe('creativesContainerReducer', () => {
+  it('returns the initial state', () => {
+    expect(creativesContainerReducer(undefined, {})).toEqual(fromJS({}));
+  });
+});

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

@@ -1,15 +1,15 @@
-/**
- * Test  sagas
- */
-
-/* eslint-disable redux-saga/yield-effects */
-// import { take, call, put, select } from 'redux-saga/effects';
-// import { defaultSaga } from '../sagas';
-
-// const generator = defaultSaga();
-
-describe('defaultSaga Saga', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(true);
-  });
-});
+/**
+ * Test  sagas
+ */
+
+/* eslint-disable redux-saga/yield-effects */
+// import { take, call, put, select } from 'redux-saga/effects';
+// import { defaultSaga } from '../sagas';
+
+// const generator = defaultSaga();
+
+describe('defaultSaga Saga', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(true);
+  });
+});

package/v2Containers/CreativesContainer/tests/selectors.test.js

@@ -1,10 +1,10 @@
-// import { fromJS } from 'immutable';
-// import { makeSelectCreativesContainerDomain } from '../selectors';
-
-// const selector = makeSelectCreativesContainerDomain();
-
-describe('makeSelectCreativesContainerDomain', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(true);
-  });
-});
+// import { fromJS } from 'immutable';
+// import { makeSelectCreativesContainerDomain } from '../selectors';
+
+// const selector = makeSelectCreativesContainerDomain();
+
+describe('makeSelectCreativesContainerDomain', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(true);
+  });
+});

package/v2Containers/Line/Container/Image/index.js

@@ -84,9 +84,10 @@ export const LineImage = ({
     }, [errorMessageTitle, imageSrc, messageTitle, isImageError]);
 
     useEffect(() => {
-        if (Line.uploadedAssetData && Object.keys(Line.uploadedAssetData).length) {
-            const imgSrc = get(Line, 'uploadedAssetData.metaInfo.secure_file_path', '');
-            const imgPreview = get(Line, 'uploadedAssetData.metaInfo.secure_file_path_preview', '');
+        if (Line[`uploadedAssetData${index}`] && Object.keys(Line[`uploadedAssetData${index}`]).length) {
+            const imgSrc = get(Line, `uploadedAssetData${index}.metaInfo.secure_file_path`, '');
+            const imgPreview = get(Line, `uploadedAssetData${index}.metaInfo.secure_file_path_preview`, '');
+            actions.clearAsset(index);
             if (imgSrc) {
                 updateUploadedAssetList({
                     ...uploadedAssetList,
@@ -95,16 +96,16 @@ export const LineImage = ({
                         imgSrc,
                     },
                 });
-                actions.clearAsset();
             }
         }
-    }, [Line.uploadedAssetData]);
+    }, [Line[`uploadedAssetData${index}`]]);
 
     useEffect(() => {
         const imgSrc = get(uploadedAssetList[index], 'imgSrc', '');
         const imgPreview = get(uploadedAssetList[index], 'imgPreview', '');
+        const { type } = content;
 
-        if (imgSrc) {
+        if (imgSrc && type === 'image') {
             updateImageSrc(imgSrc);
             updateImageStatus(true);
             updateImagePreview(imgPreview);
@@ -141,6 +142,7 @@ export const LineImage = ({
                 data.file,
                 data.type,
                 data.fileParams,
+                index,
             );
         }
     }

package/v2Containers/Line/Container/ImageCarousel/Content.js

@@ -89,8 +89,8 @@ export const LineImageCarouselContent = ({
   }, [imageSrc, isImageError]);
 
   useEffect(() => {
-    if (Line.uploadedAssetDataImageCarousel && Object.keys(Line.uploadedAssetDataImageCarousel).length) {
-      const imgSrc = get(Line, 'uploadedAssetDataImageCarousel.metaInfo.secure_file_path', '');
+    if (Line[`uploadedAssetDataImageCarousel${index}`] && Object.keys(Line[`uploadedAssetDataImageCarousel${index}`]).length) {
+      const imgSrc = get(Line, `uploadedAssetDataImageCarousel${index}.metaInfo.secure_file_path`, '');
       if (imgSrc) {
         updateUploadedAssetList({
           ...uploadedAssetList,
@@ -101,10 +101,10 @@ export const LineImageCarouselContent = ({
             }
           },
         });
-        actions.clearAsset('ImageCarousel');
+        actions.clearAsset(`ImageCarousel${index}`);
       }
     }
-  }, [Line.uploadedAssetDataImageCarousel]);
+  }, [Line[`uploadedAssetDataImageCarousel${index}`]]);
 
   useEffect(() => {
     const imgSrc = get(uploadedAssetList[index], `${activeIndex}.imgSrc`, '');
@@ -148,7 +148,7 @@ export const LineImageCarouselContent = ({
         data.file,
         data.type,
         data.fileParams,
-        'ImageCarousel',
+        `ImageCarousel${index}`,
       );
     }
   }

package/v2Containers/Line/Container/ImageCarousel/index.js

@@ -120,7 +120,7 @@ export const LineImageCarousel = (props) => {
 			actionLabelErrorMessage,
 			activeIndex,
 		}) => {
-			isErrorIndex = (isErrorIndex !== undefined)
+			isErrorIndex = (isErrorIndex !== undefined && isErrorIndex !== false)
 				? isErrorIndex
 				: ((!originalContentUrl || !selectedActionType || actionContentErrorMessage || actionLabelErrorMessage || !actionContent) && activeIndex);
 			columns.push({

package/v2Containers/Line/Container/ImageMap/index.js

@@ -54,7 +54,10 @@ export const LineImageMap = ({
     content,
     activeKey,
     Templates,
-    getAllTemplates
+    getAllTemplates,
+    uploadedAssetList,
+    updateUploadedAssetList,
+    deleteUploadedImgList,
 }) => {
     if (activeKey !== IMAGE_MAP) {
         return null;
@@ -90,7 +93,7 @@ export const LineImageMap = ({
                 baseSize = {},
                 selectedTemplate,
                 assetType,
-                actionLinks,
+                actionLinks = {},
                 altText,
               } = content;
         if ( baseUrl && type === IMAGE_MAP) {
@@ -127,13 +130,26 @@ export const LineImageMap = ({
     }, [errorMessageTitle, imageSrc, messageTitle, isImageError, imageMapTemplate, actionLinks, assetType, isImage, templateSchema, altText]);
 
     useEffect(() => {
-        const imgSrc = get(Line, 'uploadedAssetData', false);
+        const imgSrc = get(Line, `uploadedAssetData${index}`, false);
         if (imgSrc && typeof imgSrc !== 'object') {
-            updateImageSrc(imgSrc.slice(0, -5));
+            updateUploadedAssetList({
+                ...uploadedAssetList,
+                [index]: {
+                    imgSrc: imgSrc.slice(0, -5),
+                },
+            });
+            actions.clearAsset(index);
+        }
+    }, [Line[`uploadedAssetData${index}`]]);
+
+    useEffect(() => {
+        const imgSrc = get(uploadedAssetList[index], 'imgSrc', '');
+
+        if (imgSrc) {
+            updateImageSrc(imgSrc);
             updateImageStatus(true);
-            actions.clearAsset()
         }
-    }, [Line]);
+    }, [uploadedAssetList]);
 
     const getActions = () => {
       const actionsMap = [];
@@ -187,6 +203,7 @@ export const LineImageMap = ({
                 data.file,
                 data.type,
                 data.fileParams,
+                index,
             );
         }
     }
@@ -323,6 +340,7 @@ export const LineImageMap = ({
 
     const onReUpload = () => {
         updateImageStatus(false);
+        deleteUploadedImgList(index);
         updateImageSrc('');
     }
 

package/v2Containers/Line/Container/reducer.js

@@ -42,14 +42,14 @@ function createReducer(state = initialState, action) {
       return state
         .set('uploadAssetSuccess', (action.statusCode !== undefined && action.statusCode !== '' && action.statusCode < 300))
         .set('assetUploading', false)
-        .set(action.templateType ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData', action.data);
+        .set(action.templateType !== undefined ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData', action.data);
     case types.UPLOAD_ASSET_FAILURE:
       return state
         .set('uploadAssetSuccess', false)
         .set('assetUploading', false);
     case types.CLEAR_ASSET:
       return state
-        .delete(action.templateType ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData');
+        .delete(action.templateType !== undefined ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData');
       // FOR EDIT
     case types.EDIT_TEMPLATE_REQUEST:
       return state

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

@@ -1,18 +1,18 @@
-
-import {
-  defaultAction,
-} from '../actions';
-import {
-  DEFAULT_ACTION,
-} from '../constants';
-
-describe('Templates actions', () => {
-  describe('Default Action', () => {
-    it('has a type of DEFAULT_ACTION', () => {
-      const expected = {
-        type: DEFAULT_ACTION,
-      };
-      expect(defaultAction()).toEqual(expected);
-    });
-  });
-});
+
+import {
+  defaultAction,
+} from '../actions';
+import {
+  DEFAULT_ACTION,
+} from '../constants';
+
+describe('Templates actions', () => {
+  describe('Default Action', () => {
+    it('has a type of DEFAULT_ACTION', () => {
+      const expected = {
+        type: DEFAULT_ACTION,
+      };
+      expect(defaultAction()).toEqual(expected);
+    });
+  });
+});

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

@@ -1,10 +1,10 @@
-// import React from 'react';
-// import { shallow } from 'enzyme';
-
-// import { Templates } from '../index';
-
-describe('<Templates />', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(false);
-  });
-});
+// import React from 'react';
+// import { shallow } from 'enzyme';
+
+// import { Templates } from '../index';
+
+describe('<Templates />', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});

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

@@ -1,9 +1,9 @@
-
-import { fromJS } from 'immutable';
-import templatesReducer from '../reducer';
-
-describe('templatesReducer', () => {
-  it('returns the initial state', () => {
-    expect(templatesReducer(undefined, {})).toEqual(fromJS({}));
-  });
-});
+
+import { fromJS } from 'immutable';
+import templatesReducer from '../reducer';
+
+describe('templatesReducer', () => {
+  it('returns the initial state', () => {
+    expect(templatesReducer(undefined, {})).toEqual(fromJS({}));
+  });
+});

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

@@ -1,15 +1,15 @@
-/**
- * Test  sagas
- */
-
-/* eslint-disable redux-saga/yield-effects */
-// import { take, call, put, select } from 'redux-saga/effects';
-// import { defaultSaga } from '../sagas';
-
-// const generator = defaultSaga();
-
-describe('defaultSaga Saga', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(false);
-  });
-});
+/**
+ * Test  sagas
+ */
+
+/* eslint-disable redux-saga/yield-effects */
+// import { take, call, put, select } from 'redux-saga/effects';
+// import { defaultSaga } from '../sagas';
+
+// const generator = defaultSaga();
+
+describe('defaultSaga Saga', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});

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

@@ -1,10 +1,10 @@
-// import { fromJS } from 'immutable';
-// import { makeSelectTemplatesDomain } from '../selectors';
-
-// const selector = makeSelectTemplatesDomain();
-
-describe('makeSelectTemplatesDomain', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(false);
-  });
-});
+// import { fromJS } from 'immutable';
+// import { makeSelectTemplatesDomain } from '../selectors';
+
+// const selector = makeSelectTemplatesDomain();
+
+describe('makeSelectTemplatesDomain', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});

package/v2Containers/TemplatesV2/TemplatesV2.style.js

@@ -1,29 +1,29 @@
-import { css } from 'styled-components';
-import {CAP_SPACE_24, CAP_SPACE_16} from '@capillarytech/cap-ui-library/styled/variables';
-
-export default css`
-  .cap-tab-v2-wrapper{
-    .ant-tabs-tabpane {
-        border: none;
-    }
-  }
-
-  .component-wrapper {
-    ${(props) => props.isFullMode ? `
-      max-width: 1140px;
-      margin: 0 auto;
-      width: 100%;
-      padding: ${CAP_SPACE_24} 0;
-      .ant-tabs-content{
-        margin-top: ${CAP_SPACE_16}
-      }
-    ` : `.cap-tab-v2 {
-      height: calc(100vh - 118px);
-    } `}
-  }
-`;
-
-export const CapTabStyle = css`
-  ${(props) => props.isFullMode ? `margin-top: ${CAP_SPACE_24}` : ``
-  }
-`;
+import { css } from 'styled-components';
+import {CAP_SPACE_24, CAP_SPACE_16} from '@capillarytech/cap-ui-library/styled/variables';
+
+export default css`
+  .cap-tab-v2-wrapper{
+    .ant-tabs-tabpane {
+        border: none;
+    }
+  }
+
+  .component-wrapper {
+    ${(props) => props.isFullMode ? `
+      max-width: 1140px;
+      margin: 0 auto;
+      width: 100%;
+      padding: ${CAP_SPACE_24} 0;
+      .ant-tabs-content{
+        margin-top: ${CAP_SPACE_16}
+      }
+    ` : `.cap-tab-v2 {
+      height: calc(100vh - 118px);
+    } `}
+  }
+`;
+
+export const CapTabStyle = css`
+  ${(props) => props.isFullMode ? `margin-top: ${CAP_SPACE_24}` : ``
+  }
+`;

package/v2Containers/TemplatesV2/actions.js

@@ -1,16 +1,16 @@
-
-import * as types from './constants';
-
-export function defaultAction() {
-  return {
-    type: types.DEFAULT_ACTION,
-  };
-}
-
-export function getTemplates({channel, query}) {
-  return {
-    type: types.GET_TEMPLATES_REQUEST,
-    channel,
-    query,
-  };
-}
+
+import * as types from './constants';
+
+export function defaultAction() {
+  return {
+    type: types.DEFAULT_ACTION,
+  };
+}
+
+export function getTemplates({channel, query}) {
+  return {
+    type: types.GET_TEMPLATES_REQUEST,
+    channel,
+    query,
+  };
+}

package/v2Containers/TemplatesV2/constants.js

@@ -1,10 +1,10 @@
-/*
- *
- * TemplatesV2 constants
- *
- */
-
-export const DEFAULT_ACTION = 'app/TemplatesV2/DEFAULT_ACTION';
-export const GET_TEMPLATES_REQUEST = 'app/TemplatesV2/GET_TEMPLATES_REQUEST';
-export const GET_TEMPLATES_SUCESS = 'app/TemplatesV2/GET_TEMPLATES_SUCESS';
-export const GET_TEMPLATES_FAILURE = 'app/TemplatesV2/GET_TEMPLATES_FAILURE';
+/*
+ *
+ * TemplatesV2 constants
+ *
+ */
+
+export const DEFAULT_ACTION = 'app/TemplatesV2/DEFAULT_ACTION';
+export const GET_TEMPLATES_REQUEST = 'app/TemplatesV2/GET_TEMPLATES_REQUEST';
+export const GET_TEMPLATES_SUCESS = 'app/TemplatesV2/GET_TEMPLATES_SUCESS';
+export const GET_TEMPLATES_FAILURE = 'app/TemplatesV2/GET_TEMPLATES_FAILURE';