@contentful/field-editor-slug 2.2.2-canary.2 → 2.2.3-canary.0

package/dist/cjs/SlugEditor.test.js

@@ -7,6 +7,7 @@ const _fieldeditortestutils = require("@contentful/field-editor-test-utils");
 const _react1 = require("@testing-library/react");
 require("@testing-library/jest-dom/extend-expect");
 const _SlugEditor = require("./SlugEditor");
+const _SlugEditorField = require("./SlugEditorField");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -303,6 +304,26 @@ describe('SlugEditor', ()=>{
                 expect(getByTestId('cf-ui-text-input')).not.toHaveAttribute('aria-invalid');
             });
         });
+        it('shows error and hides warning for duplicate slug when publish sets hasError', async ()=>{
+            const performUniqueCheck = jest.fn().mockResolvedValue(false);
+            const setValue = jest.fn();
+            const { queryByTestId } = (0, _react1.render)(/*#__PURE__*/ _react.createElement(_SlugEditorField.SlugEditorFieldStatic, {
+                hasError: true,
+                isUniqueValidationEnabled: false,
+                isOptionalLocaleWithFallback: false,
+                isDisabled: false,
+                value: "slug-value",
+                locale: "en-US",
+                titleValue: "Slug value",
+                createdAt: "2020-01-24T15:33:47.906Z",
+                setValue: setValue,
+                performUniqueCheck: performUniqueCheck
+            }));
+            await (0, _react1.waitFor)(()=>{
+                expect(queryByTestId('slug-editor-duplicate-error')).toBeInTheDocument();
+                expect(queryByTestId('slug-editor-duplicate-warning')).not.toBeInTheDocument();
+            });
+        });
     });
     describe('should react to title changes', ()=>{
         it('when field is disabled', async ()=>{

package/dist/cjs/SlugEditorField.js

@@ -114,7 +114,8 @@ function SlugEditorFieldStatic(props) {
     const { hasError, isDisabled, value, setValue, onChange, onBlur, isUniqueValidationEnabled, id } = props;
     const status = useUniqueChecker(props);
     const hasDuplicate = status === 'duplicate';
-    const shouldShowDuplicateAsError = hasDuplicate && isUniqueValidationEnabled;
+    const shouldShowDuplicateAsError = hasDuplicate && (isUniqueValidationEnabled || hasError);
+    const shouldShowDuplicateAsWarning = hasDuplicate && !shouldShowDuplicateAsError;
     return /*#__PURE__*/ _react.createElement("div", {
         className: _styles.inputContainer
     }, /*#__PURE__*/ _react.createElement(_f36icons.LinkSimpleIcon, {
@@ -140,13 +141,13 @@ function SlugEditorFieldStatic(props) {
         className: _styles.spinnerContainer
     }, /*#__PURE__*/ _react.createElement(_f36components.Spinner, {
         testId: "slug-editor-spinner"
-    })), hasDuplicate && isUniqueValidationEnabled && /*#__PURE__*/ _react.createElement(_f36components.ValidationMessage, {
+    })), shouldShowDuplicateAsError && /*#__PURE__*/ _react.createElement(_f36components.ValidationMessage, {
         testId: "slug-editor-duplicate-error",
         className: _styles.uniqueValidationError
     }, _core.i18n._({
         id: "FieldEditors.Slug.SlugEditorField.DuplicateSlugError",
         message: "This slug has already been published in another entry"
-    })), hasDuplicate && !isUniqueValidationEnabled && /*#__PURE__*/ _react.createElement(_f36note.Note, {
+    })), shouldShowDuplicateAsWarning && /*#__PURE__*/ _react.createElement(_f36note.Note, {
         variant: "warning",
         testId: "slug-editor-duplicate-warning",
         className: _styles.uniqueValidationError

package/dist/esm/SlugEditor.test.js

@@ -3,6 +3,7 @@ import { createFakeFieldAPI, createFakeLocalesAPI } from '@contentful/field-edit
 import { cleanup, configure, fireEvent, render, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import { SlugEditor } from './SlugEditor';
+import { SlugEditorFieldStatic } from './SlugEditorField';
 configure({
     testIdAttribute: 'data-test-id'
 });
@@ -258,6 +259,26 @@ describe('SlugEditor', ()=>{
                 expect(getByTestId('cf-ui-text-input')).not.toHaveAttribute('aria-invalid');
             });
         });
+        it('shows error and hides warning for duplicate slug when publish sets hasError', async ()=>{
+            const performUniqueCheck = jest.fn().mockResolvedValue(false);
+            const setValue = jest.fn();
+            const { queryByTestId } = render(/*#__PURE__*/ React.createElement(SlugEditorFieldStatic, {
+                hasError: true,
+                isUniqueValidationEnabled: false,
+                isOptionalLocaleWithFallback: false,
+                isDisabled: false,
+                value: "slug-value",
+                locale: "en-US",
+                titleValue: "Slug value",
+                createdAt: "2020-01-24T15:33:47.906Z",
+                setValue: setValue,
+                performUniqueCheck: performUniqueCheck
+            }));
+            await waitFor(()=>{
+                expect(queryByTestId('slug-editor-duplicate-error')).toBeInTheDocument();
+                expect(queryByTestId('slug-editor-duplicate-warning')).not.toBeInTheDocument();
+            });
+        });
     });
     describe('should react to title changes', ()=>{
         it('when field is disabled', async ()=>{

package/dist/esm/SlugEditorField.js

@@ -55,7 +55,8 @@ export function SlugEditorFieldStatic(props) {
     const { hasError, isDisabled, value, setValue, onChange, onBlur, isUniqueValidationEnabled, id } = props;
     const status = useUniqueChecker(props);
     const hasDuplicate = status === 'duplicate';
-    const shouldShowDuplicateAsError = hasDuplicate && isUniqueValidationEnabled;
+    const shouldShowDuplicateAsError = hasDuplicate && (isUniqueValidationEnabled || hasError);
+    const shouldShowDuplicateAsWarning = hasDuplicate && !shouldShowDuplicateAsError;
     return /*#__PURE__*/ React.createElement("div", {
         className: styles.inputContainer
     }, /*#__PURE__*/ React.createElement(LinkSimpleIcon, {
@@ -81,13 +82,13 @@ export function SlugEditorFieldStatic(props) {
         className: styles.spinnerContainer
     }, /*#__PURE__*/ React.createElement(Spinner, {
         testId: "slug-editor-spinner"
-    })), hasDuplicate && isUniqueValidationEnabled && /*#__PURE__*/ React.createElement(ValidationMessage, {
+    })), shouldShowDuplicateAsError && /*#__PURE__*/ React.createElement(ValidationMessage, {
         testId: "slug-editor-duplicate-error",
         className: styles.uniqueValidationError
     }, $_i18n._({
         id: "FieldEditors.Slug.SlugEditorField.DuplicateSlugError",
         message: "This slug has already been published in another entry"
-    })), hasDuplicate && !isUniqueValidationEnabled && /*#__PURE__*/ React.createElement(Note, {
+    })), shouldShowDuplicateAsWarning && /*#__PURE__*/ React.createElement(Note, {
         variant: "warning",
         testId: "slug-editor-duplicate-warning",
         className: styles.uniqueValidationError

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-slug",
-  "version": "2.2.2-canary.2+4797c8d5",
+  "version": "2.2.3-canary.0+bb4ffc6b",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -59,5 +59,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "4797c8d502ae3dc55e22bf12f5aef2762f010a09"
+  "gitHead": "bb4ffc6b56516966c6dcfd8b7f24f9ca58196a86"
 }