@capillarytech/creatives-library 8.0.199-alpha.0 → 8.0.200-alpha.0
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/constants/unified.js +0 -1
- package/package.json +1 -1
- package/utils/common.js +1 -7
- package/utils/createMobilePushPayload.js +27 -6
- package/utils/tests/createMobilePushPayload.test.js +53 -0
- package/v2Components/FormBuilder/index.js +300 -0
- package/v2Containers/BeeEditor/index.js +1 -1
- package/v2Containers/CreativesContainer/SlideBoxContent.js +2 -6
- package/v2Containers/CreativesContainer/index.js +62 -17
- package/v2Containers/CreativesContainer/tests/SlideBoxContent.test.js +135 -0
- package/v2Containers/CreativesContainer/tests/__snapshots__/SlideBoxContent.test.js.snap +145 -0
- package/v2Containers/Email/index.js +3 -0
- package/v2Containers/MobilePushNew/index.js +172 -70
- package/v2Containers/MobilePushNew/messages.js +17 -0
- package/v2Containers/Templates/_templates.scss +2 -2
- package/v2Containers/Templates/index.js +11 -15
package/constants/unified.js
CHANGED
|
@@ -44,7 +44,6 @@ export const REGISTRATION_CUSTOM_FIELD = 'Registration custom fields';
|
|
|
44
44
|
export const GIFT_CARDS = 'GIFT_CARDS';
|
|
45
45
|
export const PROMO_ENGINE = 'PROMO_ENGINE';
|
|
46
46
|
export const LIQUID_SUPPORT = 'ENABLE_LIQUID_SUPPORT';
|
|
47
|
-
export const ENABLE_NEW_MPUSH = 'ENABLE_NEW_MPUSH';
|
|
48
47
|
export const CUSTOM_TAG = 'CustomTagMessage';
|
|
49
48
|
export const CUSTOMER_EXTENDED_FIELD = 'Customer extended fields';
|
|
50
49
|
export const EXTENDED_TAG = 'ExtendedTagMessage';
|
package/package.json
CHANGED
package/utils/common.js
CHANGED
|
@@ -21,8 +21,7 @@ import {
|
|
|
21
21
|
EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
|
|
22
22
|
BADGES_ISSUE,
|
|
23
23
|
ENABLE_WECHAT,
|
|
24
|
-
LIQUID_SUPPORT
|
|
25
|
-
ENABLE_NEW_MPUSH
|
|
24
|
+
LIQUID_SUPPORT
|
|
26
25
|
} from '../constants/unified';
|
|
27
26
|
import { apiMessageFormatHandler } from './commonUtils';
|
|
28
27
|
|
|
@@ -126,11 +125,6 @@ export const isEmailUnsubscribeTagMandatory = Auth.hasFeatureAccess.bind(
|
|
|
126
125
|
EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
|
|
127
126
|
);
|
|
128
127
|
|
|
129
|
-
export const hasNewMobilePushFeatureEnabled = Auth.hasFeatureAccess.bind(
|
|
130
|
-
null,
|
|
131
|
-
ENABLE_NEW_MPUSH,
|
|
132
|
-
);
|
|
133
|
-
|
|
134
128
|
//filtering tags based on scope
|
|
135
129
|
export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
|
|
136
130
|
(tag) => !tagsToFilter?.includes(tag?.definition?.value)
|
|
@@ -62,12 +62,33 @@ const createMobilePushPayload = ({
|
|
|
62
62
|
throw new Error(intl.formatMessage(messages.templateNameEmptyError));
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
// Validate content
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
65
|
+
// Validate content - allow single platform if explicitly allowed
|
|
66
|
+
const allowSinglePlatform = options?.allowSinglePlatform || false;
|
|
67
|
+
|
|
68
|
+
if (!allowSinglePlatform) {
|
|
69
|
+
// Normal validation: require all supported platforms to have content
|
|
70
|
+
if (isAndroidSupported && (!androidContent?.title || !androidContent?.message)) {
|
|
71
|
+
throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
|
|
72
|
+
}
|
|
73
|
+
if (isIosSupported && (!iosContent?.title || !iosContent?.message)) {
|
|
74
|
+
throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
|
|
75
|
+
}
|
|
76
|
+
} else {
|
|
77
|
+
// Single platform mode: require at least one platform to have content
|
|
78
|
+
const hasAndroidContent = isAndroidSupported && androidContent?.title?.trim() && androidContent?.message?.trim();
|
|
79
|
+
const hasIosContent = isIosSupported && iosContent?.title?.trim() && iosContent?.message?.trim();
|
|
80
|
+
|
|
81
|
+
if (!hasAndroidContent && !hasIosContent) {
|
|
82
|
+
throw new Error(intl.formatMessage(messages.singlePlatformContentMissing));
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
// Validate individual platforms that are supported but have incomplete content
|
|
86
|
+
if (isAndroidSupported && !hasAndroidContent && androidContent) {
|
|
87
|
+
throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
|
|
88
|
+
}
|
|
89
|
+
if (isIosSupported && !hasIosContent && iosContent) {
|
|
90
|
+
throw new Error(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
|
|
91
|
+
}
|
|
71
92
|
}
|
|
72
93
|
|
|
73
94
|
// Ensure imageSrc has the required properties
|
|
@@ -261,6 +261,59 @@ describe('createMobilePushPayload', () => {
|
|
|
261
261
|
accountData: unsupportedAccountData,
|
|
262
262
|
})).not.toThrow();
|
|
263
263
|
});
|
|
264
|
+
|
|
265
|
+
// Single Platform Mode Tests
|
|
266
|
+
it('should allow single platform when allowSinglePlatform is true - Android only', () => {
|
|
267
|
+
expect(() => callWithIntl({
|
|
268
|
+
templateName: 'Test',
|
|
269
|
+
androidContent: { title: 'Title', message: 'Message' },
|
|
270
|
+
iosContent: null,
|
|
271
|
+
accountData: mockAccountData,
|
|
272
|
+
options: { allowSinglePlatform: true },
|
|
273
|
+
})).not.toThrow();
|
|
274
|
+
});
|
|
275
|
+
|
|
276
|
+
it('should allow single platform when allowSinglePlatform is true - iOS only', () => {
|
|
277
|
+
expect(() => callWithIntl({
|
|
278
|
+
templateName: 'Test',
|
|
279
|
+
androidContent: null,
|
|
280
|
+
iosContent: { title: 'Title', message: 'Message' },
|
|
281
|
+
accountData: mockAccountData,
|
|
282
|
+
options: { allowSinglePlatform: true },
|
|
283
|
+
})).not.toThrow();
|
|
284
|
+
});
|
|
285
|
+
|
|
286
|
+
it('should throw error when no platforms have content even with allowSinglePlatform', () => {
|
|
287
|
+
expect(() => callWithIntl({
|
|
288
|
+
templateName: 'Test',
|
|
289
|
+
androidContent: null,
|
|
290
|
+
iosContent: null,
|
|
291
|
+
accountData: mockAccountData,
|
|
292
|
+
options: { allowSinglePlatform: true },
|
|
293
|
+
})).toThrow(intl.formatMessage(messages.singlePlatformContentMissing));
|
|
294
|
+
});
|
|
295
|
+
|
|
296
|
+
it('should validate individual platforms in single platform mode - Android incomplete', () => {
|
|
297
|
+
// Test case where iOS has valid content but Android has incomplete content
|
|
298
|
+
expect(() => callWithIntl({
|
|
299
|
+
templateName: 'Test',
|
|
300
|
+
androidContent: { title: 'Valid Title' }, // Missing message property
|
|
301
|
+
iosContent: { title: 'Valid Title', message: 'Valid Message' }, // Complete content
|
|
302
|
+
accountData: mockAccountData,
|
|
303
|
+
options: { allowSinglePlatform: true },
|
|
304
|
+
})).toThrow(intl.formatMessage(messages.contentValidationError, { platform: 'Android' }));
|
|
305
|
+
});
|
|
306
|
+
|
|
307
|
+
it('should validate individual platforms in single platform mode - iOS incomplete', () => {
|
|
308
|
+
// Test case where Android has valid content but iOS has incomplete content
|
|
309
|
+
expect(() => callWithIntl({
|
|
310
|
+
templateName: 'Test',
|
|
311
|
+
androidContent: { title: 'Valid Title', message: 'Valid Message' }, // Complete content
|
|
312
|
+
iosContent: { title: 'Valid Title' }, // Missing message property
|
|
313
|
+
accountData: mockAccountData,
|
|
314
|
+
options: { allowSinglePlatform: true },
|
|
315
|
+
})).toThrow(intl.formatMessage(messages.contentValidationError, { platform: 'iOS' }));
|
|
316
|
+
});
|
|
264
317
|
});
|
|
265
318
|
|
|
266
319
|
// Account Data Validation Tests
|
|
@@ -139,8 +139,196 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
|
|
|
139
139
|
// Check if the liquid flow feature is supported and the channel is in the supported list.
|
|
140
140
|
this.liquidFlow = this.isLiquidFlowSupported.bind(this);
|
|
141
141
|
this.onSubmitWrapper = this.onSubmitWrapper.bind(this);
|
|
142
|
+
|
|
143
|
+
// Performance optimization: Debounced functions for high-frequency updates
|
|
144
|
+
this.debouncedUpdateFormData = _.debounce((data, val, event, skipStateUpdate) => {
|
|
145
|
+
this.performFormDataUpdate(data, val, event, skipStateUpdate);
|
|
146
|
+
}, 300);
|
|
147
|
+
this.debouncedValidation = _.debounce(this.validateForm.bind(this), 500);
|
|
148
|
+
|
|
149
|
+
// Memoized validation cache
|
|
150
|
+
this.validationCache = new Map();
|
|
151
|
+
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
// Helper function to generate unique tab ID
|
|
155
|
+
generateUniqueTabId(formData, tabIndex) {
|
|
156
|
+
let id = _.uniqueId();
|
|
157
|
+
let validId = false;
|
|
158
|
+
|
|
159
|
+
while (!validId) {
|
|
160
|
+
validId = true;
|
|
161
|
+
for (let idx = 0; idx < formData[tabIndex].selectedLanguages.length; idx += 1) {
|
|
162
|
+
if (!formData[tabIndex]) {
|
|
163
|
+
continue;
|
|
164
|
+
}
|
|
165
|
+
if (id === formData[tabIndex][formData[tabIndex].selectedLanguages[idx]].tabKey) {
|
|
166
|
+
validId = false;
|
|
167
|
+
break;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (!validId) {
|
|
171
|
+
id = _.uniqueId();
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
return id;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
// Performance optimized form data update function
|
|
179
|
+
performFormDataUpdate(data, val, event, skipStateUpdate = false) {
|
|
180
|
+
|
|
181
|
+
// Use optimized state update instead of deep cloning
|
|
182
|
+
const formData = this.optimizedFormDataUpdate(data, val, event);
|
|
183
|
+
|
|
184
|
+
const tabIndex = this.state.currentTab - 1;
|
|
185
|
+
let currentTab = this.state.currentTab;
|
|
186
|
+
|
|
187
|
+
if (this.state.usingTabContainer && !val.standalone) {
|
|
188
|
+
const data1 = data;
|
|
189
|
+
if (event === "addLanguage") {
|
|
190
|
+
const addLanguageType = this.props.addLanguageType;
|
|
191
|
+
if (addLanguageType === '') {
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
const currentLang = formData[tabIndex].activeTab;
|
|
195
|
+
let baseTab;
|
|
196
|
+
|
|
197
|
+
switch (addLanguageType) {
|
|
198
|
+
case "upload":
|
|
199
|
+
baseTab = _.cloneDeep(formData[tabIndex][currentLang]);
|
|
200
|
+
|
|
201
|
+
baseTab.iso_code = data.iso_code;
|
|
202
|
+
baseTab.lang_id = data.lang_id;
|
|
203
|
+
baseTab.language = data.language;
|
|
204
|
+
baseTab.tabKey = this.generateUniqueTabId(formData, tabIndex);
|
|
205
|
+
|
|
206
|
+
formData[tabIndex][data.iso_code] = baseTab;
|
|
207
|
+
formData[tabIndex].activeTab = data.iso_code;
|
|
208
|
+
formData[tabIndex].tabKey = baseTab.tabKey;
|
|
209
|
+
break;
|
|
210
|
+
case "copyPrimaryLanguage":
|
|
211
|
+
case "useEditor":
|
|
212
|
+
baseTab = _.cloneDeep(formData[tabIndex][this.props.baseLanguage]);
|
|
213
|
+
|
|
214
|
+
baseTab.iso_code = data.iso_code;
|
|
215
|
+
baseTab.lang_id = data.lang_id;
|
|
216
|
+
baseTab.language = data.language;
|
|
217
|
+
baseTab.tabKey = this.generateUniqueTabId(formData, tabIndex);
|
|
218
|
+
|
|
219
|
+
formData[tabIndex].selectedLanguages.push(data.iso_code);
|
|
220
|
+
formData[tabIndex][data.iso_code] = baseTab;
|
|
221
|
+
formData[tabIndex].activeTab = data.iso_code;
|
|
222
|
+
formData[tabIndex].tabKey = baseTab.tabKey;
|
|
223
|
+
break;
|
|
224
|
+
case '':
|
|
225
|
+
return;
|
|
226
|
+
default:
|
|
227
|
+
break;
|
|
228
|
+
}
|
|
229
|
+
const that = this;
|
|
230
|
+
setTimeout(() => {
|
|
231
|
+
that.setState({tabKey: baseTab.tabKey});
|
|
232
|
+
}, 0);
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
if (!this.props.isNewVersionFlow) {
|
|
236
|
+
formData[tabIndex][val.id] = data1;
|
|
237
|
+
} else if (this.props.isNewVersionFlow && event !== "addLanguage" && event !== "onContentChange") {
|
|
238
|
+
formData[tabIndex][this.props.baseLanguage][val.id] = data1;
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
if (formData[tabIndex].base) {
|
|
242
|
+
if (!this.props.isNewVersionFlow) {
|
|
243
|
+
formData.base[val.id] = data1;
|
|
244
|
+
} else {
|
|
245
|
+
formData.base[data1.iso_code] = formData[tabIndex][data1.iso_code];
|
|
246
|
+
formData.base.tabKey = formData[tabIndex].tabKey;
|
|
247
|
+
formData.base.activeTab = formData[tabIndex].activeTab;
|
|
248
|
+
formData.base.selectedLanguages = formData[tabIndex].selectedLanguages;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
} else {
|
|
252
|
+
formData[val.id] = data;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
if (this.props.isNewVersionFlow) {
|
|
256
|
+
if (event === 'onSelect' && data === 'New Version') {
|
|
257
|
+
this.callChildEvent(data, val, 'addVersion', event);
|
|
258
|
+
} else if (event === 'onSelect' && data !== 'New Version') {
|
|
259
|
+
currentTab = _.findIndex(this.state.formData['template-version-options'], { key: data}) + 1;
|
|
260
|
+
this.setState({currentTab, tabKey: formData[`${currentTab - 1}`].tabKey}, () => {
|
|
261
|
+
val.injectedEvents[event].call(this, this.state.formData['template-version-options'][currentTab - 1].key, formData, val);
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
if (event === 'onContentChange') {
|
|
266
|
+
// Content change handling
|
|
267
|
+
}
|
|
268
|
+
}
|
|
142
269
|
|
|
270
|
+
// Only update state if not already updated (for immediate UI feedback)
|
|
271
|
+
if (!skipStateUpdate) {
|
|
272
|
+
this.setState({formData}, () => {
|
|
273
|
+
if (this.props.startValidation) {
|
|
274
|
+
this.debouncedValidation();
|
|
275
|
+
}
|
|
276
|
+
});
|
|
277
|
+
} else {
|
|
278
|
+
// Just trigger validation if state was already updated
|
|
279
|
+
if (this.props.startValidation) {
|
|
280
|
+
this.debouncedValidation();
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
if (event && val.injectedEvents[event]) {
|
|
285
|
+
if (event === "onRowClick") {
|
|
286
|
+
val.injectedEvents[event].call(this, data);
|
|
287
|
+
} else if (this.props.isNewVersionFlow && event !== 'onSelect') {
|
|
288
|
+
if (event === 'addLanguage') {
|
|
289
|
+
val.injectedEvents[event].call(this, data, formData, val);
|
|
290
|
+
this.setState({currentEventVal: {}, currentEvent: {}, currentEventData: {}});
|
|
291
|
+
} else {
|
|
292
|
+
val.injectedEvents[event].call(this, true, formData, val);
|
|
293
|
+
}
|
|
294
|
+
} else if (!this.props.isNewVersionFlow) {
|
|
295
|
+
val.injectedEvents[event].call(this, true, formData, val);
|
|
296
|
+
}
|
|
297
|
+
} else if (val.injectedEvents && val.injectedEvents.onChange) {
|
|
298
|
+
val.injectedEvents.onChange.call(this, true, formData, val);
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
if (!((event === 'onSelect' && data === 'New Version') || event === 'onContentChange')) {
|
|
302
|
+
this.props.onChange(formData, this.state.tabCount, currentTab, val);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
// Optimized form data update - only clone what's necessary
|
|
307
|
+
optimizedFormDataUpdate(data, val, event) {
|
|
308
|
+
const currentFormData = this.state.formData;
|
|
309
|
+
|
|
310
|
+
// For simple field updates, use spread operator instead of deep clone
|
|
311
|
+
if (!this.state.usingTabContainer || val.standalone) {
|
|
312
|
+
return {
|
|
313
|
+
...currentFormData,
|
|
314
|
+
[val.id]: data
|
|
315
|
+
};
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
// For tab container updates, only clone the affected tab
|
|
319
|
+
const tabIndex = this.state.currentTab - 1;
|
|
320
|
+
const updatedFormData = { ...currentFormData };
|
|
321
|
+
|
|
322
|
+
if (updatedFormData[tabIndex]) {
|
|
323
|
+
updatedFormData[tabIndex] = {
|
|
324
|
+
...updatedFormData[tabIndex],
|
|
325
|
+
[val.id]: data
|
|
326
|
+
};
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
return updatedFormData;
|
|
143
330
|
}
|
|
331
|
+
|
|
144
332
|
isLiquidFlowSupported = () => {
|
|
145
333
|
return Boolean(LIQUID_SUPPORTED_CHANNELS.includes(this.props?.schema?.channel?.toUpperCase()) && hasLiquidSupportFeature());
|
|
146
334
|
}
|
|
@@ -2027,6 +2215,64 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
|
|
|
2027
2215
|
}
|
|
2028
2216
|
|
|
2029
2217
|
updateFormData(data, val, event) {
|
|
2218
|
+
|
|
2219
|
+
// Check if this is a high-frequency input field that should be optimized
|
|
2220
|
+
const isHighFrequencyField = val && (
|
|
2221
|
+
val.id === 'template-name' ||
|
|
2222
|
+
val.id === 'template-subject' ||
|
|
2223
|
+
val.type === 'input' ||
|
|
2224
|
+
val.type === 'textarea'
|
|
2225
|
+
);
|
|
2226
|
+
|
|
2227
|
+
if (isHighFrequencyField && !event) {
|
|
2228
|
+
// For high-frequency fields: immediate UI update + debounced expensive operations
|
|
2229
|
+
this.updateFormDataOptimized(data, val, event);
|
|
2230
|
+
return;
|
|
2231
|
+
}
|
|
2232
|
+
|
|
2233
|
+
// For non-high-frequency fields or special events, use immediate update
|
|
2234
|
+
this.performFormDataUpdate(data, val, event);
|
|
2235
|
+
}
|
|
2236
|
+
|
|
2237
|
+
// Optimized update for high-frequency fields
|
|
2238
|
+
updateFormDataOptimized(data, val, event) {
|
|
2239
|
+
// 1. Immediate UI update - update the field value instantly
|
|
2240
|
+
this.updateFieldValueImmediately(data, val);
|
|
2241
|
+
|
|
2242
|
+
// 2. Debounce expensive operations (validation, parent updates) - skip state update since we already did it
|
|
2243
|
+
this.debouncedUpdateFormData(data, val, event, true);
|
|
2244
|
+
}
|
|
2245
|
+
|
|
2246
|
+
// Update field value immediately for UI feedback
|
|
2247
|
+
updateFieldValueImmediately(data, val) {
|
|
2248
|
+
const currentFormData = this.state.formData;
|
|
2249
|
+
let updatedFormData;
|
|
2250
|
+
|
|
2251
|
+
if (!this.state.usingTabContainer || val.standalone) {
|
|
2252
|
+
// Simple field update
|
|
2253
|
+
updatedFormData = {
|
|
2254
|
+
...currentFormData,
|
|
2255
|
+
[val.id]: data
|
|
2256
|
+
};
|
|
2257
|
+
} else {
|
|
2258
|
+
// Tab container update
|
|
2259
|
+
const tabIndex = this.state.currentTab - 1;
|
|
2260
|
+
updatedFormData = { ...currentFormData };
|
|
2261
|
+
|
|
2262
|
+
if (updatedFormData[tabIndex]) {
|
|
2263
|
+
updatedFormData[tabIndex] = {
|
|
2264
|
+
...updatedFormData[tabIndex],
|
|
2265
|
+
[val.id]: data
|
|
2266
|
+
};
|
|
2267
|
+
}
|
|
2268
|
+
}
|
|
2269
|
+
|
|
2270
|
+
// Update state immediately for UI feedback
|
|
2271
|
+
this.setState({ formData: updatedFormData });
|
|
2272
|
+
}
|
|
2273
|
+
|
|
2274
|
+
// Legacy updateFormData function - kept for backward compatibility
|
|
2275
|
+
updateFormDataLegacy(data, val, event) {
|
|
2030
2276
|
const formData = _.cloneDeep(this.state.formData);
|
|
2031
2277
|
|
|
2032
2278
|
const tabIndex = this.state.currentTab - 1;
|
|
@@ -2186,6 +2432,57 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
|
|
|
2186
2432
|
hasClass(element, className) {
|
|
2187
2433
|
return (` ${element.className} `).indexOf(` ${className} `) > -1;
|
|
2188
2434
|
}
|
|
2435
|
+
|
|
2436
|
+
// Handle field blur for validation
|
|
2437
|
+
handleFieldBlur = (e, val) => {
|
|
2438
|
+
// Trigger validation on blur for high-frequency fields
|
|
2439
|
+
if (val && (val.id === 'template-name' || val.id === 'template-subject' || val.type === 'input' || val.type === 'textarea')) {
|
|
2440
|
+
this.debouncedValidation();
|
|
2441
|
+
}
|
|
2442
|
+
}
|
|
2443
|
+
|
|
2444
|
+
// Memoized validation for specific fields
|
|
2445
|
+
getMemoizedValidation = (fieldId, fieldValue) => {
|
|
2446
|
+
const cacheKey = `${fieldId}_${fieldValue}`;
|
|
2447
|
+
|
|
2448
|
+
if (this.validationCache.has(cacheKey)) {
|
|
2449
|
+
return this.validationCache.get(cacheKey);
|
|
2450
|
+
}
|
|
2451
|
+
|
|
2452
|
+
// Perform validation logic here
|
|
2453
|
+
const isValid = this.performFieldValidation(fieldId, fieldValue);
|
|
2454
|
+
this.validationCache.set(cacheKey, isValid);
|
|
2455
|
+
|
|
2456
|
+
// Clear cache if it gets too large
|
|
2457
|
+
if (this.validationCache.size > 100) {
|
|
2458
|
+
this.validationCache.clear();
|
|
2459
|
+
}
|
|
2460
|
+
|
|
2461
|
+
return isValid;
|
|
2462
|
+
}
|
|
2463
|
+
|
|
2464
|
+
// Perform validation for a specific field
|
|
2465
|
+
performFieldValidation = (fieldId, fieldValue) => {
|
|
2466
|
+
// Basic validation logic for template-name and template-subject
|
|
2467
|
+
if (fieldId === 'template-name' || fieldId === 'template-subject') {
|
|
2468
|
+
return fieldValue && fieldValue.trim().length > 0;
|
|
2469
|
+
}
|
|
2470
|
+
return true;
|
|
2471
|
+
}
|
|
2472
|
+
|
|
2473
|
+
// Cleanup debounced functions on component unmount
|
|
2474
|
+
componentWillUnmount() {
|
|
2475
|
+
if (this.debouncedUpdateFormData) {
|
|
2476
|
+
this.debouncedUpdateFormData.cancel();
|
|
2477
|
+
}
|
|
2478
|
+
if (this.debouncedValidation) {
|
|
2479
|
+
this.debouncedValidation.cancel();
|
|
2480
|
+
}
|
|
2481
|
+
// Clear validation cache
|
|
2482
|
+
if (this.validationCache) {
|
|
2483
|
+
this.validationCache.clear();
|
|
2484
|
+
}
|
|
2485
|
+
}
|
|
2189
2486
|
allowAddSecondaryCta = (val) => {
|
|
2190
2487
|
if (val.fieldsCount > 0) {
|
|
2191
2488
|
const errorData = _.cloneDeep(this.state.errorData);
|
|
@@ -2601,6 +2898,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
|
|
|
2601
2898
|
label={val.label}
|
|
2602
2899
|
autosize={val.autosize ? val.autosizeParams : false}
|
|
2603
2900
|
onChange={(e) => this.updateFormData(e.target.value, val)}
|
|
2901
|
+
onBlur={(e) => this.handleFieldBlur(e, val)}
|
|
2604
2902
|
style={val.style ? val.style : {}}
|
|
2605
2903
|
defaultValue={messageContent || ''}
|
|
2606
2904
|
value={messageContent || ""}
|
|
@@ -2682,6 +2980,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
|
|
|
2682
2980
|
style={val.style ? val.style : {}}
|
|
2683
2981
|
placeholder={val.placeholder}
|
|
2684
2982
|
onChange={(e) => this.updateFormData(e.target.value, val)}
|
|
2983
|
+
onBlur={(e) => this.handleFieldBlur(e, val)}
|
|
2685
2984
|
defaultValue={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
|
|
2686
2985
|
value={value || ""}
|
|
2687
2986
|
disabled={val.disabled}
|
|
@@ -3166,6 +3465,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
|
|
|
3166
3465
|
style={val.style ? val.style : {}}
|
|
3167
3466
|
placeholder={val.placeholder}
|
|
3168
3467
|
onChange={(e) => this.updateFormData(e.target.value, val)}
|
|
3468
|
+
onBlur={(e) => this.handleFieldBlur(e, val)}
|
|
3169
3469
|
value={value || ""}
|
|
3170
3470
|
defaultValue={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
|
|
3171
3471
|
disabled={val.disabled}
|
|
@@ -349,4 +349,4 @@ const withConnect = connect(mapStateToProps, mapDispatchToProps);
|
|
|
349
349
|
const withSaga = injectSaga({ key: 'beeEditor', saga: v2BeeEditionSagas });
|
|
350
350
|
const withReducer = injectReducer({ key: 'beeEditor', reducer: v2BeeEditionReducer });
|
|
351
351
|
|
|
352
|
-
export default compose(withReducer, withSaga, withConnect)(injectIntl(BeeEditor));
|
|
352
|
+
export default compose(withReducer, withSaga, withConnect)(injectIntl(React.memo(BeeEditor)));
|
|
@@ -668,9 +668,7 @@ export function SlideBoxContent(props) {
|
|
|
668
668
|
/>
|
|
669
669
|
)}
|
|
670
670
|
{isEditMPush && (
|
|
671
|
-
(isFullMode &&
|
|
672
|
-
(!isFullMode && isLoyaltyModule) ||
|
|
673
|
-
(!isFullMode && !isLoyaltyModule && !commonUtil.hasNewMobilePushFeatureEnabled()) ? (
|
|
671
|
+
(!isFullMode && isLoyaltyModule) ? (
|
|
674
672
|
<MobliPushEdit
|
|
675
673
|
getFormLibraryData={getFormData}
|
|
676
674
|
setIsLoadingContent={setIsLoadingContent}
|
|
@@ -726,9 +724,7 @@ export function SlideBoxContent(props) {
|
|
|
726
724
|
)
|
|
727
725
|
)}
|
|
728
726
|
{isCreateMPush && (
|
|
729
|
-
(isFullMode &&
|
|
730
|
-
(!isFullMode && isLoyaltyModule) ||
|
|
731
|
-
(!isFullMode && !isLoyaltyModule && !commonUtil.hasNewMobilePushFeatureEnabled()) ? (
|
|
727
|
+
(!isFullMode && isLoyaltyModule) ? (
|
|
732
728
|
<MobilepushWrapper
|
|
733
729
|
key="creatives-mobilepush-wrapper"
|
|
734
730
|
date={new Date().getMilliseconds()}
|
|
@@ -11,7 +11,7 @@ import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
|
|
|
11
11
|
import { injectIntl, FormattedMessage } from 'react-intl';
|
|
12
12
|
import classnames from 'classnames';
|
|
13
13
|
import {
|
|
14
|
-
isEmpty, get, forEach, cloneDeep,
|
|
14
|
+
isEmpty, get, forEach, cloneDeep, debounce,
|
|
15
15
|
} from 'lodash';
|
|
16
16
|
import { connect } from 'react-redux';
|
|
17
17
|
import { createStructuredSelector } from 'reselect';
|
|
@@ -105,6 +105,8 @@ export class Creatives extends React.Component {
|
|
|
105
105
|
// NEW: Test and Preview feature state
|
|
106
106
|
showTestAndPreviewSlidebox: false,
|
|
107
107
|
isTestAndPreviewMode: false, // Add flag to track Test & Preview mode
|
|
108
|
+
// Performance optimization: Local template name for immediate UI feedback
|
|
109
|
+
localTemplateName: '',
|
|
108
110
|
};
|
|
109
111
|
this.liquidFlow = Boolean(commonUtil.hasLiquidSupportFeature());
|
|
110
112
|
this.creativesTemplateSteps = {
|
|
@@ -112,6 +114,9 @@ export class Creatives extends React.Component {
|
|
|
112
114
|
2: 'templateSelection', // only for email in current flows wil be used for mpush, line and wechat as well.
|
|
113
115
|
3: 'createTemplateContent',
|
|
114
116
|
};
|
|
117
|
+
|
|
118
|
+
// Performance optimization: Debounced template name update
|
|
119
|
+
this.debouncedTemplateNameUpdate = debounce(this.performTemplateNameUpdate.bind(this), 300);
|
|
115
120
|
}
|
|
116
121
|
|
|
117
122
|
componentWillUnmount() {
|
|
@@ -119,6 +124,11 @@ export class Creatives extends React.Component {
|
|
|
119
124
|
this.props.templateActions.resetTemplateStoreData();
|
|
120
125
|
}
|
|
121
126
|
this.props.globalActions.clearMetaEntities();
|
|
127
|
+
|
|
128
|
+
// Cleanup debounced function
|
|
129
|
+
if (this.debouncedTemplateNameUpdate) {
|
|
130
|
+
this.debouncedTemplateNameUpdate.cancel();
|
|
131
|
+
}
|
|
122
132
|
}
|
|
123
133
|
|
|
124
134
|
componentDidMount() {
|
|
@@ -136,6 +146,29 @@ export class Creatives extends React.Component {
|
|
|
136
146
|
|
|
137
147
|
onEnterTemplateName = () => {
|
|
138
148
|
this.setState({ templateNameExists: true });
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
// Performance optimized template name update
|
|
152
|
+
performTemplateNameUpdate = (value, formData, onFormDataChange) => {
|
|
153
|
+
const isEmptyTemplateName = !value.trim();
|
|
154
|
+
const newFormData = { ...formData, 'template-name': value, 'isTemplateNameEdited': true };
|
|
155
|
+
|
|
156
|
+
this.setState({ isTemplateNameEmpty: isEmptyTemplateName });
|
|
157
|
+
onFormDataChange(newFormData);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
// Update template name immediately for UI feedback
|
|
161
|
+
updateTemplateNameImmediately = (value, formData, onFormDataChange) => {
|
|
162
|
+
const isEmptyTemplateName = !value.trim();
|
|
163
|
+
|
|
164
|
+
// 1. IMMEDIATE: Update local state for instant UI feedback
|
|
165
|
+
this.setState({
|
|
166
|
+
isTemplateNameEmpty: isEmptyTemplateName,
|
|
167
|
+
localTemplateName: value
|
|
168
|
+
});
|
|
169
|
+
|
|
170
|
+
// 2. DEBOUNCED: Only debounce the expensive onFormDataChange call
|
|
171
|
+
this.debouncedTemplateNameUpdate(value, formData, onFormDataChange);
|
|
139
172
|
};
|
|
140
173
|
|
|
141
174
|
onRemoveTemplateName = () => {
|
|
@@ -1395,21 +1428,30 @@ export class Creatives extends React.Component {
|
|
|
1395
1428
|
} />
|
|
1396
1429
|
)
|
|
1397
1430
|
|
|
1398
|
-
templateNameComponentInput = ({ formData, onFormDataChange, name }) =>
|
|
1399
|
-
|
|
1400
|
-
|
|
1401
|
-
|
|
1402
|
-
|
|
1403
|
-
|
|
1404
|
-
|
|
1405
|
-
|
|
1406
|
-
|
|
1407
|
-
|
|
1408
|
-
|
|
1409
|
-
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
|
|
1431
|
+
templateNameComponentInput = ({ formData, onFormDataChange, name }) => {
|
|
1432
|
+
// Use local state for immediate UI feedback, fallback to prop value
|
|
1433
|
+
const displayValue = this.state.localTemplateName !== '' ? this.state.localTemplateName : name;
|
|
1434
|
+
|
|
1435
|
+
return (
|
|
1436
|
+
<CapInput
|
|
1437
|
+
value={displayValue}
|
|
1438
|
+
suffix={<span />}
|
|
1439
|
+
onBlur={() => {
|
|
1440
|
+
this.setState({
|
|
1441
|
+
isEditName: false,
|
|
1442
|
+
localTemplateName: '' // Clear local state on blur
|
|
1443
|
+
}, () => {
|
|
1444
|
+
this.showTemplateName({ formData, onFormDataChange });
|
|
1445
|
+
});
|
|
1446
|
+
}}
|
|
1447
|
+
onChange={(ev) => {
|
|
1448
|
+
const { value } = ev.currentTarget;
|
|
1449
|
+
// Use optimized update for better performance
|
|
1450
|
+
this.updateTemplateNameImmediately(value, formData, onFormDataChange);
|
|
1451
|
+
}}
|
|
1452
|
+
/>
|
|
1453
|
+
);
|
|
1454
|
+
}
|
|
1413
1455
|
|
|
1414
1456
|
showTemplateName = ({ formData, onFormDataChange }) => { //gets called from email/index after template data is fetched
|
|
1415
1457
|
const { slidBoxContent, currentChannel, isEditName } = this.state;
|
|
@@ -1423,7 +1465,10 @@ export class Creatives extends React.Component {
|
|
|
1423
1465
|
if (name && !isEditName) {
|
|
1424
1466
|
this.setState({ showTemplateNameComponentEdit: false });
|
|
1425
1467
|
} else if (isEditName) {
|
|
1426
|
-
this.setState({
|
|
1468
|
+
this.setState({
|
|
1469
|
+
showTemplateNameComponentEdit: true,
|
|
1470
|
+
localTemplateName: name || '' // Initialize local state with current value
|
|
1471
|
+
});
|
|
1427
1472
|
}
|
|
1428
1473
|
}
|
|
1429
1474
|
}
|