@capillarytech/creatives-library 6.8.4 → 6.8.5

package/v2Containers/CreativesContainer/sagas.js

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

package/v2Containers/CreativesContainer/selectors.js

@@ -1,30 +1,30 @@
-import { createSelector } from 'reselect';
-
-/**
- * Direct selector to the creativesContainer state domain
- */
-const selectCreativesContainerDomain = () => (state) => state.get('creativesContainer');
-
-/**
- * Other specific selectors
- */
-
-
-/**
- * Default selector used by CreativesContainer
- */
-
-const makeSelectCreativesContainer = () => createSelector(
-  selectCreativesContainerDomain(),
-  (substate) => substate.toJS()
-);
-const isLoading = () => createSelector(
-  makeSelectCreativesContainer(),
-  (substate) => substate.containerLoader
-);
-
-export default makeSelectCreativesContainer;
-export {
-  selectCreativesContainerDomain,
-  isLoading,
-};
+import { createSelector } from 'reselect';
+
+/**
+ * Direct selector to the creativesContainer state domain
+ */
+const selectCreativesContainerDomain = () => (state) => state.get('creativesContainer');
+
+/**
+ * Other specific selectors
+ */
+
+
+/**
+ * Default selector used by CreativesContainer
+ */
+
+const makeSelectCreativesContainer = () => createSelector(
+  selectCreativesContainerDomain(),
+  (substate) => substate.toJS()
+);
+const isLoading = () => createSelector(
+  makeSelectCreativesContainer(),
+  (substate) => substate.containerLoader
+);
+
+export default makeSelectCreativesContainer;
+export {
+  selectCreativesContainerDomain,
+  isLoading,
+};

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

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

package/v2Containers/CreativesContainer/tests/index.test.js

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

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

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

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

@@ -1,15 +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(true);
-  });
-});
+/**
+ * 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(true);
+  });
+});

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

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

package/v2Containers/Line/Container/Text/index.js

@@ -15,6 +15,8 @@ import messages from './messages';
 import style from './style';
 import withStyles from '../../../../hoc/withStyles';
 
+import { validateTags } from '../../../../utils/tagValidations';
+
 const { TextArea } = CapInput;
 const {CapCustomCardList} = CapCustomCard;
 
@@ -71,7 +73,7 @@ export const LineText = ({
     useEffect(() => {
         if (messageContent && (isFullMode ? messageTitle : true)) {
             updateMessageState({
-                isError: (messageContent.length > charLimit) || (!messageContent || !(isFullMode ? messageTitle : true) || (errorMessageTextarea && errorMessageTitle)),
+                isError: (messageContent.length > charLimit) || (!messageContent || !(isFullMode ? messageTitle : true) || (errorMessageTextarea || errorMessageTitle)),
                 messageContent,
                 messageTitle,
                 index,
@@ -116,10 +118,19 @@ export const LineText = ({
 
     const updateTextContentError = (value) => {
         let errorMessage = false;
+        const { valid } = validateTags({
+            content: value,
+            tagsParam: tags,
+            injectedTagsParams: injectedTags,
+            location,
+            tagModule: 'outbound',
+        }) || {};
         if (value === '') {
             errorMessage = formatMessage(messages.emptyTitleErrorMessage);
         } else if (value.length > charLimit) {
             errorMessage = formatMessage(messages.limitExceededContentErrorMessage);
+        } else if (!valid && !isFullMode) {
+            errorMessage = formatMessage(messages.invalidTagError);
         }
         updateErrorMessageTextArea(errorMessage);
     }
@@ -128,7 +139,7 @@ export const LineText = ({
         updateTextMessageContent(value);
         updateTextContentError(value);
         updateMessageState({
-            isError: (value.length > charLimit) || (!value || !(isFullMode ? messageTitle : true) || (!value && errorMessageTitle)),
+            isError: (value.length > charLimit) || (!value || !(isFullMode ? messageTitle : true) || (!value || errorMessageTitle)),
             messageContent: value,
             messageTitle,
             index,
@@ -149,7 +160,7 @@ export const LineText = ({
         updateTextMessageTitle(value);
         updateTextTitleError(value);
         updateMessageState({
-            isError: (messageContent.length > charLimit) || (!messageContent || !(isFullMode ? value : true) || (!value && errorMessageTextarea)),
+            isError: (messageContent.length > charLimit) || (!messageContent || !(isFullMode ? value : true) || (!value || errorMessageTextarea)),
             messageContent,
             messageTitle: value,
             index,
@@ -158,7 +169,11 @@ export const LineText = ({
         });
     }
 
-    const onTagSelect = (data) => updateTextMessageContent(`${messageContent}{{${data}}}`);
+    const onTagSelect = (data) => {
+        const messageData = `${messageContent}{{${data}}}`;
+        updateTextMessageContent(messageData);
+        updateTextContentError(messageData);
+    }
 
     const setNewContent = () => updateCreateNew(true);
 

package/v2Containers/Line/Container/Text/messages.js

@@ -71,4 +71,8 @@ export default defineMessages({
     id: `${scope}.searchText`,
     defaultMessage: 'Search Text',
   },
+  "invalidTagError": {
+    id: `${scope}.invalidTagError`,
+    defaultMessage: 'Please check the message content for unsupported/missing tags',
+  },
 });