@capillarytech/creatives-library 6.8.2 → 6.8.3

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/Drawer/index.js

@@ -1,11 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import CapInput from '@capillarytech/cap-ui-library/CapInput';
-import CapHeading from '@capillarytech/cap-ui-library/CapHeading';
-import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 import CapCustomCard from '@capillarytech/cap-ui-library/CapCustomCard';
-import { injectIntl, FormattedMessage } from 'react-intl';
 import Pagination from '../../../../v2Components/Pagination';
-import messages from './messages';
 
 const {CapCustomCardList} = CapCustomCard;
 
@@ -14,22 +10,10 @@ export const LineDrawer = ({
     cardDataList,
     isDrawer,
     searchPlaceholder,
-    intl: {
-        formatMessage,
-    },
-    Templates
 }) => {
 
     const [currentPage, updateCurrentPage] = useState(0);
     const [searchText, updateSearchText] = useState('');
-    const [isSearching, updateSearchStatus] = useState(false);
-
-    useEffect(() => {
-        const { getAllTemplatesInProgress } = Templates || {};
-        if (getAllTemplatesInProgress !== undefined) {
-            updateSearchStatus(getAllTemplatesInProgress);
-        }
-    }, [Templates]);
 
     useEffect(() => {
         if (!isDrawer) {
@@ -38,9 +22,6 @@ export const LineDrawer = ({
         }
     }, [isDrawer]);
 
-    useEffect(() => {
-    }, [cardDataList]);
-
     let delayTimer = 0;
 
     const getAllLineTemplate = ({params = {} , getNextPage, resetPage}, isReRender = false) => {
@@ -86,7 +67,7 @@ export const LineDrawer = ({
     }
 
     return (
-        <CapSpin spinning={isSearching} tip={formatMessage(messages.gettingAllTemplates)} style={{width: '100%'}}>
+        <>
             <CapInput.Search
                 className="search-text"
                 style={{width: 324}}
@@ -96,15 +77,6 @@ export const LineDrawer = ({
                 onClear={() => searchTemplate('')}
             />
             <Pagination onPageChange={() => { getAllLineTemplate({getNextPage: true}); }} paginationSelector="pagination-container">
-                {
-                    !cardDataList.length
-                    ? (
-                        <CapHeading type="h6" style={{ textAlign: 'center', padding: 20 }}>
-                            <FormattedMessage {...messages.noTemplatesFound} />
-                        </CapHeading>
-                    )
-                    : null
-                }
                 <div className="pagination-container">
                     <CapCustomCardList
                         key={'LINE-card-list'}
@@ -114,8 +86,8 @@ export const LineDrawer = ({
                     />
                 </div>
             </Pagination>
-        </CapSpin>
+        </>
         )
 }
 
-export default injectIntl(LineDrawer);
+export default LineDrawer;

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

@@ -39,9 +39,6 @@ export const LineImage = ({
     activeKey,
     Templates,
     getAllTemplates,
-    uploadedAssetList,
-    updateUploadedAssetList,
-    deleteUploadedImgList,
 }) => {
     if (activeKey !== 'image') {
         return null;
@@ -84,40 +81,17 @@ 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', '');
-            updateUploadedAssetList({
-                ...uploadedAssetList,
-                [index]: {
-                    imgPreview,
-                    imgSrc,
-                },
-            });
-            actions.clearAsset();
-        }
-    }, [Line.uploadedAssetData]);
-
-    useEffect(() => {
-        const imgSrc = get(uploadedAssetList[index], 'imgSrc', '');
-        const imgPreview = get(uploadedAssetList[index], 'imgPreview', '');
+        const imgSrc = get(Line, 'uploadedAssetData.metaInfo.secure_file_path', '');
+        const imgPreview = get(Line, 'uploadedAssetData.metaInfo.secure_file_path_preview', '');
 
         if (imgSrc) {
             updateImageSrc(imgSrc);
             updateImageStatus(true);
+        }
+        if (imgPreview)  {
             updateImagePreview(imgPreview);
-
-            updateMessageState({
-                isError: !imgSrc || !(isFullMode ? messageTitle : true) || errorMessageTitle,
-                originalContentUrl: imgSrc,
-                previewImageUrl: imgPreview,
-                messageTitle,
-                index,
-                type: 'image',
-                messageType: 'originalContentUrl',
-            });
         }
-    }, [uploadedAssetList]);
+    }, [Line]);
 
     const submitAction = (data, incorrectFile) => {
         const {
@@ -131,9 +105,8 @@ export const LineImage = ({
             type,
         } = data;
         if (incorrectFile || size > LINE_IMG_SIZE || height > LINE_IMG_HEIGHT || width > LINE_IMG_WIDTH) {
-            updateImageErrorMessage(formatMessage(messages.lineImageIncorrectSize));
+            updateImageErrorMessage(formatMessage(messages.lineImageIncorrectSize))
         } else {
-            updateImageErrorMessage('');
             data.fileParams.isGeneratePreview = true;
             actions.uploadAsset(
                 data.file,
@@ -234,7 +207,6 @@ export const LineImage = ({
         if (!isFullMode) {
             updateCreateNew(false);
         }
-        deleteUploadedImgList(index);
         updateImageSrc('');
         updateImagePreview('');
         updateMessageState({
@@ -391,7 +363,6 @@ export const LineImage = ({
                 getAllTemplates={getAllTemplates}
                 cardDataList={cardDataList}
                 isDrawer={isTemplateDrawerRequired}
-                Templates={Templates}
                 searchPlaceholder={formatMessage(messages.searchImages)}
             />
         </>

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

@@ -1,7 +1,7 @@
 export const LINE_ASSET_WIDTH = 1040;
 export const LINE_ASSET_HEIGHT = 1040;
 export const LINE_CUSTOM_ASSET_HEIGHT_MIN = 520;
-export const LINE_CUSTOM_ASSET_HEIGHT_MAX= 2080;
+export const LINE_CUSTOM_ASSET_HEIGHT_MAX= 1040;
 export const DEFAULT_ASSET_TYPE = 'default';
 export const CUSTOM_ASSET_TYPE = 'custom';
 export const DEFAULT_TEMPLATES = [

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

@@ -164,12 +164,11 @@ export const LineImageMap = ({
             type,
         } = data;
         const validWidth = width === LINE_ASSET_WIDTH;
-        const isCustom = assetType === CUSTOM_ASSET_TYPE;
-        const validHeight = isCustom ? ( LINE_CUSTOM_ASSET_HEIGHT_MIN <= height && height <= LINE_CUSTOM_ASSET_HEIGHT_MAX) : height === LINE_ASSET_HEIGHT;
-        if (incorrectFile || !validWidth || !validHeight) {
-            updateImageErrorMessage(formatMessage(messages.lineImageMapIncorrectSize));
+        const validHeight = assetType === CUSTOM_ASSET_TYPE ? ( LINE_CUSTOM_ASSET_HEIGHT_MIN <= height && height <= LINE_CUSTOM_ASSET_HEIGHT_MAX) : height === LINE_ASSET_HEIGHT;
+        if (incorrectFile || size > LINE_IMG_SIZE || !validWidth || !validHeight) {
+            updateImageErrorMessage(formatMessage(messages.lineImageMapIncorrectSize))
         } else {
-            updateImageErrorMessage('');
+            updateImageErrorMessage('')
             data.fileParams.isGeneratePreview = true;
             updateBaseSize({
               height,
@@ -177,7 +176,7 @@ export const LineImageMap = ({
             });
             actions.uploadAsset(
                 data.file,
-                isCustom ? `${data.type}?assetType=${CUSTOM_ASSET_TYPE}` : data.type,
+                data.type,
                 data.fileParams,
             );
         }
@@ -324,12 +323,12 @@ export const LineImageMap = ({
                     <CapHeading className="dragger-or" type="label6">
                         <FormattedMessage {...messages.or} />
                     </CapHeading>
-                    <CapButton className="dragger-button" type="secondary" style={{marginRight: CAP_SPACE_08}} disabled={!imageMapTemplate}>
+                    <CapButton className="dragger-button" type="secondary" style={{marginRight: CAP_SPACE_08}}>
                         <FormattedMessage {...messages.uploadComputer} />
                     </CapButton>
                 </CapUploader.CapDragger>
                 <CapLabel type="label9" style={{marginTop: CAP_SPACE_12 }}>
-                    {formatMessage(messages.imageDimenstionDescription, {dimensions: assetType === DEFAULT_ASSET_TYPE ? '1040 X 1040 px' : '1040 X 520 - 2080 px'})}
+                    {formatMessage(messages.imageDimenstionDescription, {dimensions: assetType === DEFAULT_ASSET_TYPE ? '1040 X 1040 px' : '1040 X 520 - 2040 px'})}
                 </CapLabel>
                 <CapDivider />
             </>);
@@ -338,7 +337,7 @@ export const LineImageMap = ({
           <>
             <CapImage className="base-image-preview" src={`${imageSrc}/1040`} />
             <CapLabel type="label9" style={{marginTop: CAP_SPACE_12 }}>
-              {formatMessage(messages.imageDimenstionDescription, {dimensions: assetType === DEFAULT_ASSET_TYPE ? '1040 X 1040 px' : '1040 X 520 - 2080 px'})}
+              {formatMessage(messages.imageDimenstionDescription, {dimensions: assetType === DEFAULT_ASSET_TYPE ? '1040 X 1040 px' : '1040 X 520 - 2040 px'})}
             </CapLabel>
             <CapDivider />
           </>

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

@@ -296,7 +296,6 @@ export const LineText = ({
                 isDrawer={isDrawerRequired}
                 className="drawer-head"
                 searchPlaceholder={formatMessage(messages.searchText)}
-                Templates={Templates}
             />
         </>
         );

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

@@ -71,7 +71,6 @@ export const LineWrapper = ({
             });
         } else {
             togglePopup(true);
-            rest.deleteUploadedImgList(index);
             updateSelectedKey(type);
             updateActiveKey(activeKey);
         }

package/v2Containers/Line/Container/index.js

@@ -62,7 +62,6 @@ export const LineContainer = ({
     const [isEditFlow, checkEditFlow] = useState(false);
     const [isEditLoading, updateEditLoading] = useState(false);
     const [accountSelectFlow, updateAccountSelectFlow] = useState(false);
-    const [uploadedAssetList, updateUploadedAssetList] = useState({});
     const [selectedAccount, updateSelectedAccount] = useState('');
 
     useEffect(() => {
@@ -72,7 +71,6 @@ export const LineContainer = ({
             const queryParams = {"sortBy":"Most Recent","page":1,"perPage":25};
             templateActions.getAllTemplates('Line', queryParams);
         }
-        return () => actions.clearAsset();
     }, []);
 
     const onAccountSelect = (account) => {
@@ -176,12 +174,6 @@ export const LineContainer = ({
         }
     }, [templateData]);
 
-    const deleteUploadedImgList = (selectedIndex) => {
-        const newUploadedAssetList = { ...uploadedAssetList };
-        delete newUploadedAssetList[selectedIndex];
-        updateUploadedAssetList(newUploadedAssetList);
-    }
-
     const addLineWrappers = () => {
         updateLineWrapperContent([...lineWrapperContents, ...initialWrapperContent])
     }
@@ -189,11 +181,6 @@ export const LineContainer = ({
     const deleteWrapper = index => {
         const selectedIndex = lineWrapperContents.findIndex((el, i) => i === index);
         if (selectedIndex > -1) {
-            // change uploaded img sequence
-            const newUploadedAssetList = { ...uploadedAssetList };
-            delete newUploadedAssetList[index];
-            updateUploadedAssetList(newUploadedAssetList);
-
             const newLineWrapperContents = [...lineWrapperContents];
             newLineWrapperContents.splice(selectedIndex, 1);
             updateLineWrapperContent(newLineWrapperContents);
@@ -204,14 +191,6 @@ export const LineContainer = ({
         const selectedIndex = lineWrapperContents.findIndex((el, i) => i === index);
         const selectedElement = lineWrapperContents.find((el, i) => i === index);
         if (selectedIndex > -1) {
-            // change uploaded img sequence
-            const newUploadedAssetList = { ...uploadedAssetList };
-            const selectedUploadedAsset = uploadedAssetList[index];
-            const newPositionUploadedAsset = uploadedAssetList[index - 1];
-            newUploadedAssetList[index - 1] = selectedUploadedAsset;
-            newUploadedAssetList[index] = newPositionUploadedAsset;
-            updateUploadedAssetList(newUploadedAssetList);
-
             const newLineWrapperContents = [...lineWrapperContents];
             newLineWrapperContents.splice(selectedIndex, 1);
             newLineWrapperContents.splice(selectedIndex - 1, 0, selectedElement);
@@ -223,14 +202,6 @@ export const LineContainer = ({
         const selectedIndex = lineWrapperContents.findIndex((el, i) => i === index);
         const selectedElement = lineWrapperContents.find((el, i) => i === index);
         if (selectedIndex > -1) {
-            // change uploaded img sequence
-            const newUploadedAssetList = { ...uploadedAssetList };
-            const selectedUploadedAsset = uploadedAssetList[index];
-            const newPositionUploadedAsset = uploadedAssetList[index + 1];
-            newUploadedAssetList[index + 1] = selectedUploadedAsset;
-            newUploadedAssetList[index] = newPositionUploadedAsset;
-            updateUploadedAssetList(newUploadedAssetList);
-
             const newLineWrapperContents = [...lineWrapperContents];
             newLineWrapperContents.splice(selectedIndex, 1);
             newLineWrapperContents.splice(selectedIndex + 1, 0, selectedElement);
@@ -287,9 +258,6 @@ export const LineContainer = ({
                     lineWrappers={lineWrapperContents.length}
                     Templates={Templates}
                     getAllTemplates={templateActions.getAllTemplates}
-                    uploadedAssetList={uploadedAssetList}
-                    deleteUploadedImgList={deleteUploadedImgList}
-                    updateUploadedAssetList={updateUploadedAssetList}
                 />
             );
         });
@@ -537,7 +505,7 @@ export const LineContainer = ({
         <div className={className}>
             <CapSpin spinning={isLoading}>
                 <CapRow>
-                    <CapColumn span={14} style={{ zIndex: 1 }}>
+                    <CapColumn span={14}>
                         {getAccountSection()}
                         <CapHeader
                             title={formatMessage(messages.lineCreativeTitle)}