@capillarytech/creatives-library 6.11.5 → 6.11.7

package/v2Components/TemplatePreview/assets/images/wechat_mobile_android.svg

@@ -1,20 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="220" height="472" viewBox="0 0 220 472">
-    <g fill="none" fill-rule="evenodd">
-        <rect width="220" height="472" fill="#101211" rx="26"/>
-        <rect width="202" height="404" x="9" y="36" fill="#F4F5F7" rx="9"/>
-        <rect width="182" height="136" x="19" y="112" fill="#F4F5F7" rx="17.5"/>
-        <path fill="#F4F5F7" d="M18 36h184c4.97 0 9 4.03 9 9v6H9v-6c0-4.97 4.03-9 9-9z"/>
-        <path fill="#F4F5F7" d="M9 51H211V82H9z" transform="matrix(1 0 0 -1 0 133)"/>
-        <rect width="52" height="5" x="84" y="14" fill="#2E2E2E" rx="2.5"/>
-        <rect width="52" height="5" x="84" y="455" fill="#2E2E2E" rx="2.5"/>
-        <circle cx="45.5" cy="19.5" r="5.5" fill="#2E2E2E"/>
-        <circle cx="65.5" cy="19.5" r="3.5" fill="#2E2E2E"/>
-        <text fill="#000" font-family="Roboto-Regular, Roboto" font-size="12" letter-spacing=".175">
-            <tspan x="49.5" y="71">Muji India</tspan>
-        </text>
-        <circle cx="199" cy="63" r="1" fill="#000"/>
-        <circle cx="199" cy="70" r="1" fill="#000"/>
-        <circle cx="199" cy="66.5" r="1" fill="#000"/>
-        <path fill="#000" d="M28 66c0 .279-.226.505-.505.505h-5.556l2.42 2.42c.198.197.198.518 0 .716-.198.198-.52.198-.718 0l-2.934-2.934c-.39-.39-.39-1.024 0-1.414l2.934-2.934c.198-.198.52-.198.718 0 .198.198.198.519 0 .717l-2.42 2.419h5.556c.279 0 .505.226.505.505z"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="220" height="472" viewBox="0 0 220 472">
+    <g fill="none" fill-rule="evenodd">
+        <rect width="220" height="472" fill="#101211" rx="26"/>
+        <rect width="202" height="404" x="9" y="36" fill="#F4F5F7" rx="9"/>
+        <rect width="182" height="136" x="19" y="112" fill="#F4F5F7" rx="17.5"/>
+        <path fill="#F4F5F7" d="M18 36h184c4.97 0 9 4.03 9 9v6H9v-6c0-4.97 4.03-9 9-9z"/>
+        <path fill="#F4F5F7" d="M9 51H211V82H9z" transform="matrix(1 0 0 -1 0 133)"/>
+        <rect width="52" height="5" x="84" y="14" fill="#2E2E2E" rx="2.5"/>
+        <rect width="52" height="5" x="84" y="455" fill="#2E2E2E" rx="2.5"/>
+        <circle cx="45.5" cy="19.5" r="5.5" fill="#2E2E2E"/>
+        <circle cx="65.5" cy="19.5" r="3.5" fill="#2E2E2E"/>
+        <text fill="#000" font-family="Roboto-Regular, Roboto" font-size="12" letter-spacing=".175">
+            <tspan x="49.5" y="71">Muji India</tspan>
+        </text>
+        <circle cx="199" cy="63" r="1" fill="#000"/>
+        <circle cx="199" cy="70" r="1" fill="#000"/>
+        <circle cx="199" cy="66.5" r="1" fill="#000"/>
+        <path fill="#000" d="M28 66c0 .279-.226.505-.505.505h-5.556l2.42 2.42c.198.197.198.518 0 .716-.198.198-.52.198-.718 0l-2.934-2.934c-.39-.39-.39-1.024 0-1.414l2.934-2.934c.198-.198.52-.198.718 0 .198.198.198.519 0 .717l-2.42 2.419h5.556c.279 0 .505.226.505.505z"/>
+    </g>
+</svg>

package/v2Components/TemplatePreview/index.js

@@ -21,10 +21,11 @@ const smsMobileAndroid = require('./assets/images/sms_mobile_android.svg');
 const lineMobileAndroid = require('../../assets/line.png');
 const lineImgPlaceholder = require('../../assets/line-image-placeholder.svg');
 const lineStickerPlaceholder = require('../../assets/smiley-placeholder.svg');
+const lineVideoPlaceholder = require('../../assets/rich-video-placeholder.svg');
 const androidPushMessagePhone = require('./assets/images/androidPushMessage.svg');
 const iPhonePushMessagePhone = require('./assets/images/iPhonePushMessage.svg');
-import { CAP_COLOR_03, CAP_WHITE, FONT_COLOR_01, CAP_G08 } from '@capillarytech/cap-ui-library/styled/variables';
-import { TEMPLATE, IMAGE_CAROUSEL, IMAGE, STICKER, TEXT, IMAGE_MAP } from '../../v2Containers/Line/Container/constants';
+import { CAP_COLOR_03, CAP_WHITE, FONT_COLOR_01, CAP_G08, CAP_G06 } from '@capillarytech/cap-ui-library/styled/variables';
+import { TEMPLATE, IMAGE_CAROUSEL, IMAGE, STICKER, TEXT, IMAGE_MAP, VIDEO } from '../../v2Containers/Line/Container/constants';
 
 class TemplatePreview extends React.Component { // eslint-disable-line react/prefer-stateless-function
   onPreviewContentClicked = (channel) => {
@@ -175,6 +176,76 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
       });
     }
     
+    const getVideoContent = ({
+      video,
+      actionUrl,
+      sectionStyle,
+    }) => (
+      <div
+        className="message-pop align-left"
+        style={{
+          ...sectionStyle,
+          minHeight: 184,
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          backgroundColor: !video ? 'transparent' : CAP_G06,
+          marginTop: 0,
+        }}
+        key={video}
+      >
+        {
+          video
+          ? (
+            <>
+              <video width="126" style={{ opacity: 0.5 }}>
+                <source src={video} type="video/mp4" />
+              </video>
+              <div
+                style={{
+                  position: 'absolute',
+                  display: 'flex',
+                  flexDirection: 'column',
+                }}
+              >
+                <CapButton
+                  className="preview-video-btn"
+                  type="flat"
+                >
+                  <CapIcon type="play"/>
+                  <FormattedMessage {...messages.playVideo} />
+                </CapButton>
+                {
+                  actionUrl
+                  ? (
+                    <CapButton
+                      className="preview-video-btn"
+                      type="flat"
+                    >
+                      <CapIcon type="reply" style={{ fontSize: 18 }}/>
+                      <FormattedMessage {...messages.showDetails} />
+                    </CapButton>
+                  )
+                  : null
+                }
+              </div>
+            </>
+          )
+          : (
+            <CapImage
+              src={lineVideoPlaceholder}
+              alt="brand-name"
+              rest={{
+                style: {
+                  width: 126,
+                  marginBottom: 5,
+                },
+              }}
+            />
+          )
+        }
+      </div>  
+    );
 
     return (
       <CapRow>
@@ -346,6 +417,8 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                           stickerUrl: lineStickerPlaceholder,
                         },
                         imageCarousel = [lineImgPlaceholder],
+                        video,
+                        actionUrl,
                       } = item || {};
                       const sectionStyle = {
                         background: CAP_WHITE,
@@ -393,7 +466,13 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                           </div>  
                         );
                       }
+                      if (type === VIDEO) {
+                        return getVideoContent({ video, actionUrl, sectionStyle });
+                      }
                       if ((type === IMAGE_MAP && baseUrl)) {
+                        if (video) {
+                          return getVideoContent({ video, actionUrl, sectionStyle });
+                        }
                         return (
                           <div
                             className="message-pop align-left"

package/v2Components/TemplatePreview/messages.js

@@ -66,4 +66,12 @@ export default defineMessages({
     id: 'creatives.componentsV2.TemplatePreview.textMessageCharacter',
     defaultMessage: 'characters',
   },
+  playVideo: {
+    id: 'creatives.componentsV2.TemplatePreview.playVideo',
+    defaultMessage: 'Play',
+  },
+  showDetails: {
+    id: 'creatives.componentsV2.TemplatePreview.showDetails',
+    defaultMessage: 'Show details',
+  },
 });

package/v2Components/TemplatePreview/tests/index.test.js

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

package/v2Containers/BeeEditor/index.js

@@ -256,7 +256,7 @@ function BeeEditor(props) {
   </>;
   return (
     <CapSpin spinning={saveRowRequest || false}>
-      <div id="bee-plugin-container" style={{ height: '500px'}}>
+      <div id="bee-plugin-container" style={{ height: '650px'}}>
       </div>
       <TagList
         moduleFilterEnabled={moduleFilterEnabled}

package/v2Containers/Cap/actions.js

@@ -12,7 +12,7 @@ export function authenticate(user) {
 
 export function logout() {
   return {
-    type: types.LOGOUT_REQUEST,
+    type: types.LOGOUT_REQUEST_V2,
   };
 }
 

package/v2Containers/Cap/constants.js

@@ -6,9 +6,9 @@ export const LOGIN_REQUEST = 'cap/LOGIN_REQUEST';
 export const LOGIN_SUCCESS = 'cap/LOGIN_SUCCESS';
 export const LOGIN_FAILURE = 'cap/LOGIN_FAILURE';
 
-export const LOGOUT_REQUEST = 'cap/LOGOUT_REQUEST';
-export const LOGOUT_SUCCESS = 'cap/LOGOUT_SUCCESS';
-export const LOGOUT_FAILURE = 'cap/LOGOUT_FAILURE';
+export const LOGOUT_REQUEST_V2 = 'cap/LOGOUT_REQUEST_V2';
+export const LOGOUT_SUCCESS_V2 = 'cap/LOGOUT_SUCCESS_V2';
+export const LOGOUT_FAILURE_V2 = 'cap/LOGOUT_FAILURE_V2';
 export const ADD_MESSAGE = 'cap/ADD_MESSAGE';
 export const REMOVE_MESSAGE = 'cap/REMOVE_MESSAGE';
 export const GET_USER_DATA_REQUEST = 'cap/GET_USER_DATA_REQUEST';

package/v2Containers/Cap/reducer.js

@@ -22,11 +22,11 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state
         .set('login_progress', false)
         .set('message', action.error.message);
-    case types.LOGOUT_REQUEST:
+    case types.LOGOUT_REQUEST_V2:
       return state.set('login_progress', false);
-    case types.LOGOUT_SUCCESS:
+    case types.LOGOUT_SUCCESS_V2:
       return state;
-    case types.LOGOUT_FAILURE:
+    case types.LOGOUT_FAILURE_V2:
       return state;
     case types.SWITCH_ORG_REQUEST:
       return state

package/v2Containers/Cap/sagas.js

@@ -5,7 +5,7 @@ import * as Api from '../../services/api';
 import * as LocalStorage from '../../services/localStorageApi';
 import * as types from './constants';
 import config from '../../config/app';
-import pathConfig from '../../config/path';
+//import pathConfig from '../../config/path';
 import { getTopbarMenuDataValue } from '../../v2Containers/App/constants';
 // import {makeSelectOrgId} from './selectors';
 
@@ -42,8 +42,8 @@ function* loginFlow() {
   while (condition) {
     const { user } = yield take(types.LOGIN_REQUEST);
     const task = yield fork(authorize, user);
-    const action = yield take([types.LOGOUT_REQUEST, types.LOGIN_FAILURE]);
-    if (action.type === types.LOGOUT_REQUEST) {
+    const action = yield take([types.LOGOUT_REQUEST_V2, types.LOGIN_FAILURE]);
+    if (action.type === types.LOGOUT_REQUEST_V2) {
       yield cancel(task);
     }
     // yield call(LocalStorage.clearItem, 'token');
@@ -57,16 +57,16 @@ function* logoutFlow() {
     const serverLogout = yield call(Api.logout);
     if (serverLogout.success && serverLogout.success === true) {
       const loginUrl = (process.env.NODE_ENV === 'production') ?
-        `${pathConfig.publicPath}${config.production.login_url}` : `${pathConfig.publicPath}${config.development.login_url}`;
-      yield [put({type: types.LOGOUT_SUCCESS})];
+        `${config.production.login_url}` : `${config.development.login_url}`;
+      yield [put({type: types.LOGOUT_SUCCESS_V2})];
       yield call(LocalStorage.clearItem, 'token');
       yield call(LocalStorage.clearItem, 'orgID');
       yield call(LocalStorage.clearItem, 'user');
       yield call(LocalStorage.clearItem, 'isLoggedIn');
-      window.location.href = loginUrl;
+      window.location.href = `${window.location.origin}${loginUrl}`;
     }
   } catch (error) {
-    yield put({ type: types.LOGOUT_FAILURE, error });
+    yield put({ type: types.LOGOUT_FAILURE_V2, error });
   }
 }
 
@@ -141,7 +141,7 @@ function* watchForOrgChange() {
 }
 
 function* watchForLogoutFlow() {
-  yield takeLatest(types.LOGOUT_REQUEST, logoutFlow);
+  yield takeLatest(types.LOGOUT_REQUEST_V2, logoutFlow);
 }
 
 function* watchForFetchUserInfo() {

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -176,6 +176,12 @@ function SlideBoxContent(props) {
           stickerId,
           packageId,
           baseUrl,
+          video: {
+            originalContentUrl,
+            externalLink: {
+              linkUri,
+            } = {},
+          } = {},
           template,
         }) => {
           let previewContent = {};
@@ -188,6 +194,8 @@ function SlideBoxContent(props) {
             packageId,
           };
           previewContent.baseUrl = baseUrl;
+          previewContent.video = originalContentUrl;
+          previewContent.actionUrl = linkUri;
           previewContent.imageCarousel = get(template, 'columns', [{}]).map(({ imageUrl, action: { label: actionLabel } = {} }) => ({ imageUrl, actionLabel }) );
 
           const getType = () => {
@@ -206,6 +214,9 @@ function SlideBoxContent(props) {
             if (template) {
               return 'image_carousel';
             }
+            if (video) {
+              return 'video';
+            }
           };
           previewContent.type = getType();
           return previewContent;

package/v2Containers/CreativesContainer/actions.js

@@ -1,27 +1,27 @@
-/*
- *
- * CreativesContainer actions
- *
- */
-
-import {
-  DEFAULT_ACTION,
-  HIDE_CONTAINER_LOADER,
-  SHOW_CONTANER_LOADER,
-} from './constants';
-
-export function defaultAction() {
-  return {
-    type: DEFAULT_ACTION,
-  };
-}
-export function showCreativesContainerLoader() {
-  return {
-    type: SHOW_CONTANER_LOADER,
-  };
-}
-export function hideCreativesContanerLoader() {
-  return {
-    type: HIDE_CONTAINER_LOADER,
-  };
-}
+/*
+ *
+ * CreativesContainer actions
+ *
+ */
+
+import {
+  DEFAULT_ACTION,
+  HIDE_CONTAINER_LOADER,
+  SHOW_CONTANER_LOADER,
+} from './constants';
+
+export function defaultAction() {
+  return {
+    type: DEFAULT_ACTION,
+  };
+}
+export function showCreativesContainerLoader() {
+  return {
+    type: SHOW_CONTANER_LOADER,
+  };
+}
+export function hideCreativesContanerLoader() {
+  return {
+    type: HIDE_CONTAINER_LOADER,
+  };
+}

package/v2Containers/CreativesContainer/constants.js

@@ -1,17 +1,17 @@
-/*
- *
- * CreativesContainer constants
- *
- */
-
-export const DEFAULT_ACTION = 'app/CreativesContainer/DEFAULT_ACTION';
-export const EMAIL = "EMAIL";
-export const SMS = "SMS";
-export const EBILL = "EBILL";
-export const LINE = "LINE";
-export const CALL_TASK = "CALL_TASK";
-export const MOBILE_PUSH = "MOBILEPUSH";
-export const WECHAT = "WECHAT";
-export const FACEBOOK = "FACEBOOK";
-export const SHOW_CONTANER_LOADER = "app/CreativesContainer/SHOW_CONTANER_LOADER";
-export const HIDE_CONTAINER_LOADER = "app/CreativesContainer/HIDE_CONTAINER_LOADER";
+/*
+ *
+ * CreativesContainer constants
+ *
+ */
+
+export const DEFAULT_ACTION = 'app/CreativesContainer/DEFAULT_ACTION';
+export const EMAIL = "EMAIL";
+export const SMS = "SMS";
+export const EBILL = "EBILL";
+export const LINE = "LINE";
+export const CALL_TASK = "CALL_TASK";
+export const MOBILE_PUSH = "MOBILEPUSH";
+export const WECHAT = "WECHAT";
+export const FACEBOOK = "FACEBOOK";
+export const SHOW_CONTANER_LOADER = "app/CreativesContainer/SHOW_CONTANER_LOADER";
+export const HIDE_CONTAINER_LOADER = "app/CreativesContainer/HIDE_CONTAINER_LOADER";

package/v2Containers/CreativesContainer/index.scss

@@ -1,45 +1,45 @@
-@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
-
-$classPrefix: add-creatives-section;
-
-.#{$classPrefix} {
-    &.creatives-library-mode{
-        .sms-create-container,  .sms-email-container{
-            .ant-tabs-top-bar{
-                display: none;
-            }
-        }
-    }
-    .#{$classPrefix}-footer {
-        position: absolute;
-        bottom: 0;
-        left: 1px;
-        padding: 0 12px;
-        display: flex;
-        align-items: center;
-        height: 48px;
-        border-top: 1px solid $CAP_G07;
-
-        &.with-creative {
-            width: 100%;
-        }
-    }
-    .wechat-steps {
-        width: 40% !important;
-        left: 20%;
-        position: relative;
-        .ant-steps-item-title::after {
-            top: 8px;
-        }
-        .ant-steps-item-content {
-            vertical-align: middle;
-            padding-top: 4px;
-        }
-    }
-}
-
-.map-template-create {
-    .slidebox-header div:first-child {
-        width: 100%;
-    }
+@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
+
+$classPrefix: add-creatives-section;
+
+.#{$classPrefix} {
+    &.creatives-library-mode{
+        .sms-create-container,  .sms-email-container{
+            .ant-tabs-top-bar{
+                display: none;
+            }
+        }
+    }
+    .#{$classPrefix}-footer {
+        position: absolute;
+        bottom: 0;
+        left: 1px;
+        padding: 0 12px;
+        display: flex;
+        align-items: center;
+        height: 48px;
+        border-top: 1px solid $CAP_G07;
+
+        &.with-creative {
+            width: 100%;
+        }
+    }
+    .wechat-steps {
+        width: 40% !important;
+        left: 20%;
+        position: relative;
+        .ant-steps-item-title::after {
+            top: 8px;
+        }
+        .ant-steps-item-content {
+            vertical-align: middle;
+            padding-top: 4px;
+        }
+    }
+}
+
+.map-template-create {
+    .slidebox-header div:first-child {
+        width: 100%;
+    }
 }