feat(chat): move from edit to move endpoint for conversations/pro…

…mpts rename (Issue #3052) (#3062)
epam · Feb 7, 2025 · d0e0390 · d0e0390
1 parent e0c0591
commit d0e0390
Show file tree

Hide file tree

Showing 49 changed files with 534 additions and 580 deletions.
diff --git a/apps/chat-e2e/src/assertions/api/apiAssertion.ts b/apps/chat-e2e/src/assertions/api/apiAssertion.ts
@@ -1,6 +1,6 @@
 import { ChatBody } from '@/chat/types/chat';
+import { MoveModel } from '@/chat/types/common';
 import { DialAIEntityModel } from '@/chat/types/models';
-import { Prompt } from '@/chat/types/prompt';
 import { ExpectedConstants, ExpectedMessages } from '@/src/testData';
 import { Message } from '@epam/ai-dial-shared';
 import { expect } from '@playwright/test';
@@ -123,30 +123,30 @@ export class ApiAssertion {
       .toBe(expectedMessage);
   }
 
-  public async assertRequestPromptName(request: Prompt, expectedValue: string) {
-    expect
-      .soft(request.name, ExpectedMessages.promptRequestNameIsValid)
-      .toBe(expectedValue);
-  }
-
-  public async assertRequestPromptDescription(
-    request: Prompt,
-    expectedValue: string,
+  public async assertMoveRequest(
+    request: MoveModel,
+    expectedDestination: string,
+    expectedSource: string,
+    isOverwritten = false,
   ) {
     expect
       .soft(
-        request.description,
-        ExpectedMessages.promptRequestDescriptionIsValid,
+        request.destinationUrl.endsWith(`/${expectedDestination}`),
+        ExpectedMessages.moveDestinationIsValid,
       )
-      .toBe(expectedValue);
-  }
-
-  public async assertRequestPromptContent(
-    request: Prompt,
-    expectedValue: string,
-  ) {
+      .toBeTruthy();
     expect
-      .soft(request.content, ExpectedMessages.promptRequestContentIsValid)
-      .toBe(expectedValue);
+      .soft(
+        request.sourceUrl.endsWith(`/${expectedSource}`),
+        ExpectedMessages.moveSourceIsValid,
+      )
+      .toBeTruthy();
+    isOverwritten
+      ? expect
+          .soft(isOverwritten, ExpectedMessages.moveSourceIsValid)
+          .toBeTruthy()
+      : expect
+          .soft(isOverwritten, ExpectedMessages.moveOverwriteIsValid)
+          .toBeFalsy();
   }
 }
diff --git a/apps/chat-e2e/src/testData/expectedConstants.ts b/apps/chat-e2e/src/testData/expectedConstants.ts
@@ -57,20 +57,11 @@ export const ExpectedConstants = {
     'Deleting will stop sharing and other users will no longer see this conversation.',
   renameSharedFolderMessage:
     'Renaming will stop sharing and other users will no longer see this folder.',
-  renameSharedConversationMessage:
-    'Renaming will stop sharing and other users will no longer see this conversation.',
   deleteSharedPromptMessage:
     'Are you sure that you want to delete a prompt?\n' +
     'Deleting will stop sharing and other users will no longer see this prompt.',
-  sharedConversationModelChangeDialogTitle: 'Confirm model changing',
-  renameSharedConversationDialogTitle: 'Confirm renaming conversation',
-  renameSharedPromptDialogTitle: 'Confirm renaming prompt',
   notAllowedToMoveParentToChild:
     "It's not allowed to move parent folder in child folder",
-  sharedConversationModelChangeMessage:
-    'Model changing will stop sharing and other users will no longer see this conversation.',
-  renameSharedPromptMessage:
-    'Renaming will stop sharing and other users will no longer see this prompt.',
   deletePromptConfirmationModalTitle: 'Confirm deleting prompt',
   deletePromptConfirmationModalMessage:
     'Are you sure that you want to delete a prompt?',
@@ -116,9 +107,9 @@ export const ExpectedConstants = {
   responseFileUrlContentPattern: (model: string) =>
     new RegExp('/appdata/' + model + '/images/.*\\.png', 'g'),
   shareConversationText:
-    'This link is temporary and will be active for 3 days. This conversation and future changes to it will be visible to users who follow the link. Only owner will be able to make changes. Renaming or changing the model will stop sharing.',
+    'This link is temporary and will be active for 3 days. This conversation and future changes to it will be visible to users who follow the link. Only owner will be able to make changes.',
   sharePromptText:
-    'This link is temporary and will be active for 3 days. This prompt and future changes to it will be visible to users who follow the link. Only owner will be able to make changes. Renaming will stop sharing.',
+    'This link is temporary and will be active for 3 days. This prompt and future changes to it will be visible to users who follow the link. Only owner will be able to make changes.',
   shareApplicationText:
     'This application and its updates will be visible to users with the link. Renaming or changing the version will stop sharing.',
   shareConversationFolderText:
@@ -300,6 +291,9 @@ export const API = {
   promptsHost: () => `${API.listingHost}/prompts`,
   filesListingHost: () => `${API.listingHost}/files`,
   fileHost: '/api/files',
+  conversationHost: '/api/conversations',
+  promptHost: '/api/prompts',
+  moveHost: '/api/ops/resource/move',
   importFileRootPath: (bucket: string) => `files/${bucket}`,
   modelFilePath: (modelId: string) => `appdata/${modelId}/images`,
   importFilePath: (bucket: string, modelId: string) =>

diff --git a/apps/chat-e2e/src/testData/expectedMessages.ts b/apps/chat-e2e/src/testData/expectedMessages.ts
@@ -91,9 +91,9 @@ export enum ExpectedMessages {
   chatRequestAddonsAreValid = 'Chat API request addons are valid',
   chatRequestMessageIsValid = 'Chat API request message is valid',
   chatRequestAttachmentIsValid = 'Chat API request attachment is valid',
-  promptRequestNameIsValid = 'Prompt API request name is valid',
-  promptRequestDescriptionIsValid = 'Prompt API request description is valid',
-  promptRequestContentIsValid = 'Prompt API request content is valid',
+  moveDestinationIsValid = 'Move API request destination is valid',
+  moveSourceIsValid = 'Move API request source is valid',
+  moveOverwriteIsValid = 'Move API request overwrite is valid',
   sendMessageButtonDisabled = 'Send message button is disabled',
   sendMessageButtonEnabled = 'Send message button is enabled',
   tooltipContentIsValid = 'Tooltip content is valid',

diff --git a/apps/chat-e2e/src/tests/chatBarConversation.test.ts b/apps/chat-e2e/src/tests/chatBarConversation.test.ts
@@ -758,7 +758,7 @@ dialTest(
           1,
         );
         await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderConversations.editFolderNameWithEnter(folderName);
+        await folderConversations.renameEmptyFolderWithEnter(folderName);
 
         await conversations.openEntityDropdownMenu(conversation.name);
         await conversationDropdownMenu.selectMenuOption(MenuOptions.moveTo);

diff --git a/apps/chat-e2e/src/tests/chatBarFolderConversation.test.ts b/apps/chat-e2e/src/tests/chatBarFolderConversation.test.ts
@@ -181,7 +181,7 @@ dialTest(
       ExpectedConstants.newFolderWithIndexTitle(randomFolderIndex),
     );
     await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-    await folderConversations.editFolderNameWithEnter(newNameWithSpaces);
+    await folderConversations.renameEmptyFolderWithEnter(newNameWithSpaces);
     await expect
       .soft(
         folderConversations.getFolderByName(newNameWithSpaces.trim()),
@@ -393,7 +393,9 @@ dialTest(
     await dialTest.step(
       'Edit folder name using tick button and verify it is renamed',
       async () => {
-        await folderConversations.editFolderNameWithTick(newFolderNameToSet);
+        await folderConversations.renameFolderWithContentWithTick(
+          newFolderNameToSet,
+        );
         await expect
           .soft(toast.getElementLocator(), ExpectedMessages.noErrorToastIsShown)
           .toBeHidden();

diff --git a/apps/chat-e2e/src/tests/compareMode.test.ts b/apps/chat-e2e/src/tests/compareMode.test.ts
@@ -264,9 +264,13 @@ dialTest(
           iconsToBeLoaded: [defaultModel.iconUrl],
         });
         await dialHomePage.waitForPageLoaded();
-        await conversations.selectConversation(modelConversation.name, {
-          exactMatch: true,
-        });
+        await conversations.selectConversation(
+          modelConversation.name,
+          { isHttpMethodTriggered: false },
+          {
+            exactMatch: true,
+          },
+        );
         await conversations.openEntityDropdownMenu(modelConversation.name, {
           exactMatch: true,
         });
@@ -613,11 +617,7 @@ dialTest(
           .soft(isComparedMessageRated, ExpectedMessages.chatMessageIsRated)
           .toBeTruthy();
 
-        await conversations.selectConversation(
-          firstConversation.name,
-          undefined,
-          { isHttpMethodTriggered: false },
-        );
+        await conversations.selectConversation(firstConversation.name);
         await chatMessages
           .getChatMessageRate(firstConversation.messages.length + 2, rate)
           .waitFor();
@@ -1374,11 +1374,7 @@ dialTest(
     await dialTest.step(
       'Switch to comparing conversation and verify Compare mode is closed',
       async () => {
-        await conversations.selectConversation(
-          firstConversation.name,
-          undefined,
-          { isHttpMethodTriggered: false },
-        );
+        await conversations.selectConversation(firstConversation.name);
         await expect
           .soft(compare.getElementLocator(), ExpectedMessages.compareModeClosed)
           .toBeHidden();

diff --git a/apps/chat-e2e/src/tests/conversationNameNumeration.test.ts b/apps/chat-e2e/src/tests/conversationNameNumeration.test.ts
@@ -339,7 +339,11 @@ dialTest(
     await dialTest.step(
       'Send one more request to "test" conversation and verify name is not changed',
       async () => {
-        await conversations.selectConversation(requestBasedConversationName, 2);
+        await conversations.selectConversation(
+          requestBasedConversationName,
+          { isHttpMethodTriggered: false },
+          2,
+        );
         await chat.sendRequestWithButton('1+2', false);
         expect
           .soft(

diff --git a/apps/chat-e2e/src/tests/duplicateSharedConversations.test.ts b/apps/chat-e2e/src/tests/duplicateSharedConversations.test.ts
@@ -162,8 +162,6 @@ dialSharedWithMeTest(
       async () => {
         await additionalShareUserSharedWithMeConversations.selectConversation(
           conversationName,
-          undefined,
-          { isHttpMethodTriggered: false },
         );
         await additionalShareUserChat.duplicateConversation();
         await additionalShareUserConversations

diff --git a/apps/chat-e2e/src/tests/folderNameNumeration.test.ts b/apps/chat-e2e/src/tests/folderNameNumeration.test.ts
@@ -115,7 +115,7 @@ dialTest(
       async () => {
         await folderConversations.openFolderDropdownMenu(incrementedFolderName);
         await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderConversations.editFolderNameWithTick(
+        await folderConversations.renameEmptyFolderWithTick(
           GeneratorUtil.randomString(5),
         );
 
@@ -173,7 +173,7 @@ dialTest(
           nestedFolders[nestedFolderLevel - 1].name,
         );
         await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderConversations.editFolderNameWithTick(
+        await folderConversations.renameFolderWithContentWithTick(
           expectedDuplicatedFolderName,
         );
 

diff --git a/apps/chat-e2e/src/tests/folderPrompts.test.ts b/apps/chat-e2e/src/tests/folderPrompts.test.ts
@@ -124,7 +124,7 @@ dialTest(
       'Select "Rename" option, set new name and verify folder is renamed',
       async () => {
         await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithEnter(newName);
+        await folderPrompts.renameEmptyFolderWithEnter(newName);
         await promptBarFolderAssertion.assertFolderState(
           { name: newName },
           'visible',
@@ -196,7 +196,7 @@ dialTest(
     await dialHomePage.waitForPageLoaded();
     await folderPrompts.openFolderDropdownMenu(promptInFolder.folders.name);
     await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-    await folderPrompts.editFolderNameWithTick(newName);
+    await folderPrompts.renameFolderWithContentWithTick(newName);
     await expect
       .soft(
         folderPrompts.getFolderByName(newName),

diff --git a/apps/chat-e2e/src/tests/messageTemplate.test.ts b/apps/chat-e2e/src/tests/messageTemplate.test.ts
@@ -1014,10 +1014,10 @@ dialTest(
       async () => {
         await conversations.selectConversation(
           replayName,
+          { isHttpMethodTriggered: false },
           {
             exactMatch: true,
           },
-          { isHttpMethodTriggered: false },
         );
         await chat.startReplay(
           simpleConversationMessage.messages[0].content,

diff --git a/apps/chat-e2e/src/tests/parametrizedReplay.test.ts b/apps/chat-e2e/src/tests/parametrizedReplay.test.ts
@@ -266,7 +266,9 @@ dialTest(
     await dialTest.step(
       'Export conversation and then delete all Dial entities',
       async () => {
-        await conversations.openEntityDropdownMenu(conversation.name, 2);
+        await conversations.openEntityDropdownMenu(conversation.name, {
+          exactMatch: true,
+        });
         await conversationDropdownMenu.selectMenuOption(MenuOptions.export);
         exportedData = await dialHomePage.downloadData(
           () =>

diff --git a/apps/chat-e2e/src/tests/promptFolderNamesakes.test.ts b/apps/chat-e2e/src/tests/promptFolderNamesakes.test.ts
@@ -41,7 +41,7 @@ dialTest(
         ExpectedConstants.newFolderWithIndexTitle(1),
       );
       await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-      await folderPrompts.editFolderNameWithTick(duplicatedFolderName);
+      await folderPrompts.renameEmptyFolderWithTick(duplicatedFolderName);
     });
 
     await dialTest.step(
@@ -51,7 +51,7 @@ dialTest(
           ExpectedConstants.newFolderWithIndexTitle(2),
         );
         await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithTick(duplicatedFolderName, {
+        await folderPrompts.renameEmptyFolderWithTick(duplicatedFolderName, {
           isHttpMethodTriggered: false,
         });
         const errorMessage = await toast.getElementContent();
@@ -205,7 +205,7 @@ dialTest(
         ExpectedConstants.newFolderWithIndexTitle(3),
       );
       await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-      await folderPrompts.editFolderNameWithTick(
+      await folderPrompts.renameEmptyFolderWithTick(
         ExpectedConstants.newFolderWithIndexTitle(2),
       );
     });

diff --git a/apps/chat-e2e/src/tests/promptFolderNumeration.test.ts b/apps/chat-e2e/src/tests/promptFolderNumeration.test.ts
@@ -163,7 +163,7 @@ dialTest(
           ExpectedConstants.newFolderWithIndexTitle(folderNumber),
         );
         await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithTick('Renamed Folder');
+        await folderPrompts.renameEmptyFolderWithTick('Renamed Folder');
 
         await promptBar.createNewFolder();
         await expect
@@ -209,7 +209,7 @@ dialTest(
         ExpectedConstants.newFolderWithIndexTitle(1),
       );
       await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-      await folderPrompts.editFolderNameWithTick(
+      await folderPrompts.renameEmptyFolderWithTick(
         ExpectedConstants.newPromptFolderWithIndexTitle(999),
       );
     });
@@ -285,7 +285,7 @@ dialTest(
           ExpectedConstants.newFolderWithIndexTitle(i),
         );
         await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithTick(duplicatedFolderName);
+        await folderPrompts.renameEmptyFolderWithTick(duplicatedFolderName);
         await expect(
           folderPrompts.getFolderByName(duplicatedFolderName, i),
           ExpectedMessages.folderNameUpdated,

diff --git a/apps/chat-e2e/src/tests/promptFoldersSpecialChars.test.ts b/apps/chat-e2e/src/tests/promptFoldersSpecialChars.test.ts
@@ -81,7 +81,7 @@ dialTest(
     });
 
     await dialTest.step('Rename it to contain special characters', async () => {
-      await folderPrompts.editFolderNameWithTick(newNameWithSpecialChars);
+      await folderPrompts.renameEmptyFolderWithTick(newNameWithSpecialChars);
       await promptBarFolderAssertion.assertFolderState(
         { name: newNameWithSpecialChars },
         'visible',
@@ -174,7 +174,7 @@ dialTest(
       async () => {
         await folderPrompts.openFolderDropdownMenu(expectedName);
         await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithTick(newNameWithEmojis);
+        await folderPrompts.renameEmptyFolderWithTick(newNameWithEmojis);
         await promptBarFolderAssertion.assertFolderState(
           { name: newNameWithEmojis },
           'visible',

diff --git a/apps/chat-e2e/src/tests/promptMaximumNameLength.test.ts b/apps/chat-e2e/src/tests/promptMaximumNameLength.test.ts
@@ -75,10 +75,6 @@ dialTest(
     await dialTest.step('Rename the prompt to a long name', async () => {
       await prompts.openEntityDropdownMenu(expectedName);
       await promptDropdownMenu.selectMenuOption(MenuOptions.edit);
-      await promptModalDialog.setField(
-        promptModalDialog.name,
-        nameUnder160Symbols,
-      );
       // Wait for the API request to update the prompt name
       await promptModalDialog.updatePromptDetailsWithButton(
         nameUnder160Symbols,
@@ -138,14 +134,14 @@ dialTest(
           ExpectedConstants.newPromptFolderWithIndexTitle(1),
         );
         await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithTick(longName);
+        await folderPrompts.renameEmptyFolderWithTick(longName);
 
         // Rename folder_child
         await folderPrompts.openFolderDropdownMenu(
           ExpectedConstants.newPromptFolderWithIndexTitle(2),
         );
         await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
-        await folderPrompts.editFolderNameWithTick(longName);
+        await folderPrompts.renameEmptyFolderWithTick(longName);
       },
     );