@capillarytech/creatives-library 7.17.88 → 7.17.89
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/initialState.js +0 -1
- package/package.json +1 -1
- package/v2Components/CapTagList/index.js +5 -45
- package/v2Components/CapTagList/messages.js +0 -8
- package/v2Components/CapTagList/style.scss +0 -21
- package/v2Containers/Cap/constants.js +1 -1
- package/v2Containers/Cap/reducer.js +3 -6
- package/v2Containers/Cap/sagas.js +2 -21
- package/v2Containers/Cap/selectors.js +0 -6
- package/v2Containers/Cap/tests/saga.test.js +1 -101
- package/v2Containers/Line/Container/Wrapper/tests/__snapshots__/index.test.js.snap +0 -1
- package/v2Containers/Rcs/tests/__snapshots__/index.test.js.snap +0 -31
- package/v2Containers/SmsTrai/Edit/tests/__snapshots__/index.test.js.snap +0 -4
- package/v2Containers/TagList/index.js +1 -8
- package/v2Containers/Whatsapp/selectors.js +1 -1
- package/v2Containers/Whatsapp/tests/__snapshots__/index.test.js.snap +0 -4
package/initialState.js
CHANGED
package/package.json
CHANGED
|
@@ -10,20 +10,7 @@ import { connect } from 'react-redux';
|
|
|
10
10
|
import moment from 'moment';
|
|
11
11
|
import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
|
|
12
12
|
// import styled from 'styled-components';
|
|
13
|
-
import {
|
|
14
|
-
CapSpin,
|
|
15
|
-
CapModal,
|
|
16
|
-
CapButton,
|
|
17
|
-
CapPopover,
|
|
18
|
-
CapInput,
|
|
19
|
-
CapTree,
|
|
20
|
-
CapSelect,
|
|
21
|
-
CapTooltip,
|
|
22
|
-
CapLink,
|
|
23
|
-
CapIcon,
|
|
24
|
-
CapRow,
|
|
25
|
-
CapLabel,
|
|
26
|
-
} from "@capillarytech/cap-ui-library";
|
|
13
|
+
import { CapSpin, CapModal, CapButton, CapPopover, CapInput, CapTree, CapSelect, CapTooltip, CapLink, CapIcon } from '@capillarytech/cap-ui-library';
|
|
27
14
|
import './style.scss';
|
|
28
15
|
import _ from 'lodash';
|
|
29
16
|
import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
|
|
@@ -252,7 +239,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
|
|
|
252
239
|
window.open(TAG_TRANSLATION_DOC, '_blank');
|
|
253
240
|
}
|
|
254
241
|
render() {
|
|
255
|
-
const { hidePopover = false, tags = {}, intl = {}, moduleFilterEnabled, label, modalProps, channel
|
|
242
|
+
const { hidePopover = false, tags = {}, intl = {}, moduleFilterEnabled, label, modalProps, channel } = this.props;
|
|
256
243
|
const tg = tags;
|
|
257
244
|
const {formatMessage} = intl;
|
|
258
245
|
const { tagValue, expandedKeys, autoExpandParent, searchValue, visible, translationLang } = this.state;
|
|
@@ -331,39 +318,13 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
|
|
|
331
318
|
{contentSection}
|
|
332
319
|
</CapModal> :
|
|
333
320
|
<CapPopover
|
|
334
|
-
visible={
|
|
321
|
+
visible={visible}
|
|
335
322
|
onVisibleChange={this.togglePopoverVisibility}
|
|
336
323
|
content={contentSection}
|
|
337
324
|
trigger="click"
|
|
338
325
|
placement={translationLang === "ja-JP" && channel === 'EMAIL' ? "bottom" : "rightTop"}
|
|
339
|
-
>
|
|
340
|
-
<CapTooltip
|
|
341
|
-
title={
|
|
342
|
-
fetchingSchemaError && (
|
|
343
|
-
<CapRow className="tooltip-text-container">
|
|
344
|
-
<CapLabel className="tooltip-text1">
|
|
345
|
-
{formatMessage(messages.somethingWentWrong)}
|
|
346
|
-
</CapLabel>
|
|
347
|
-
<CapLabel className="tooltip-text2">
|
|
348
|
-
{formatMessage(messages.labelFetchErrorMsg)}
|
|
349
|
-
</CapLabel>
|
|
350
|
-
</CapRow>
|
|
351
|
-
)
|
|
352
|
-
}
|
|
353
|
-
placement="right"
|
|
354
326
|
>
|
|
355
|
-
|
|
356
|
-
<CapButton
|
|
357
|
-
disabled={
|
|
358
|
-
this?.props?.disabled || fetchingSchemaError
|
|
359
|
-
}
|
|
360
|
-
isAddBtn
|
|
361
|
-
type="flat"
|
|
362
|
-
>
|
|
363
|
-
{label || ""}
|
|
364
|
-
</CapButton>
|
|
365
|
-
</CapRow>
|
|
366
|
-
</CapTooltip>
|
|
327
|
+
<CapButton disabled={this?.props?.disabled} isAddBtn type="flat">{label || ''}</CapButton>
|
|
367
328
|
</CapPopover>
|
|
368
329
|
}
|
|
369
330
|
<CapModal
|
|
@@ -400,8 +361,7 @@ CapTagList.propTypes = {
|
|
|
400
361
|
disableTagsDetails: PropTypes.object,
|
|
401
362
|
currentOrgDetails: PropTypes.object,
|
|
402
363
|
channel: PropTypes.string,
|
|
403
|
-
disabled: PropTypes.bool
|
|
404
|
-
fetchingSchemaError: PropTypes.bool,
|
|
364
|
+
disabled: PropTypes.bool
|
|
405
365
|
};
|
|
406
366
|
|
|
407
367
|
CapTagList.defaultValue = {
|
|
@@ -50,12 +50,4 @@ export default defineMessages({
|
|
|
50
50
|
id: `creatives.componentsV2.CapTagList.customerBarcodeDisable`,
|
|
51
51
|
defaultMessage: 'This label is not enabled for your organization. Please connect with your Capillary POC',
|
|
52
52
|
},
|
|
53
|
-
"somethingWentWrong": {
|
|
54
|
-
id: `creatives.componentsV2.CapTagList.somethingWentWrong`,
|
|
55
|
-
defaultMessage: 'Something went wrong',
|
|
56
|
-
},
|
|
57
|
-
'labelFetchErrorMsg': {
|
|
58
|
-
id: `creatives.componentsV2.CapTagList.labelFetchErrorMsg`,
|
|
59
|
-
defaultMessage: 'Unable to fetch the labels. Please try again later'
|
|
60
|
-
},
|
|
61
53
|
});
|
|
@@ -1,26 +1,5 @@
|
|
|
1
|
-
@import "~@capillarytech/cap-ui-library/styles/_variables";
|
|
2
|
-
|
|
3
1
|
@media (max-height: 25rem) {
|
|
4
2
|
.ant-tree.cap-tree-v2.ant-tree-icon-hide {
|
|
5
3
|
height: 8.5714rem;
|
|
6
4
|
}
|
|
7
5
|
}
|
|
8
|
-
|
|
9
|
-
.tooltip-add-label-container {
|
|
10
|
-
float: right;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
.tooltip-text-container {
|
|
14
|
-
margin: $CAP_SPACE_12 $CAP_SPACE_20;
|
|
15
|
-
.tooltip-text1 {
|
|
16
|
-
margin-bottom: $CAP_SPACE_08;
|
|
17
|
-
font-weight: $FONT_WEIGHT_MEDIUM;
|
|
18
|
-
color: $FONT_COLOR_06;
|
|
19
|
-
font-size: $FONT_SIZE_L;
|
|
20
|
-
}
|
|
21
|
-
.tooltip-text2 {
|
|
22
|
-
font-weight: $FONT_WEIGHT_REGULAR;
|
|
23
|
-
color: $FONT_COLOR_06;
|
|
24
|
-
font-size: $FONT_SIZE_M;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
@@ -79,12 +79,10 @@ function capReducer(state = fromJS(initialState.cap), action) {
|
|
|
79
79
|
.set('getUserDataCode', action.status);
|
|
80
80
|
case types.GET_SCHEMA_FOR_ENTITY_REQUEST:
|
|
81
81
|
return state
|
|
82
|
-
.set('fetchingSchema', true)
|
|
83
|
-
.set('fetchingSchemaError', false);
|
|
82
|
+
.set('fetchingSchema', true);
|
|
84
83
|
case types.GET_SCHEMA_FOR_ENTITY_FAILURE:
|
|
85
84
|
return state
|
|
86
|
-
.set('fetchingSchema', false)
|
|
87
|
-
.set('fetchingSchemaError', true);
|
|
85
|
+
.set('fetchingSchema', false);
|
|
88
86
|
case types.GET_SCHEMA_FOR_ENTITY_SUCCESS: {
|
|
89
87
|
const stateMeta = state.get('metaEntities');
|
|
90
88
|
return state
|
|
@@ -92,8 +90,7 @@ function capReducer(state = fromJS(initialState.cap), action) {
|
|
|
92
90
|
.set('metaEntities', {
|
|
93
91
|
layouts: action.data && action.entityType === 'LAYOUT' ? action.data.metaEntities : stateMeta.layouts,
|
|
94
92
|
tags: action.data && action.entityType === 'TAG' ? action.data.metaEntities : stateMeta.tags,
|
|
95
|
-
})
|
|
96
|
-
.set('fetchingSchemaError', false);
|
|
93
|
+
});
|
|
97
94
|
}
|
|
98
95
|
case types.CLEAR_META_ENTITIES:
|
|
99
96
|
return state.set('metaEntities', {
|
|
@@ -125,28 +125,9 @@ export function* fetchSchemaForEntity(queryParams) {
|
|
|
125
125
|
const result = yield call(Api.fetchSchemaForEntity, queryParams);
|
|
126
126
|
|
|
127
127
|
// const sidebar = result.response.sidebar;
|
|
128
|
-
|
|
129
|
-
success = false,
|
|
130
|
-
response = {},
|
|
131
|
-
status: {
|
|
132
|
-
code = '',
|
|
133
|
-
} = {},
|
|
134
|
-
} = result || {};
|
|
135
|
-
const {
|
|
136
|
-
metaEntities = [],
|
|
137
|
-
} = response || {};
|
|
138
|
-
const {
|
|
139
|
-
queryParams: {
|
|
140
|
-
type = '',
|
|
141
|
-
} = {},
|
|
142
|
-
} = queryParams || {};
|
|
143
|
-
if (success || metaEntities?.length) {
|
|
144
|
-
yield put({ type: types.GET_SCHEMA_FOR_ENTITY_SUCCESS, data: response, statusCode: code, entityType: type });
|
|
145
|
-
} else {
|
|
146
|
-
yield put({ type: types.GET_SCHEMA_FOR_ENTITY_FAILURE, error: true });
|
|
147
|
-
}
|
|
128
|
+
yield put({ type: types.GET_SCHEMA_FOR_ENTITY_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', entityType: queryParams.queryParams.type });
|
|
148
129
|
} catch (error) {
|
|
149
|
-
yield put({ type: types.GET_SCHEMA_FOR_ENTITY_FAILURE, error});
|
|
130
|
+
yield put({ type: types.GET_SCHEMA_FOR_ENTITY_FAILURE, error });
|
|
150
131
|
}
|
|
151
132
|
}
|
|
152
133
|
|
|
@@ -73,11 +73,6 @@ const makeSelectFetchingSchema = () => createSelector(
|
|
|
73
73
|
(globalState) => globalState.get('fetchingSchema')
|
|
74
74
|
);
|
|
75
75
|
|
|
76
|
-
const makeSelectFetchingSchemaError = () => createSelector(
|
|
77
|
-
selectCapDomain,
|
|
78
|
-
(globalState) => globalState.get('fetchingSchemaError')
|
|
79
|
-
);
|
|
80
|
-
|
|
81
76
|
const makeSelectLoyaltyPromotionDisplay = () => createSelector(
|
|
82
77
|
selectCapDomain,
|
|
83
78
|
(globalState) => ({
|
|
@@ -99,5 +94,4 @@ export {
|
|
|
99
94
|
makeSelectFetchingSchema,
|
|
100
95
|
setInjectedTags,
|
|
101
96
|
makeSelectLoyaltyPromotionDisplay,
|
|
102
|
-
makeSelectFetchingSchemaError,
|
|
103
97
|
};
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
+
import { authorize, loginFlow } from '../sagas';
|
|
1
2
|
import { take, fork, cancel } from 'redux-saga/effects';
|
|
2
|
-
import { expectSaga } from "redux-saga-test-plan";
|
|
3
|
-
import * as matchers from "redux-saga-test-plan/matchers";
|
|
4
|
-
import { authorize, loginFlow, fetchSchemaForEntity } from '../sagas';
|
|
5
3
|
import {
|
|
6
4
|
LOGIN_REQUEST,
|
|
7
5
|
LOGIN_FAILURE,
|
|
8
6
|
LOGOUT_REQUEST_V2,
|
|
9
|
-
GET_SCHEMA_FOR_ENTITY_SUCCESS,
|
|
10
|
-
GET_SCHEMA_FOR_ENTITY_FAILURE
|
|
11
7
|
} from '../constants';
|
|
12
|
-
import { fetchSchemaForEntity as fetchSchemaForEntityApi } from "../../../services/api";
|
|
13
|
-
|
|
14
8
|
describe('loginFlow', () => {
|
|
15
9
|
it('should handle the login flow', () => {
|
|
16
10
|
const generator = loginFlow();
|
|
@@ -34,98 +28,4 @@ describe('loginFlow', () => {
|
|
|
34
28
|
}
|
|
35
29
|
catch{}
|
|
36
30
|
});
|
|
37
|
-
});
|
|
38
|
-
|
|
39
|
-
describe("fetchSchemaForEntity", () => {
|
|
40
|
-
it("handle success response from fetchSchemaForEntity", () => {
|
|
41
|
-
expectSaga(fetchSchemaForEntity, {
|
|
42
|
-
queryParams: {
|
|
43
|
-
type: 'tags'
|
|
44
|
-
},
|
|
45
|
-
})
|
|
46
|
-
.provide([
|
|
47
|
-
[
|
|
48
|
-
matchers.call.fn(fetchSchemaForEntityApi),
|
|
49
|
-
{
|
|
50
|
-
success: true,
|
|
51
|
-
response: {},
|
|
52
|
-
},
|
|
53
|
-
],
|
|
54
|
-
])
|
|
55
|
-
.put({
|
|
56
|
-
type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
|
|
57
|
-
data: {},
|
|
58
|
-
statusCode: '',
|
|
59
|
-
entityType: 'tags'
|
|
60
|
-
})
|
|
61
|
-
.run();
|
|
62
|
-
});
|
|
63
|
-
|
|
64
|
-
it("handle success response from fetchSchemaForEntity when metaEntities available", () => {
|
|
65
|
-
expectSaga(fetchSchemaForEntity, {
|
|
66
|
-
queryParams: {
|
|
67
|
-
type: 'tags'
|
|
68
|
-
},
|
|
69
|
-
})
|
|
70
|
-
.provide([
|
|
71
|
-
[
|
|
72
|
-
matchers.call.fn(fetchSchemaForEntityApi),
|
|
73
|
-
{
|
|
74
|
-
response: {
|
|
75
|
-
metaEntities: []
|
|
76
|
-
},
|
|
77
|
-
},
|
|
78
|
-
],
|
|
79
|
-
])
|
|
80
|
-
.put({
|
|
81
|
-
type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
|
|
82
|
-
data: {
|
|
83
|
-
metaEntities: []
|
|
84
|
-
},
|
|
85
|
-
statusCode: '',
|
|
86
|
-
entityType: 'tags'
|
|
87
|
-
})
|
|
88
|
-
.run();
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
it("handle when response and query params are empty from fetchSchemaForEntity when metaEntities available", () => {
|
|
92
|
-
expectSaga(fetchSchemaForEntity, {})
|
|
93
|
-
.provide([
|
|
94
|
-
[
|
|
95
|
-
matchers.call.fn(fetchSchemaForEntityApi),
|
|
96
|
-
{
|
|
97
|
-
success: true
|
|
98
|
-
},
|
|
99
|
-
],
|
|
100
|
-
])
|
|
101
|
-
.put({
|
|
102
|
-
type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
|
|
103
|
-
data: {},
|
|
104
|
-
statusCode: '',
|
|
105
|
-
entityType: ''
|
|
106
|
-
})
|
|
107
|
-
.run();
|
|
108
|
-
});
|
|
109
|
-
|
|
110
|
-
it("handle error response from fetchSchemaForEntity", () => {
|
|
111
|
-
expectSaga(fetchSchemaForEntity, {
|
|
112
|
-
queryParams: {
|
|
113
|
-
type: 'tags'
|
|
114
|
-
},
|
|
115
|
-
})
|
|
116
|
-
.provide([
|
|
117
|
-
[
|
|
118
|
-
matchers.call.fn(fetchSchemaForEntityApi),
|
|
119
|
-
{
|
|
120
|
-
success: false,
|
|
121
|
-
response: {},
|
|
122
|
-
},
|
|
123
|
-
],
|
|
124
|
-
])
|
|
125
|
-
.put({
|
|
126
|
-
type: GET_SCHEMA_FOR_ENTITY_FAILURE,
|
|
127
|
-
error: 'Error in fetching tags'
|
|
128
|
-
})
|
|
129
|
-
.run();
|
|
130
|
-
});
|
|
131
31
|
});
|
|
@@ -23085,7 +23085,6 @@ new message content.",
|
|
|
23085
23085
|
"app": Object {},
|
|
23086
23086
|
"cap": Object {
|
|
23087
23087
|
"fetchingSchema": true,
|
|
23088
|
-
"fetchingSchemaError": "",
|
|
23089
23088
|
"messages": Array [],
|
|
23090
23089
|
"metaEntities": Object {
|
|
23091
23090
|
"layouts": Array [],
|
|
@@ -5326,7 +5326,6 @@ new message content.",
|
|
|
5326
5326
|
"app": Object {},
|
|
5327
5327
|
"cap": Object {
|
|
5328
5328
|
"fetchingSchema": true,
|
|
5329
|
-
"fetchingSchemaError": "",
|
|
5330
5329
|
"messages": Array [],
|
|
5331
5330
|
"metaEntities": Object {
|
|
5332
5331
|
"layouts": Array [],
|
|
@@ -7390,7 +7389,6 @@ new message content.",
|
|
|
7390
7389
|
"app": Object {},
|
|
7391
7390
|
"cap": Object {
|
|
7392
7391
|
"fetchingSchema": true,
|
|
7393
|
-
"fetchingSchemaError": "",
|
|
7394
7392
|
"messages": Array [],
|
|
7395
7393
|
"metaEntities": Object {
|
|
7396
7394
|
"layouts": Array [],
|
|
@@ -18761,7 +18759,6 @@ new message content.",
|
|
|
18761
18759
|
"app": Object {},
|
|
18762
18760
|
"cap": Object {
|
|
18763
18761
|
"fetchingSchema": true,
|
|
18764
|
-
"fetchingSchemaError": "",
|
|
18765
18762
|
"messages": Array [],
|
|
18766
18763
|
"metaEntities": Object {
|
|
18767
18764
|
"layouts": Array [],
|
|
@@ -20825,7 +20822,6 @@ new message content.",
|
|
|
20825
20822
|
"app": Object {},
|
|
20826
20823
|
"cap": Object {
|
|
20827
20824
|
"fetchingSchema": true,
|
|
20828
|
-
"fetchingSchemaError": "",
|
|
20829
20825
|
"messages": Array [],
|
|
20830
20826
|
"metaEntities": Object {
|
|
20831
20827
|
"layouts": Array [],
|
|
@@ -30720,7 +30716,6 @@ new message content.",
|
|
|
30720
30716
|
"app": Object {},
|
|
30721
30717
|
"cap": Object {
|
|
30722
30718
|
"fetchingSchema": true,
|
|
30723
|
-
"fetchingSchemaError": "",
|
|
30724
30719
|
"messages": Array [],
|
|
30725
30720
|
"metaEntities": Object {
|
|
30726
30721
|
"layouts": Array [],
|
|
@@ -32784,7 +32779,6 @@ new message content.",
|
|
|
32784
32779
|
"app": Object {},
|
|
32785
32780
|
"cap": Object {
|
|
32786
32781
|
"fetchingSchema": true,
|
|
32787
|
-
"fetchingSchemaError": "",
|
|
32788
32782
|
"messages": Array [],
|
|
32789
32783
|
"metaEntities": Object {
|
|
32790
32784
|
"layouts": Array [],
|
|
@@ -40422,7 +40416,6 @@ new message content.",
|
|
|
40422
40416
|
"app": Object {},
|
|
40423
40417
|
"cap": Object {
|
|
40424
40418
|
"fetchingSchema": true,
|
|
40425
|
-
"fetchingSchemaError": "",
|
|
40426
40419
|
"messages": Array [],
|
|
40427
40420
|
"metaEntities": Object {
|
|
40428
40421
|
"layouts": Array [],
|
|
@@ -42486,7 +42479,6 @@ new message content.",
|
|
|
42486
42479
|
"app": Object {},
|
|
42487
42480
|
"cap": Object {
|
|
42488
42481
|
"fetchingSchema": true,
|
|
42489
|
-
"fetchingSchemaError": "",
|
|
42490
42482
|
"messages": Array [],
|
|
42491
42483
|
"metaEntities": Object {
|
|
42492
42484
|
"layouts": Array [],
|
|
@@ -52318,7 +52310,6 @@ new message content.",
|
|
|
52318
52310
|
"app": Object {},
|
|
52319
52311
|
"cap": Object {
|
|
52320
52312
|
"fetchingSchema": true,
|
|
52321
|
-
"fetchingSchemaError": "",
|
|
52322
52313
|
"messages": Array [],
|
|
52323
52314
|
"metaEntities": Object {
|
|
52324
52315
|
"layouts": Array [],
|
|
@@ -67760,7 +67751,6 @@ new message content.",
|
|
|
67760
67751
|
"app": Object {},
|
|
67761
67752
|
"cap": Object {
|
|
67762
67753
|
"fetchingSchema": true,
|
|
67763
|
-
"fetchingSchemaError": "",
|
|
67764
67754
|
"messages": Array [],
|
|
67765
67755
|
"metaEntities": Object {
|
|
67766
67756
|
"layouts": Array [],
|
|
@@ -83096,7 +83086,6 @@ new message content.",
|
|
|
83096
83086
|
"app": Object {},
|
|
83097
83087
|
"cap": Object {
|
|
83098
83088
|
"fetchingSchema": true,
|
|
83099
|
-
"fetchingSchemaError": "",
|
|
83100
83089
|
"messages": Array [],
|
|
83101
83090
|
"metaEntities": Object {
|
|
83102
83091
|
"layouts": Array [],
|
|
@@ -98538,7 +98527,6 @@ new message content.",
|
|
|
98538
98527
|
"app": Object {},
|
|
98539
98528
|
"cap": Object {
|
|
98540
98529
|
"fetchingSchema": true,
|
|
98541
|
-
"fetchingSchemaError": "",
|
|
98542
98530
|
"messages": Array [],
|
|
98543
98531
|
"metaEntities": Object {
|
|
98544
98532
|
"layouts": Array [],
|
|
@@ -111126,7 +111114,6 @@ new message content.",
|
|
|
111126
111114
|
"app": Object {},
|
|
111127
111115
|
"cap": Object {
|
|
111128
111116
|
"fetchingSchema": true,
|
|
111129
|
-
"fetchingSchemaError": "",
|
|
111130
111117
|
"messages": Array [],
|
|
111131
111118
|
"metaEntities": Object {
|
|
111132
111119
|
"layouts": Array [],
|
|
@@ -113190,7 +113177,6 @@ new message content.",
|
|
|
113190
113177
|
"app": Object {},
|
|
113191
113178
|
"cap": Object {
|
|
113192
113179
|
"fetchingSchema": true,
|
|
113193
|
-
"fetchingSchemaError": "",
|
|
113194
113180
|
"messages": Array [],
|
|
113195
113181
|
"metaEntities": Object {
|
|
113196
113182
|
"layouts": Array [],
|
|
@@ -123031,7 +123017,6 @@ new message content.",
|
|
|
123031
123017
|
"app": Object {},
|
|
123032
123018
|
"cap": Object {
|
|
123033
123019
|
"fetchingSchema": true,
|
|
123034
|
-
"fetchingSchemaError": "",
|
|
123035
123020
|
"messages": Array [],
|
|
123036
123021
|
"metaEntities": Object {
|
|
123037
123022
|
"layouts": Array [],
|
|
@@ -128287,7 +128272,6 @@ new message content.",
|
|
|
128287
128272
|
"app": Object {},
|
|
128288
128273
|
"cap": Object {
|
|
128289
128274
|
"fetchingSchema": true,
|
|
128290
|
-
"fetchingSchemaError": "",
|
|
128291
128275
|
"messages": Array [],
|
|
128292
128276
|
"metaEntities": Object {
|
|
128293
128277
|
"layouts": Array [],
|
|
@@ -135329,7 +135313,6 @@ new message content.",
|
|
|
135329
135313
|
"app": Object {},
|
|
135330
135314
|
"cap": Object {
|
|
135331
135315
|
"fetchingSchema": true,
|
|
135332
|
-
"fetchingSchemaError": "",
|
|
135333
135316
|
"messages": Array [],
|
|
135334
135317
|
"metaEntities": Object {
|
|
135335
135318
|
"layouts": Array [],
|
|
@@ -139619,7 +139602,6 @@ new message content.",
|
|
|
139619
139602
|
"app": Object {},
|
|
139620
139603
|
"cap": Object {
|
|
139621
139604
|
"fetchingSchema": true,
|
|
139622
|
-
"fetchingSchemaError": "",
|
|
139623
139605
|
"messages": Array [],
|
|
139624
139606
|
"metaEntities": Object {
|
|
139625
139607
|
"layouts": Array [],
|
|
@@ -141683,7 +141665,6 @@ new message content.",
|
|
|
141683
141665
|
"app": Object {},
|
|
141684
141666
|
"cap": Object {
|
|
141685
141667
|
"fetchingSchema": true,
|
|
141686
|
-
"fetchingSchemaError": "",
|
|
141687
141668
|
"messages": Array [],
|
|
141688
141669
|
"metaEntities": Object {
|
|
141689
141670
|
"layouts": Array [],
|
|
@@ -149343,7 +149324,6 @@ new message content.",
|
|
|
149343
149324
|
"app": Object {},
|
|
149344
149325
|
"cap": Object {
|
|
149345
149326
|
"fetchingSchema": true,
|
|
149346
|
-
"fetchingSchemaError": "",
|
|
149347
149327
|
"messages": Array [],
|
|
149348
149328
|
"metaEntities": Object {
|
|
149349
149329
|
"layouts": Array [],
|
|
@@ -151401,7 +151381,6 @@ new message content.",
|
|
|
151401
151381
|
"app": Object {},
|
|
151402
151382
|
"cap": Object {
|
|
151403
151383
|
"fetchingSchema": true,
|
|
151404
|
-
"fetchingSchemaError": "",
|
|
151405
151384
|
"messages": Array [],
|
|
151406
151385
|
"metaEntities": Object {
|
|
151407
151386
|
"layouts": Array [],
|
|
@@ -158485,7 +158464,6 @@ new message content.",
|
|
|
158485
158464
|
"app": Object {},
|
|
158486
158465
|
"cap": Object {
|
|
158487
158466
|
"fetchingSchema": true,
|
|
158488
|
-
"fetchingSchemaError": "",
|
|
158489
158467
|
"messages": Array [],
|
|
158490
158468
|
"metaEntities": Object {
|
|
158491
158469
|
"layouts": Array [],
|
|
@@ -160549,7 +160527,6 @@ new message content.",
|
|
|
160549
160527
|
"app": Object {},
|
|
160550
160528
|
"cap": Object {
|
|
160551
160529
|
"fetchingSchema": true,
|
|
160552
|
-
"fetchingSchemaError": "",
|
|
160553
160530
|
"messages": Array [],
|
|
160554
160531
|
"metaEntities": Object {
|
|
160555
160532
|
"layouts": Array [],
|
|
@@ -167910,7 +167887,6 @@ new message content.",
|
|
|
167910
167887
|
"app": Object {},
|
|
167911
167888
|
"cap": Object {
|
|
167912
167889
|
"fetchingSchema": true,
|
|
167913
|
-
"fetchingSchemaError": "",
|
|
167914
167890
|
"messages": Array [],
|
|
167915
167891
|
"metaEntities": Object {
|
|
167916
167892
|
"layouts": Array [],
|
|
@@ -169974,7 +169950,6 @@ new message content.",
|
|
|
169974
169950
|
"app": Object {},
|
|
169975
169951
|
"cap": Object {
|
|
169976
169952
|
"fetchingSchema": true,
|
|
169977
|
-
"fetchingSchemaError": "",
|
|
169978
169953
|
"messages": Array [],
|
|
169979
169954
|
"metaEntities": Object {
|
|
169980
169955
|
"layouts": Array [],
|
|
@@ -177619,7 +177594,6 @@ new message content.",
|
|
|
177619
177594
|
"app": Object {},
|
|
177620
177595
|
"cap": Object {
|
|
177621
177596
|
"fetchingSchema": true,
|
|
177622
|
-
"fetchingSchemaError": "",
|
|
177623
177597
|
"messages": Array [],
|
|
177624
177598
|
"metaEntities": Object {
|
|
177625
177599
|
"layouts": Array [],
|
|
@@ -179683,7 +179657,6 @@ new message content.",
|
|
|
179683
179657
|
"app": Object {},
|
|
179684
179658
|
"cap": Object {
|
|
179685
179659
|
"fetchingSchema": true,
|
|
179686
|
-
"fetchingSchemaError": "",
|
|
179687
179660
|
"messages": Array [],
|
|
179688
179661
|
"metaEntities": Object {
|
|
179689
179662
|
"layouts": Array [],
|
|
@@ -187044,7 +187017,6 @@ new message content.",
|
|
|
187044
187017
|
"app": Object {},
|
|
187045
187018
|
"cap": Object {
|
|
187046
187019
|
"fetchingSchema": true,
|
|
187047
|
-
"fetchingSchemaError": "",
|
|
187048
187020
|
"messages": Array [],
|
|
187049
187021
|
"metaEntities": Object {
|
|
187050
187022
|
"layouts": Array [],
|
|
@@ -189108,7 +189080,6 @@ new message content.",
|
|
|
189108
189080
|
"app": Object {},
|
|
189109
189081
|
"cap": Object {
|
|
189110
189082
|
"fetchingSchema": true,
|
|
189111
|
-
"fetchingSchemaError": "",
|
|
189112
189083
|
"messages": Array [],
|
|
189113
189084
|
"metaEntities": Object {
|
|
189114
189085
|
"layouts": Array [],
|
|
@@ -196760,7 +196731,6 @@ new message content.",
|
|
|
196760
196731
|
"app": Object {},
|
|
196761
196732
|
"cap": Object {
|
|
196762
196733
|
"fetchingSchema": true,
|
|
196763
|
-
"fetchingSchemaError": "",
|
|
196764
196734
|
"messages": Array [],
|
|
196765
196735
|
"metaEntities": Object {
|
|
196766
196736
|
"layouts": Array [],
|
|
@@ -198824,7 +198794,6 @@ new message content.",
|
|
|
198824
198794
|
"app": Object {},
|
|
198825
198795
|
"cap": Object {
|
|
198826
198796
|
"fetchingSchema": true,
|
|
198827
|
-
"fetchingSchemaError": "",
|
|
198828
198797
|
"messages": Array [],
|
|
198829
198798
|
"metaEntities": Object {
|
|
198830
198799
|
"layouts": Array [],
|
|
@@ -3196,7 +3196,6 @@ FREE GIFTS-
|
|
|
3196
3196
|
"app": Object {},
|
|
3197
3197
|
"cap": Object {
|
|
3198
3198
|
"fetchingSchema": true,
|
|
3199
|
-
"fetchingSchemaError": "",
|
|
3200
3199
|
"messages": Array [],
|
|
3201
3200
|
"metaEntities": Object {
|
|
3202
3201
|
"layouts": Array [],
|
|
@@ -10526,7 +10525,6 @@ FREE GIFTS-
|
|
|
10526
10525
|
"app": Object {},
|
|
10527
10526
|
"cap": Object {
|
|
10528
10527
|
"fetchingSchema": true,
|
|
10529
|
-
"fetchingSchemaError": "",
|
|
10530
10528
|
"messages": Array [],
|
|
10531
10529
|
"metaEntities": Object {
|
|
10532
10530
|
"layouts": Array [],
|
|
@@ -18276,7 +18274,6 @@ FREE GIFTS-
|
|
|
18276
18274
|
"app": Object {},
|
|
18277
18275
|
"cap": Object {
|
|
18278
18276
|
"fetchingSchema": true,
|
|
18279
|
-
"fetchingSchemaError": "",
|
|
18280
18277
|
"messages": Array [],
|
|
18281
18278
|
"metaEntities": Object {
|
|
18282
18279
|
"layouts": Array [],
|
|
@@ -26135,7 +26132,6 @@ FREE GIFTS-
|
|
|
26135
26132
|
"app": Object {},
|
|
26136
26133
|
"cap": Object {
|
|
26137
26134
|
"fetchingSchema": true,
|
|
26138
|
-
"fetchingSchemaError": "",
|
|
26139
26135
|
"messages": Array [],
|
|
26140
26136
|
"metaEntities": Object {
|
|
26141
26137
|
"layouts": Array [],
|
|
@@ -19,7 +19,7 @@ import * as globalActions from '../Cap/actions';
|
|
|
19
19
|
// import styled from styled-components;
|
|
20
20
|
import CapTagList from '../../v2Components/CapTagList';
|
|
21
21
|
import './_tagList.scss';
|
|
22
|
-
import { selectCurrentOrgDetails
|
|
22
|
+
import { selectCurrentOrgDetails } from '../Cap/selectors';
|
|
23
23
|
import { injectIntl } from 'react-intl';
|
|
24
24
|
import { scope } from './messages';
|
|
25
25
|
import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature, hasBadgesFeature, transformBadgeTags } from '../../utils/common';
|
|
@@ -33,7 +33,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
|
|
|
33
33
|
this.state = {
|
|
34
34
|
loading: false,
|
|
35
35
|
tags: [],
|
|
36
|
-
tagsError: false,
|
|
37
36
|
};
|
|
38
37
|
this.renderTags = this.renderTags.bind(this);
|
|
39
38
|
this.populateTags = this.populateTags.bind(this);
|
|
@@ -58,9 +57,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
|
|
|
58
57
|
|
|
59
58
|
this.setState({loading: false});
|
|
60
59
|
}
|
|
61
|
-
if (nextProps?.fetchingSchemaError) {
|
|
62
|
-
this.setState({tagsError: nextProps?.fetchingSchemaError});
|
|
63
|
-
}
|
|
64
60
|
|
|
65
61
|
}
|
|
66
62
|
componentDidUpdate(prevProps) {
|
|
@@ -289,7 +285,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
|
|
|
289
285
|
currentOrgDetails={this.props.currentOrgDetails}
|
|
290
286
|
channel={this.props.channel}
|
|
291
287
|
disabled={this.props.disabled}
|
|
292
|
-
fetchingSchemaError={this?.state?.tagsError}
|
|
293
288
|
/>
|
|
294
289
|
</div>
|
|
295
290
|
);
|
|
@@ -317,13 +312,11 @@ TagList.propTypes = {
|
|
|
317
312
|
currentOrgDetails: PropTypes.object,
|
|
318
313
|
channel: PropTypes.string,
|
|
319
314
|
disabled: PropTypes.bool,
|
|
320
|
-
fetchingSchemaError: PropTypes.bool,
|
|
321
315
|
};
|
|
322
316
|
|
|
323
317
|
const mapStateToProps = createStructuredSelector({
|
|
324
318
|
TagList: makeSelectTagList(),
|
|
325
319
|
currentOrgDetails: selectCurrentOrgDetails(),
|
|
326
|
-
fetchingSchemaError: makeSelectFetchingSchemaError(),
|
|
327
320
|
});
|
|
328
321
|
|
|
329
322
|
function mapDispatchToProps(dispatch) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createSelector } from 'reselect';
|
|
2
2
|
|
|
3
|
-
const selectWhatsappDomain = () => (state) => state.get('
|
|
3
|
+
const selectWhatsappDomain = () => (state) => state.get('templates');
|
|
4
4
|
const selectAccountDomain = () => (state) => state.get('templates');
|
|
5
5
|
|
|
6
6
|
const makeSelectWhatsapp = () =>
|
|
@@ -124802,7 +124802,6 @@ Click {{3}} to unsubscribe'",
|
|
|
124802
124802
|
"app": Object {},
|
|
124803
124803
|
"cap": Object {
|
|
124804
124804
|
"fetchingSchema": true,
|
|
124805
|
-
"fetchingSchemaError": "",
|
|
124806
124805
|
"messages": Array [],
|
|
124807
124806
|
"metaEntities": Object {
|
|
124808
124807
|
"layouts": Array [],
|
|
@@ -160207,7 +160206,6 @@ Click {{3}} to unsubscribe'",
|
|
|
160207
160206
|
"app": Object {},
|
|
160208
160207
|
"cap": Object {
|
|
160209
160208
|
"fetchingSchema": true,
|
|
160210
|
-
"fetchingSchemaError": "",
|
|
160211
160209
|
"messages": Array [],
|
|
160212
160210
|
"metaEntities": Object {
|
|
160213
160211
|
"layouts": Array [],
|
|
@@ -177727,7 +177725,6 @@ Click {{unsubscribe}} to unsubscribe",
|
|
|
177727
177725
|
"app": Object {},
|
|
177728
177726
|
"cap": Object {
|
|
177729
177727
|
"fetchingSchema": true,
|
|
177730
|
-
"fetchingSchemaError": "",
|
|
177731
177728
|
"messages": Array [],
|
|
177732
177729
|
"metaEntities": Object {
|
|
177733
177730
|
"layouts": Array [],
|
|
@@ -189968,7 +189965,6 @@ new message content.",
|
|
|
189968
189965
|
"app": Object {},
|
|
189969
189966
|
"cap": Object {
|
|
189970
189967
|
"fetchingSchema": true,
|
|
189971
|
-
"fetchingSchemaError": "",
|
|
189972
189968
|
"messages": Array [],
|
|
189973
189969
|
"metaEntities": Object {
|
|
189974
189970
|
"layouts": Array [],
|