@capillarytech/creatives-library 6.8.7 → 6.9.0

package/v2Containers/Email/initialSchema.js

@@ -199,9 +199,24 @@ 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: "edmeditor",
-                            type: "edmeditor",
+                            id: "BEEeditor",
+                            type: "BEEeditor",
                             metaType: "text",
                             datatype: "string",
                             required: true,

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.getCmsTemplateSettings, cmsType, projectId, cmsMode, langId, isEdmSupport);
+    const result = yield call(Api.getCmsTemplateSettingsV2, 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.getCmsTemplateData, cmsType, projectId, langId);
+    const result = yield call(Api.getCmsTemplateDataV2, 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,9 +26,14 @@ 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,7 +15,13 @@ 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 } from '../Templates/selectors';
+import {
+  selectEmailLayout,
+  selectCmsTemplates,
+  selectEdmEditor,
+  uploadSelector,
+  selectCmsTemplatesLoader,
+} from '../Templates/selectors';
 import * as templatesActionsCreators from '../Templates/actions';
 import Email from '../Email';
 import CmsTemplatesComponent from '../../v2Components/CmsTemplatesComponent';
@@ -76,7 +82,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.getEdmDefaultTemplates();
+        templatesActions.getDefaultBeeTemplates();
       }
     } else if (step === "createTemplateContent" && !this.state.selectedCreateMode) {
       if (emailCreateMode === 'upload' && !_.isEmpty(EmailLayout)) {
@@ -156,6 +162,7 @@ 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',
     });
@@ -188,6 +195,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       selectedOfferDetails,
       onPreviewContentClicked,
       onTestContentClicked,
+      cmsTemplatesLoader,
     } = this.props;
     const {
       templateName,
@@ -251,7 +259,13 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 onPreviewContentClicked={onPreviewContentClicked}
                 onTestContentClicked={onTestContentClicked}
               />}
-              {CmsTemplates && !isShowEmailCreate && <CmsTemplatesComponent cmsTemplates={CmsTemplates} handleEdmDefaultTemplateSelection={this.useEditor} />}
+              {!isShowEmailCreate && (
+                <CmsTemplatesComponent
+                  cmsTemplates={CmsTemplates}
+                  handleEdmDefaultTemplateSelection={this.useEditor}
+                  cmsTemplatesLoader={cmsTemplatesLoader}
+                />
+              )}
             </div>
           }
         </CapSpin>
@@ -289,6 +303,7 @@ const mapStateToProps = createStructuredSelector({
   CmsTemplates: selectCmsTemplates(),
   SelectedEdmDefaultTemplate: selectEdmEditor(),
   isUploading: uploadSelector(),
+  cmsTemplatesLoader: selectCmsTemplatesLoader(),
 });
 
 function mapDispatchToProps(dispatch) {

package/v2Containers/TagList/index.js

@@ -242,8 +242,11 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           tags={tags}
           onSelect={this.onSelect}
           label={this.props.label}
+          visibleTaglist={this.props.visibleTaglist}
+          hidePopover={this.props.hidePopover}
           onContextChange={this.getTagsforContext}
           moduleFilterEnabled={this.props.moduleFilterEnabled}
+          modalProps={this.props.modalProps}
         />
       </div>
     );
@@ -265,6 +268,9 @@ TagList.propTypes = {
   className: PropTypes.string,
   userLocale: PropTypes.string,
   selectedOfferDetails: PropTypes.array,
+  visibleTaglist: PropTypes.bool,
+  hidePopover: PropTypes.bool,
+  modalProps: PropTypes.any,
 };
 
 const mapStateToProps = createStructuredSelector({