@capillarytech/creatives-library 8.0.26 → 8.0.28

package/containers/Cap/tests/selectors.test.js

@@ -0,0 +1,28 @@
+import { fromJS } from 'immutable';
+
+import { makeSelectLocationState } from 'containers/Cap/selectors';
+
+describe('makeSelectLocationState', () => {
+  it('should select the route as a plain JS object', () => {
+    const route = fromJS({
+      locationBeforeTransitions: null,
+    });
+    const mockedState = fromJS({
+      route,
+    });
+    expect(makeSelectLocationState()(mockedState)).toEqual(route.toJS());
+  });
+
+  it('should return cached js routeState for same concurrent calls', () => {
+    const route = fromJS({
+      locationBeforeTransitions: null,
+    });
+    const mockedState = fromJS({
+      route,
+    });
+    const selectLocationState = makeSelectLocationState();
+
+    const firstRouteStateJS = selectLocationState(mockedState);
+    expect(selectLocationState(mockedState)).toBe(firstRouteStateJS);
+  });
+});

package/containers/TagList/constants.js

@@ -28,3 +28,5 @@ export const JAPANESE_HIDE_DATE_TAGS = [
   "dd Mon",
   "dd/m/yyyy",
 ];
+
+export const STRING = "string";

package/containers/TestPage/constants.js

@@ -0,0 +1,7 @@
+/*
+ *
+ * Dashboard constants
+ *
+ */
+
+export const DEFAULT_ACTION = 'app/containers/TestPage/DEFAULT_ACTION';

package/containers/TestPage/index.js

@@ -0,0 +1,31 @@
+
+import React from "react";
+import SmsTest from '../../components/SmsTest';
+
+export default class TestPage extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
+  render() {
+    return (
+      <SmsTest />
+    );
+  }
+}
+
+// const schema = {
+//   title: "Todo",
+//   type: "object",
+//   required: ["title"],
+//   properties: {
+//     title: {type: "string", title: "Title", default: "A new task"},
+//     done: {type: "boolean", title: "Done?", default: false},
+//   },
+// };
+
+// const log = (type) => console.log.bind(console, type);
+
+// render((
+//   <div>
+//     <SmsTest
+//     />
+//   </div>
+// ), document.getElementById("app"));
+//export default TestPage;

package/containers/TestPage/messages.js

@@ -0,0 +1,13 @@
+/*
+ * NotFoundPage Messages
+ *
+ * This contains all the text for the NotFoundPage component.
+ */
+import { defineMessages } from 'react-intl';
+
+export default defineMessages({
+  header: {
+    id: 'creatives.components.TestPage.header',
+    defaultMessage: 'Looks like youas are lost!',
+  },
+});

package/containers/TestPage/reducer.js

@@ -0,0 +1,21 @@
+/*
+ *
+ * Dashboard reducer
+ *
+ */
+
+import { fromJS } from 'immutable';
+import { DEFAULT_ACTION } from './constants';
+
+const initialState = fromJS({});
+
+function TestPageReducer(state = initialState, action) {
+  switch (action.type) {
+    case DEFAULT_ACTION:
+      return state;
+    default:
+      return state;
+  }
+}
+
+export default TestPageReducer;

package/containers/TestPage/sagas.js

@@ -0,0 +1,11 @@
+// import { take, call, put, select } from 'redux-saga/effects';
+
+// Individual exports for testing
+export function* defaultSaga() {
+  // See example in containers/HomePage/sagas.js
+}
+
+// All sagas to be loaded
+export default [
+  defaultSaga,
+];

package/containers/Testv2/actions.js

@@ -0,0 +1,15 @@
+/*
+ *
+ * Testv2 actions
+ *
+ */
+
+import {
+  DEFAULT_ACTION,
+} from './constants';
+
+export function defaultAction() {
+  return {
+    type: DEFAULT_ACTION,
+  };
+}

package/containers/Testv2/constants.js

@@ -0,0 +1,7 @@
+/*
+ *
+ * Testv2 constants
+ *
+ */
+
+export const DEFAULT_ACTION = 'app/Testv2/DEFAULT_ACTION';

package/containers/Testv2/index.js

@@ -0,0 +1,47 @@
+/*
+ *
+ * Testv2
+ *
+ */
+
+import PropTypes from 'prop-types';
+
+import React from 'react';
+import { connect } from 'react-redux';
+import Helmet from 'react-helmet';
+import { FormattedMessage } from 'react-intl';
+import { createStructuredSelector } from 'reselect';
+import makeSelectTestv2 from './selectors';
+import messages from './messages';
+
+export class Testv2 extends React.Component { // eslint-disable-line react/prefer-stateless-function
+  render() {
+    return (
+      <div>
+        <Helmet
+          title={<FormattedMessage {...messages.testv2} />}
+          meta={[
+            { name: 'description', content: <FormattedMessage {...messages.descriptionTestv2} /> },
+          ]}
+        />
+        <FormattedMessage {...messages.header} />
+      </div>
+    );
+  }
+}
+
+Testv2.propTypes = {
+  dispatch: PropTypes.func.isRequired,
+};
+
+const mapStateToProps = createStructuredSelector({
+  Testv2: makeSelectTestv2(),
+});
+
+function mapDispatchToProps(dispatch) {
+  return {
+    dispatch,
+  };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Testv2);

package/containers/Testv2/messages.js

@@ -0,0 +1,21 @@
+/*
+ * Testv2 Messages
+ *
+ * This contains all the text for the Testv2 component.
+ */
+import { defineMessages } from 'react-intl';
+
+export default defineMessages({
+  header: {
+    id: 'creatives.containers.Testv2.header',
+    defaultMessage: 'This is Testv2 container !',
+  },
+  testv2: {
+    id: 'creatives.containers.Testv2.testv2',
+    defaultMessage: 'Testv2',
+  },
+  descriptionTestv2: {
+    id: 'creatives.containers.Testv2.descriptionTestv2',
+    defaultMessage: 'Description of Testv2',
+  },
+});

package/containers/Testv2/reducer.js

@@ -0,0 +1,23 @@
+/*
+ *
+ * Testv2 reducer
+ *
+ */
+
+import { fromJS } from 'immutable';
+import {
+  DEFAULT_ACTION,
+} from './constants';
+
+const initialState = fromJS({});
+
+function testv2Reducer(state = initialState, action) {
+  switch (action.type) {
+    case DEFAULT_ACTION:
+      return state;
+    default:
+      return state;
+  }
+}
+
+export default testv2Reducer;

package/containers/Testv2/sagas.js

@@ -0,0 +1,11 @@
+// import { take, call, put, select } from 'redux-saga/effects';
+
+// Individual exports for testing
+export function* defaultSaga() {
+  // See example in containers/HomePage/sagas.js
+}
+
+// All sagas to be loaded
+export default [
+  defaultSaga,
+];

package/containers/Testv2/selectors.js

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

package/package.json

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

package/reducers.js

@@ -0,0 +1,77 @@
+/**
+ * Combine all reducers in this file and export the combined reducers.
+ * If we were to do this in store.js, reducers wouldn't be hot reloadable.
+ */
+
+import { combineReducers } from 'redux-immutable';
+import { fromJS } from 'immutable';
+import { LOCATION_CHANGE } from 'react-router-redux';
+
+import languageProviderReducer from 'v2Containers/LanguageProvider/reducer';
+import beeEditorReducer from 'v2Containers/BeeEditor/reducer';
+import CapFacebookPreviewReducer from 'v2Containers/CapFacebookPreview/reducer';
+
+import capReducer from 'containers/Cap/reducer';
+import appReducer from 'containers/App/reducer';
+import createSmsReducer from 'containers/Sms/Create/reducer';
+import editSmsReducer from 'containers/Sms/Edit/reducer';
+import templateReducer from 'containers/Templates/reducer';
+import tagsReducer from 'containers/TagList/reducer';
+import emailReducer from 'containers/Email/reducer';
+import ebillReducer from 'containers/Ebill/reducer';
+import ftpReducer from 'v2Containers/FTP/reducer';
+import galleryReducer from './v2Containers/Assets/Gallery/reducer';
+import { AIRA_REDUCER_DOMAIN, askAiraReducer } from '@capillarytech/cap-ui-library/CapAskAira';
+import CapCollapsibleLeftNavigationReducer from '@capillarytech/cap-ui-library/CapCollapsibleLeftNavigation/reducer';
+/*
+ * routeReducer
+ *
+ * The reducer merges route location changes into our immutable state.
+ * The change is necessitated by moving to react-router-redux@4
+ *
+ */
+
+// Initial routing state
+const routeInitialState = fromJS({
+  locationBeforeTransitions: null,
+});
+
+/**
+ * Merge route into the global application state
+ */
+function routeReducer(state = routeInitialState, action) {
+  switch (action.type) {
+    /* istanbul ignore next */
+    case LOCATION_CHANGE:
+      return state.merge({
+        locationBeforeTransitions: action.payload,
+      });
+    default:
+      return state;
+  }
+}
+
+/**
+ * Creates the main reducer with the asynchronously loaded ones
+ */
+export default function createReducer(asyncReducers) {
+  return combineReducers({
+    route: routeReducer,
+    language: languageProviderReducer,
+    cap: capReducer,
+    app: appReducer,
+    create: createSmsReducer,
+    edit: editSmsReducer,
+    templates: templateReducer,
+    tagList: tagsReducer,
+    email: emailReducer,
+    ebill: ebillReducer,
+    beeEditor: beeEditorReducer,
+    facebookPreview: CapFacebookPreviewReducer,
+    FTP: ftpReducer,
+    gallery: galleryReducer,
+    navigationConfig: CapCollapsibleLeftNavigationReducer,
+    [AIRA_REDUCER_DOMAIN]: askAiraReducer,
+    ...asyncReducers,
+  });
+}

package/store.js

@@ -0,0 +1,61 @@
+/**
+ * Create the store with asynchronously loaded reducers
+ */
+
+import { createStore, applyMiddleware, compose } from 'redux';
+import { fromJS } from 'immutable';
+import { routerMiddleware } from 'react-router-redux';
+import createSagaMiddleware from 'redux-saga';
+// import { createMiddleware } from 'redux-beacon';
+// import { logger } from 'redux-beacon/extensions/logger';
+// import { GoogleTagManager } from 'redux-beacon/targets/google-tag-manager';
+import createReducer from './reducers';
+// import eventsMap from './gtm/eventDefinitionsMap';
+
+const sagaMiddleware = createSagaMiddleware();
+// const gtmMiddleware = createMiddleware(eventsMap, GoogleTagManager());
+
+export default function configureStore(initialState = {}, history) {
+  const middlewares = [
+    sagaMiddleware,
+    routerMiddleware(history),
+  ];
+
+  const enhancers = [
+    applyMiddleware(...middlewares),
+  ];
+
+  // If Redux DevTools Extension is installed use it, otherwise use Redux compose
+  /* eslint-disable no-underscore-dangle */
+  const composeEnhancers =
+    process.env.NODE_ENV !== 'production' &&
+    typeof window === 'object' &&
+    window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ?
+      window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ : compose;
+  /* eslint-enable */
+
+  const store = createStore(
+    createReducer(),
+    fromJS(initialState),
+    composeEnhancers(...enhancers)
+  );
+
+  // Extensions
+  store.runSaga = sagaMiddleware.run;
+  store.asyncReducers = {}; // Async reducer registry
+
+  // Make reducers hot reloadable, see http://mxs.is/googmo
+  /* istanbul ignore next */
+  if (module.hot) {
+    module.hot.accept('./reducers', () => {
+      import('./reducers').then((reducerModule) => {
+        const createReducers = reducerModule.default;
+        const nextReducers = createReducers(store.asyncReducers);
+
+        store.replaceReducer(nextReducers);
+      });
+    });
+  }
+
+  return store;
+}

package/tests/integration/TemplateCreation/TemplateCreation.integration.test.js

@@ -9,6 +9,7 @@ import {
   fireEvent,
   screen,
   within,
+  waitFor,
 } from '../../../utils/test-utils';
 
 import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils';
@@ -31,7 +32,7 @@ jest.mock('@capillarytech/cap-ui-utils', () => ({
   },
 }));
 
-jest.setTimeout(60000);
+jest.setTimeout(80000);
 
 const initializeCreatives = () => { 
   const store = configureStore(mockInitialState, initialReducer, history);
@@ -93,8 +94,8 @@ describe("Creatives testing template creation", () => {
       name: globalMessages.email.defaultMessage,
     });
     await userEvent.click(whatsapp);
-    expect(creativesScreen.getByText(
-      /Whatsapp accounts are not setup for your brand/i)
+    expect(await creativesScreen.findByText(
+        /Whatsapp accounts are not setup for your brand/i, undefined, { timeout: 10000 })
     ).toBeInTheDocument();
     await userEvent.click(line);
     //assertions for template filters for line channel
@@ -108,24 +109,28 @@ describe("Creatives testing template creation", () => {
     userEvent.click(creativesScreen.getByText(/image/i));
     expect(creativesScreen.getByText(/text/i)).toBeInTheDocument();
     userEvent.click(creativesScreen.getByText(/text/i));
-    await userEvent.click(facebook);
 
      //Currently weChat tab has been disabled as we dont suppport it anymore
     // await userEvent.click(wechat);
     // expect(creativesScreen.getByText(/wechat account/i)).toBeInTheDocument();
-    await userEvent.click(mpush);
-    expect(
-      creativesScreen.getByText(/push notifications are not setup for your brand/i)
-    ).toBeInTheDocument();
-    await userEvent.click(email);
+    // fireEvent.click(mpush);
+    // screen.debug(null, Infinity);
+    // await waitFor(() => {
+    //   expect(
+    //     screen.findByText(/Push notifications are not setup for your brand/i, undefined, { timeout: 10000 })
+    //   ).toBeInTheDocument();
+    // }, { timeout: 50000, interval: 500 });
+    fireEvent.click(email);
 
     //start of rcs template creation
-    await userEvent.click(rcs);
-    const createButton = creativesScreen.getByRole('button', {
-      name: /create new/i,
-    });
-    await userEvent.click(createButton);
-    expect(creativesScreen.getByText(/Creative name/i, {})).toBeInTheDocument();
+    fireEvent.click(rcs);
+    await waitFor(() => {
+      const createButton = creativesScreen.findByRole('button', {
+        name: /create new/i,
+      });
+      userEvent.click(createButton);
+    }, { timeout: 50000, interval: 1000 });
+    // expect(await creativesScreen.findByText(/Creative name/i, undefined, {timeout: 10000})).toBeInTheDocument();
     const templateNameInput = await creativesScreen.findByTestId(
       /template_name/,
       {},