UBERF-5012: remove extra key (avoid reloading after notifications del…

…eting) (#4399) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
hcengineering · Jan 22, 2024 · 581cb35 · 581cb35
1 parent 32d9073
commit 581cb35
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 48 deletions.
diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte
@@ -44,6 +44,7 @@
   import Filter from '../Filter.svelte'
   import { getDisplayInboxNotifications, resolveLocation } from '../../utils'
   import { InboxNotificationsFilter } from '../../types'
+  import { onDestroy } from 'svelte'
 
   export let visibleNav: boolean = true
   export let navFloat: boolean = false
@@ -55,8 +56,6 @@
   const notificationsByContextStore = inboxClient.inboxNotificationsByContext
   const notifyContextsStore = inboxClient.docNotifyContexts
 
-  const checkedContexts = new Set<Ref<DocNotifyContext>>()
-
   const allTab: TabItem = {
     id: 'all',
     labelIntl: notification.string.All
@@ -71,18 +70,20 @@
   }
 
   let displayNotifications: DisplayInboxNotification[] = []
+  let displayContextsIds = new Set<Ref<DocNotifyContext>>()
+
   let filteredNotifications: DisplayInboxNotification[] = []
   let filter: InboxNotificationsFilter = 'all'
 
   let tabItems: TabItem[] = []
-  let displayContextsIds = new Set<Ref<DocNotifyContext>>()
   let selectedTabId: string = allTab.id
 
   let selectedContextId: Ref<DocNotifyContext> | undefined = undefined
   let selectedContext: DocNotifyContext | undefined = undefined
   let selectedComponent: AnyComponent | undefined = undefined
 
   let viewlets: ActivityNotificationViewlet[] = []
+
   let viewlet: WithLookup<Viewlet> | undefined
   let loading = true
 
@@ -91,10 +92,9 @@
   })
 
   $: displayNotifications = getDisplayInboxNotifications($notificationsByContextStore, filter)
+  $: displayContextsIds = new Set(displayNotifications.map(({ docNotifyContext }) => docNotifyContext))
 
-  locationStore.subscribe((newLocation) => {
-    syncLocation(newLocation)
-  })
+  $: filteredNotifications = filterNotifications(selectedTabId, displayNotifications, $notifyContextsStore)
 
   async function syncLocation (newLocation: Location) {
     const loc = await resolveLocation(newLocation)
@@ -110,11 +110,8 @@
     ? selectedContext ?? $notifyContextsStore.find(({ _id }) => _id === selectedContextId)
     : undefined
 
-  $: displayContextsIds = new Set(displayNotifications.map(({ docNotifyContext }) => docNotifyContext))
   $: updateSelectedPanel(selectedContext)
-
   $: updateTabItems(displayContextsIds, $notifyContextsStore)
-  $: filteredNotifications = filterNotifications(selectedTabId, displayNotifications, $notifyContextsStore)
 
   function updateTabItems (displayContextsIds: Set<Ref<DocNotifyContext>>, notifyContexts: DocNotifyContext[]): void {
     const displayClasses = new Set(
@@ -174,6 +171,7 @@
 
     const isChunterChannel = hierarchy.isDerived(selectedContext.attachedToClass, chunter.class.ChunterSpace)
     const panelComponent = hierarchy.classHierarchyMixin(selectedContext.attachedToClass, view.mixin.ObjectPanel)
+
     selectedComponent = panelComponent?.component ?? view.component.EditDoc
 
     const contextNotifications = $notificationsByContextStore.get(selectedContext._id) ?? []
@@ -246,7 +244,6 @@
                 is={viewlet.$lookup.descriptor.component}
                 props={{
                   notifications: filteredNotifications,
-                  checkedContexts,
                   viewlets,
                   selectedContext
                 }}

diff --git a/plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte b/plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte
@@ -82,29 +82,27 @@
   <ListView bind:this={list} bind:selection={listSelection} count={notifications.length}>
     <svelte:fragment slot="item" let:item={itemIndex}>
       {@const notification = notifications[itemIndex]}
-      {#key notification._id}
-        <div class="notification gap-2 ml-2">
-          <!--        <div class="mt-6">-->
-          <!--          <CheckBox-->
-          <!--            circle-->
-          <!--            kind="primary"-->
-          <!--            on:value={(event) => {-->
-          <!--              handleCheck(notification, event.detail)-->
-          <!--            }}-->
-          <!--          />-->
-          <!--        </div>-->
-          <InboxNotificationPresenter
-            value={notification}
-            {viewlets}
-            onClick={() => {
-              dispatch('click', {
-                context: $notifyContextsStore.find(({ _id }) => _id === notification.docNotifyContext),
-                notification
-              })
-            }}
-          />
-        </div>
-      {/key}
+      <div class="notification gap-2 ml-2">
+        <!--        <div class="mt-6">-->
+        <!--          <CheckBox-->
+        <!--            circle-->
+        <!--            kind="primary"-->
+        <!--            on:value={(event) => {-->
+        <!--              handleCheck(notification, event.detail)-->
+        <!--            }}-->
+        <!--          />-->
+        <!--        </div>-->
+        <InboxNotificationPresenter
+          value={notification}
+          {viewlets}
+          onClick={() => {
+            dispatch('click', {
+              context: $notifyContextsStore.find(({ _id }) => _id === notification.docNotifyContext),
+              notification
+            })
+          }}
+        />
+      </div>
     </svelte:fragment>
   </ListView>
 </div>

diff --git a/plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte b/plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte
@@ -101,21 +101,19 @@
       {@const contextId = displayData[itemIndex][0]}
       {@const contextNotifications = displayData[itemIndex][1]}
       {@const context = $notifyContextsStore.find(({ _id }) => _id === contextId)}
-      {#key contextId}
-        {#if context}
-          <DocNotifyContextCard
-            value={context}
-            notifications={contextNotifications}
-            {viewlets}
-            on:click={(event) => {
-              dispatch('click', event.detail)
-              listSelection = itemIndex
-            }}
-            on:check={(event) => handleCheck(context, event.detail)}
-          />
-          <div class="separator" />
-        {/if}
-      {/key}
+      {#if context}
+        <DocNotifyContextCard
+          value={context}
+          notifications={contextNotifications}
+          {viewlets}
+          on:click={(event) => {
+            dispatch('click', event.detail)
+            listSelection = itemIndex
+          }}
+          on:check={(event) => handleCheck(context, event.detail)}
+        />
+        <div class="separator" />
+      {/if}
     </svelte:fragment>
   </ListView>
 </div>