Validation fixes (#2374)

Azure · Jan 22, 2024 · 3e2d250 · 3e2d250
1 parent b43c5cb
commit 3e2d250
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/admin/media/mediaModal.tsx b/src/admin/media/mediaModal.tsx
@@ -110,12 +110,14 @@ export class MediaModal extends React.Component<MediaModalProps, MediaModalState
     }
 
     renameMedia = async (mediaItem: MediaContract): Promise<void> => {
-        const updatedMedia: MediaContract = {
-            ...mediaItem,
-            fileName: this.state.fileNewName
+        if (this.state.fileNewName) {
+            const updatedMedia: MediaContract = {
+                ...mediaItem,
+                fileName: this.state.fileNewName
+            }
+            await this.mediaService.updateMedia(updatedMedia);
+            this.eventManager.dispatchEvent('onSaveChanges');
         }
-        await this.mediaService.updateMedia(updatedMedia);
-        this.eventManager.dispatchEvent('onSaveChanges');
 
         this.setState({ fileForRename: '', fileNewName: '' });
         this.searchMedia();

diff --git a/src/admin/pages/pageDetailsModal.tsx b/src/admin/pages/pageDetailsModal.tsx
@@ -98,7 +98,7 @@ export class PageDetailsModal extends React.Component<PageDetailsModalProps, Pag
     }
 
     validatePermalink = async (permalink: string): Promise<string> => {
-        if (permalink === this.props.page?.permalink) return '';
+        if (!this.state.copyPage && permalink === this.props.page?.permalink) return '';
 
         const isPermalinkNotDefined = await this.permalinkService.isPermalinkDefined(permalink) && !reservedPermalinks.includes(permalink);
         const errorMessage = validateField(UNIQUE_REQUIRED, permalink, isPermalinkNotDefined);

diff --git a/src/admin/pages/pageLayoutDetailsModal.tsx b/src/admin/pages/pageLayoutDetailsModal.tsx
@@ -73,9 +73,9 @@ export class PageLayoutDetailsModal extends React.Component<PageLayoutModalProps
     }
 
     validatePermalink = async (permalink: string): Promise<string> => {
-        if (permalink === this.props.layout?.permalinkTemplate) return '';
+        if (!this.state.copyLayout && permalink === this.props.layout?.permalinkTemplate) return '';
 
-        const isPermalinkNotDefined = !(await this.layoutService.getLayoutByPermalinkTemplate(permalink)) && !reservedPermalinks.includes(permalink);
+        const isPermalinkNotDefined = permalink ? !(await this.layoutService.getLayoutByPermalinkTemplate(permalink)) : true && !reservedPermalinks.includes(permalink);
         const errorMessage = validateField(UNIQUE_REQUIRED, permalink, isPermalinkNotDefined);
 
         return errorMessage;
@@ -95,7 +95,7 @@ export class PageLayoutDetailsModal extends React.Component<PageLayoutModalProps
     copyLayout = async (): Promise<void> => {
         this.setState({ copyLayout: true, layout: {
             ...this.state.layout,
-            permalinkTemplate: null,
+            permalinkTemplate: this.state.layout.permalinkTemplate + '-copy',
             title: this.state.layout.title + ' (copy)'
         }});
     }