@capillarytech/creatives-library 8.0.242-alpha.0 → 8.0.242-alpha.10
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/assets/Android.png +0 -0
- package/assets/iOS.png +0 -0
- package/constants/unified.js +2 -1
- package/initialReducer.js +2 -0
- package/package.json +1 -1
- package/sagas/__tests__/assetPolling.test.js +74 -3
- package/sagas/assetPolling.js +8 -1
- package/services/api.js +10 -5
- package/services/tests/api.test.js +18 -0
- package/translations/en.json +0 -1
- package/utils/common.js +5 -0
- package/utils/commonUtils.js +14 -1
- package/utils/tests/commonUtil.test.js +224 -0
- package/utils/transformTemplateConfig.js +0 -10
- package/utils/transformerUtils.js +0 -42
- package/v2Components/CapDeviceContent/index.js +61 -56
- package/v2Components/CapImageUpload/constants.js +0 -2
- package/v2Components/CapImageUpload/index.js +14 -54
- package/v2Components/CapImageUpload/index.scss +1 -4
- package/v2Components/CapImageUpload/messages.js +0 -4
- package/v2Components/CapTagList/index.js +6 -1
- package/v2Components/CapTagListWithInput/index.js +5 -1
- package/v2Components/CapTagListWithInput/messages.js +1 -1
- package/v2Components/CapWhatsappCTA/tests/index.test.js +5 -0
- package/v2Components/ErrorInfoNote/index.js +412 -72
- package/v2Components/ErrorInfoNote/messages.js +22 -0
- package/v2Components/ErrorInfoNote/style.scss +279 -2
- package/v2Components/HtmlEditor/HTMLEditor.js +220 -91
- package/v2Components/HtmlEditor/__tests__/HTMLEditor.test.js +1132 -133
- package/v2Components/HtmlEditor/__tests__/index.lazy.test.js +17 -12
- package/v2Components/HtmlEditor/_htmlEditor.scss +107 -45
- package/v2Components/HtmlEditor/_index.lazy.scss +1 -1
- package/v2Components/HtmlEditor/components/CodeEditorPane/_codeEditorPane.scss +13 -101
- package/v2Components/HtmlEditor/components/CodeEditorPane/index.js +148 -139
- package/v2Components/HtmlEditor/components/DeviceToggle/_deviceToggle.scss +2 -1
- package/v2Components/HtmlEditor/components/DeviceToggle/index.js +3 -3
- package/v2Components/HtmlEditor/components/EditorToolbar/_editorToolbar.scss +9 -0
- package/v2Components/HtmlEditor/components/EditorToolbar/index.js +1 -1
- package/v2Components/HtmlEditor/components/FullscreenModal/_fullscreenModal.scss +22 -0
- package/v2Components/HtmlEditor/components/InAppPreviewPane/DeviceFrame.js +4 -7
- package/v2Components/HtmlEditor/components/InAppPreviewPane/__tests__/DeviceFrame.test.js +35 -45
- package/v2Components/HtmlEditor/components/InAppPreviewPane/_inAppPreviewPane.scss +1 -3
- package/v2Components/HtmlEditor/components/InAppPreviewPane/constants.js +33 -33
- package/v2Components/HtmlEditor/components/InAppPreviewPane/index.js +7 -6
- package/v2Components/HtmlEditor/components/PreviewPane/_previewPane.scss +3 -6
- package/v2Components/HtmlEditor/components/PreviewPane/index.js +10 -11
- package/v2Components/HtmlEditor/components/SplitContainer/_splitContainer.scss +1 -1
- package/v2Components/HtmlEditor/components/ValidationErrorDisplay/__tests__/index.test.js +70 -72
- package/v2Components/HtmlEditor/components/ValidationErrorDisplay/index.js +49 -31
- package/v2Components/HtmlEditor/components/ValidationTabs/_validationTabs.scss +254 -0
- package/v2Components/HtmlEditor/components/ValidationTabs/index.js +362 -0
- package/v2Components/HtmlEditor/components/ValidationTabs/messages.js +51 -0
- package/v2Components/HtmlEditor/constants.js +29 -20
- package/v2Components/HtmlEditor/hooks/__tests__/useInAppContent.test.js +373 -16
- package/v2Components/HtmlEditor/hooks/useEditorContent.js +5 -2
- package/v2Components/HtmlEditor/hooks/useInAppContent.js +88 -146
- package/v2Components/HtmlEditor/index.js +1 -1
- package/v2Components/HtmlEditor/messages.js +95 -85
- package/v2Components/HtmlEditor/utils/liquidTemplateSupport.js +99 -101
- package/v2Components/HtmlEditor/utils/properSyntaxHighlighting.js +23 -25
- package/v2Components/HtmlEditor/utils/validationAdapter.js +34 -41
- package/v2Components/MobilePushPreviewV2/index.js +32 -7
- package/v2Components/TemplatePreview/_templatePreview.scss +44 -24
- package/v2Components/TemplatePreview/index.js +47 -32
- package/v2Components/TemplatePreview/messages.js +4 -0
- package/v2Components/TestAndPreviewSlidebox/index.js +31 -25
- package/v2Containers/App/constants.js +0 -5
- package/v2Containers/BeeEditor/index.js +82 -80
- package/v2Containers/BeePopupEditor/constants.js +10 -0
- package/v2Containers/BeePopupEditor/index.js +193 -0
- package/v2Containers/BeePopupEditor/tests/index.test.js +627 -0
- package/v2Containers/Cap/tests/__snapshots__/index.test.js.snap +0 -1
- package/v2Containers/CreativesContainer/SlideBoxContent.js +148 -120
- package/v2Containers/CreativesContainer/SlideBoxFooter.js +9 -3
- package/v2Containers/CreativesContainer/SlideBoxHeader.js +2 -2
- package/v2Containers/CreativesContainer/constants.js +1 -2
- package/v2Containers/CreativesContainer/index.js +173 -193
- package/v2Containers/CreativesContainer/messages.js +4 -4
- package/v2Containers/CreativesContainer/tests/__snapshots__/SlideBoxContent.test.js.snap +38 -50
- package/v2Containers/CreativesContainer/tests/__snapshots__/index.test.js.snap +36 -0
- package/v2Containers/Email/actions.js +7 -0
- package/v2Containers/Email/constants.js +5 -1
- package/v2Containers/Email/index.js +13 -0
- package/v2Containers/Email/messages.js +32 -0
- package/v2Containers/Email/reducer.js +12 -1
- package/v2Containers/Email/sagas.js +41 -6
- package/v2Containers/Email/tests/__snapshots__/reducer.test.js.snap +2 -0
- package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js +1046 -0
- package/v2Containers/EmailWrapper/components/EmailWrapperView.js +193 -7
- package/v2Containers/EmailWrapper/components/HTMLEditorTesting.js +40 -74
- package/v2Containers/EmailWrapper/components/__tests__/HTMLEditorTesting.test.js +2 -67
- package/v2Containers/EmailWrapper/constants.js +2 -0
- package/v2Containers/EmailWrapper/hooks/useEmailWrapper.js +436 -67
- package/v2Containers/EmailWrapper/index.js +99 -23
- package/v2Containers/EmailWrapper/messages.js +61 -1
- package/v2Containers/EmailWrapper/tests/useEmailWrapper.test.js +111 -77
- package/v2Containers/InApp/__tests__/InAppHTMLEditor.test.js +376 -0
- package/v2Containers/InApp/__tests__/sagas.test.js +363 -0
- package/v2Containers/InApp/actions.js +7 -0
- package/v2Containers/InApp/constants.js +20 -4
- package/v2Containers/InApp/index.js +801 -357
- package/v2Containers/InApp/index.scss +4 -3
- package/v2Containers/InApp/messages.js +7 -3
- package/v2Containers/InApp/reducer.js +21 -3
- package/v2Containers/InApp/sagas.js +29 -9
- package/v2Containers/InApp/selectors.js +25 -5
- package/v2Containers/InApp/tests/index.test.js +154 -50
- package/v2Containers/InApp/tests/reducer.test.js +34 -0
- package/v2Containers/InApp/tests/sagas.test.js +61 -9
- package/v2Containers/InApp/tests/selectors.test.js +612 -0
- package/v2Containers/InAppWrapper/components/InAppWrapperView.js +162 -0
- package/v2Containers/InAppWrapper/components/__tests__/InAppWrapperView.test.js +267 -0
- package/v2Containers/InAppWrapper/components/inAppWrapperView.scss +9 -0
- package/v2Containers/InAppWrapper/constants.js +16 -0
- package/v2Containers/InAppWrapper/hooks/__tests__/useInAppWrapper.test.js +473 -0
- package/v2Containers/InAppWrapper/hooks/useInAppWrapper.js +198 -0
- package/v2Containers/InAppWrapper/index.js +148 -0
- package/v2Containers/InAppWrapper/messages.js +49 -0
- package/v2Containers/InappAdvance/index.js +1099 -0
- package/v2Containers/InappAdvance/index.scss +10 -0
- package/v2Containers/InappAdvance/tests/index.test.js +448 -0
- package/v2Containers/Line/Container/ImageCarousel/tests/__snapshots__/content.test.js.snap +3 -3
- package/v2Containers/Line/Container/ImageCarousel/tests/__snapshots__/index.test.js.snap +2 -2
- package/v2Containers/Line/Container/Wrapper/tests/__snapshots__/index.test.js.snap +2 -25
- package/v2Containers/Line/Container/tests/__snapshots__/index.test.js.snap +9 -18
- package/v2Containers/Rcs/tests/__snapshots__/index.test.js.snap +12 -46
- package/v2Containers/SmsTrai/Create/tests/__snapshots__/index.test.js.snap +0 -4
- package/v2Containers/SmsTrai/Edit/tests/__snapshots__/index.test.js.snap +4 -8
- package/v2Containers/TagList/index.js +67 -1
- package/v2Containers/Templates/ChannelTypeIllustration.js +1 -13
- package/v2Containers/Templates/_templates.scss +56 -200
- package/v2Containers/Templates/actions.js +1 -2
- package/v2Containers/Templates/constants.js +0 -1
- package/v2Containers/Templates/index.js +124 -277
- package/v2Containers/Templates/messages.js +4 -24
- package/v2Containers/Templates/reducer.js +0 -2
- package/v2Containers/Templates/tests/index.test.js +0 -10
- package/v2Containers/TemplatesV2/index.js +2 -3
- package/v2Containers/TemplatesV2/messages.js +0 -4
- package/v2Containers/Whatsapp/tests/__snapshots__/index.test.js.snap +35 -132
- package/v2Components/CapImageUrlUpload/constants.js +0 -19
- package/v2Components/CapImageUrlUpload/index.js +0 -455
- package/v2Components/CapImageUrlUpload/index.scss +0 -35
- package/v2Components/CapImageUrlUpload/messages.js +0 -47
- package/v2Containers/EmailWrapper/tests/EmailWrapperView.test.js +0 -214
- package/v2Containers/WebPush/Create/components/ButtonForm.js +0 -175
- package/v2Containers/WebPush/Create/components/ButtonItem.js +0 -101
- package/v2Containers/WebPush/Create/components/ButtonList.js +0 -144
- package/v2Containers/WebPush/Create/components/_buttons.scss +0 -246
- package/v2Containers/WebPush/Create/components/tests/ButtonForm.test.js +0 -554
- package/v2Containers/WebPush/Create/components/tests/ButtonItem.test.js +0 -607
- package/v2Containers/WebPush/Create/components/tests/ButtonList.test.js +0 -633
- package/v2Containers/WebPush/Create/components/tests/__snapshots__/ButtonForm.test.js.snap +0 -666
- package/v2Containers/WebPush/Create/components/tests/__snapshots__/ButtonItem.test.js.snap +0 -74
- package/v2Containers/WebPush/Create/components/tests/__snapshots__/ButtonList.test.js.snap +0 -80
- package/v2Containers/WebPush/Create/index.js +0 -1755
- package/v2Containers/WebPush/Create/index.scss +0 -123
- package/v2Containers/WebPush/Create/messages.js +0 -199
- package/v2Containers/WebPush/Create/preview/DevicePreviewContent.js +0 -241
- package/v2Containers/WebPush/Create/preview/NotificationContainer.js +0 -290
- package/v2Containers/WebPush/Create/preview/PreviewContent.js +0 -81
- package/v2Containers/WebPush/Create/preview/PreviewControls.js +0 -240
- package/v2Containers/WebPush/Create/preview/PreviewDisclaimer.js +0 -23
- package/v2Containers/WebPush/Create/preview/WebPushPreview.js +0 -144
- package/v2Containers/WebPush/Create/preview/assets/Light.svg +0 -53
- package/v2Containers/WebPush/Create/preview/assets/Top.svg +0 -5
- package/v2Containers/WebPush/Create/preview/assets/chrome-icon.png +0 -0
- package/v2Containers/WebPush/Create/preview/assets/edge-icon.png +0 -0
- package/v2Containers/WebPush/Create/preview/assets/firefox-icon.svg +0 -106
- package/v2Containers/WebPush/Create/preview/assets/iOS.svg +0 -26
- package/v2Containers/WebPush/Create/preview/assets/opera-icon.svg +0 -18
- package/v2Containers/WebPush/Create/preview/assets/safari-icon.svg +0 -29
- package/v2Containers/WebPush/Create/preview/components/AndroidMobileChromeHeader.js +0 -44
- package/v2Containers/WebPush/Create/preview/components/AndroidMobileExpanded.js +0 -110
- package/v2Containers/WebPush/Create/preview/components/IOSHeader.js +0 -45
- package/v2Containers/WebPush/Create/preview/components/NotificationExpandedContent.js +0 -72
- package/v2Containers/WebPush/Create/preview/components/NotificationHeader.js +0 -55
- package/v2Containers/WebPush/Create/preview/components/WindowsChromeExpanded.js +0 -70
- package/v2Containers/WebPush/Create/preview/components/tests/AndroidMobileExpanded.test.js +0 -512
- package/v2Containers/WebPush/Create/preview/components/tests/__snapshots__/AndroidMobileExpanded.test.js.snap +0 -77
- package/v2Containers/WebPush/Create/preview/config/notificationMappings.js +0 -527
- package/v2Containers/WebPush/Create/preview/constants.js +0 -162
- package/v2Containers/WebPush/Create/preview/notification-container.scss +0 -104
- package/v2Containers/WebPush/Create/preview/preview.scss +0 -409
- package/v2Containers/WebPush/Create/preview/styles/_android-mobile-chrome.scss +0 -300
- package/v2Containers/WebPush/Create/preview/styles/_android-mobile-edge.scss +0 -12
- package/v2Containers/WebPush/Create/preview/styles/_android-mobile-firefox.scss +0 -12
- package/v2Containers/WebPush/Create/preview/styles/_android-mobile-opera.scss +0 -12
- package/v2Containers/WebPush/Create/preview/styles/_android-tablet-chrome.scss +0 -303
- package/v2Containers/WebPush/Create/preview/styles/_android-tablet-edge.scss +0 -11
- package/v2Containers/WebPush/Create/preview/styles/_android-tablet-firefox.scss +0 -11
- package/v2Containers/WebPush/Create/preview/styles/_android-tablet-opera.scss +0 -11
- package/v2Containers/WebPush/Create/preview/styles/_base.scss +0 -188
- package/v2Containers/WebPush/Create/preview/styles/_ios.scss +0 -106
- package/v2Containers/WebPush/Create/preview/styles/_ipados.scss +0 -107
- package/v2Containers/WebPush/Create/preview/styles/_macos-chrome.scss +0 -75
- package/v2Containers/WebPush/Create/preview/styles/_windows-chrome.scss +0 -174
- package/v2Containers/WebPush/Create/preview/tests/DevicePreviewContent.test.js +0 -909
- package/v2Containers/WebPush/Create/preview/tests/NotificationContainer.test.js +0 -1077
- package/v2Containers/WebPush/Create/preview/tests/PreviewControls.test.js +0 -723
- package/v2Containers/WebPush/Create/preview/tests/WebPushPreview.test.js +0 -943
- package/v2Containers/WebPush/Create/preview/tests/__snapshots__/DevicePreviewContent.test.js.snap +0 -128
- package/v2Containers/WebPush/Create/preview/tests/__snapshots__/NotificationContainer.test.js.snap +0 -121
- package/v2Containers/WebPush/Create/preview/tests/__snapshots__/PreviewControls.test.js.snap +0 -144
- package/v2Containers/WebPush/Create/preview/tests/__snapshots__/WebPushPreview.test.js.snap +0 -127
- package/v2Containers/WebPush/Create/utils/urlValidation.js +0 -116
- package/v2Containers/WebPush/Create/utils/urlValidation.test.js +0 -449
- package/v2Containers/WebPush/actions.js +0 -60
- package/v2Containers/WebPush/constants.js +0 -108
- package/v2Containers/WebPush/index.js +0 -2
- package/v2Containers/WebPush/reducer.js +0 -104
- package/v2Containers/WebPush/sagas.js +0 -119
- package/v2Containers/WebPush/selectors.js +0 -65
- package/v2Containers/WebPush/tests/reducer.test.js +0 -863
- package/v2Containers/WebPush/tests/sagas.test.js +0 -566
- package/v2Containers/WebPush/tests/selectors.test.js +0 -960
|
@@ -7,91 +7,72 @@
|
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import { render, screen } from '@testing-library/react';
|
|
9
9
|
import '@testing-library/jest-dom';
|
|
10
|
+
import { IntlProvider } from 'react-intl';
|
|
10
11
|
import ValidationErrorDisplay from '../index';
|
|
11
12
|
|
|
12
|
-
//
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return (
|
|
22
|
-
<div data-testid="error-info-note">
|
|
23
|
-
{liquidErrors.map((msg, index) => (
|
|
24
|
-
<div key={`liquid-${index}`} data-testid="error-message">
|
|
25
|
-
{msg}
|
|
26
|
-
</div>
|
|
27
|
-
))}
|
|
28
|
-
{standardErrors.map((msg, index) => (
|
|
29
|
-
<div key={`standard-${index}`} data-testid="error-message">
|
|
30
|
-
{msg}
|
|
31
|
-
</div>
|
|
32
|
-
))}
|
|
33
|
-
</div>
|
|
34
|
-
);
|
|
35
|
-
};
|
|
36
|
-
});
|
|
13
|
+
// Test wrapper with IntlProvider
|
|
14
|
+
const TestWrapper = ({ children }) => (
|
|
15
|
+
<IntlProvider locale="en" messages={{}}>
|
|
16
|
+
{children}
|
|
17
|
+
</IntlProvider>
|
|
18
|
+
);
|
|
19
|
+
|
|
20
|
+
// Note: ValidationErrorDisplay uses ValidationTabs, not ErrorInfoNote
|
|
21
|
+
// The tests should check for the actual rendered structure
|
|
37
22
|
|
|
38
23
|
describe('ValidationErrorDisplay', () => {
|
|
39
24
|
it('renders standard errors when validation has issues', () => {
|
|
40
25
|
const mockValidation = {
|
|
41
26
|
getAllIssues: () => [
|
|
42
|
-
{
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
isValidating: false
|
|
47
|
-
};
|
|
48
|
-
|
|
49
|
-
render(<ValidationErrorDisplay validation={mockValidation} />);
|
|
50
|
-
|
|
51
|
-
expect(screen.getByTestId('error-info-note')).toBeInTheDocument();
|
|
52
|
-
const errorMessages = screen.getAllByTestId('error-message');
|
|
53
|
-
expect(errorMessages).toHaveLength(2);
|
|
54
|
-
expect(errorMessages[0]).toHaveTextContent('Missing closing tag Line 5, Char 10.');
|
|
55
|
-
expect(errorMessages[1]).toHaveTextContent('Invalid attribute Line 7.');
|
|
56
|
-
});
|
|
57
|
-
|
|
58
|
-
it('renders liquid errors separately', () => {
|
|
59
|
-
const mockValidation = {
|
|
60
|
-
getAllIssues: () => [
|
|
61
|
-
{ message: 'Invalid liquid syntax', severity: 'error', source: 'liquid-validator', line: 3 },
|
|
62
|
-
{ message: 'HTML error', severity: 'error', source: 'htmlhint', line: 10 }
|
|
27
|
+
{
|
|
28
|
+
message: 'Missing closing tag', severity: 'error', line: 5, column: 10,
|
|
29
|
+
},
|
|
30
|
+
{ message: 'Invalid attribute', severity: 'error', line: 7 },
|
|
63
31
|
],
|
|
64
32
|
isClean: () => false,
|
|
65
|
-
isValidating: false
|
|
33
|
+
isValidating: false,
|
|
66
34
|
};
|
|
67
35
|
|
|
68
|
-
|
|
36
|
+
const { container } = render(
|
|
37
|
+
<TestWrapper>
|
|
38
|
+
<ValidationErrorDisplay validation={mockValidation} />
|
|
39
|
+
</TestWrapper>
|
|
40
|
+
);
|
|
69
41
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
expect(
|
|
42
|
+
// Check for validation-error-display wrapper
|
|
43
|
+
expect(container.querySelector('.validation-error-display')).toBeInTheDocument();
|
|
44
|
+
// Check for validation-tabs component
|
|
45
|
+
expect(container.querySelector('.validation-tabs')).toBeInTheDocument();
|
|
46
|
+
// Check that error messages are rendered
|
|
47
|
+
expect(screen.getByText('Missing closing tag')).toBeInTheDocument();
|
|
48
|
+
expect(screen.getByText('Invalid attribute')).toBeInTheDocument();
|
|
76
49
|
});
|
|
77
50
|
|
|
78
51
|
it('does not render when validation has no errors', () => {
|
|
79
52
|
const mockValidation = {
|
|
80
53
|
getAllIssues: () => [],
|
|
81
54
|
isClean: () => true,
|
|
82
|
-
isValidating: false
|
|
55
|
+
isValidating: false,
|
|
83
56
|
};
|
|
84
57
|
|
|
85
|
-
const { container } = render(
|
|
58
|
+
const { container } = render(
|
|
59
|
+
<TestWrapper>
|
|
60
|
+
<ValidationErrorDisplay validation={mockValidation} />
|
|
61
|
+
</TestWrapper>
|
|
62
|
+
);
|
|
86
63
|
|
|
87
|
-
expect(
|
|
64
|
+
expect(container.querySelector('.validation-error-display')).not.toBeInTheDocument();
|
|
88
65
|
expect(container.firstChild).toBeNull();
|
|
89
66
|
});
|
|
90
67
|
|
|
91
68
|
it('does not render when validation is null', () => {
|
|
92
|
-
const { container } = render(
|
|
69
|
+
const { container } = render(
|
|
70
|
+
<TestWrapper>
|
|
71
|
+
<ValidationErrorDisplay validation={null} />
|
|
72
|
+
</TestWrapper>
|
|
73
|
+
);
|
|
93
74
|
|
|
94
|
-
expect(
|
|
75
|
+
expect(container.querySelector('.validation-error-display')).not.toBeInTheDocument();
|
|
95
76
|
expect(container.firstChild).toBeNull();
|
|
96
77
|
});
|
|
97
78
|
|
|
@@ -99,12 +80,16 @@ describe('ValidationErrorDisplay', () => {
|
|
|
99
80
|
const mockValidation = {
|
|
100
81
|
getAllIssues: () => [],
|
|
101
82
|
isClean: () => false,
|
|
102
|
-
isValidating: true
|
|
83
|
+
isValidating: true,
|
|
103
84
|
};
|
|
104
85
|
|
|
105
|
-
const { container } = render(
|
|
86
|
+
const { container } = render(
|
|
87
|
+
<TestWrapper>
|
|
88
|
+
<ValidationErrorDisplay validation={mockValidation} />
|
|
89
|
+
</TestWrapper>
|
|
90
|
+
);
|
|
106
91
|
|
|
107
|
-
expect(
|
|
92
|
+
expect(container.querySelector('.validation-error-display')).not.toBeInTheDocument();
|
|
108
93
|
expect(container.firstChild).toBeNull();
|
|
109
94
|
});
|
|
110
95
|
|
|
@@ -112,11 +97,13 @@ describe('ValidationErrorDisplay', () => {
|
|
|
112
97
|
const mockValidation = {
|
|
113
98
|
getAllIssues: () => [{ message: 'Error', severity: 'error' }],
|
|
114
99
|
isClean: () => false,
|
|
115
|
-
isValidating: false
|
|
100
|
+
isValidating: false,
|
|
116
101
|
};
|
|
117
102
|
|
|
118
103
|
const { container } = render(
|
|
119
|
-
<
|
|
104
|
+
<TestWrapper>
|
|
105
|
+
<ValidationErrorDisplay validation={mockValidation} className="custom-class" />
|
|
106
|
+
</TestWrapper>
|
|
120
107
|
);
|
|
121
108
|
|
|
122
109
|
const wrapper = container.querySelector('.validation-error-display');
|
|
@@ -127,26 +114,37 @@ describe('ValidationErrorDisplay', () => {
|
|
|
127
114
|
const mockValidation = {
|
|
128
115
|
getAllIssues: () => [{ message: 'Mobile error', severity: 'error' }],
|
|
129
116
|
isClean: () => false,
|
|
130
|
-
isValidating: false
|
|
117
|
+
isValidating: false,
|
|
131
118
|
};
|
|
132
119
|
|
|
133
|
-
|
|
120
|
+
const { container } = render(
|
|
121
|
+
<TestWrapper>
|
|
122
|
+
<ValidationErrorDisplay validation={mockValidation} variant="inapp" />
|
|
123
|
+
</TestWrapper>
|
|
124
|
+
);
|
|
134
125
|
|
|
135
|
-
expect(
|
|
136
|
-
expect(screen.
|
|
126
|
+
expect(container.querySelector('.validation-error-display')).toBeInTheDocument();
|
|
127
|
+
expect(screen.getByText('Mobile error')).toBeInTheDocument();
|
|
137
128
|
});
|
|
138
129
|
|
|
139
130
|
it('includes rule information in error messages when available', () => {
|
|
140
131
|
const mockValidation = {
|
|
141
132
|
getAllIssues: () => [
|
|
142
|
-
{
|
|
133
|
+
{
|
|
134
|
+
message: 'Alt attribute required', severity: 'error', rule: 'alt-require', line: 5,
|
|
135
|
+
},
|
|
143
136
|
],
|
|
144
137
|
isClean: () => false,
|
|
145
|
-
isValidating: false
|
|
138
|
+
isValidating: false,
|
|
146
139
|
};
|
|
147
140
|
|
|
148
|
-
render(
|
|
141
|
+
render(
|
|
142
|
+
<TestWrapper>
|
|
143
|
+
<ValidationErrorDisplay validation={mockValidation} />
|
|
144
|
+
</TestWrapper>
|
|
145
|
+
);
|
|
149
146
|
|
|
150
|
-
|
|
147
|
+
// Check that the error message is rendered (rule info may be in tooltip or separate element)
|
|
148
|
+
expect(screen.getByText('Alt attribute required')).toBeInTheDocument();
|
|
151
149
|
});
|
|
152
150
|
});
|
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* ValidationErrorDisplay - HTML Editor validation
|
|
2
|
+
* ValidationErrorDisplay - HTML Editor validation display
|
|
3
3
|
*
|
|
4
|
-
* This component
|
|
5
|
-
*
|
|
4
|
+
* This component displays validation errors using the new ValidationTabs component
|
|
5
|
+
* with tabbed interface for HTML, Label, and Liquid issues.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
|
-
import React from 'react';
|
|
8
|
+
import React, { useState } from 'react';
|
|
9
9
|
import PropTypes from 'prop-types';
|
|
10
10
|
|
|
11
|
-
import
|
|
12
|
-
import
|
|
13
|
-
|
|
14
|
-
import { transformValidationToErrorInfo, hasValidationErrors } from '../../utils/validationAdapter';
|
|
15
|
-
import { HTML_EDITOR_VARIANTS } from '../../constants';
|
|
11
|
+
import { hasValidationErrors } from '../../utils/validationAdapter';
|
|
12
|
+
import ValidationTabs from '../ValidationTabs';
|
|
16
13
|
|
|
17
14
|
// Styles
|
|
18
15
|
import './_validationErrorDisplay.scss';
|
|
@@ -20,51 +17,72 @@ import './_validationErrorDisplay.scss';
|
|
|
20
17
|
/**
|
|
21
18
|
* ValidationErrorDisplay Component
|
|
22
19
|
*
|
|
23
|
-
* Displays validation errors using the
|
|
20
|
+
* Displays validation errors using the ValidationTabs component
|
|
24
21
|
*/
|
|
25
22
|
const ValidationErrorDisplay = ({
|
|
26
23
|
validation,
|
|
27
|
-
variant = HTML_EDITOR_VARIANTS.EMAIL,
|
|
28
24
|
onErrorClick,
|
|
29
|
-
|
|
25
|
+
onClose,
|
|
26
|
+
isLiquidEnabled = false,
|
|
27
|
+
className = '',
|
|
30
28
|
}) => {
|
|
31
|
-
//
|
|
32
|
-
|
|
33
|
-
return null;
|
|
34
|
-
}
|
|
29
|
+
// Track if panel is dismissed
|
|
30
|
+
const [isDismissed, setIsDismissed] = useState(false);
|
|
35
31
|
|
|
36
|
-
//
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
onErrorClick?.(error);
|
|
32
|
+
// Handle close - dismiss temporarily
|
|
33
|
+
const handleClose = () => {
|
|
34
|
+
setIsDismissed(true);
|
|
35
|
+
if (onClose) {
|
|
36
|
+
onClose();
|
|
37
|
+
}
|
|
43
38
|
};
|
|
44
39
|
|
|
40
|
+
// Reset dismissed state when validation changes (new errors appear)
|
|
41
|
+
React.useEffect(() => {
|
|
42
|
+
if (hasValidationErrors(validation)) {
|
|
43
|
+
setIsDismissed(false);
|
|
44
|
+
}
|
|
45
|
+
}, [validation]);
|
|
46
|
+
|
|
47
|
+
// Don't render if no validation, no errors, or dismissed
|
|
48
|
+
if (!hasValidationErrors(validation) || isDismissed) {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
|
|
45
52
|
return (
|
|
46
|
-
<
|
|
53
|
+
<div
|
|
47
54
|
className={`validation-error-display ${className}`}
|
|
48
55
|
role="alert"
|
|
49
56
|
aria-live="polite"
|
|
50
57
|
aria-label="Validation errors"
|
|
51
58
|
>
|
|
52
|
-
<
|
|
53
|
-
|
|
54
|
-
onErrorClick={
|
|
59
|
+
<ValidationTabs
|
|
60
|
+
validation={validation}
|
|
61
|
+
onErrorClick={onErrorClick}
|
|
62
|
+
onClose={handleClose}
|
|
63
|
+
isLiquidEnabled={isLiquidEnabled}
|
|
55
64
|
/>
|
|
56
|
-
</
|
|
65
|
+
</div>
|
|
57
66
|
);
|
|
58
67
|
};
|
|
59
68
|
|
|
60
69
|
ValidationErrorDisplay.propTypes = {
|
|
61
70
|
validation: PropTypes.shape({
|
|
62
71
|
isValidating: PropTypes.bool,
|
|
63
|
-
getAllIssues: PropTypes.func
|
|
72
|
+
getAllIssues: PropTypes.func,
|
|
64
73
|
}),
|
|
65
|
-
variant: PropTypes.oneOf(Object.values(HTML_EDITOR_VARIANTS)),
|
|
66
74
|
onErrorClick: PropTypes.func,
|
|
67
|
-
|
|
75
|
+
onClose: PropTypes.func,
|
|
76
|
+
isLiquidEnabled: PropTypes.bool,
|
|
77
|
+
className: PropTypes.string,
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
ValidationErrorDisplay.defaultProps = {
|
|
81
|
+
validation: null,
|
|
82
|
+
onErrorClick: null,
|
|
83
|
+
onClose: null,
|
|
84
|
+
isLiquidEnabled: false,
|
|
85
|
+
className: '',
|
|
68
86
|
};
|
|
69
87
|
|
|
70
88
|
export default ValidationErrorDisplay;
|
|
@@ -0,0 +1,254 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ValidationTabs Styles
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
|
|
6
|
+
|
|
7
|
+
.validation-tabs {
|
|
8
|
+
overflow-y: hidden;
|
|
9
|
+
width: 100%;
|
|
10
|
+
background-color: $CAP_COLOR_05; // Light pink background
|
|
11
|
+
border-radius: 0.25rem;
|
|
12
|
+
padding: 0.5rem 0.75rem;
|
|
13
|
+
box-sizing: border-box;
|
|
14
|
+
|
|
15
|
+
&__header {
|
|
16
|
+
display: flex;
|
|
17
|
+
align-items: flex-start;
|
|
18
|
+
justify-content: space-between;
|
|
19
|
+
width: 100%;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
&__tabs {
|
|
23
|
+
flex: 1;
|
|
24
|
+
|
|
25
|
+
// Override CapTab styles for proper spacing
|
|
26
|
+
.cap-tab-v2 {
|
|
27
|
+
.ant-tabs-nav {
|
|
28
|
+
margin-bottom: 0;
|
|
29
|
+
|
|
30
|
+
&::before {
|
|
31
|
+
border-bottom: none;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
.ant-tabs-tab {
|
|
36
|
+
padding: 0.5rem 0.75rem; // Add horizontal padding for spacing
|
|
37
|
+
margin-right: 0; // Remove margin, use padding instead
|
|
38
|
+
color: $CAP_G03;
|
|
39
|
+
font-size: 0.875rem;
|
|
40
|
+
font-weight: 500;
|
|
41
|
+
|
|
42
|
+
& + .ant-tabs-tab {
|
|
43
|
+
margin-left: 1.5rem; // Add space between tabs
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
&:hover {
|
|
47
|
+
color: $CAP_COLOR_05;
|
|
48
|
+
background: transparent;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
&.ant-tabs-tab-active {
|
|
52
|
+
.ant-tabs-tab-btn {
|
|
53
|
+
color: $CAP_COLOR_05;
|
|
54
|
+
font-weight: 600;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
.ant-tabs-ink-bar {
|
|
60
|
+
background-color: $CAP_COLOR_05;
|
|
61
|
+
height: 0.125rem;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
.ant-tabs-content-holder {
|
|
65
|
+
padding-top: 0.25rem; // Reduced from 0.5rem
|
|
66
|
+
padding-bottom: 0; // No bottom padding
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
&__tab-label {
|
|
72
|
+
display: flex;
|
|
73
|
+
align-items: center;
|
|
74
|
+
gap: 0.25rem;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
&__tab-count {
|
|
78
|
+
color: inherit;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
&__actions {
|
|
82
|
+
display: flex;
|
|
83
|
+
align-items: center;
|
|
84
|
+
gap: 0.5rem;
|
|
85
|
+
flex-shrink: 0;
|
|
86
|
+
padding-top: 0.5rem;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
&__close {
|
|
90
|
+
display: flex;
|
|
91
|
+
align-items: center;
|
|
92
|
+
justify-content: center;
|
|
93
|
+
width: 1.5rem;
|
|
94
|
+
height: 1.5rem;
|
|
95
|
+
padding: 0;
|
|
96
|
+
background: transparent;
|
|
97
|
+
border: none;
|
|
98
|
+
border-radius: 0.25rem;
|
|
99
|
+
cursor: pointer;
|
|
100
|
+
color: $CAP_G03;
|
|
101
|
+
transition: all 0.2s ease;
|
|
102
|
+
|
|
103
|
+
&:hover {
|
|
104
|
+
background-color: rgba($CAP_COLOR_05, 0.1);
|
|
105
|
+
color: $CAP_COLOR_05;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
.cap-icon-v2 {
|
|
109
|
+
font-size: 0.875rem;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
&__content {
|
|
114
|
+
max-height: 15rem; // Limit height for many errors
|
|
115
|
+
overflow-y: auto;
|
|
116
|
+
padding-right: 0.25rem;
|
|
117
|
+
padding-bottom: 0; // Remove bottom padding completely
|
|
118
|
+
|
|
119
|
+
// Custom scrollbar
|
|
120
|
+
&::-webkit-scrollbar {
|
|
121
|
+
width: 0.375rem;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
&::-webkit-scrollbar-track {
|
|
125
|
+
background: transparent;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
&::-webkit-scrollbar-thumb {
|
|
129
|
+
background-color: $CAP_G06;
|
|
130
|
+
border-radius: 0.1875rem;
|
|
131
|
+
|
|
132
|
+
&:hover {
|
|
133
|
+
background-color: $CAP_G04;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
&__item {
|
|
139
|
+
display: flex;
|
|
140
|
+
align-items: flex-start;
|
|
141
|
+
gap: 0.5rem;
|
|
142
|
+
padding: 0.25rem 0; // Reduced from 0.375rem
|
|
143
|
+
border-bottom: 1px solid rgba($CAP_G06, 0.3);
|
|
144
|
+
|
|
145
|
+
&:last-child {
|
|
146
|
+
border-bottom: none;
|
|
147
|
+
padding-bottom: 0.25rem; // Minimal padding on last item
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
&--error {
|
|
151
|
+
.validation-tabs__icon--error {
|
|
152
|
+
color: $CAP_RED;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
&--warning {
|
|
157
|
+
.validation-tabs__icon--warning {
|
|
158
|
+
color: $CAP_YELLOW;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
&__item-icon {
|
|
164
|
+
flex-shrink: 0;
|
|
165
|
+
display: flex;
|
|
166
|
+
align-items: center;
|
|
167
|
+
padding-top: 0.125rem;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
&__icon {
|
|
171
|
+
font-size: 0.875rem;
|
|
172
|
+
|
|
173
|
+
&--error {
|
|
174
|
+
color: $CAP_RED;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
&--warning {
|
|
178
|
+
color: $CAP_YELLOW;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
&__item-content {
|
|
183
|
+
flex: 1;
|
|
184
|
+
display: flex;
|
|
185
|
+
flex-wrap: wrap;
|
|
186
|
+
align-items: baseline;
|
|
187
|
+
gap: 0.25rem;
|
|
188
|
+
font-size: 0.75rem;
|
|
189
|
+
line-height: 1.4;
|
|
190
|
+
color: $CAP_G01;
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
&__item-message {
|
|
194
|
+
color: $CAP_G01;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
&__item-location {
|
|
198
|
+
color: $CAP_G03;
|
|
199
|
+
white-space: nowrap;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
&__item-rule {
|
|
203
|
+
color: $CAP_G04;
|
|
204
|
+
font-family: monospace;
|
|
205
|
+
font-size: 0.6875rem;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
&__item-navigate {
|
|
209
|
+
flex-shrink: 0;
|
|
210
|
+
display: flex;
|
|
211
|
+
align-items: center;
|
|
212
|
+
justify-content: center;
|
|
213
|
+
width: 1.25rem;
|
|
214
|
+
height: 1.25rem;
|
|
215
|
+
padding: 0;
|
|
216
|
+
background: transparent;
|
|
217
|
+
border: none;
|
|
218
|
+
border-radius: 0.25rem;
|
|
219
|
+
cursor: pointer;
|
|
220
|
+
color: $CAP_G04;
|
|
221
|
+
transition: all 0.2s ease;
|
|
222
|
+
|
|
223
|
+
&:hover {
|
|
224
|
+
background-color: rgba($CAP_G01, 0.1);
|
|
225
|
+
color: $CAP_G01;
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
.anticon {
|
|
229
|
+
font-size: 0.75rem;
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
// Responsive adjustments
|
|
235
|
+
@media (max-width: 768px) {
|
|
236
|
+
.validation-tabs {
|
|
237
|
+
padding: 0.375rem 0.5rem;
|
|
238
|
+
|
|
239
|
+
&__tabs {
|
|
240
|
+
.ant-tabs-tab {
|
|
241
|
+
margin-right: 1rem;
|
|
242
|
+
font-size: 0.8125rem;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
&__content {
|
|
247
|
+
max-height: 10rem;
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
&__item-content {
|
|
251
|
+
font-size: 0.6875rem;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
}
|