@capillarytech/creatives-library 6.9.2 → 6.9.5

package/v2Containers/Email/initialSchema.js

@@ -199,24 +199,9 @@ export const response = {
                               "getEditorInstanse",
                             ],
                           },
-                          // will remove once bee gets tested end to end
-                          // {
-                          //   id: "edmeditor",
-                          //   type: "edmeditor",
-                          //   metaType: "text",
-                          //   datatype: "string",
-                          //   required: true,
-                          //   onlyDisplay: true,
-                          //   standalone: false,
-                          //   width: 24,
-                          //   order: 2,
-                          //   customComponent: true,
-                          //   colStyle: { display: "none" },
-                          //   supportedEvents: [],
-                          // },
                           {
-                            id: "BEEeditor",
-                            type: "BEEeditor",
+                            id: "edmeditor",
+                            type: "edmeditor",
                             metaType: "text",
                             datatype: "string",
                             required: true,
@@ -380,7 +365,7 @@ export const response = {
                           styling: "semantic",
                           order: 3,
                           width: 2,
-                          offset: 4,
+                          offset: 1,
                           fluid: false,
                           onlyDisplay: true,
                           submitAction: "onTabOptionSelect",

package/v2Containers/Email/sagas.js

@@ -53,7 +53,7 @@ export function* getAllAssets(assetType, queryParams) {
 
 export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSupport}) {
   try {
-    const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport);
+    const result = yield call(Api.getCmsTemplateSettings, cmsType, projectId, cmsMode, langId, isEdmSupport);
 
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
   } catch (error) {
@@ -63,7 +63,7 @@ export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSuppor
 
 export function* getCmsData({cmsType, projectId, langId}) {
   try {
-    const result = yield call(Api.getCmsTemplateDataV2, cmsType, projectId, langId);
+    const result = yield call(Api.getCmsTemplateData, cmsType, projectId, langId);
 
     yield put({ type: types.GET_CMS_EDITOR_DATA_SUCCESS, data: result.data.response.data, langId: result.data.response.langId });
   } catch (error) {

package/v2Containers/Email/selectors.js

@@ -26,14 +26,9 @@ const selectLoadingStatus = () => createSelector(
   selectEmailDomain(), (email) => email.createTemplateInProgress || (email.assetUploading !== undefined && email.assetUploading)
 );
 
-const makeSelectFetchingCmsData = () => createSelector(
-  selectEmailDomain(), (state) => state.get('fetchingCmsData')
-);
-
 export default makeSelectEmail;
 export {
   makeSelectEmail,
   makeSelectCreateResponse,
   selectLoadingStatus,
-  makeSelectFetchingCmsData,
 };

package/v2Containers/EmailWrapper/index.js

@@ -15,13 +15,7 @@ import styled from 'styled-components';
 import { CapRadioCard, CapNotification, CapInput, CapUploader, CapSpin, CapButton } from '@capillarytech/cap-ui-library';
 import ComponentWithLabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
 import { UserIsAuthenticated } from '../../utils/authWrapper';
-import {
-  selectEmailLayout,
-  selectCmsTemplates,
-  selectEdmEditor,
-  uploadSelector,
-  selectCmsTemplatesLoader,
-} from '../Templates/selectors';
+import { selectEmailLayout, selectCmsTemplates, selectEdmEditor, uploadSelector } from '../Templates/selectors';
 import * as templatesActionsCreators from '../Templates/actions';
 import Email from '../Email';
 import CmsTemplatesComponent from '../../v2Components/CmsTemplatesComponent';
@@ -82,7 +76,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       //document.getElementById('upload-email-template').click();
     } else if (step === "templateSelection" && !this.state.selectedCreateMode) {
       if (emailCreateMode === "editor" && !CmsTemplates) {
-        templatesActions.getDefaultBeeTemplates();
+        templatesActions.getEdmDefaultTemplates();
       }
     } else if (step === "createTemplateContent" && !this.state.selectedCreateMode) {
       if (emailCreateMode === 'upload' && !_.isEmpty(EmailLayout)) {
@@ -162,7 +156,6 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
     const data = _.find(CmsTemplates, { _id: id });
 
     templatesActions.setEdmTemplate(data);
-    templatesActions.setBEETemplate(data);
     this.setState({
       selectedCreateMode: 'editor',
     });
@@ -195,7 +188,6 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       selectedOfferDetails,
       onPreviewContentClicked,
       onTestContentClicked,
-      cmsTemplatesLoader,
     } = this.props;
     const {
       templateName,
@@ -214,7 +206,6 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                   value={templateName}
                   labelPosition="top"
                   size="default"
-                  style={{ width: '68%'}}
                 />
               }
               <CardContainer>
@@ -260,13 +251,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 onPreviewContentClicked={onPreviewContentClicked}
                 onTestContentClicked={onTestContentClicked}
               />}
-              {!isShowEmailCreate && (
-                <CmsTemplatesComponent
-                  cmsTemplates={CmsTemplates}
-                  handleEdmDefaultTemplateSelection={this.useEditor}
-                  cmsTemplatesLoader={cmsTemplatesLoader}
-                />
-              )}
+              {CmsTemplates && !isShowEmailCreate && <CmsTemplatesComponent cmsTemplates={CmsTemplates} handleEdmDefaultTemplateSelection={this.useEditor} />}
             </div>
           }
         </CapSpin>
@@ -304,7 +289,6 @@ const mapStateToProps = createStructuredSelector({
   CmsTemplates: selectCmsTemplates(),
   SelectedEdmDefaultTemplate: selectEdmEditor(),
   isUploading: uploadSelector(),
-  cmsTemplatesLoader: selectCmsTemplatesLoader(),
 });
 
 function mapDispatchToProps(dispatch) {

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

@@ -72,7 +72,7 @@ export const LineImage = ({
     useEffect(() => {
         if (imageSrc && (isFullMode ? messageTitle: true) && imagePreview) {
                 updateMessageState({
-                    isError: !imageSrc || !(isFullMode ? messageTitle : true) || (isImageError && errorMessageTitle),
+                    isError: !imageSrc || !(isFullMode ? messageTitle : true) || isImageError || errorMessageTitle,
                     originalContentUrl: imageSrc,
                     previewImageUrl: imagePreview,
                     messageTitle,
@@ -87,14 +87,16 @@ export const LineImage = ({
         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();
+            if (imsSrc) {
+                updateUploadedAssetList({
+                    ...uploadedAssetList,
+                    [index]: {
+                        imgPreview,
+                        imgSrc,
+                    },
+                });
+                actions.clearAsset();
+            }
         }
     }, [Line.uploadedAssetData]);
 
@@ -148,16 +150,16 @@ export const LineImage = ({
         let errorMessage = false;
         if (value === '') {
             errorMessage = formatMessage(messages.emptyTitleErrorMessage);
-            updateMessageState({
-                isError: true,
-                originalContentUrl: imageSrc,
-                previewImageUrl: imagePreview,
-                messageTitle: '',
-                index,
-                type: 'image',
-                messageType: 'originalContentUrl',
-            });
         }
+        updateMessageState({
+            isError: !imageSrc || !(isFullMode ? value : true) || isImageError || !value,
+            originalContentUrl: imageSrc,
+            previewImageUrl: imagePreview,
+            messageTitle: value,
+            index,
+            type: 'image',
+            messageType: 'originalContentUrl',
+        });
         updateErrorMessageTitle(errorMessage);
     }
 
@@ -407,7 +409,7 @@ export const LineImage = ({
             updateImageSrc(image);
             updateImagePreview(imagePreview);
             updateMessageState({
-                isError: !image || !(isFullMode ? messageTitle : true) || (isImageError && errorMessageTitle),
+                isError: !image || !(isFullMode ? messageTitle : true) || isImageError || errorMessageTitle,
                 originalContentUrl: image,
                 previewImageUrl: imagePreview,
                 messageTitle,