From 24762abaa927316d41e4d25ff0241adaa9320053 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Thu, 6 Apr 2023 12:12:15 +0600
Subject: [PATCH] Fix notification mark (#2908)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 models/notification/src/index.ts              |  3 +-
 .../src/components/AppItem.svelte             | 14 +--
 .../src/components/Workbench.svelte           | 88 ++++++++++---------
 plugins/workbench/src/index.ts                |  1 -
 .../notification-resources/src/index.ts       |  7 +-
 5 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/models/notification/src/index.ts b/models/notification/src/index.ts
index 51246d79ed..1dfb3e2308 100644
--- a/models/notification/src/index.ts
+++ b/models/notification/src/index.ts
@@ -235,8 +235,7 @@ export function createModel (builder: Builder): void {
       label: notification.string.Inbox,
       icon: notification.icon.Notifications,
       alias: notificationId,
-      position: 'bottom',
-      hidden: false,
+      hidden: true,
       component: notification.component.Inbox
     },
     notification.app.Notification
diff --git a/plugins/workbench-resources/src/components/AppItem.svelte b/plugins/workbench-resources/src/components/AppItem.svelte
index bc05a3b550..31ee3cffe4 100644
--- a/plugins/workbench-resources/src/components/AppItem.svelte
+++ b/plugins/workbench-resources/src/components/AppItem.svelte
@@ -19,20 +19,12 @@
 
   export let label: IntlString
   export let icon: Asset | AnySvelteComponent
-  export let action: () => Promise<void>
-  export let selected: boolean
+  export let selected: boolean = false
   export let mini: boolean = false
-  export let notify: boolean
+  export let notify: boolean = false
 </script>
 
-<button
-  class="app"
-  class:selected
-  class:mini
-  id={'app-' + label}
-  use:tooltip={{ label }}
-  on:click|stopPropagation={action}
->
+<button class="app" class:selected class:mini id={'app-' + label} use:tooltip={{ label }} on:click>
   <div class="flex-center icon-container" class:mini class:noty={notify}>
     <Icon {icon} size={mini ? 'small' : 'large'} />
   </div>
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index 7bc67ba7b5..6a5a0455ff 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -15,35 +15,36 @@
 <script lang="ts">
   import calendar from '@hcengineering/calendar'
   import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
-  import core, { Class, Doc, getCurrentAccount, Ref, setCurrentAccount, Space } from '@hcengineering/core'
-  import notification, { NotificationStatus } from '@hcengineering/notification'
+  import core, { Class, Doc, Ref, Space, getCurrentAccount, setCurrentAccount } from '@hcengineering/core'
+  import login from '@hcengineering/login'
+  import notification, { notificationId } from '@hcengineering/notification'
   import { BrowserNotificatator, NotificationClientImpl } from '@hcengineering/notification-resources'
-  import { getMetadata, getResource, IntlString } from '@hcengineering/platform'
+  import { IntlString, getMetadata, getResource } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import request, { RequestStatus } from '@hcengineering/request'
   import {
     AnyComponent,
-    areLocationsEqual,
-    closePanel,
-    closePopup,
-    closeTooltip,
     Component,
     DatePickerPopup,
-    deviceOptionsStore as deviceInfo,
     Label,
-    location,
     Location,
-    navigate,
     NavLink,
-    openPanel,
     PanelInstance,
     Popup,
     PopupAlignment,
     PopupPosAlignment,
-    resizeObserver,
     ResolvedLocation,
-    showPopup,
-    TooltipInstance
+    TooltipInstance,
+    areLocationsEqual,
+    closePanel,
+    closePopup,
+    closeTooltip,
+    deviceOptionsStore as deviceInfo,
+    location,
+    navigate,
+    openPanel,
+    resizeObserver,
+    showPopup
   } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { ActionContext, ActionHandler, migrateViewOpttions } from '@hcengineering/view-resources'
@@ -52,17 +53,15 @@
   import { get } from 'svelte/store'
   import { subscribeMobile } from '../mobile'
   import workbench from '../plugin'
+  import { workspacesStore } from '../utils'
   import AccountPopup from './AccountPopup.svelte'
   import AppItem from './AppItem.svelte'
   import Applications from './Applications.svelte'
-  import Settings from './icons/Settings.svelte'
-  import TopMenu from './icons/TopMenu.svelte'
   import NavHeader from './NavHeader.svelte'
   import Navigator from './Navigator.svelte'
   import SpaceView from './SpaceView.svelte'
-  import login from '@hcengineering/login'
-  import { workspacesStore } from '../utils'
-  import App from './App.svelte'
+  import Settings from './icons/Settings.svelte'
+  import TopMenu from './icons/TopMenu.svelte'
 
   let contentPanel: HTMLElement
   let shownMenu: boolean = false
@@ -143,14 +142,13 @@
   let hasNotification = false
   const notificationQuery = createQuery()
 
-  $: notificationQuery.query(
-    notification.class.Notification,
+  notificationQuery.query(
+    notification.class.DocUpdates,
     {
-      attachedTo: account.employee,
-      status: { $nin: [NotificationStatus.Read] }
+      user: account._id
     },
     (res) => {
-      hasNotification = res.length > 0
+      hasNotification = res.some((p) => p.txes.length > 0)
     }
   )
 
@@ -501,6 +499,8 @@
       return apps
     }
   }
+
+  let prevLoc: Location | undefined = undefined
 </script>
 
 {#if employee?.active === true}
@@ -538,9 +538,8 @@
           icon={TopMenu}
           label={visibileNav ? workbench.string.HideMenu : workbench.string.ShowMenu}
           selected={!visibileNav}
-          action={toggleNav}
+          on:click={toggleNav}
           mini={appsMini}
-          notify={false}
         />
         <!-- svelte-ignore a11y-click-events-have-key-events -->
         <div class="thinButton" class:shownMenu on:click={() => (shownMenu = !shownMenu)}>
@@ -548,7 +547,7 @@
         </div>
       </div>
       <Applications
-        apps={getApps(apps).filter((p) => p.position !== 'bottom')}
+        apps={getApps(apps)}
         active={currentApplication?._id}
         direction={appsDirection}
         bind:shown={shownMenu}
@@ -557,26 +556,33 @@
         <AppItem
           icon={request.icon.Requests}
           label={request.string.Requests}
-          selected={false}
-          action={async () => {
-            showPopup(request.component.RequestsPopup, {}, popupPosition)
-          }}
+          on:click={() => showPopup(request.component.RequestsPopup, {}, popupPosition)}
           notify={hasRequests}
         />
         <AppItem
           icon={calendar.icon.Reminder}
           label={calendar.string.Reminders}
-          selected={false}
-          action={async () => {
-            showPopup(calendar.component.RemindersPopup, {}, popupPosition)
-          }}
-          notify={false}
+          on:click={() => showPopup(calendar.component.RemindersPopup, {}, popupPosition)}
         />
-        {#each getApps(apps).filter((p) => p.position === 'bottom') as app}
-          <NavLink app={app.alias}>
-            <App selected={app._id === currentApplication?._id} icon={app.icon} label={app.label} />
-          </NavLink>
-        {/each}
+        <NavLink app={notificationId}>
+          <AppItem
+            icon={notification.icon.Notifications}
+            label={notification.string.Inbox}
+            selected={currentAppAlias === notificationId}
+            on:click={(e) => {
+              if (currentAppAlias === notificationId) {
+                e.preventDefault()
+                e.stopPropagation()
+                if (prevLoc !== undefined) {
+                  navigate(prevLoc)
+                }
+              } else {
+                prevLoc = $location
+              }
+            }}
+            notify={hasNotification}
+          />
+        </NavLink>
         <div class="flex-center" class:mt-2={appsDirection === 'vertical'} class:ml-2={appsDirection === 'horizontal'}>
           <!-- svelte-ignore a11y-click-events-have-key-events -->
           <div
diff --git a/plugins/workbench/src/index.ts b/plugins/workbench/src/index.ts
index 88f3d654bf..04c3203fde 100644
--- a/plugins/workbench/src/index.ts
+++ b/plugins/workbench/src/index.ts
@@ -28,7 +28,6 @@ export interface Application extends Doc {
   alias: string
   icon: Asset
   hidden: boolean
-  position?: 'top' | 'bottom'
   navigatorModel?: NavigatorModel
   locationResolver?: Resource<(loc: Location) => Promise<ResolvedLocation | undefined>>
 
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index caf73599e9..ecb16008cc 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -389,8 +389,13 @@ export async function OnUpdateLastView (tx: Tx, control: TriggerControl): Promis
   if (actualTx._class !== core.class.TxUpdateDoc) return []
   if (actualTx.objectClass !== notification.class.LastView) return []
   const result: Tx[] = []
+  const lastView = (await control.findAll(notification.class.LastView, { _id: actualTx.objectId }))[0]
+  if (lastView === undefined) return result
   for (const key in actualTx.operations) {
-    const docs = await control.findAll(notification.class.DocUpdates, { attachedTo: key as Ref<Doc> })
+    const docs = await control.findAll(notification.class.DocUpdates, {
+      attachedTo: key as Ref<Doc>,
+      user: lastView.user
+    })
     for (const doc of docs) {
       const txes = doc.txes.filter((p) => p[1] > actualTx.operations[key])
       result.push(