@capillarytech/creatives-library 2.0.70 → 2.0.71

package/index.js

@@ -1,39 +1,39 @@
-/*-------Containers--------------*/
-import capReducer from './containers/Cap/reducer';
-import capSaga from './containers/Cap/sagas';
-import Cap from './containers/Cap/index';
+/*-------v2Containers--------------*/
+import capReducer from './v2Containers/Cap/reducer';
+import capSaga from './v2Containers/Cap/sagas';
+import Cap from './v2Containers/Cap/index';
 
-import templateReducer from './containers/Templates/reducer';
-import templateSaga from './containers/Templates/sagas';
-import Templates from './containers/Templates/index';
+import templateReducer from './v2Containers/Templates/reducer';
+import templateSaga from './v2Containers/Templates/sagas';
+import Templates from './v2Containers/Templates/index';
 
-import SmsCreate from './containers/Sms/Create/index';
-import smsCreateReducer from './containers/Sms/Create/reducer';
-import smsCreateSaga from './containers/Sms/Create/sagas';
+import SmsCreate from './v2Containers/Sms/Create/index';
+import smsCreateReducer from './v2Containers/Sms/Create/reducer';
+import smsCreateSaga from './v2Containers/Sms/Create/sagas';
 
-import SmsEdit from './containers/Sms/Edit/index';
-import smsEditReducer from './containers/Sms/Edit/reducer';
-import smsEditSaga from './containers/Sms/Edit/sagas';
+import SmsEdit from './v2Containers/Sms/Edit/index';
+import smsEditReducer from './v2Containers/Sms/Edit/reducer';
+import smsEditSaga from './v2Containers/Sms/Edit/sagas';
 
-import Email from './containers/Email/index';
-import emailReducer from './containers/Email/reducer';
-import emailSaga from './containers/Email/sagas';
+import Email from './v2Containers/Email/index';
+import emailReducer from './v2Containers/Email/reducer';
+import emailSaga from './v2Containers/Email/sagas';
 
-import CallTask from './containers/CallTask/index';
-import callTaskReducer from './containers/CallTask/reducer';
-import callTaskSaga from './containers/CallTask/sagas';
+import CallTask from './v2Containers/CallTask/index';
+import callTaskReducer from './v2Containers/CallTask/reducer';
+import callTaskSaga from './v2Containers/CallTask/sagas';
 
 import WeChat from './containers/WeChat/MapTemplates';
 import wechatReduce from './containers/WeChat/MapTemplates/reducer';
 import wechatSaga from './containers/WeChat/MapTemplates/sagas';
 
-import MobilepushCreate from './containers/MobilePush/Create';
-import mobilepushCreateReducer from './containers/MobilePush/Create/reducer';
-import mobilepushCreateSaga from './containers/MobilePush/Create/sagas';
+import MobilepushCreate from './v2Containers/MobilePush/Create';
+import mobilepushCreateReducer from './v2Containers/MobilePush/Create/reducer';
+import mobilepushCreateSaga from './v2Containers/MobilePush/Create/sagas';
 
-import MobilepushEdit from './containers/MobilePush/Edit';
-import mobilepushEditReducer from './containers/MobilePush/Edit/reducer';
-import mobilepushEditSaga from './containers/MobilePush/Edit/sagas';
+import MobilepushEdit from './v2Containers/MobilePush/Edit';
+import mobilepushEditReducer from './v2Containers/MobilePush/Edit/reducer';
+import mobilepushEditSaga from './v2Containers/MobilePush/Edit/sagas';
 
 
 import LineCreate from './containers/Line/Create';
@@ -43,10 +43,10 @@ import lineCreateSaga from './containers/Line/Create/sagas';
 import LineEdit from './containers/Line/Edit';
 import lineEditReducer from './containers/Line/Edit/reducer';
 import lineEditSaga from './containers/Line/Edit/sagas';
-import TemplatesV2 from './containers/TemplatesV2/index';
+import TemplatesV2 from './v2Containers/TemplatesV2/index';
 
-import CreativesContainer from './containers/CreativesContainer';
-import CreativesContainerReducer from './containers/CreativesContainer/reducer';
+import CreativesContainer from './v2Containers/CreativesContainer';
+import CreativesContainerReducer from './v2Containers/CreativesContainer/reducer';
 
 
 export {default as Ebill} from './containers/Ebill';
@@ -67,9 +67,9 @@ const LineCreateContainer = {LineCreate, lineCreateReducer, lineCreateSaga};
 const LineEditContainer = {LineEdit, lineEditReducer, lineEditSaga};
 const TemplatesV2Container = {TemplatesV2, templateReducer, templateSaga};
 
-export {default as TagList} from './containers/TagList/index';
-export {default as TagListSaga} from './containers/TagList/sagas';
-export {default as TagListReducer} from './containers/TagList/reducer';
+export {default as TagList} from './v2Containers/TagList/index';
+export {default as TagListSaga} from './v2Containers/TagList/sagas';
+export {default as TagListReducer} from './v2Containers/TagList/reducer';
 export {default as TemplatePreview} from './components/TemplatePreview';
 export {default as EmailPreview} from './components/EmailPreview';
 export {default as EmailPreviewV2} from './components/EmailPreviewV2';

package/initialState.js

@@ -36,5 +36,11 @@ export default {
   },
   ebill: {
 
+  },
+  mobileCreate: {
+
+  },
+  creativesContainer: {
+
   },
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "2.0.70",
+  "version": "2.0.71",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -12,8 +12,8 @@
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
-    "@capillarytech/cap-ui-library": "^1.0.106",
-    "antd": "3.15.0",
+    "@capillarytech/cap-ui-library": "^1.0.140",
+    "antd": "3.19.6",
     "axios": "^0.16.2",
     "babel-polyfill": "6.20.0",
     "babel-preset-env": "^1.6.1",

package/routes.js

@@ -391,7 +391,7 @@ export default function createRoutes(store) {
 
         importModules.then(([reducer, createReducer, sagas, component]) => {
           injectReducer('mobilePush', reducer.default);
-          injectReducer('create', createReducer.default);
+          injectReducer('mobileCreate', createReducer.default);
           injectSagas(sagas.default);
           injectSagas(mobilpushSagas.default);
           renderRoute(component);
@@ -412,7 +412,7 @@ export default function createRoutes(store) {
         const renderRoute = loadModule(cb);
 
         importModules.then(([reducer, sagas, component]) => {
-          injectReducer('mobilepushCreate', reducer.default);
+          injectReducer('mobileCreate', reducer.default);
           injectSagas(sagas.default);
           injectSagas(rootSaga.default);
           renderRoute(component);
@@ -599,23 +599,25 @@ export default function createRoutes(store) {
       name: 'templatesV2',
       getComponent(nextState, cb) {
         const importModules = Promise.all([
-          import('containers/Templates/reducer'),
-          import('containers/Templates/sagas'),
-          import('containers/TemplatesV2'),
-          import('containers/Email/sagas'),
-          import('containers/CreativesContainer/reducer'),
-          import('containers/Sms/Create/reducer'),
-          import('containers/Sms/Create/sagas'),
-          import('containers/Sms/Edit/reducer'),
-          import('containers/Sms/Edit/sagas'),
-          import('containers/Email/reducer'),
-          import('containers/Email/sagas'),
-          import('containers/CallTask/reducer'),
-          import('containers/CallTask/sagas'),
-          import('containers/Mobilepush/Create/sagas'),
-          import('containers/Mobilepush/Create/reducer'),
-          import('containers/Mobilepush/Edit/sagas'),
-          import('containers/Mobilepush/Edit/reducer'),
+          import('v2Containers/Templates/reducer'),
+          import('v2Containers/Templates/sagas'),
+          import('v2Containers/TemplatesV2'),
+          import('v2Containers/Email/sagas'),
+          import('v2Containers/CreativesContainer/reducer'),
+          import('v2Containers/Sms/Create/reducer'),
+          import('v2Containers/Sms/Create/sagas'),
+          import('v2Containers/Sms/Edit/reducer'),
+          import('v2Containers/Sms/Edit/sagas'),
+          import('v2Containers/Email/reducer'),
+          import('v2Containers/Email/sagas'),
+          import('v2Containers/CallTask/reducer'),
+          import('v2Containers/CallTask/sagas'),
+          import('v2Containers/Mobilepush/Create/sagas'),
+          import('v2Containers/Mobilepush/Create/reducer'),
+          import('v2Containers/Mobilepush/Edit/sagas'),
+          import('v2Containers/Mobilepush/Edit/reducer'),
+          import('V2Containers/Assets/Gallery/reducer'),
+          import('v2Containers/Assets/Gallery/sagas'),
         ]);
 
         const renderRoute = loadModule(cb);
@@ -628,6 +630,7 @@ export default function createRoutes(store) {
           callTaskReducer, callTaskSagas,
           mpushCreateSagas, mpushCreateReducer,
           mpushEditSagas, mpushEditReducer,
+          galleryReducer, gallerySagas,
         ]) => {
           injectReducer('templates', reducer.default);
           injectReducer('create', smsCreateReducer.default);
@@ -637,6 +640,8 @@ export default function createRoutes(store) {
           injectReducer('callTask', callTaskReducer.default);
           injectReducer('mobileCreate', mpushCreateReducer.default);
           injectReducer('mobileEdit', mpushEditReducer.default);
+          injectReducer('gallery', galleryReducer.default);
+          injectSagas(gallerySagas.default);
           injectSagas(sagas.default);
           injectSagas(emailContainerSagas.default);
           injectSagas(smsCreateSaga.default);

package/services/api.js

@@ -5,6 +5,7 @@ import 'whatwg-fetch';
 import { loadItem, clearItem } from './localStorageApi';
 import config from '../config/app';
 import pathConfig from '../config/path';
+import getSchema from './getSchema';
 import * as API from '../utils/ApiCaller';
 let API_ENDPOINT = config.development.api_endpoint;
 let API_AUTH_ENDPOINT = config.development.auth_endpoint;
@@ -257,8 +258,11 @@ export const getUserList = () => {
 };
 
 export const fetchSchemaForEntity = ({queryParams}) => {
-  if (queryParams.version === "v2" && queryParams.type === "LAYOUT" && queryParams.layout === "MOBILEPUSH") {
-    return import('../containers/MobilePush/initialSchema').then((layout) => layout);
+  if (queryParams.version === "v2" && queryParams.type === "LAYOUT") {
+    const schema = getSchema(queryParams.layout);
+    return schema.then((layout) => layout).catch((err) => {
+      console.error(err);
+    });
   }
   const url = `${API_ENDPOINT}/meta/${queryParams.type}?query=${JSON.stringify(queryParams)}`;
   return request(url, getAPICallObject('GET'));// request(url, getAPICallObject('GET'));

package/services/getSchema.js

@@ -0,0 +1,18 @@
+import {SMS, EMAIL, MOBILE_PUSH} from '../v2Containers/CreativesContainer/constants';
+export default function getSchema(channel) {
+  let schemaPath = '../containers/';
+  switch (channel.toUpperCase()) {
+    case SMS:
+      schemaPath = import(`../v2Containers/Sms/initialSchema`);
+      break;
+    case EMAIL:
+      schemaPath = import(`../v2Containers/Email/initialSchema`);
+      break;
+    case MOBILE_PUSH:
+      schemaPath = import(`../v2Containers/MobilePush/initialSchema`);
+      break;
+    default:
+      schemaPath = import(`../v2Containers/Sms/initialSchema`);
+  }
+  return schemaPath;
+}

package/v2Containers/App/actions.js

@@ -0,0 +1,7 @@
+import * as types from './constants';
+
+export function getSidebar() {
+  return {
+    type: types.GET_SIDEBAR_REQUEST,
+  };
+}

package/v2Containers/App/constants.js

@@ -0,0 +1,3 @@
+export const GET_SIDEBAR_REQUEST = 'app/App/GET_SIDEBAR_REQUEST';
+export const GET_SIDEBAR_SUCCESS = 'app/App/GET_SIDEBAR_SUCCESS';
+export const GET_SIDEBAR_FAILURE = 'app/App/GET_SIDEBAR_FAILURE';

package/v2Containers/App/reducer.js

@@ -0,0 +1,19 @@
+import { fromJS } from 'immutable';
+import * as types from './constants';
+
+const initialState = fromJS({});
+
+function appReducer(state = initialState, action) {
+  switch (action.type) {
+    case types.GET_SIDEBAR_REQUEST:
+      return state;
+    case types.GET_SIDEBAR_SUCCESS:
+      return state;
+    case types.GET_SIDEBAR_FAILURE:
+      return state;
+    default:
+      return state;
+  }
+}
+
+export default appReducer;

package/v2Containers/App/sagas.js

@@ -0,0 +1,26 @@
+import { call, put, takeLatest } from 'redux-saga/effects';
+// import { LOCATION_CHANGE } from 'react-router-redux';
+// import { schema, normalize } from 'normalizr';
+import * as Api from '../../services/api';
+import * as types from './constants';
+
+// Individual exports for testing
+export function* getSidebar() {
+  try {
+    const result = yield call(Api.getSidebar);
+    const sidebar = result.response.sidebar;
+    yield put({ type: types.GET_SIDEBAR_SUCCESS, sidebar });
+  } catch (error) {
+    yield put({ type: types.GET_SIDEBAR_FAILURE, error });
+  }
+}
+
+
+function* watchgetSidebar() {
+  yield takeLatest(types.GET_SIDEBAR_REQUEST, getSidebar);
+}
+
+// All sagas to be loaded
+export default [
+  watchgetSidebar,
+];

package/v2Containers/App/selectors.js

@@ -0,0 +1,25 @@
+import { createSelector } from 'reselect';
+
+/**
+ * Direct selector to the cap state domain
+ */
+const selectAppDomain = () => (state) => state.get('app');
+
+/**
+ * Other specific selectors
+ */
+
+
+/**
+ * Default selector used by Cap
+ */
+
+const makeSelectApp = () => createSelector(
+  selectAppDomain(),
+  (substate) => substate.toJS()
+);
+
+export default makeSelectApp;
+export {
+  selectAppDomain,
+};

package/v2Containers/App/tests/actions.test.js

@@ -0,0 +1,18 @@
+
+import {
+  defaultAction,
+} from '../actions';
+import {
+  DEFAULT_ACTION,
+} from '../constants';
+
+describe('Cap actions', () => {
+  describe('Default Action', () => {
+    it('has a type of DEFAULT_ACTION', () => {
+      const expected = {
+        type: DEFAULT_ACTION,
+      };
+      expect(defaultAction()).toEqual(expected);
+    });
+  });
+});

package/v2Containers/App/tests/reducer.test.js

@@ -0,0 +1,9 @@
+
+import { fromJS } from 'immutable';
+import capReducer from '../reducer';
+
+describe('capReducer', () => {
+  it('returns the initial state', () => {
+    expect(capReducer(undefined, {})).toEqual(fromJS({}));
+  });
+});

package/v2Containers/App/tests/sagas.test.js

@@ -0,0 +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(false);
+  });
+});

package/v2Containers/App/tests/selectors.test.js

@@ -0,0 +1,10 @@
+// import { fromJS } from 'immutable';
+// import { makeSelectCapDomain } from '../selectors';
+
+// const selector = makeSelectCapDomain();
+
+describe('makeSelectCapDomain', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});

package/v2Containers/Assets/Gallery/actions.js

@@ -0,0 +1,37 @@
+/*
+ *
+ * Gallery actions
+ *
+ */
+
+import * as types from './constants';
+
+export function uploadAsset(file, assetType, fileParams) {
+  return {
+    type: types.UPLOAD_ASSET_REQUEST,
+    file,
+    assetType,
+    fileParams,
+  };
+}
+
+export function getAllAssets(assetType, queryParams) {
+  return {
+    type: types.GET_ALL_ASSETS_REQUEST,
+    assetType,
+    queryParams,
+  };
+}
+export function deleteAssetById(assetId, assetType) {
+  return {
+    type: types.DELETE_ASSET_REQUEST,
+    assetId,
+    assetType,
+  };
+}
+
+export function getUserList() {
+  return {
+    type: types.GET_USER_LIST_REQUEST,
+  };
+}

package/v2Containers/Assets/Gallery/constants.js

@@ -0,0 +1,23 @@
+/*
+ *
+ * Gallery constants
+ *
+ */
+
+export const DEFAULT_ACTION = 'app/Gallery/DEFAULT_ACTION';
+
+export const UPLOAD_ASSET_REQUEST = 'app/Gallery/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/Gallery/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/Gallery/UPLOAD_ASSET_FAILURE';
+
+export const GET_ALL_ASSETS_REQUEST = 'app/Gallery/GET_ALL_ASSETS_REQUEST';
+export const GET_ALL_ASSETS_SUCCESS = 'app/Gallery/GET_ALL_ASSETS_SUCCESS';
+export const GET_ALL_ASSETS_FAILURE = 'app/Gallery/GET_ALL_ASSETS_FAILURE';
+
+export const DELETE_ASSET_REQUEST = 'app/Gallery/DELETE_ASSET_REQUEST';
+export const DELETE_ASSET_SUCCESS = 'app/Gallery/DELETE_ASSET_SUCCESS';
+export const DELETE_ASSET_FAILURE = 'app/Gallery/DELETE_ASSET_FAILURE';
+
+export const GET_USER_LIST_REQUEST = "app/Gallery/GET_USER_LIST_REQUEST";
+export const GET_USER_LIST_SUCCESS = "app/Gallery/GET_USER_LIST_SUCCESS";
+export const GET_USER_LIST_FAILURE = "app/Gallery/GET_USER_LIST_FAILURE";