@capillarytech/creatives-library 8.0.60 → 8.0.61-alpha.1

package/components/TemplatePreview/_templatePreview.scss

@@ -8,14 +8,14 @@
     .action-text-reply{
       position: absolute;
       left: 34%;
-      top: 59%;
+      top: 43% !important;
       color: #3861ca;
       font-weight: $FONT_WEIGHT_MEDIUM;
     }
     .action-text-cancel{
       position: absolute;
       left: 33.5%;
-      top: 66%;
+      top: 48% !important;
       color: #3861ca;
       font-weight: $FONT_WEIGHT_MEDIUM;
     }
@@ -25,7 +25,7 @@
   }
   .lock-screen-preview .lock-msgContainer{
     position: absolute;
-    top: 40%;
+    top: 30% !important;
     left: 25.9%;
     width: 21.5%;
     height: 60px;
@@ -55,7 +55,7 @@
   }
   .main-screen-preview .msgContainer{
     position: absolute;
-    top: 30%;
+    top: 30% !important;
     left: 53%;
     width: 42%;
     height: 336px;
@@ -138,8 +138,8 @@
     margin: 0 20px 0 auto;
     .action-text{
       position: absolute;
-      left: 27.5%;
-      top: 54%;
+      left: 28.5%;
+      top: 39% !important;
       font-size: $FONT_SIZE_VS;
       color: #3861ca;
       font-weight: $FONT_WEIGHT_MEDIUM;
@@ -150,8 +150,8 @@
   }
   .lock-screen-preview .lock-msgContainer{
     position: absolute;
-    top: 43%;
-    left: 25.9%;
+    top: 32% !important;
+    left: 26.9%;
     width: 21.5%;
     height: 52px;
     display: -webkit-box;
@@ -181,7 +181,7 @@
 
   .main-screen-preview .msgContainer{
     position: absolute;
-    top: 30%;
+    top: 30% !important;
     left: 53%;
     width: 42%;
     height: 336px;

package/hoc/withCreatives.js

@@ -5,6 +5,9 @@ import { injectIntl } from 'react-intl';
 import * as globalActions from '../v2Containers/Cap/actions';
 import * as creativesContainerActions from '../v2Containers/CreativesContainer/actions';
 import { UserIsAuthenticated } from '../utils/authWrapper';
+import { v2ZaloSagas } from '../v2Containers/Zalo/saga';
+import { injectSaga } from '@capillarytech/vulcan-react-sdk/utils';
+import { DAEMON } from '@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes';
 
 /**
  * Higher Order Component to common out creatives channel logic
@@ -18,6 +21,7 @@ export default ({
   userAuth,
   sagas = [],
   reducers = [],
+  zaloSaga = false,
 }) => {
   const CreativesCommon = (props) => {
     useEffect(() => {
@@ -44,7 +48,9 @@ export default ({
   };
 
   const withConnect = connect(mapStateToProps, hocMapDispatchToProps);
+  const withZaloSaga =  injectSaga({ key: 'zalo', saga: v2ZaloSagas,mode: DAEMON });
   return compose(
+    withZaloSaga,
     ...sagas,
     ...reducers,
     withConnect,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.60",
+  "version": "8.0.61-alpha.1",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/Cap/index.js

@@ -54,6 +54,8 @@ import { v2ViberSagas } from '../Viber/sagas';
 import { v2FacebookSagas } from '../Facebook/sagas';
 import createReducer from '../Line/Container/reducer';
 import { DAEMON } from '@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes';
+import { v2ZaloSagas } from '../Zalo/saga';
+
 const gtm = window.dataLayer || [];
 const {
   logNewTab,
@@ -609,6 +611,7 @@ function mapDispatchToProps(dispatch) {
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
 const withReducer = injectReducer({ key: 'cap', reducer });
 const withZaloReducer = injectReducer({ key: 'zalo', reducer: zaloReducer });
+const withZaloSagas = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 const withSaga = injectSaga({ key: 'cap', saga: v2CapSagas });
 const withLiquidSaga = injectSaga({ key: 'liquid', saga: capSagaLiquidEntity, mode : DAEMON });
 const withSmsCreateSaga = injectSaga({ key: 'create', saga: v2SmsCreateSagas });
@@ -638,6 +641,7 @@ export default compose(
   withFacebookSaga,
   withReducer,
   withZaloReducer,
+  withZaloSagas,
   withLineReducer,
   withConnect,
 )(injectIntl(Cap));

package/v2Containers/Cap/reducer.js

@@ -135,6 +135,7 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state.set('metaEntities', {
         layouts: [],
         tags: [],
+        tagLookupMap: {},
       });
     // eslint-disable-next-line no-case-declarations
     case types.HIDE_TAGS:
@@ -142,7 +143,7 @@ function capReducer(state = fromJS(initialState.cap), action) {
       metaEntities.tags.standard = _.filter(state.get('metaEntities').tags.standard, (tag) => action.tagList.indexOf(tag.definition.value) === -1);
       metaEntities.tags.custom = _.filter(state.get('metaEntities').tags.custom, (tag) => action.tagList.indexOf(tag.name) === -1);
       return state.setIn(['metaEntities'], metaEntities);
-    case types.SET_INJECTED_TAGS:
+    case types.SET_INJECTED_TAGS: 
 
       // Deep clone the tagLookupMap to avoid direct mutations
       let updatedMetaEntitiesTagLookUp = _.cloneDeep(state.getIn(['metaEntities', 'tagLookupMap']));
@@ -152,9 +153,13 @@ function capReducer(state = fromJS(initialState.cap), action) {
         ...formattedInjectedTags || {},
         ...updatedMetaEntitiesTagLookUp || {},
       };
-      return state
-        .set('injectedTags', action.injectedTags)
-        .setIn(['metaEntities', 'tagLookupMap'], fromJS(updatedMetaEntitiesTagLookUp));
+      return state.set("injectedTags", action.injectedTags).setIn(
+        ["metaEntities"],
+        fromJS({
+          ...state.get("metaEntities"),
+          tagLookupMap: updatedMetaEntitiesTagLookUp
+        })
+      );
     case types.GET_TOPBAR_MENU_DATA_REQUEST:
       return state.set('topbarMenuData', fromJS({ status: 'request' }));
     case types.GET_TOPBAR_MENU_DATA_SUCCESS:

package/v2Containers/Zalo/index.js

@@ -506,7 +506,8 @@ const mapDispatchToProps = (dispatch) => ({
 
 
 const withReducer = injectReducer({ key: 'zalo', reducer: v2ZaloReducer });
-const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
+// const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
+//
 
 export default withCreatives({
   WrappedComponent: Zalo,
@@ -514,5 +515,6 @@ export default withCreatives({
   mapDispatchToProps,
   userAuth: true,
   reducers: [withReducer],
-  sagas: [withZaloSaga],
+  zaloSaga: true,
+  // sagas: [withZaloSaga],
 });