From 10fe399bd056c35886dc8a8940131aa7560e53d6 Mon Sep 17 00:00:00 2001
From: Alexander Platov <alexander.platov@hardcoreeng.com>
Date: Mon, 29 Jul 2024 08:23:52 +0300
Subject: [PATCH 1/6] Updated Server Manager layout (#6158)

Signed-off-by: Alexander Platov <alexander.platov@hardcoreeng.com>
---
 .../src/components/ServerManager.svelte       | 79 +++++++++++--------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/plugins/workbench-resources/src/components/ServerManager.svelte b/plugins/workbench-resources/src/components/ServerManager.svelte
index 5cd23b629f..80700cbc5c 100644
--- a/plugins/workbench-resources/src/components/ServerManager.svelte
+++ b/plugins/workbench-resources/src/components/ServerManager.svelte
@@ -10,9 +10,13 @@
   import ServerManagerGeneral from './ServerManagerGeneral.svelte'
 
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { Panel, TabItem, TabList } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+  import presentation from '@hcengineering/presentation'
+  import { Header, TabItem, Switcher, Breadcrumb, IconSettings, ButtonIcon, IconClose } from '@hcengineering/ui'
   import ServerManagerAccountStatistics from './ServerManagerAccountStatistics.svelte'
 
+  const dispatch = createEventDispatcher()
+
   const tabs: TabItem[] = [
     {
       id: 'general',
@@ -42,35 +46,46 @@
   let selectedTab: string | number = tabs[0].id
 </script>
 
-<Panel on:close isFullSize useMaxWidth={true}>
-  <svelte:fragment slot="title">
-    <span class="p-3"> Server manager </span>
-    <TabList
-      items={tabs}
-      bind:selected={selectedTab}
-      kind={'separated'}
-      on:select={(result) => {
-        selectedTab = result.detail.id
-      }}
-    />
-  </svelte:fragment>
-  {#if selectedTab === 'general'}
-    <ServerManagerGeneral />
-  {:else if selectedTab === 'users'}
-    <ServerManagerUsers />
-  {:else if selectedTab === 'statistics'}
-    <ServerManagerServerStatistics />
-  {:else if selectedTab === 'statistics-front'}
-    <ServerManagerFrontStatistics />
-  {:else if selectedTab === 'statistics-collab'}
-    <ServerManagerCollaboratorStatistics />
-  {:else if selectedTab === 'account'}
-    <ServerManagerAccountStatistics />
-  {/if}
-</Panel>
+<div class="hulyComponent">
+  <Header type={'type-panel'} freezeBefore>
+    <svelte:fragment slot="beforeTitle">
+      <ButtonIcon
+        icon={IconClose}
+        kind={'secondary'}
+        size={'small'}
+        tooltip={{ label: presentation.string.Close }}
+        on:click={() => dispatch('close')}
+      />
+    </svelte:fragment>
 
-<style lang="scss">
-  .greyed {
-    color: rgba(black, 0.5);
-  }
-</style>
+    <Breadcrumb icon={IconSettings} title={'Server manager'} size={'large'} isCurrent />
+
+    <svelte:fragment slot="actions">
+      <Switcher
+        name={'swManagerMode'}
+        items={tabs}
+        bind:selected={selectedTab}
+        kind={'subtle'}
+        on:select={(result) => {
+          selectedTab = result.detail.id
+        }}
+      />
+    </svelte:fragment>
+  </Header>
+
+  <div class="hulyComponent-content__column content">
+    {#if selectedTab === 'general'}
+      <ServerManagerGeneral />
+    {:else if selectedTab === 'users'}
+      <ServerManagerUsers />
+    {:else if selectedTab === 'statistics'}
+      <ServerManagerServerStatistics />
+    {:else if selectedTab === 'statistics-front'}
+      <ServerManagerFrontStatistics />
+    {:else if selectedTab === 'statistics-collab'}
+      <ServerManagerCollaboratorStatistics />
+    {:else if selectedTab === 'account'}
+      <ServerManagerAccountStatistics />
+    {/if}
+  </div>
+</div>

From d1ef98cf873ee40e684359146192f8e539b3a8e5 Mon Sep 17 00:00:00 2001
From: Alexander Platov <alexander.platov@hardcoreeng.com>
Date: Mon, 29 Jul 2024 08:24:41 +0300
Subject: [PATCH 2/6] Fixed Scrollbar in Filters, presenters and adjusted tests
 (#6160)

Signed-off-by: Alexander Platov <alexander.platov@hardcoreeng.com>
---
 packages/theme/styles/popups.scss             |  1 -
 packages/ui/src/components/Button.svelte      |  2 ++
 .../src/components/NotificationToast.svelte   |  6 ++--
 .../components/ActivityMessageAction.svelte   |  6 ++--
 .../components/ActivityMessageActions.svelte  | 12 ++++---
 .../components/state/StatePresenter.svelte    |  4 +--
 .../components/state/StateRefPresenter.svelte |  2 +-
 .../src/components/Templates.svelte           |  3 +-
 .../src/components/TextActionButton.svelte    |  1 +
 .../src/components/DueDateEditor.svelte       |  1 +
 .../src/components/ObjectPresenter.svelte     |  4 +--
 .../custom-atributes/class-properties-page.ts |  2 +-
 tests/sanity/tests/model/channel-page.ts      | 32 ++++++++++++++-----
 .../model/documents/document-content-page.ts  |  2 +-
 .../tests/model/planning/planning-page.ts     |  8 ++---
 .../sanity/tests/model/tracker/issues-page.ts | 11 +++++--
 16 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/packages/theme/styles/popups.scss b/packages/theme/styles/popups.scss
index 31e5ae1f23..aab96f82ca 100644
--- a/packages/theme/styles/popups.scss
+++ b/packages/theme/styles/popups.scss
@@ -194,7 +194,6 @@
     height: max-content;
     overflow-x: hidden;
     overflow-y: auto;
-    scrollbar-width: thin;
 
     &::-webkit-scrollbar { width: 0; }
     .box {
diff --git a/packages/ui/src/components/Button.svelte b/packages/ui/src/components/Button.svelte
index 5812b007b7..9c44f0692d 100644
--- a/packages/ui/src/components/Button.svelte
+++ b/packages/ui/src/components/Button.svelte
@@ -57,6 +57,7 @@
   export let title: string | undefined = undefined
   export let borderStyle: 'solid' | 'dashed' | 'none' = 'solid'
   export let id: string | undefined = undefined
+  export let dataId: string | undefined = undefined
   export let input: HTMLButtonElement | undefined = undefined
   export let showTooltip: LabelAndProps | undefined = undefined
   export let short: boolean = false
@@ -154,6 +155,7 @@
   on:mousemove
   on:mouseleave
   {id}
+  data-id={dataId}
 >
   {#if icon && !loading}
     <div class="btn-icon pointer-events-none" class:resetIconSize={resetIconSize === 'icon'}>
diff --git a/packages/ui/src/components/NotificationToast.svelte b/packages/ui/src/components/NotificationToast.svelte
index aba306a501..0a6b7a3777 100644
--- a/packages/ui/src/components/NotificationToast.svelte
+++ b/packages/ui/src/components/NotificationToast.svelte
@@ -43,7 +43,7 @@
   $: icon = getIcon()
 </script>
 
-<div class="root" in:fade out:fade>
+<div class="notifyPopup" in:fade out:fade>
   <div class="flex-between">
     <div class="flex-row-center">
       {#if icon}
@@ -60,7 +60,7 @@
       <span class="overflow-label fs-bold text-base caption-color">{title}</span>
     </div>
     {#if onClose !== undefined}
-      <Button icon={Close} kind="ghost" size="small" on:click={onClose} />
+      <Button icon={Close} kind="ghost" size="small" dataId={'btnNotifyClose'} on:click={onClose} />
     {/if}
   </div>
 
@@ -76,7 +76,7 @@
 </div>
 
 <style lang="scss">
-  .root {
+  .notifyPopup {
     overflow: hidden;
     display: flex;
     flex-direction: column;
diff --git a/plugins/activity-resources/src/components/ActivityMessageAction.svelte b/plugins/activity-resources/src/components/ActivityMessageAction.svelte
index 52e687427c..5ca696292a 100644
--- a/plugins/activity-resources/src/components/ActivityMessageAction.svelte
+++ b/plugins/activity-resources/src/components/ActivityMessageAction.svelte
@@ -22,7 +22,8 @@
   export let iconProps: any | undefined = undefined
   export let size: IconSize = 'small'
   export let action: (ev: MouseEvent) => Promise<void> | void = async () => {}
-  export let opened = false
+  export let opened: boolean = false
+  export let dataId: string | undefined = undefined
 
   function onClick (ev: MouseEvent): void {
     ev.stopPropagation()
@@ -38,6 +39,7 @@
   size="small"
   kind="tertiary"
   pressed={opened}
-  on:click={onClick}
+  {dataId}
   tooltip={{ label }}
+  on:click={onClick}
 />
diff --git a/plugins/activity-resources/src/components/ActivityMessageActions.svelte b/plugins/activity-resources/src/components/ActivityMessageActions.svelte
index d64271c98b..a0e941d563 100644
--- a/plugins/activity-resources/src/components/ActivityMessageActions.svelte
+++ b/plugins/activity-resources/src/components/ActivityMessageActions.svelte
@@ -79,7 +79,7 @@
 </script>
 
 {#if message}
-  <div class="root">
+  <div class="activityMessage-actionPopup">
     {#each inlineActions as inline}
       {#if inline.icon}
         {#await getResource(inline.action) then action}
@@ -88,6 +88,7 @@
             size={inline.actionProps?.size ?? 'small'}
             icon={inline.icon}
             iconProps={inline.actionProps?.iconProps}
+            dataId={inline._id}
             action={(ev) => action(message, ev, { onOpen, onClose })}
           />
         {/await}
@@ -96,18 +97,19 @@
 
     {#if withActionMenu}
       <ActivityMessageAction
-        size="small"
         icon={IconMoreV}
-        opened={isActionMenuOpened}
-        action={showMenu}
         label={view.string.MoreActions}
+        size={'small'}
+        opened={isActionMenuOpened}
+        dataId={'btnMoreActions'}
+        action={showMenu}
       />
     {/if}
   </div>
 {/if}
 
 <style lang="scss">
-  .root {
+  .activityMessage-actionPopup {
     display: flex;
     align-items: center;
     border-radius: 0.375rem;
diff --git a/plugins/task-resources/src/components/state/StatePresenter.svelte b/plugins/task-resources/src/components/state/StatePresenter.svelte
index bb2ac2acda..2c146f0938 100644
--- a/plugins/task-resources/src/components/state/StatePresenter.svelte
+++ b/plugins/task-resources/src/components/state/StatePresenter.svelte
@@ -41,12 +41,12 @@
   export let shouldShowAvatar = true
   export let inline: boolean = false
   export let disabled: boolean = false
-  export let oneLine: boolean = false
+  export let oneLine: boolean = true
   export let shouldShowName: boolean = true
   export let shouldShowTooltip: boolean = false
   export let noUnderline: boolean = false
   export let accent: boolean = false
-  export let shrink: number = 0
+  export let shrink: number = 1
   export let space: Ref<Project> | undefined = undefined
   export let projectType: Ref<ProjectType> | undefined = $selectedTypeStore
   export let taskType: Ref<TaskType> | undefined = undefined
diff --git a/plugins/task-resources/src/components/state/StateRefPresenter.svelte b/plugins/task-resources/src/components/state/StateRefPresenter.svelte
index 2cff463dc6..e256c95e5b 100644
--- a/plugins/task-resources/src/components/state/StateRefPresenter.svelte
+++ b/plugins/task-resources/src/components/state/StateRefPresenter.svelte
@@ -27,7 +27,7 @@
   export let kind: ButtonKind = 'link'
   export let size: ButtonSize = 'medium'
   export let shouldShowName: boolean = true
-  export let shrink: number = 0
+  export let shrink: number = 1
   export let disabled: boolean = false
 
   import { selectedTaskTypeStore, selectedTypeStore } from '../../index'
diff --git a/plugins/templates-resources/src/components/Templates.svelte b/plugins/templates-resources/src/components/Templates.svelte
index 634e83fefd..7605a9d882 100644
--- a/plugins/templates-resources/src/components/Templates.svelte
+++ b/plugins/templates-resources/src/components/Templates.svelte
@@ -162,7 +162,7 @@
 
   <div class="hulyComponent-content__container columns">
     <div class="hulyComponent-content__column">
-      <div id="create-template" class="flex-between trans-title m-3">
+      <div id="create-template" class="flex-between trans-title flex-no-shrink bottom-divider p-3">
         <Button
           icon={templatesPlugin.icon.Template}
           label={templatesPlugin.string.CreateTemplate}
@@ -179,6 +179,7 @@
             label={getEmbeddedLabel(space.name)}
             actions={async () => await getSpaceActions(space)}
             isFold
+            noDivider
             empty={getTemps.length === 0}
           >
             {#each getTemps as t (t._id)}
diff --git a/plugins/text-editor-resources/src/components/TextActionButton.svelte b/plugins/text-editor-resources/src/components/TextActionButton.svelte
index 543888d752..f49c779d10 100644
--- a/plugins/text-editor-resources/src/components/TextActionButton.svelte
+++ b/plugins/text-editor-resources/src/components/TextActionButton.svelte
@@ -66,6 +66,7 @@
   class:selected
   use:tooltip={{ label: action.label }}
   tabindex="0"
+  data-id={'btn' + action.label.split(':').pop()}
   on:click|preventDefault|stopPropagation={handleClick}
 >
   <Icon icon={action.icon} {size} />
diff --git a/plugins/time-resources/src/components/DueDateEditor.svelte b/plugins/time-resources/src/components/DueDateEditor.svelte
index 7451920805..0dbe5e3bb0 100644
--- a/plugins/time-resources/src/components/DueDateEditor.svelte
+++ b/plugins/time-resources/src/components/DueDateEditor.svelte
@@ -55,6 +55,7 @@
   type="type-button"
   icon={time.icon.Calendar}
   iconSize="small"
+  id={'dueDateButton'}
   title={buttonTitle}
   label={buttonLabel}
   pressed={opened}
diff --git a/plugins/view-resources/src/components/ObjectPresenter.svelte b/plugins/view-resources/src/components/ObjectPresenter.svelte
index f560fa591d..f42c78bf80 100644
--- a/plugins/view-resources/src/components/ObjectPresenter.svelte
+++ b/plugins/view-resources/src/components/ObjectPresenter.svelte
@@ -27,10 +27,10 @@
   export let accent: boolean = false
   export let colorInherit: boolean = false
   export let shouldShowAvatar: boolean = true
-  export let noUnderline: boolean = false
+  export let noUnderline: boolean = true
   export let disabled: boolean = false
   export let shouldShowName: boolean = true
-  export let shrink: number = 0
+  export let shrink: number = 1
   export let exact = false
 
   const client = getClient()
diff --git a/tests/sanity/tests/custom-atributes/class-properties-page.ts b/tests/sanity/tests/custom-atributes/class-properties-page.ts
index 8275ec1704..741010b2e1 100644
--- a/tests/sanity/tests/custom-atributes/class-properties-page.ts
+++ b/tests/sanity/tests/custom-atributes/class-properties-page.ts
@@ -31,7 +31,7 @@ export class ClassProperties {
   inputName = (): Locator => this.page.getByPlaceholder('Name')
   createButton = (): Locator => this.page.getByRole('button', { name: 'Create' })
   enterTextString = (): Locator => this.page.getByPlaceholder('Type text...')
-  confirmChange = (): Locator => this.page.locator('.ml-2 > .antiButton')
+  confirmChange = (): Locator => this.page.locator('.selectPopup button')
 
   async selectDataType (dataType: DataType): Promise<void> {
     switch (dataType) {
diff --git a/tests/sanity/tests/model/channel-page.ts b/tests/sanity/tests/model/channel-page.ts
index 442a772b38..7226e1c78a 100644
--- a/tests/sanity/tests/model/channel-page.ts
+++ b/tests/sanity/tests/model/channel-page.ts
@@ -14,17 +14,33 @@ export class ChannelPage {
   readonly channelTab = (): Locator => this.page.getByRole('link', { name: 'Channels' }).getByRole('button')
   readonly channelTable = (): Locator => this.page.getByRole('table')
   readonly channel = (channel: string): Locator => this.page.getByRole('button', { name: channel })
+  readonly channelNameOnDetail = (channel: string): Locator =>
+    this.page
+      .locator('span.labelOnPanel', { hasText: 'Name' })
+      .locator('xpath=following-sibling::div[1]')
+      .locator('button', { hasText: channel })
+
   readonly chooseChannel = (channel: string): Locator => this.page.getByRole('button', { name: channel })
-  readonly closePopupWindow = (): Locator => this.page.locator('.root > div > .antiButton').first()
+  readonly closePopupWindow = (): Locator => this.page.locator('.notifyPopup button[data-id="btnNotifyClose"]')
   readonly openAddMemberToChannel = (userName: string): Locator => this.page.getByRole('button', { name: userName })
   readonly addMemberToChannelButton = (userName: string): Locator => this.page.getByText(userName)
   readonly joinChannelButton = (): Locator => this.page.getByRole('button', { name: 'Join' })
-  readonly addEmojiButton = (): Locator => this.page.locator('.root > button').first()
+  readonly addEmojiButton = (): Locator =>
+    this.page.locator('.activityMessage-actionPopup > button[data-id$="AddReactionAction"]')
+
   readonly selectEmoji = (emoji: string): Locator => this.page.getByText(emoji)
-  readonly saveMessageButton = (): Locator => this.page.locator('.root > button:nth-child(2)')
-  readonly pinMessageButton = (): Locator => this.page.locator('.root > button:nth-child(3)')
-  readonly replyButton = (): Locator => this.page.locator('.root > button:nth-child(4)')
-  readonly openMoreButton = (): Locator => this.page.locator('.root > button:nth-child(5)')
+  readonly saveMessageButton = (): Locator =>
+    this.page.locator('.activityMessage-actionPopup > button[data-id$="SaveForLaterAction"]')
+
+  readonly pinMessageButton = (): Locator =>
+    this.page.locator('.activityMessage-actionPopup > button[data-id$="PinMessageAction"]')
+
+  readonly replyButton = (): Locator =>
+    this.page.locator('.activityMessage-actionPopup > button[data-id$="ReplyToThreadAction"]')
+
+  readonly openMoreButton = (): Locator =>
+    this.page.locator('.activityMessage-actionPopup > button[data-id="btnMoreActions"]')
+
   readonly messageSaveMarker = (): Locator => this.page.locator('.saveMarker')
   readonly saveMessageTab = (): Locator => this.page.getByRole('button', { name: 'Saved' })
   readonly pinnedMessageButton = (): Locator => this.page.getByRole('button', { name: 'pinned' })
@@ -36,7 +52,7 @@ export class ChannelPage {
   readonly deleteMessageButton = (): Locator => this.page.getByRole('button', { name: 'Delete' })
   readonly updateButton = (): Locator => this.page.getByRole('button', { name: 'Update' })
   readonly openChannelDetails = (): Locator => this.page.locator('.hulyHeader-buttonsGroup > .antiButton')
-  readonly changeChannelNameConfirm = (): Locator => this.page.locator('.ml-2 > .antiButton')
+  readonly changeChannelNameConfirm = (): Locator => this.page.locator('.selectPopup button')
   readonly privateOrPublicChangeButton = (change: string, autoJoin: boolean): Locator =>
     this.page
       .locator('span.labelOnPanel', { hasText: autoJoin ? 'Auto join' : 'Private' })
@@ -64,7 +80,7 @@ export class ChannelPage {
   }
 
   async changeChannelName (channel: string): Promise<void> {
-    await this.channel(channel).nth(2).click()
+    await this.channelNameOnDetail(channel).click()
     await this.page.keyboard.type('New Channel Name')
     await this.changeChannelNameConfirm().click()
   }
diff --git a/tests/sanity/tests/model/documents/document-content-page.ts b/tests/sanity/tests/model/documents/document-content-page.ts
index 363eca9346..5d6de50ea6 100644
--- a/tests/sanity/tests/model/documents/document-content-page.ts
+++ b/tests/sanity/tests/model/documents/document-content-page.ts
@@ -11,7 +11,7 @@ export class DocumentContentPage extends CommonPage {
 
   readonly buttonDocumentTitle = (): Locator => this.page.locator('div[class*="main-content"] div.title input')
   readonly inputContent = (): Locator => this.page.locator('div.textInput div.tiptap')
-  readonly buttonToolbarLink = (): Locator => this.page.locator('div.text-editor-toolbar button:nth-child(10)')
+  readonly buttonToolbarLink = (): Locator => this.page.locator('div.text-editor-toolbar button[data-id="btnLink"]')
   readonly inputFormLink = (): Locator => this.page.locator('form[id="text-editor:string:Link"] input')
   readonly buttonFormLinkSave = (): Locator =>
     this.page.locator('form[id="text-editor:string:Link"] button[type="submit"]')
diff --git a/tests/sanity/tests/model/planning/planning-page.ts b/tests/sanity/tests/model/planning/planning-page.ts
index f5b1f14947..7f7e36406f 100644
--- a/tests/sanity/tests/model/planning/planning-page.ts
+++ b/tests/sanity/tests/model/planning/planning-page.ts
@@ -21,12 +21,8 @@ export class PlanningPage extends CalendarPage {
   readonly inputPopupCreateTitle = (): Locator => this.popup().locator('input[type="text"]')
   readonly inputPopupCreateDescription = (): Locator => this.popup().locator('div.tiptap')
   readonly inputPanelCreateDescription = (): Locator => this.panel().locator('div.tiptap')
-  readonly buttonPopupCreateDueDate = (): Locator =>
-    this.popup().locator('div.block:first-child div.flex-row-center button:nth-child(3)')
-
-  readonly buttonPanelCreateDueDate = (): Locator =>
-    this.panel().locator('div.slots-content div.flex-row-top.justify-between div.flex-row-center button:first-child')
-
+  readonly buttonPopupCreateDueDate = (): Locator => this.popup().locator('button#dueDateButton')
+  readonly buttonPanelCreateDueDate = (): Locator => this.panel().locator('button#dueDateButton')
   readonly buttonPopupCreatePriority = (): Locator => this.popup().locator('button#priorityButton')
   readonly buttonPanelCreatePriority = (): Locator => this.panel().locator('button#priorityButton')
   readonly buttonPopupCreateVisible = (): Locator => this.popup().locator('button#visibleButton')
diff --git a/tests/sanity/tests/model/tracker/issues-page.ts b/tests/sanity/tests/model/tracker/issues-page.ts
index 5a589f495c..f1004db822 100644
--- a/tests/sanity/tests/model/tracker/issues-page.ts
+++ b/tests/sanity/tests/model/tracker/issues-page.ts
@@ -113,7 +113,12 @@ export class IssuesPage extends CommonTrackerPage {
   createdTab = (): Locator => this.page.locator('[data-id="tab-created"]')
   subscribedTab = (): Locator => this.page.locator('[data-id="tab-subscribed"]')
   issueListPanel = (): Locator => this.page.locator('.hulyComponent')
-  notTrackButton = (): Locator => this.page.locator('button:has-text("Appleseed John") >> nth=1')
+  notTrackButton = (): Locator =>
+    this.page
+      .locator('span.labelOnPanel', { hasText: 'Collaborators' })
+      .locator('xpath=following-sibling::div[1]')
+      .locator('button')
+
   selectPopup = (): Locator => this.page.locator('.selectPopup >> button:has-text("Appleseed John")')
   notificationTimeoutSetting = (timeout: string): Promise<void> => {
     return this.page.evaluate((timeout) => {
@@ -136,7 +141,7 @@ export class IssuesPage extends CommonTrackerPage {
   issueName = (name: string): Locator => this.page.locator(`text="${name}"`)
   issuesButton = (): Locator => this.page.locator('text="Issues"')
   viewButton = (): Locator => this.page.locator('button[data-id="btn-viewOptions"]')
-  orderingButton = (): Locator => this.page.locator('.ordering >> nth=0')
+  orderingButton = (): Locator => this.page.locator('.ordering button')
   modifiedDateMenuItem = (): Locator => this.page.locator('button.menu-item', { hasText: 'Modified date' })
   estimationContainer = (): Locator => this.page.locator('.estimation-container').first()
   addTimeReportButton = (): Locator => this.page.locator('button:has-text("Add time report")')
@@ -158,7 +163,7 @@ export class IssuesPage extends CommonTrackerPage {
   dueDateButton = (): Locator => this.page.locator('button:has-text("Due date")')
   specificDay = (day: string): Locator => this.page.locator(`.date-popup-container div.day >> text=${day}`).first()
   inputTextPlaceholder = (): Locator => this.page.getByPlaceholder('Type text...')
-  confirmInput = (): Locator => this.page.locator('.ml-2 > .antiButton')
+  confirmInput = (): Locator => this.page.locator('.selectPopup button')
 
   async navigateToIssues (): Promise<void> {
     await this.page.click('text="Issues"')

From ff610b4d82e640b91300223e3c92b683b65a4a82 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Mon, 29 Jul 2024 10:50:10 +0400
Subject: [PATCH 3/6] Smooth chat history loading (#6162)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 packages/ui/src/components/Scroller.svelte    |   5 +
 .../src/channelDataProvider.ts                | 217 ++++++++++++++----
 .../src/components/ChannelScrollView.svelte   |  31 ++-
 3 files changed, 203 insertions(+), 50 deletions(-)

diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte
index ed08e67538..05372851e9 100644
--- a/packages/ui/src/components/Scroller.svelte
+++ b/packages/ui/src/components/Scroller.svelte
@@ -43,6 +43,7 @@
   export let checkForHeaders: boolean = false
   export let stickedScrollBars: boolean = false
   export let thinScrollBars: boolean = false
+  export let disableOverscroll = false
   export let onScroll: ((params: ScrollParams) => void) | undefined = undefined
   export let onResize: (() => void) | undefined = undefined
 
@@ -542,6 +543,7 @@
         onResize?.()
       }}
       class="scroll relative flex-shrink"
+      class:disableOverscroll
       style:overflow-x={horizontal ? 'auto' : 'hidden'}
       on:scroll={() => {
         if (onScroll) {
@@ -838,6 +840,9 @@
     height: 100%;
     overflow-y: auto;
 
+    &.disableOverscroll {
+      overscroll-behavior: none;
+    }
     &::-webkit-scrollbar:vertical {
       width: 0;
     }
diff --git a/plugins/chunter-resources/src/channelDataProvider.ts b/plugins/chunter-resources/src/channelDataProvider.ts
index 2c5a749f7f..23a6601ba2 100644
--- a/plugins/chunter-resources/src/channelDataProvider.ts
+++ b/plugins/chunter-resources/src/channelDataProvider.ts
@@ -60,7 +60,6 @@ interface IChannelDataProvider {
   datesStore: Readable<Timestamp[]>
   metadataStore: Readable<MessageMetadata[]>
 
-  loadMore: (mode: LoadMode, loadAfter: Timestamp) => Promise<void>
   canLoadMore: (mode: LoadMode, loadAfter: Timestamp) => boolean
   jumpToDate: (date: Timestamp) => Promise<void>
 }
@@ -95,10 +94,27 @@ export class ChannelDataProvider implements IChannelDataProvider {
     ([initialLoaded, tailLoading]) => !initialLoaded || tailLoading
   )
 
+  private readonly backwardNextStore = writable<Chunk | undefined>(undefined)
+  private readonly forwardNextStore = writable<Chunk | undefined>(undefined)
+
+  private backwardNextPromise: Promise<void> | undefined = undefined
+  private forwardNextPromise: Promise<void> | undefined = undefined
+
+  private readonly isBackwardLoading = writable(false)
+  private readonly isForwardLoading = writable(false)
+
+  private nextChunkAdding = false
+
   public messagesStore = derived([this.chunksStore, this.tailStore], ([chunks, tail]) => {
     return [...chunks.map(({ data }) => data).flat(), ...tail]
   })
 
+  public canLoadNextForwardStore = derived([this.messagesStore, this.forwardNextStore], ([messages, forwardNext]) => {
+    if (forwardNext !== undefined) return false
+
+    return this.canLoadMore('forward', messages[messages.length - 1]?.createdOn)
+  })
+
   constructor (
     chatId: Ref<Doc>,
     _class: Ref<Class<ActivityMessage>>,
@@ -139,20 +155,15 @@ export class ChannelDataProvider implements IChannelDataProvider {
 
   private clearData (): void {
     this.metadataStore.set([])
-    this.tailStore.set([])
-    this.chunksStore.set([])
-
     this.isInitialLoadingStore.set(false)
-    this.isInitialLoadedStore.set(false)
     this.isTailLoading.set(false)
-
     this.datesStore.set([])
     this.newTimestampStore.set(undefined)
     this.isLoadingMoreStore.set(false)
-
-    this.tailStart = undefined
     this.chatId = undefined
     this.selectedMsgId = undefined
+
+    this.clearMessages()
   }
 
   private async loadData (loadAll = false): Promise<void> {
@@ -211,9 +222,13 @@ export class ChannelDataProvider implements IChannelDataProvider {
       this.isTailLoading.set(true)
       const tailStart = metadata[startIndex]?.createdOn
       this.loadTail(tailStart)
+      this.backwardNextPromise = this.loadNext('backward', metadata[startIndex]?.createdOn, this.limit)
     } else {
       const newStart = Math.max(startPosition - this.limit / 2, 0)
       await this.loadMore('forward', metadata[newStart]?.createdOn, this.limit)
+      if (newStart > 0) {
+        this.backwardNextPromise = this.loadNext('backward', metadata[newStart]?.createdOn, this.limit)
+      }
     }
 
     this.isInitialLoadingStore.set(false)
@@ -260,41 +275,28 @@ export class ChannelDataProvider implements IChannelDataProvider {
     )
   }
 
-  public async loadMore (mode: LoadMode, loadAfter?: Timestamp, limit?: number): Promise<void> {
-    if (this.chatId === undefined || loadAfter === undefined) {
-      return
-    }
+  isNextLoading (mode: LoadMode): boolean {
+    return mode === 'forward' ? get(this.isForwardLoading) : get(this.isBackwardLoading)
+  }
 
-    if (!this.canLoadMore(mode, loadAfter) || get(this.isLoadingMoreStore)) {
-      return
-    }
+  isNextLoaded (mode: LoadMode): boolean {
+    return mode === 'forward' ? get(this.forwardNextStore) !== undefined : get(this.backwardNextStore) !== undefined
+  }
 
-    this.isLoadingMoreStore.set(true)
+  setNextLoading (mode: LoadMode, value: boolean): void {
+    mode === 'forward' ? this.isForwardLoading.set(value) : this.isBackwardLoading.set(value)
+  }
 
-    const isBackward = mode === 'backward'
-    const isForward = mode === 'forward'
+  getTailStartIndex (metadata: MessageMetadata[], loadAfter: Timestamp): number {
+    const index = metadata.slice(-this.limit - 1).findIndex(({ createdOn }) => createdOn === loadAfter)
 
-    const chunks = get(this.chunksStore)
-    const tail = get(this.tailStore)
-    const lastChunk: Chunk | undefined = isBackward ? chunks[0] : chunks[chunks.length - 1]
-    const skipIds = (lastChunk?.data ?? [])
-      .concat(tail)
-      .filter(({ createdOn }) => createdOn === loadAfter)
-      .map(({ _id }) => _id) as Array<Ref<ChatMessage>>
-
-    if (isForward) {
-      const metadata = get(this.metadataStore)
-      const metaIndex = metadata.findIndex(({ createdOn }) => createdOn === loadAfter)
-      const shouldLoadTail = metaIndex >= 0 && metaIndex + this.limit >= metadata.length
-
-      if (shouldLoadTail) {
-        this.loadTail(metadata[metaIndex + 1]?.createdOn, undefined, { _id: { $nin: skipIds } })
-        this.isLoadingMoreStore.set(false)
-        return
-      }
-    }
+    return index !== -1 ? metadata.length - index : -1
+  }
 
+  async loadChunk (isBackward: boolean, loadAfter: Timestamp, limit?: number): Promise<Chunk | undefined> {
     const client = getClient()
+    const skipIds = this.getChunkSkipIds(loadAfter)
+
     const messages = await client.findAll(
       chunter.class.ChatMessage,
       {
@@ -312,20 +314,149 @@ export class ChannelDataProvider implements IChannelDataProvider {
     )
 
     if (messages.length === 0) {
-      this.isLoadingMoreStore.set(false)
       return
     }
 
     const from = isBackward ? messages[0] : messages[messages.length - 1]
     const to = isBackward ? messages[messages.length - 1] : messages[0]
 
-    const chunk: Chunk = {
+    return {
       from: from.createdOn ?? from.modifiedOn,
       to: to.createdOn ?? to.modifiedOn,
       data: isBackward ? messages.reverse() : messages
     }
+  }
+
+  getChunkSkipIds (after: Timestamp, loadTail = false): Array<Ref<ChatMessage>> {
+    const chunks = get(this.chunksStore)
+    const metadata = get(this.metadataStore)
+    const tail = get(this.tailStore)
+    const tailData = tail.length > 0 ? get(this.tailStore) : metadata.slice(-this.limit)
+
+    return chunks
+      .filter(({ to, from }) => from >= after || to <= after)
+      .map(({ data }) => data as MessageMetadata[])
+      .flat()
+      .concat(loadTail ? [] : tailData)
+      .filter(({ createdOn }) => createdOn === after)
+      .map(({ _id }) => _id) as Array<Ref<ChatMessage>>
+  }
+
+  async loadNext (mode: LoadMode, loadAfter?: Timestamp, limit?: number): Promise<void> {
+    if (this.chatId === undefined || loadAfter === undefined) {
+      return
+    }
+
+    if (this.isNextLoading(mode) || this.isNextLoaded(mode)) {
+      return
+    }
+
+    if (!this.canLoadMore(mode, loadAfter)) {
+      return
+    }
+
+    this.setNextLoading(mode, true)
+
+    const isBackward = mode === 'backward'
+    const isForward = mode === 'forward'
+
+    const metadata = get(this.metadataStore)
+
+    if (isForward && this.getTailStartIndex(metadata, loadAfter) !== -1) {
+      this.setNextLoading(mode, false)
+      return
+    }
+
+    const chunk = await this.loadChunk(isBackward, loadAfter, limit)
+
+    if (chunk !== undefined && isBackward) {
+      this.backwardNextStore.set(chunk)
+    }
+    if (chunk !== undefined && isForward) {
+      this.forwardNextStore.set(chunk)
+    }
+
+    this.setNextLoading(mode, false)
+  }
+
+  public async addNextChunk (mode: LoadMode, loadAfter?: Timestamp, limit?: number): Promise<void> {
+    if (loadAfter === undefined || this.nextChunkAdding) {
+      return
+    }
+
+    this.nextChunkAdding = true
+
+    if (this.forwardNextPromise instanceof Promise && mode === 'forward') {
+      await this.forwardNextPromise
+      this.forwardNextPromise = undefined
+    }
+
+    if (this.backwardNextPromise instanceof Promise && mode === 'backward') {
+      await this.backwardNextPromise
+      this.backwardNextPromise = undefined
+    }
+
+    if (this.isNextLoaded(mode)) {
+      const next = mode === 'forward' ? get(this.forwardNextStore) : get(this.backwardNextStore)
+      if (next !== undefined) {
+        if (mode === 'forward') {
+          this.forwardNextStore.set(undefined)
+          this.chunksStore.set([...get(this.chunksStore), next])
+          this.forwardNextPromise = this.loadNext('forward', next.from, limit)
+        } else {
+          this.backwardNextStore.set(undefined)
+          this.chunksStore.set([next, ...get(this.chunksStore)])
+          this.backwardNextPromise = this.loadNext('backward', next.to, limit)
+        }
+      }
+    } else {
+      await this.loadMore(mode, loadAfter, limit)
+    }
+
+    this.nextChunkAdding = false
+  }
+
+  private async loadMore (mode: LoadMode, loadAfter?: Timestamp, limit?: number): Promise<void> {
+    if (get(this.isLoadingMoreStore) || loadAfter === undefined) {
+      return
+    }
+
+    if (!this.canLoadMore(mode, loadAfter)) {
+      return
+    }
+
+    this.isLoadingMoreStore.set(true)
+
+    const isBackward = mode === 'backward'
+    const isForward = mode === 'forward'
+
+    const chunks = get(this.chunksStore)
+    const metadata = get(this.metadataStore)
+
+    if (isForward) {
+      const index = this.getTailStartIndex(metadata, loadAfter)
+      const tailAfter = metadata[index]?.createdOn
+
+      if (tailAfter !== undefined) {
+        const skipIds = chunks[chunks.length - 1]?.data.map(({ _id }) => _id) ?? []
+        this.loadTail(tailAfter, undefined, { _id: { $nin: skipIds } })
+        this.isLoadingMoreStore.set(false)
+        return
+      }
+    }
+
+    const chunk = await this.loadChunk(isBackward, loadAfter, limit)
+
+    if (chunk !== undefined) {
+      this.chunksStore.set(isBackward ? [chunk, ...chunks] : [...chunks, chunk])
+
+      if (isBackward) {
+        this.forwardNextPromise = this.loadNext('backward', chunk.to, limit)
+      } else {
+        this.forwardNextPromise = this.loadNext('forward', chunk.from, limit)
+      }
+    }
 
-    this.chunksStore.set(isBackward ? [chunk, ...chunks] : [...chunks, chunk])
     this.isLoadingMoreStore.set(false)
   }
 
@@ -426,6 +557,12 @@ export class ChannelDataProvider implements IChannelDataProvider {
     this.isInitialLoadedStore.set(false)
     this.tailQuery.unsubscribe()
     this.tailStart = undefined
+    this.backwardNextPromise = undefined
+    this.forwardNextPromise = undefined
+    this.forwardNextStore.set(undefined)
+    this.backwardNextStore.set(undefined)
+    this.isBackwardLoading.set(false)
+    this.isForwardLoading.set(false)
   }
 
   public async jumpToDate (date: Timestamp): Promise<void> {
diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index 7b4de7f091..e9f09049f2 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -67,6 +67,7 @@
   const dateSelectorHeight = 30
   const headerHeight = 52
   const minMsgHeightRem = 2
+  const loadMoreThreshold = 40
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
@@ -244,7 +245,7 @@
       return false
     }
 
-    return scrollElement.scrollTop === 0
+    return scrollElement.scrollTop <= loadMoreThreshold
   }
 
   function shouldLoadMoreDown (): boolean {
@@ -254,10 +255,11 @@
 
     const { scrollHeight, scrollTop, clientHeight } = scrollElement
 
-    return scrollHeight - Math.ceil(scrollTop + clientHeight) <= 0
+    return scrollHeight - Math.ceil(scrollTop + clientHeight) <= loadMoreThreshold
   }
 
   let scrollToRestore = 0
+  let backwardRequested = false
 
   function loadMore (): void {
     if (!loadMoreAllowed || $isLoadingMoreStore || !scrollElement || isInitialScrolling) {
@@ -268,18 +270,24 @@
     const maxMsgPerScreen = Math.ceil(scrollElement.clientHeight / minMsgHeightPx)
     const limit = Math.max(maxMsgPerScreen, provider.limit)
 
-    if (shouldLoadMoreUp() && scrollElement && provider.canLoadMore('backward', messages[0]?.createdOn)) {
+    if (!shouldLoadMoreUp()) {
+      backwardRequested = false
+    }
+
+    if (shouldLoadMoreUp() && !backwardRequested) {
       shouldScrollToNew = false
-      scrollToRestore = scrollElement.scrollHeight
-      void provider.loadMore('backward', messages[0]?.createdOn, limit)
-    } else if (shouldLoadMoreDown() && provider.canLoadMore('forward', messages[messages.length - 1]?.createdOn)) {
+      scrollToRestore = scrollElement?.scrollHeight ?? 0
+      provider.addNextChunk('backward', messages[0]?.createdOn, limit)
+      backwardRequested = true
+    } else if (shouldLoadMoreDown()) {
+      scrollToRestore = 0
       shouldScrollToNew = false
-      void provider.loadMore('forward', messages[messages.length - 1]?.createdOn, limit)
       isScrollAtBottom = false
+      provider.addNextChunk('forward', messages[messages.length - 1]?.createdOn, limit)
     }
   }
 
-  function handleScroll ({ autoScrolling }: ScrollParams): void {
+  async function handleScroll ({ autoScrolling }: ScrollParams): Promise<void> {
     saveScrollPosition()
     updateDownButtonVisibility($metadataStore, displayMessages, scrollElement)
     if (autoScrolling) {
@@ -668,6 +676,8 @@
       scrollToBottom()
     }
   }
+
+  const canLoadNextForwardStore = provider.canLoadNextForwardStore
 </script>
 
 {#if isLoading}
@@ -694,10 +704,11 @@
       bind:divScroll={scrollElement}
       bind:divBox={scrollContentBox}
       noStretch={false}
+      disableOverscroll
       onScroll={handleScroll}
       onResize={handleResize}
     >
-      {#if loadMoreAllowed && provider.canLoadMore('backward', messages[0]?.createdOn)}
+      {#if loadMoreAllowed}
         <HistoryLoading isLoading={$isLoadingMoreStore} />
       {/if}
       <slot name="header" />
@@ -736,7 +747,7 @@
         />
       {/each}
 
-      {#if loadMoreAllowed && provider.canLoadMore('forward', messages[messages.length - 1]?.createdOn)}
+      {#if loadMoreAllowed && $canLoadNextForwardStore}
         <HistoryLoading isLoading={$isLoadingMoreStore} />
       {/if}
     </Scroller>

From 81429df8cf70b67587e0e888c5db99076ff724b0 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Mon, 29 Jul 2024 13:50:56 +0700
Subject: [PATCH 4/6] UBERF-7678 Fix folder upload to drive (#6159)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 plugins/drive-assets/lang/en.json             |  3 +-
 plugins/drive-assets/lang/es.json             |  3 +-
 plugins/drive-assets/lang/fr.json             |  3 +-
 plugins/drive-assets/lang/pt.json             |  3 +-
 plugins/drive-assets/lang/ru.json             |  3 +-
 plugins/drive-assets/lang/zh.json             |  1 -
 .../src/components/DriveSpaceHeader.svelte    | 33 ++----------
 .../src/components/FilePanel.svelte           |  1 +
 plugins/drive-resources/src/plugin.ts         |  1 -
 plugins/drive-resources/src/utils.ts          | 51 +++++++++++++++----
 .../src/components/FileUploadPopup.svelte     |  5 +-
 .../src/components/FileUploadStatusBar.svelte |  2 +-
 .../components/FileUploadStatusPopup.svelte   | 17 +++++++
 plugins/uploader-resources/src/utils.ts       | 10 ++--
 plugins/uploader/src/types.ts                 |  8 ++-
 plugins/uploader/src/utils.ts                 | 16 ++++--
 16 files changed, 99 insertions(+), 61 deletions(-)

diff --git a/plugins/drive-assets/lang/en.json b/plugins/drive-assets/lang/en.json
index bbb0b4c9b1..f78383395d 100644
--- a/plugins/drive-assets/lang/en.json
+++ b/plugins/drive-assets/lang/en.json
@@ -20,8 +20,7 @@
     "Upload": "Upload",
     "CreateDrive": "Create Drive",
     "CreateFolder": "Create Folder",
-    "UploadFile": "Upload File",
-    "UploadFolder": "Upload Folder",
+    "UploadFile": "Upload Files",
     "EditDrive": "Edit Drive",
     "Rename": "Rename",
     "Restore": "Restore",
diff --git a/plugins/drive-assets/lang/es.json b/plugins/drive-assets/lang/es.json
index a79eeeefd3..a06ae13a75 100644
--- a/plugins/drive-assets/lang/es.json
+++ b/plugins/drive-assets/lang/es.json
@@ -20,8 +20,7 @@
     "Upload": "Subir",
     "CreateDrive": "Crear unidad",
     "CreateFolder": "Crear carpeta",
-    "UploadFile": "Subir archivo",
-    "UploadFolder": "Subir carpeta",
+    "UploadFile": "Subir archivos",
     "EditDrive": "Editar unidad",
     "Rename": "Renombrar",
     "Restore": "Restaurar",
diff --git a/plugins/drive-assets/lang/fr.json b/plugins/drive-assets/lang/fr.json
index 61a79d2642..7daf2d616e 100644
--- a/plugins/drive-assets/lang/fr.json
+++ b/plugins/drive-assets/lang/fr.json
@@ -20,8 +20,7 @@
     "Upload": "Téléverser",
     "CreateDrive": "Créer un disque",
     "CreateFolder": "Créer un dossier",
-    "UploadFile": "Télécharger un fichier",
-    "UploadFolder": "Télécharger un dossier",
+    "UploadFile": "Télécharger des fichiers",
     "EditDrive": "Modifier le disque",
     "Rename": "Renommer",
     "Restore": "Restaurer",
diff --git a/plugins/drive-assets/lang/pt.json b/plugins/drive-assets/lang/pt.json
index 9822a424ee..fc063c799f 100644
--- a/plugins/drive-assets/lang/pt.json
+++ b/plugins/drive-assets/lang/pt.json
@@ -20,8 +20,7 @@
     "Upload": "Carregar",
     "CreateDrive": "Criar unidade",
     "CreateFolder": "Criar pasta",
-    "UploadFile": "Carregar ficheiro",
-    "UploadFolder": "Carregar pasta",
+    "UploadFile": "Carregar ficheiros",
     "EditDrive": "Editar unidade",
     "Rename": "Renomear",
     "Restore": "Restaurar",
diff --git a/plugins/drive-assets/lang/ru.json b/plugins/drive-assets/lang/ru.json
index 9d7c4ea9cc..825892ec0d 100644
--- a/plugins/drive-assets/lang/ru.json
+++ b/plugins/drive-assets/lang/ru.json
@@ -20,8 +20,7 @@
     "Upload": "Загрузить",
     "CreateDrive": "Создать диск",
     "CreateFolder": "Создать папку",
-    "UploadFile": "Загрузить файл",
-    "UploadFolder": "Загрузить папку",
+    "UploadFile": "Загрузить файлы",
     "EditDrive": "Редактировать",
     "Rename": "Переименовать",
     "Restore": "Восстановить",
diff --git a/plugins/drive-assets/lang/zh.json b/plugins/drive-assets/lang/zh.json
index 1359f4c65f..0ac452d5ac 100644
--- a/plugins/drive-assets/lang/zh.json
+++ b/plugins/drive-assets/lang/zh.json
@@ -21,7 +21,6 @@
     "CreateDrive": "创建磁盘",
     "CreateFolder": "创建文件夹",
     "UploadFile": "上传文件",
-    "UploadFolder": "上传文件夹",
     "EditDrive": "编辑磁盘",
     "Rename": "重命名",
     "Restore": "恢复",
diff --git a/plugins/drive-resources/src/components/DriveSpaceHeader.svelte b/plugins/drive-resources/src/components/DriveSpaceHeader.svelte
index f638ee2937..8054b62c46 100644
--- a/plugins/drive-resources/src/components/DriveSpaceHeader.svelte
+++ b/plugins/drive-resources/src/components/DriveSpaceHeader.svelte
@@ -14,22 +14,19 @@
 -->
 <script lang="ts">
   import { AccountRole, Ref, getCurrentAccount, hasAccountRole } from '@hcengineering/core'
-  import { createFile, type Drive } from '@hcengineering/drive'
-  import { setPlatformStatus, unknownError } from '@hcengineering/platform'
-  import { createQuery, getClient } from '@hcengineering/presentation'
+  import { type Drive } from '@hcengineering/drive'
+  import { createQuery } from '@hcengineering/presentation'
   import { Button, ButtonWithDropdown, IconAdd, IconDropdown, Loading, SelectPopupValueType } from '@hcengineering/ui'
-  import { showFilesUploadPopup } from '@hcengineering/uploader'
 
   import drive from '../plugin'
   import { getFolderIdFromFragment } from '../navigation'
-  import { showCreateDrivePopup, showCreateFolderPopup } from '../utils'
+  import { showCreateDrivePopup, showCreateFolderPopup, uploadFilesToDrivePopup } from '../utils'
 
   export let currentSpace: Ref<Drive> | undefined
   export let currentFragment: string | undefined
 
   const me = getCurrentAccount()
 
-  const client = getClient()
   const query = createQuery()
 
   let loading = true
@@ -66,27 +63,7 @@
 
   async function handleUploadFile (): Promise<void> {
     if (currentSpace !== undefined) {
-      const space = currentSpace
-      const target =
-        parent !== drive.ids.Root
-          ? { objectId: parent, objectClass: drive.class.Folder }
-          : { objectId: space, objectClass: drive.class.Drive }
-      await showFilesUploadPopup(target, {}, async (uuid, name, file, path, metadata) => {
-        try {
-          const data = {
-            file: uuid,
-            size: file.size,
-            type: file.type,
-            lastModified: file instanceof File ? file.lastModified : Date.now(),
-            name,
-            metadata
-          }
-
-          await createFile(client, space, parent, data)
-        } catch (err) {
-          void setPlatformStatus(unknownError(err))
-        }
-      })
+      await uploadFilesToDrivePopup(currentSpace, parent)
     }
   }
 
@@ -95,12 +72,10 @@
         { id: drive.string.CreateDrive, label: drive.string.CreateDrive, icon: drive.icon.Drive },
         { id: drive.string.CreateFolder, label: drive.string.CreateFolder, icon: drive.icon.Folder },
         { id: drive.string.UploadFile, label: drive.string.UploadFile, icon: drive.icon.File }
-        // { id: drive.string.UploadFolder, label: drive.string.UploadFolder }
       ]
     : [
         { id: drive.string.CreateFolder, label: drive.string.CreateFolder, icon: drive.icon.Folder },
         { id: drive.string.UploadFile, label: drive.string.UploadFile, icon: drive.icon.File }
-        // { id: drive.string.UploadFolder, label: drive.string.UploadFolder }
       ]
 </script>
 
diff --git a/plugins/drive-resources/src/components/FilePanel.svelte b/plugins/drive-resources/src/components/FilePanel.svelte
index 8481c0b60b..bbbd74b924 100644
--- a/plugins/drive-resources/src/components/FilePanel.svelte
+++ b/plugins/drive-resources/src/components/FilePanel.svelte
@@ -73,6 +73,7 @@
           maxNumberOfFiles: 1,
           hideProgress: true
         },
+        {},
         async (uuid, name, file, path, metadata) => {
           const data = {
             file: uuid,
diff --git a/plugins/drive-resources/src/plugin.ts b/plugins/drive-resources/src/plugin.ts
index 4512ce0fbf..661209ad96 100644
--- a/plugins/drive-resources/src/plugin.ts
+++ b/plugins/drive-resources/src/plugin.ts
@@ -21,7 +21,6 @@ export default mergeIds(driveId, drive, {
     CreateDrive: '' as IntlString,
     CreateFolder: '' as IntlString,
     UploadFile: '' as IntlString,
-    UploadFolder: '' as IntlString,
     Download: '' as IntlString,
     Upload: '' as IntlString,
     EditDrive: '' as IntlString,
diff --git a/plugins/drive-resources/src/utils.ts b/plugins/drive-resources/src/utils.ts
index 51121f5da0..269b530928 100644
--- a/plugins/drive-resources/src/utils.ts
+++ b/plugins/drive-resources/src/utils.ts
@@ -19,7 +19,12 @@ import drive, { createFile } from '@hcengineering/drive'
 import { type Asset, setPlatformStatus, unknownError } from '@hcengineering/platform'
 import { getClient } from '@hcengineering/presentation'
 import { type AnySvelteComponent, showPopup } from '@hcengineering/ui'
-import { uploadFiles } from '@hcengineering/uploader'
+import {
+  type FileUploadCallback,
+  getDataTransferFiles,
+  showFilesUploadPopup,
+  uploadFiles
+} from '@hcengineering/uploader'
 import { openDoc } from '@hcengineering/view-resources'
 
 import CreateDrive from './components/CreateDrive.svelte'
@@ -154,7 +159,38 @@ export async function resolveParents (object: Resource): Promise<Doc[]> {
   return parents.reverse()
 }
 
-export async function uploadFilesToDrive (files: DataTransfer, space: Ref<Drive>, parent: Ref<Folder>): Promise<void> {
+export async function uploadFilesToDrive (dt: DataTransfer, space: Ref<Drive>, parent: Ref<Folder>): Promise<void> {
+  const files = await getDataTransferFiles(dt)
+
+  const onFileUploaded = await fileUploadCallback(space, parent)
+
+  const target =
+    parent !== drive.ids.Root
+      ? { objectId: parent, objectClass: drive.class.Folder }
+      : { objectId: space, objectClass: drive.class.Drive }
+
+  await uploadFiles(files, target, {}, onFileUploaded)
+}
+
+export async function uploadFilesToDrivePopup (space: Ref<Drive>, parent: Ref<Folder>): Promise<void> {
+  const onFileUploaded = await fileUploadCallback(space, parent)
+
+  const target =
+    parent !== drive.ids.Root
+      ? { objectId: parent, objectClass: drive.class.Folder }
+      : { objectId: space, objectClass: drive.class.Drive }
+
+  await showFilesUploadPopup(
+    target,
+    {},
+    {
+      fileManagerSelectionType: 'both'
+    },
+    onFileUploaded
+  )
+}
+
+async function fileUploadCallback (space: Ref<Drive>, parent: Ref<Folder>): Promise<FileUploadCallback> {
   const client = getClient()
 
   const query = parent !== drive.ids.Root ? { space, path: parent } : { space }
@@ -190,12 +226,7 @@ export async function uploadFilesToDrive (files: DataTransfer, space: Ref<Drive>
     return current
   }
 
-  const target =
-    parent !== drive.ids.Root
-      ? { objectId: parent, objectClass: drive.class.Folder }
-      : { objectId: space, objectClass: drive.class.Drive }
-
-  await uploadFiles(files, target, {}, async (uuid, name, file, path, metadata) => {
+  const callback: FileUploadCallback = async (uuid, name, file, path, metadata) => {
     const folder = await findParent(path)
     try {
       const data = {
@@ -211,5 +242,7 @@ export async function uploadFilesToDrive (files: DataTransfer, space: Ref<Drive>
     } catch (err) {
       void setPlatformStatus(unknownError(err))
     }
-  })
+  }
+
+  return callback
 }
diff --git a/plugins/uploader-resources/src/components/FileUploadPopup.svelte b/plugins/uploader-resources/src/components/FileUploadPopup.svelte
index 3f83c5213b..1791b70c1a 100644
--- a/plugins/uploader-resources/src/components/FileUploadPopup.svelte
+++ b/plugins/uploader-resources/src/components/FileUploadPopup.svelte
@@ -14,6 +14,7 @@
 -->
 <script lang="ts">
   import { themeStore } from '@hcengineering/ui'
+  import { type FileUploadPopupOptions } from '@hcengineering/uploader'
 
   import { type Uppy } from '@uppy/core'
   import Dashboard from '@uppy/dashboard'
@@ -25,6 +26,7 @@
   const dispatch = createEventDispatcher()
 
   export let uppy: Uppy<any, any>
+  export let options: FileUploadPopupOptions
 
   let container: HTMLElement
 
@@ -46,7 +48,8 @@
       width: 750,
       disableInformer: true,
       proudlyDisplayPoweredByUppy: false,
-      theme: dark ? 'dark' : 'light'
+      theme: dark ? 'dark' : 'light',
+      fileManagerSelectionType: options.fileManagerSelectionType
     })
   })
 
diff --git a/plugins/uploader-resources/src/components/FileUploadStatusBar.svelte b/plugins/uploader-resources/src/components/FileUploadStatusBar.svelte
index 0242e31937..9e0f45a3db 100644
--- a/plugins/uploader-resources/src/components/FileUploadStatusBar.svelte
+++ b/plugins/uploader-resources/src/components/FileUploadStatusBar.svelte
@@ -79,7 +79,7 @@
   class="container flex-row-center flex-gap-2 active"
   class:error={state.error}
   on:click={handleClick}
-  use:tooltip={state.error != null ? { label: getEmbeddedLabel(state.error) } : undefined}
+  use:tooltip={state.error !== undefined ? { label: getEmbeddedLabel(state.error) } : undefined}
 >
   {#if state.error}
     <IconError size={'small'} fill={'var(--negative-button-default)'} />
diff --git a/plugins/uploader-resources/src/components/FileUploadStatusPopup.svelte b/plugins/uploader-resources/src/components/FileUploadStatusPopup.svelte
index 6488e9ee45..1a23c485cb 100644
--- a/plugins/uploader-resources/src/components/FileUploadStatusPopup.svelte
+++ b/plugins/uploader-resources/src/components/FileUploadStatusPopup.svelte
@@ -70,6 +70,10 @@
     }
   }
 
+  function handleCancelAll (): void {
+    upload.uppy.cancelAll()
+  }
+
   function handleCancelFile (file: UppyFile<any, any>): void {
     upload.uppy.removeFile(file.id)
   }
@@ -123,6 +127,17 @@
         noUnderline
       />
     </div>
+    {#if state.error}
+      <Button
+        kind={'icon'}
+        icon={IconClose}
+        iconProps={{ size: 'small' }}
+        showTooltip={{ label: uploader.string.Cancel }}
+        on:click={() => {
+          handleCancelAll()
+        }}
+      />
+    {/if}
   </div>
   <Scroller>
     <div class="upload-popup__content flex-col flex-no-shrink flex-gap-4">
@@ -209,6 +224,8 @@
 
     .upload-popup__header {
       padding-bottom: 1rem;
+      margin-left: 0.5rem;
+      margin-right: 0.625rem;
     }
 
     .upload-popup__content {
diff --git a/plugins/uploader-resources/src/utils.ts b/plugins/uploader-resources/src/utils.ts
index 6b36e0f8da..41c625aaea 100644
--- a/plugins/uploader-resources/src/utils.ts
+++ b/plugins/uploader-resources/src/utils.ts
@@ -17,8 +17,8 @@ import { showPopup } from '@hcengineering/ui'
 import {
   type FileUploadCallback,
   type FileUploadOptions,
+  type FileUploadPopupOptions,
   type FileUploadTarget,
-  getDataTransferFiles,
   toFileWithPath
 } from '@hcengineering/uploader'
 
@@ -31,11 +31,12 @@ import { getUppy } from './uppy'
 export async function showFilesUploadPopup (
   target: FileUploadTarget,
   options: FileUploadOptions,
+  popupOptions: FileUploadPopupOptions,
   onFileUploaded: FileUploadCallback
 ): Promise<void> {
   const uppy = getUppy(options, onFileUploaded)
 
-  showPopup(FileUploadPopup, { uppy, target }, undefined, (res) => {
+  showPopup(FileUploadPopup, { uppy, target, options: popupOptions }, undefined, (res) => {
     if (res === true && options.hideProgress !== true) {
       dockFileUpload(target, uppy)
     }
@@ -44,13 +45,12 @@ export async function showFilesUploadPopup (
 
 /** @public */
 export async function uploadFiles (
-  files: File[] | FileList | DataTransfer,
+  files: File[] | FileList,
   target: FileUploadTarget,
   options: FileUploadOptions,
   onFileUploaded: FileUploadCallback
 ): Promise<void> {
-  const items =
-    files instanceof DataTransfer ? await getDataTransferFiles(files) : Array.from(files, (p) => toFileWithPath(p))
+  const items = Array.from(files, (p) => toFileWithPath(p))
 
   if (items.length === 0) return
 
diff --git a/plugins/uploader/src/types.ts b/plugins/uploader/src/types.ts
index 5bc29fae22..6d81bec926 100644
--- a/plugins/uploader/src/types.ts
+++ b/plugins/uploader/src/types.ts
@@ -24,12 +24,13 @@ export interface FileWithPath extends File {
 export type UploadFilesPopupFn = (
   target: FileUploadTarget,
   options: FileUploadOptions,
+  popupOptions: FileUploadPopupOptions,
   onFileUploaded: FileUploadCallback
 ) => Promise<void>
 
 /** @public */
 export type UploadFilesFn = (
-  files: File[] | FileList | DataTransfer,
+  files: File[] | FileList,
   target: FileUploadTarget,
   options: FileUploadOptions,
   onFileUploaded: FileUploadCallback
@@ -49,6 +50,11 @@ export interface FileUploadOptions {
   hideProgress?: boolean
 }
 
+/** @public */
+export interface FileUploadPopupOptions {
+  fileManagerSelectionType?: 'files' | 'folders' | 'both'
+}
+
 /** @public */
 export type FileUploadCallback = (
   uuid: Ref<PlatformBlob>,
diff --git a/plugins/uploader/src/utils.ts b/plugins/uploader/src/utils.ts
index 70af2a1189..cadbf0b618 100644
--- a/plugins/uploader/src/utils.ts
+++ b/plugins/uploader/src/utils.ts
@@ -16,21 +16,28 @@
 import { getResource } from '@hcengineering/platform'
 
 import uploader from './plugin'
-import type { FileUploadCallback, FileUploadOptions, FileUploadTarget, FileWithPath } from './types'
+import type {
+  FileUploadCallback,
+  FileUploadOptions,
+  FileUploadPopupOptions,
+  FileUploadTarget,
+  FileWithPath
+} from './types'
 
 /** @public */
 export async function showFilesUploadPopup (
   target: FileUploadTarget,
   options: FileUploadOptions,
+  popupOptions: FileUploadPopupOptions,
   onFileUploaded: FileUploadCallback
 ): Promise<void> {
   const fn = await getResource(uploader.function.ShowFilesUploadPopup)
-  await fn(target, options, onFileUploaded)
+  await fn(target, options, popupOptions, onFileUploaded)
 }
 
 /** @public */
 export async function uploadFiles (
-  files: File[] | FileList | DataTransfer,
+  files: File[] | FileList,
   target: FileUploadTarget,
   options: FileUploadOptions,
   onFileUploaded: FileUploadCallback
@@ -63,6 +70,9 @@ export async function getDataTransferFiles (dataTransfer: DataTransfer): Promise
 /** @public */
 export function toFileWithPath (file: File, path?: string): FileWithPath {
   const { webkitRelativePath } = file
+  if ('relativePath' in file) {
+    return file as FileWithPath
+  }
   Object.defineProperty(file, 'relativePath', {
     value:
       typeof path === 'string'

From 6377a3e48a9ad76084d82fdd37ab22f06a7bcac3 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:48:15 +0700
Subject: [PATCH 5/6] Fix Get model hint (#6163)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 dev/docker-compose.yaml     |  6 +++---
 server/mongo/src/storage.ts | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
index 5867366c02..e431404535 100644
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@@ -158,7 +158,7 @@ services:
         limits:
           memory: 1024M
   print:
-    image: hardcoreeng/uberflow-print
+    image: hardcoreeng/print
     restart: unless-stopped
     ports:
       - 4005:4005
@@ -171,7 +171,7 @@ services:
         limits:
           memory: 300M
   sign:
-    image: hardcoreeng/uberflow-sign
+    image: hardcoreeng/sign
     restart: unless-stopped
     ports:
       - 4006:4006
@@ -193,7 +193,7 @@ services:
         limits:
           memory: 300M
   analytics:
-    image: hardcoreeng/uberflow-analytics-collector
+    image: hardcoreeng/analytics-collector
     restart: unless-stopped
     ports:
       - 4077:4007
diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts
index 4e1394ee9b..c3dbefc120 100644
--- a/server/mongo/src/storage.ts
+++ b/server/mongo/src/storage.ts
@@ -81,9 +81,9 @@ import {
   type Document,
   type Filter,
   type FindCursor,
+  type FindOptions as MongoFindOptions,
   type Sort,
-  type UpdateFilter,
-  type FindOptions as MongoFindOptions
+  type UpdateFilter
 } from 'mongodb'
 import { DBCollectionHelper, getMongoClient, getWorkspaceDB, type MongoClientReference } from './utils'
 
@@ -1477,8 +1477,10 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter {
 
   @withContext('get-model')
   async getModel (ctx: MeasureContext): Promise<Tx[]> {
-    const cursor = await ctx.with('find', {}, async () =>
-      this.db.collection<Tx>(DOMAIN_TX).find(
+    const txCollection = this.db.collection<Tx>(DOMAIN_TX)
+    const exists = await txCollection.indexExists('objectSpace_fi_1__id_fi_1_modifiedOn_fi_1')
+    const cursor = await ctx.with('find', {}, async () => {
+      let c = txCollection.find(
         { objectSpace: core.space.Model },
         {
           sort: {
@@ -1490,7 +1492,11 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter {
           }
         }
       )
-    )
+      if (exists) {
+        c = c.hint({ objectSpace: 1, _id: 1, modifiedOn: 1 })
+      }
+      return c
+    })
     const model = await ctx.with('to-array', {}, async () => await toArray<Tx>(cursor))
     // We need to put all core.account.System transactions first
     const systemTx: Tx[] = []

From 26993607db57cbdd14b89ab8d182d4825350996c Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@gmail.com>
Date: Mon, 29 Jul 2024 16:21:56 +0700
Subject: [PATCH 6/6] Fix desktop build

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 common/config/rush/pnpm-lock.yaml | 141 +++++++++++++-----------------
 desktop/package.json              |   2 +-
 2 files changed, 63 insertions(+), 80 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index f8b0b7e4a8..724c5068f2 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1425,8 +1425,8 @@ dependencies:
     specifier: ~1.0.0
     version: 1.0.1
   electron-store:
-    specifier: ^10.0.0
-    version: 10.0.0
+    specifier: ^8.2.0
+    version: 8.2.0
   electron-updater:
     specifier: ^6.2.1
     version: 6.2.1
@@ -7773,7 +7773,7 @@ packages:
       pretty-hrtime: 1.0.3
       prompts: 2.4.2
       read-pkg-up: 7.0.1
-      semver: 7.6.0
+      semver: 7.6.3
       telejson: 7.2.0
       tiny-invariant: 1.3.1
       ts-dedent: 2.2.0
@@ -9639,7 +9639,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
+      semver: 7.6.3
       tsutils: 3.21.0(typescript@5.3.3)
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -9682,7 +9682,7 @@ packages:
       '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
       eslint: 8.56.0
       eslint-scope: 5.1.1
-      semver: 7.6.0
+      semver: 7.6.3
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -10218,15 +10218,6 @@ packages:
       ajv: 8.12.0
     dev: false
 
-  /ajv-formats@3.0.1:
-    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-    dependencies:
-      ajv: 8.17.1
-    dev: false
-
   /ajv-keywords@3.5.2(ajv@6.12.6):
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
@@ -10711,11 +10702,9 @@ packages:
     engines: {node: '>=8.0.0'}
     dev: false
 
-  /atomically@2.0.3:
-    resolution: {integrity: sha512-kU6FmrwZ3Lx7/7y3hPS5QnbJfaohcIul5fGqf7ok+4KklIEk9tJ0C2IQPdacSbVUWv6zVHXEBWoWd6NrVMT7Cw==}
-    dependencies:
-      stubborn-fs: 1.2.5
-      when-exit: 2.1.3
+  /atomically@1.7.0:
+    resolution: {integrity: sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==}
+    engines: {node: '>=10.12.0'}
     dev: false
 
   /autolinker@4.0.0:
@@ -11771,19 +11760,20 @@ packages:
       typedarray: 0.0.6
     dev: false
 
-  /conf@13.0.1:
-    resolution: {integrity: sha512-l9Uwc9eOnz39oADzGO2cSBDi7siv8lwO+31ocQ2nOJijnDiW3pxqm9VV10DPYUO28wW83DjABoUqY1nfHRR2hQ==}
-    engines: {node: '>=18'}
+  /conf@10.2.0:
+    resolution: {integrity: sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg==}
+    engines: {node: '>=12'}
     dependencies:
       ajv: 8.17.1
-      ajv-formats: 3.0.1
-      atomically: 2.0.3
-      debounce-fn: 6.0.0
-      dot-prop: 9.0.0
-      env-paths: 3.0.0
-      json-schema-typed: 8.0.1
+      ajv-formats: 2.1.1
+      atomically: 1.7.0
+      debounce-fn: 4.0.0
+      dot-prop: 6.0.1
+      env-paths: 2.2.1
+      json-schema-typed: 7.0.3
+      onetime: 5.1.2
+      pkg-up: 3.1.0
       semver: 7.6.3
-      uint8array-extras: 1.4.0
     dev: false
 
   /config-file-ts@0.2.6:
@@ -12227,11 +12217,11 @@ packages:
       '@babel/runtime': 7.23.9
     dev: false
 
-  /debounce-fn@6.0.0:
-    resolution: {integrity: sha512-rBMW+F2TXryBwB54Q0d8drNEI+TfoS9JpNTAoVpukbWEhjXQq4rySFYLaqXMFXwdv61Zb2OHtj5bviSoimqxRQ==}
-    engines: {node: '>=18'}
+  /debounce-fn@4.0.0:
+    resolution: {integrity: sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==}
+    engines: {node: '>=10'}
     dependencies:
-      mimic-function: 5.0.1
+      mimic-fn: 3.1.0
     dev: false
 
   /debounce@1.2.1:
@@ -12714,11 +12704,11 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /dot-prop@9.0.0:
-    resolution: {integrity: sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==}
-    engines: {node: '>=18'}
+  /dot-prop@6.0.1:
+    resolution: {integrity: sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==}
+    engines: {node: '>=10'}
     dependencies:
-      type-fest: 4.23.0
+      is-obj: 2.0.0
     dev: false
 
   /dotenv-defaults@2.0.2:
@@ -12938,12 +12928,11 @@ packages:
       debug: 2.6.9
     dev: false
 
-  /electron-store@10.0.0:
-    resolution: {integrity: sha512-BU/QZh+5twHBprRdLu3YZX/rIarmZzhTNpJvAvqG1/yN0mNCrsMh0kl7bM4xaUKDNRiHz1r7wP/7Prjh7cleIw==}
-    engines: {node: '>=20'}
+  /electron-store@8.2.0:
+    resolution: {integrity: sha512-ukLL5Bevdil6oieAOXz3CMy+OgaItMiVBg701MNlG6W5RaC0AHN7rvlqTCmeb6O7jP0Qa1KKYTE0xV0xbhF4Hw==}
     dependencies:
-      conf: 13.0.1
-      type-fest: 4.23.0
+      conf: 10.2.0
+      type-fest: 2.19.0
     dev: false
 
   /electron-to-chromium@1.4.679:
@@ -13053,11 +13042,6 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /env-paths@3.0.0:
-    resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: false
-
   /envinfo@7.11.1:
     resolution: {integrity: sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg==}
     engines: {node: '>=4'}
@@ -16009,6 +15993,11 @@ packages:
     engines: {node: '>=0.12.0'}
     dev: false
 
+  /is-obj@2.0.0:
+    resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
+    engines: {node: '>=8'}
+    dev: false
+
   /is-path-cwd@2.2.0:
     resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
     engines: {node: '>=6'}
@@ -16224,7 +16213,7 @@ packages:
       '@babel/parser': 7.23.9
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
-      semver: 7.6.0
+      semver: 7.6.3
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -16907,8 +16896,8 @@ packages:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
     dev: false
 
-  /json-schema-typed@8.0.1:
-    resolution: {integrity: sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==}
+  /json-schema-typed@7.0.3:
+    resolution: {integrity: sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==}
     dev: false
 
   /json-stable-stringify-without-jsonify@1.0.1:
@@ -16961,7 +16950,7 @@ packages:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.6.0
+      semver: 7.6.3
     dev: false
 
   /jsx-ast-utils@3.3.5:
@@ -17537,7 +17526,7 @@ packages:
     resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
     engines: {node: '>=10'}
     dependencies:
-      semver: 7.6.0
+      semver: 7.6.3
     dev: false
 
   /make-error@1.3.6:
@@ -17759,16 +17748,16 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
+  /mimic-fn@3.1.0:
+    resolution: {integrity: sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==}
+    engines: {node: '>=8'}
+    dev: false
+
   /mimic-fn@4.0.0:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
     dev: false
 
-  /mimic-function@5.0.1:
-    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
-    engines: {node: '>=18'}
-    dev: false
-
   /mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
@@ -18120,7 +18109,7 @@ packages:
     resolution: {integrity: sha512-uPEjtyh2tFEvWYt4Jw7McOD5FPcHkcxm/tHZc5PWaDB3JYq0rGFUbgaAK+CT5pYpQddBfsZVWI08OwoRfdfbcQ==}
     engines: {node: '>=10'}
     dependencies:
-      semver: 7.6.0
+      semver: 7.6.3
     dev: false
 
   /node-abort-controller@3.1.1:
@@ -19044,6 +19033,13 @@ packages:
       find-up: 6.3.0
     dev: false
 
+  /pkg-up@3.1.0:
+    resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==}
+    engines: {node: '>=8'}
+    dependencies:
+      find-up: 3.0.0
+    dev: false
+
   /playwright-core@1.41.2:
     resolution: {integrity: sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA==}
     engines: {node: '>=16'}
@@ -21284,10 +21280,6 @@ packages:
       peek-readable: 4.1.0
     dev: false
 
-  /stubborn-fs@1.2.5:
-    resolution: {integrity: sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==}
-    dev: false
-
   /style-loader@3.3.4(webpack@5.90.3):
     resolution: {integrity: sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==}
     engines: {node: '>= 12.13.0'}
@@ -22342,11 +22334,6 @@ packages:
     resolution: {integrity: sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==}
     dev: false
 
-  /uint8array-extras@1.4.0:
-    resolution: {integrity: sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==}
-    engines: {node: '>=18'}
-    dev: false
-
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
@@ -23109,10 +23096,6 @@ packages:
       webidl-conversions: 3.0.1
     dev: false
 
-  /when-exit@2.1.3:
-    resolution: {integrity: sha512-uVieSTccFIr/SFQdFWN/fFaQYmV37OKtuaGphMAzi4DmmUlrvRBJW5WSLkHyjNQY/ePJMz3LoiX9R3yy1Su6Hw==}
-    dev: false
-
   /which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
     dependencies:
@@ -23830,7 +23813,7 @@ packages:
     dev: false
 
   file:projects/analytics-service.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
-    resolution: {integrity: sha512-3hpPEwojBH/WARd3evdL3zOnOb9ygsuGRlKmPARpwJx3BV2iI/yapLa2vF7pZUSOZRNK+U3sfYNUGmjMUiV3PA==, tarball: file:projects/analytics-service.tgz}
+    resolution: {integrity: sha512-CNOxEi0TSwyscgxa3iTdWPASgNS0YwNXfS5L52nmlmi+Y2OH7N4wwOXS0BKyEuqYYkSMsEMArPfB5xYaYoNkJw==, tarball: file:projects/analytics-service.tgz}
     id: file:projects/analytics-service.tgz
     name: '@rush-temp/analytics-service'
     version: 0.0.0
@@ -25143,7 +25126,7 @@ packages:
     dev: false
 
   file:projects/desktop.tgz(bufferutil@4.0.8)(sass@1.71.1)(utf-8-validate@6.0.4):
-    resolution: {integrity: sha512-2edgvVz9CadWKo8x9QaO8UNcvjxSGilnSzeLzkV9ijegvq0HinqBqu4Q/sFmKKHMBXYc5ZNW3wJ+/2BGvEIMZw==, tarball: file:projects/desktop.tgz}
+    resolution: {integrity: sha512-ttUpcNZ8VKqQjGhZ6u9UwTTCOpXBKD8BC7CziczYCzKpTCjdwEJh9agnt8uJU6eETt57hJY2c8BU/aIESyYMZA==, tarball: file:projects/desktop.tgz}
     id: file:projects/desktop.tgz
     name: '@rush-temp/desktop'
     version: 0.0.0
@@ -25165,7 +25148,7 @@ packages:
       electron-context-menu: 4.0.1
       electron-log: 5.1.7
       electron-squirrel-startup: 1.0.1
-      electron-store: 10.0.0
+      electron-store: 8.2.0
       electron-updater: 6.2.1
       electron-windows-badge: 1.1.0
       esbuild: 0.20.1
@@ -28496,7 +28479,7 @@ packages:
     dev: false
 
   file:projects/pod-account.tgz:
-    resolution: {integrity: sha512-yI2LfUu2SCsh/b97mSszloCkfnaZ0s0AllwwszhB5S3V6jJFzAcyhfX2Zw9y2XRbe2UOPMyISs16JrCFDI8Rog==, tarball: file:projects/pod-account.tgz}
+    resolution: {integrity: sha512-4GzxbT2fBrGb3XHE1U4rRqzn73jrkUyIaWJUsjDzDAYzmOGAUX3n+DplPLC3rPCql58F6XxniPQH25KcmLkkCw==, tarball: file:projects/pod-account.tgz}
     name: '@rush-temp/pod-account'
     version: 0.0.0
     dependencies:
@@ -28589,7 +28572,7 @@ packages:
     dev: false
 
   file:projects/pod-backup.tgz:
-    resolution: {integrity: sha512-kDZfttPxTuMHKyNcRqOBDuzJjR+H4DGGAFor6GvK4vNDRDHmw0vxFg8zkhDCSLgUAGaHIq/Xw8SxkADO1BKJQQ==, tarball: file:projects/pod-backup.tgz}
+    resolution: {integrity: sha512-K4zdP793+k9e7WeP7+suiK8gd/vTQftNronVzzMmx5qRRnqNJhqdY6QffMuYPzqEytxwmg+7T8MSfYEwPvlMJw==, tarball: file:projects/pod-backup.tgz}
     name: '@rush-temp/pod-backup'
     version: 0.0.0
     dependencies:
@@ -28686,7 +28669,7 @@ packages:
     dev: false
 
   file:projects/pod-collaborator.tgz:
-    resolution: {integrity: sha512-3qz7k9xtE0tZjr0MlSs062eI+X4WfPh+anTCA7btPShvsC+5GdSYBXxD5nCT4rO7klt7pCLfXMozSEJrIXTM2Q==, tarball: file:projects/pod-collaborator.tgz}
+    resolution: {integrity: sha512-ayRiefa0hytLnCUUVac5/YEwko1XSxpudTToOamTBxzFfXlwGdlK6D2gQMN/dNkbTG4Wc9KLzjlwDb4VXUkLmw==, tarball: file:projects/pod-collaborator.tgz}
     name: '@rush-temp/pod-collaborator'
     version: 0.0.0
     dependencies:
@@ -28719,7 +28702,7 @@ packages:
     dev: false
 
   file:projects/pod-front.tgz:
-    resolution: {integrity: sha512-dfeO6R4HILQ4+Z+sBAH3KAPWLOXtwCQjlaxfD9//EOAyiXBynRyGKJUgudkWm/iG0fpgfxdYogYzg2OyUjKtJg==, tarball: file:projects/pod-front.tgz}
+    resolution: {integrity: sha512-YkIJf+SF6JuDvwC0ANFW/F/DLjC7M/5vm+aXzIK/CJUnojLex6nCeyDNzLqfl0E3oecLOKz13pRHsDzgNHYAGQ==, tarball: file:projects/pod-front.tgz}
     name: '@rush-temp/pod-front'
     version: 0.0.0
     dependencies:
@@ -28766,7 +28749,7 @@ packages:
     dev: false
 
   file:projects/pod-github.tgz(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-prosemirror@1.2.2):
-    resolution: {integrity: sha512-WnIupxKJkkE/0F06plCcJxaijJf8mwN80v8tgb1hqkpNOB2BbBWdcDbFk0apeiASq7SiI22r16l7aZA2kAqjig==, tarball: file:projects/pod-github.tgz}
+    resolution: {integrity: sha512-RA87aZVbfB6BoGlJ19b/c8Hqd6Xc8T0VjxDw/cmrGWVBP5itbg/Vliquag/JsEXrqzRKr/c0WkNWB6lkr4ojSQ==, tarball: file:projects/pod-github.tgz}
     id: file:projects/pod-github.tgz
     name: '@rush-temp/pod-github'
     version: 0.0.0
diff --git a/desktop/package.json b/desktop/package.json
index 707f7d7f5b..cb1136e7c8 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -203,7 +203,7 @@
     "electron-windows-badge": "^1.1.0",
     "svelte": "^4.2.12",
     "commander": "^8.1.0",
-    "electron-store": "^10.0.0",
+    "electron-store": "^8.2.0",
     "electron-log": "^5.1.7",
     "electron-updater": "^6.2.1",
     "livekit-client": "^2.0.10"