feat(chat-e2e): e2e publishing preparation

apps/chat-e2e/src/assertions/conversationAssertion.ts

@@ -6,15 +6,15 @@ import {
   TreeEntity,
 } from '@/src/testData';
 import { Colors, Styles } from '@/src/ui/domData';
-import { Conversations } from '@/src/ui/webElements';
+import { Conversations } from '@/src/ui/webElements/entityTree';
 import { expect } from '@playwright/test';
 
 export class ConversationAssertion extends SideBarEntityAssertion<Conversations> {
   public async assertReplayIconState(
     entity: TreeEntity,
     expectedState: ElementState,
   ) {
-    const entityIcon = this.sideBarEntities.getConversationReplayIcon(
+    const entityIcon = this.sideBarEntities.getEntityReplayIcon(
       entity.name,
       entity.index,
     );
@@ -33,7 +33,7 @@ export class ConversationAssertion extends SideBarEntityAssertion<Conversations>
   ) {
     await this.sideBarEntities.getEntityByName(conversationName).hover();
     const style = await this.sideBarEntities
-      .getConversationName(conversationName)
+      .getEntityName(conversationName)
       .getComputedStyleProperty(Styles.cursor);
     expect
       .soft(style[0], `Conversation cursor is ${expectedCursor}`)

apps/chat-e2e/src/assertions/folderAssertion.ts

@@ -1,6 +1,6 @@
 import { CheckboxState, ElementState, ExpectedMessages } from '@/src/testData';
 import { EntityType, TreeEntity } from '@/src/testData/types';
-import { Folders } from '@/src/ui/webElements';
+import { Folders } from '@/src/ui/webElements/entityTree';
 import { ThemesUtil } from '@/src/utils/themesUtil';
 import { expect } from '@playwright/test';
 

apps/chat-e2e/src/assertions/promptAssertion.ts

@@ -1,4 +1,4 @@
 import { SideBarEntityAssertion } from '@/src/assertions/sideBarEntityAssertion';
-import { Prompts } from '@/src/ui/webElements';
+import { Prompts } from '@/src/ui/webElements/entityTree';
 
 export class PromptAssertion extends SideBarEntityAssertion<Prompts> {}

apps/chat-e2e/src/assertions/sharedWithMePromptsAssertion.ts

@@ -1,6 +1,6 @@
 import { SideBarEntityAssertion } from '@/src/assertions/sideBarEntityAssertion';
 import { ExpectedMessages, TreeEntity } from '@/src/testData';
-import { SharedWithMePrompts } from '@/src/ui/webElements';
+import { SharedWithMePrompts } from '@/src/ui/webElements/entityTree';
 import { expect } from '@playwright/test';
 
 export class SharedWithMePromptsAssertion extends SideBarEntityAssertion<SharedWithMePrompts> {
@@ -9,7 +9,7 @@ export class SharedWithMePromptsAssertion extends SideBarEntityAssertion<SharedW
     expectedColor: string,
   ) {
     const entityBackgroundColor =
-      await this.sideBarEntities.getSharedPromptBackgroundColor(
+      await this.sideBarEntities.getEntityBackgroundColor(
         entity.name,
         entity.index,
       );

apps/chat-e2e/src/assertions/sideBarEntityAssertion.ts

@@ -5,7 +5,7 @@ import {
   ExpectedMessages,
   TreeEntity,
 } from '@/src/testData';
-import { SideBarEntities } from '@/src/ui/webElements/sideBarEntities';
+import { SideBarEntities } from '@/src/ui/webElements/entityTree/sidebar/sideBarEntities';
 import { ThemesUtil } from '@/src/utils/themesUtil';
 import { expect } from '@playwright/test';
 

apps/chat-e2e/src/core/dialFixtures.ts

@@ -9,9 +9,7 @@ import {
   ChatNotFound,
   ConversationSettings,
   ConversationToCompare,
-  Conversations,
   EntitySelector,
-  Folders,
   MoreInfo,
   PromptBar,
   SelectFolderModal,
@@ -69,12 +67,16 @@ import { ConfirmationDialog } from '@/src/ui/webElements/confirmationDialog';
 import { DropdownCheckboxMenu } from '@/src/ui/webElements/dropdownCheckboxMenu';
 import { DropdownMenu } from '@/src/ui/webElements/dropdownMenu';
 import { EntitySettings } from '@/src/ui/webElements/entitySettings';
+import {
+  Conversations,
+  FolderConversations,
+  FolderPrompts,
+  Folders,
+  Prompts,
+} from '@/src/ui/webElements/entityTree';
 import { ErrorPopup } from '@/src/ui/webElements/errorPopup';
 import { ErrorToast } from '@/src/ui/webElements/errorToast';
 import { Filter } from '@/src/ui/webElements/filter';
-import { FolderConversations } from '@/src/ui/webElements/folderConversations';
-import { FolderFiles } from '@/src/ui/webElements/folderFiles';
-import { FolderPrompts } from '@/src/ui/webElements/folderPrompts';
 import { GroupEntity } from '@/src/ui/webElements/groupEntity';
 import { Header } from '@/src/ui/webElements/header';
 import { ImportExportLoader } from '@/src/ui/webElements/importExportLoader';
@@ -83,7 +85,7 @@ import { ModelSelector } from '@/src/ui/webElements/modelSelector';
 import { ModelsDialog } from '@/src/ui/webElements/modelsDialog';
 import { PlaybackControl } from '@/src/ui/webElements/playbackControl';
 import { PromptModalDialog } from '@/src/ui/webElements/promptModalDialog';
-import { Prompts } from '@/src/ui/webElements/prompts';
+import { PublishingRequestModal } from '@/src/ui/webElements/publishingRequestModal';
 import { RecentEntities } from '@/src/ui/webElements/recentEntities';
 import { ReplayAsIs } from '@/src/ui/webElements/replayAsIs';
 import { Search } from '@/src/ui/webElements/search';
@@ -190,9 +192,10 @@ const dialTest = test.extend<
     attachFilesModal: AttachFilesModal;
     uploadFromDeviceModal: UploadFromDeviceModal;
     selectFolderModal: SelectFolderModal;
-    selectUploadFolder: Folders;
-    attachedAllFiles: FolderFiles;
+    selectFolders: Folders;
+    attachedAllFiles: Folders;
     settingsModal: SettingsModal;
+    publishingModal: PublishingRequestModal;
     conversationAssertion: ConversationAssertion;
     chatBarFolderAssertion: FolderAssertion;
     errorToastAssertion: ErrorToastAssertion;
@@ -616,18 +619,22 @@ const dialTest = test.extend<
     const selectFolderModal = new SelectFolderModal(page);
     await use(selectFolderModal);
   },
-  selectUploadFolder: async ({ selectFolderModal }, use) => {
-    const selectUploadFolder = selectFolderModal.getUploadFolder();
+  selectFolders: async ({ selectFolderModal }, use) => {
+    const selectUploadFolder = selectFolderModal.getSelectFolders();
     await use(selectUploadFolder);
   },
   attachedAllFiles: async ({ attachFilesModal }, use) => {
-    const attachedAllFiles = attachFilesModal.getFolderFiles();
+    const attachedAllFiles = attachFilesModal.getAllFolderFiles();
     await use(attachedAllFiles);
   },
   settingsModal: async ({ page }, use) => {
     const settingsModal = new SettingsModal(page);
     await use(settingsModal);
   },
+  publishingModal: async ({ page }, use) => {
+    const publishingModal = new PublishingRequestModal(page);
+    await use(publishingModal);
+  },
   conversationAssertion: async ({ conversations }, use) => {
     const conversationAssertion = new ConversationAssertion(conversations);
     await use(conversationAssertion);

apps/chat-e2e/src/core/dialSharedWithMeFixtures.ts

@@ -9,18 +9,14 @@ import {
   ConfirmationDialog,
   ConversationSettings,
   ConversationToCompare,
-  Conversations,
   DropdownMenu,
   EntitySelector,
   EntitySettings,
   ErrorToast,
-  FolderPrompts,
   PromptBar,
   PromptModalDialog,
-  Prompts,
   RecentEntities,
   SendMessage,
-  SharedFolderPrompts,
   SharedPromptPreviewModal,
   VariableModalDialog,
 } from '../ui/webElements';
@@ -41,10 +37,16 @@ import dialTest, { stateFilePath } from '@/src/core/dialFixtures';
 import { LocalStorageManager } from '@/src/core/localStorageManager';
 import { AppContainer } from '@/src/ui/webElements/appContainer';
 import { ChatNotFound } from '@/src/ui/webElements/chatNotFound';
+import {
+  Conversations,
+  FolderPrompts,
+  Prompts,
+  SharedFolderPrompts,
+} from '@/src/ui/webElements/entityTree';
+import { SharedFolderConversations } from '@/src/ui/webElements/entityTree/sidebar/sharedFolderConversations';
+import { SharedWithMeConversations } from '@/src/ui/webElements/entityTree/sidebar/sharedWithMeConversations';
+import { SharedWithMePrompts } from '@/src/ui/webElements/entityTree/sidebar/sharedWithMePrompts';
 import { PlaybackControl } from '@/src/ui/webElements/playbackControl';
-import { SharedFolderConversations } from '@/src/ui/webElements/sharedFolderConversations';
-import { SharedWithMeConversations } from '@/src/ui/webElements/sharedWithMeConversations';
-import { SharedWithMePrompts } from '@/src/ui/webElements/sharedWithMePrompts';
 import { BucketUtil } from '@/src/utils';
 import { Page } from '@playwright/test';
 

apps/chat-e2e/src/tests/chatBarConversation.test.ts

@@ -125,7 +125,7 @@ dialTest(
         await dialHomePage.openHomePage();
         await dialHomePage.waitForPageLoaded();
         const chatNameOverflow = await conversations
-          .getConversationName(conversationName)
+          .getEntityName(conversationName)
           .getComputedStyleProperty(Styles.text_overflow);
         expect
           .soft(chatNameOverflow[0], ExpectedMessages.chatNameIsTruncated)
@@ -138,7 +138,7 @@ dialTest(
       async () => {
         await conversations.getEntityByName(conversationName).hover();
         const chatNameOverflow = await conversations
-          .getConversationName(conversationName)
+          .getEntityName(conversationName)
           .getComputedStyleProperty(Styles.text_overflow);
         expect
           .soft(chatNameOverflow[0], ExpectedMessages.chatNameIsTruncated)
@@ -152,7 +152,7 @@ dialTest(
         await conversations.openEntityDropdownMenu(conversationName);
         await conversationDropdownMenu.selectMenuOption(MenuOptions.rename);
         const chatNameOverflow = await conversations
-          .getConversationName(conversationName)
+          .getEntityName(conversationName)
           .getComputedStyleProperty(Styles.text_overflow);
         expect
           .soft(chatNameOverflow[0], ExpectedMessages.chatNameIsTruncated)
@@ -180,7 +180,7 @@ dialTest(
         await conversations.openEntityDropdownMenu(conversationName);
         await conversationDropdownMenu.selectMenuOption(MenuOptions.delete);
         const chatNameOverflow = await conversations
-          .getConversationName(conversationName)
+          .getEntityName(conversationName)
           .getComputedStyleProperty(Styles.text_overflow);
         expect
           .soft(chatNameOverflow[0], ExpectedMessages.chatNameIsTruncated)
@@ -217,7 +217,7 @@ dialTest(
       .toBeVisible();
 
     const chatNameOverflow = await conversations
-      .getConversationName(newName)
+      .getEntityName(newName)
       .getComputedStyleProperty(Styles.text_overflow);
     expect
       .soft(chatNameOverflow[0], ExpectedMessages.chatNameIsTruncated)
@@ -287,7 +287,7 @@ dialTest(
       )
       .toBeHidden();
     const actualName = await conversations
-      .getConversationName(expectedName)
+      .getEntityName(expectedName)
       .getElementInnerContent();
     expect
       .soft(actualName, ExpectedMessages.conversationNameUpdated)
@@ -1369,7 +1369,7 @@ for (const [request, expectedConversationName] of testRequestMap.entries()) {
           await sendMessage.send(request);
 
           const actualConversationName = await conversations
-            .getConversationName(expectedConversationName)
+            .getEntityName(expectedConversationName)
             .getElementInnerContent();
           expect
             .soft(

apps/chat-e2e/src/tests/chatBarFolderConversation.test.ts

@@ -825,7 +825,7 @@ dialTest(
           .getEntityByName(firstConversation.name)
           .click({ button: 'right' });
         await conversationDropdownMenuAssertion.assertMenuState('visible');
-        await conversations.getConversationName(firstConversation.name).click();
+        await conversations.getEntityName(firstConversation.name).click();
 
         // Folder context menu
         await folderConversations

apps/chat-e2e/src/tests/conversationWithAttachment.test.ts

@@ -349,7 +349,8 @@ dialTest(
       async () => {
         await attachFilesModal.checkAttachedFile(Attachment.longImageName);
         const attachmentNameOverflow = await attachFilesModal
-          .attachedFileName(Attachment.longImageName)
+          .getAllFiles()
+          .getEntityName(Attachment.longImageName)
           .getComputedStyleProperty(Styles.text_overflow);
         expect
           .soft(

apps/chat-e2e/src/tests/editConversationWithAttachment.test.ts

@@ -148,13 +148,16 @@ dialTest(
           UploadMenuOptions.attachUploadedFiles,
         );
         for (const file of initAttachedFiles) {
-          const isFileChecked = attachFilesModal.attachedFileCheckBox(file);
+          const isFileChecked = attachFilesModal
+            .getAllFiles()
+            .getEntityCheckbox(file);
           await expect
             .soft(isFileChecked, ExpectedMessages.attachmentFileIsChecked)
             .toBeChecked();
 
           const fileNameColor = await attachFilesModal
-            .attachedFileName(file)
+            .getAllFiles()
+            .getEntityName(file)
             .getComputedStyleProperty(Styles.color);
           expect
             .soft(fileNameColor[0], ExpectedMessages.attachmentNameColorIsValid)

apps/chat-e2e/src/tests/errorUploadFromDevice.test.ts

@@ -147,12 +147,15 @@ dialTest(
         await uploadFromDeviceModal.uploadButton.click();
         await expect
           .soft(
-            attachFilesModal.attachedFile(Attachment.sunImageName),
+            attachFilesModal
+              .getAllFiles()
+              .getEntityByName(Attachment.sunImageName),
             ExpectedMessages.fileIsUploaded,
           )
           .toBeVisible();
         const attachmentNameColor = await attachFilesModal
-          .attachedFileName(Attachment.sunImageName)
+          .getAllFiles()
+          .getEntityName(Attachment.sunImageName)
           .getComputedStyleProperty(Styles.color);
         expect
           .soft(
@@ -314,14 +317,16 @@ dialTest(
         await uploadFromDeviceModal.uploadFiles();
         await expect
           .soft(
-            attachFilesModal.attachedFile(Attachment.fileWithoutExtension),
+            attachFilesModal
+              .getAllFiles()
+              .getEntityByName(Attachment.fileWithoutExtension),
             ExpectedMessages.fileIsAttached,
           )
           .toBeVisible();
 
-        const isFileChecked = attachFilesModal.attachedFileCheckBox(
-          Attachment.fileWithoutExtension,
-        );
+        const isFileChecked = attachFilesModal
+          .getAllFiles()
+          .getEntityCheckbox(Attachment.fileWithoutExtension);
         await expect
           .soft(isFileChecked, ExpectedMessages.attachmentFileIsChecked)
           .toBeChecked();