From 5e0e4975466f73eed240c06686c8246cb247cc67 Mon Sep 17 00:00:00 2001
From: AmbrishRamachandiran <ambrish.r@infosys.com>
Date: Thu, 17 Aug 2023 20:27:38 +0530
Subject: [PATCH] fixed issues of edit and create playlist popup custom
 validations

Signed-off-by: AmbrishRamachandiran <ambrish.r@infosys.com>
---
 .../PlaylistEditDialog/PlaylistEditDialog.tsx | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
index 526f7dbe58..5cee8bf531 100644
--- a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
+++ b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
@@ -91,15 +91,31 @@ export const PlaylistEditDialog = ({
       return ownershipEntityRefs;
     }, []);
 
-  const nameIsUnique = async (name: string) => {
-    const playlistArray = await fetchAndProcessData();
-    if (
-      editingOtherFields ||
-      (await playlistArray.some(
-        (playlistData: { name: string }) => playlistData.name === name,
-      ))
-    )
-      return 'A playlist with this name already exists';
+  const nameIsUnique = async (
+    name: string,
+    isEditing: boolean,
+    originalName: string,
+  ) => {
+    if (!isEditing) {
+      const playlistArray = await fetchAndProcessData();
+      if (
+        playlistArray.some(
+          (playlistData: { name: string }) => playlistData.name === name,
+        )
+      ) {
+        return 'A playlist with this name already exists';
+      }
+    } else if (name !== originalName) {
+      const playlistArray = await fetchAndProcessData();
+      if (
+        playlistArray.some(
+          (playlistData: { name: string }) => playlistData.name === name,
+        )
+      ) {
+        return 'A playlist with this name already exists';
+      }
+    }
+
     return true;
   };
 
@@ -142,7 +158,8 @@ export const PlaylistEditDialog = ({
           control={control}
           rules={{
             required: true,
-            validate: editingOtherFields ? undefined : nameIsUnique,
+            validate: value =>
+              nameIsUnique(value, editingOtherFields, playlist.name),
           }}
           render={({ field }) => (
             <TextField