Office: use pulse for invites and join requests

models/love/src/index.ts

@@ -31,16 +31,13 @@ import {
 import {
   type DevicesPreference,
   type Floor,
-  type Invite,
-  type JoinRequest,
   loveId,
   type Meeting,
   type MeetingMinutes,
   type MeetingStatus,
   type MeetingSchedule,
   type Office,
   type ParticipantInfo,
-  type RequestStatus,
   type Room,
   type RoomAccess,
   type RoomInfo,
@@ -163,31 +160,6 @@ export class TParticipantInfo extends TDoc implements ParticipantInfo {
   account!: AccountUuid | null
 }
 
-@Model(love.class.JoinRequest, core.class.Doc, DOMAIN_TRANSIENT)
-export class TJoinRequest extends TDoc implements JoinRequest {
-  @Prop(TypeRef(contact.class.Person), getEmbeddedLabel('From'))
-    person!: Ref<Person>
-
-  @Prop(TypeRef(love.class.Room), love.string.Room)
-    room!: Ref<Room>
-
-  status!: RequestStatus
-}
-
-@Model(love.class.Invite, core.class.Doc, DOMAIN_TRANSIENT)
-export class TInvite extends TDoc implements Invite {
-  @Prop(TypeRef(contact.class.Person), getEmbeddedLabel('From'))
-    from!: Ref<Person>
-
-  @Prop(TypeRef(contact.class.Person), getEmbeddedLabel('Target'))
-    target!: Ref<Person>
-
-  @Prop(TypeRef(love.class.Room), love.string.Room)
-    room!: Ref<Room>
-
-  status!: RequestStatus
-}
-
 @Model(love.class.DevicesPreference, preference.class.Preference)
 export class TDevicesPreference extends TPreference implements DevicesPreference {
   blurRadius!: number
@@ -272,10 +244,8 @@ export function createModel (builder: Builder): void {
     TFloor,
     TOffice,
     TParticipantInfo,
-    TJoinRequest,
     TDevicesPreference,
     TRoomInfo,
-    TInvite,
     TMeeting,
     TMeetingMinutes,
     TMeetingSchedule
@@ -388,36 +358,6 @@ export function createModel (builder: Builder): void {
     love.ids.LoveNotificationGroup
   )
 
-  builder.createDoc(
-    notification.class.NotificationType,
-    core.space.Model,
-    {
-      hidden: false,
-      generated: false,
-      label: love.string.InivitingLabel,
-      group: love.ids.LoveNotificationGroup,
-      txClasses: [core.class.TxCreateDoc],
-      objectClass: love.class.Invite,
-      defaultEnabled: true
-    },
-    love.ids.InviteNotification
-  )
-
-  builder.createDoc(
-    notification.class.NotificationType,
-    core.space.Model,
-    {
-      hidden: false,
-      generated: false,
-      label: love.string.KnockingLabel,
-      group: love.ids.LoveNotificationGroup,
-      txClasses: [],
-      objectClass: love.class.JoinRequest,
-      defaultEnabled: true
-    },
-    love.ids.KnockNotification
-  )
-
   builder.createDoc(notification.class.NotificationProviderDefaults, core.space.Model, {
     provider: notification.providers.SoundNotificationProvider,
     excludeIgnore: [love.ids.KnockNotification],
@@ -514,11 +454,6 @@ export function createModel (builder: Builder): void {
     components: { input: { component: chunter.component.ChatMessageInput, props: { collection: 'messages' } } }
   })
 
-  builder.mixin(love.class.JoinRequest, core.class.Class, core.mixin.TxAccessLevel, {
-    createAccessLevel: AccountRole.Guest,
-    removeAccessLevel: AccountRole.Guest
-  })
-
   builder.mixin(love.class.ParticipantInfo, core.class.Class, core.mixin.TxAccessLevel, {
     createAccessLevel: AccountRole.Guest,
     updateAccessLevel: AccountRole.Guest

models/server-love/src/index.ts

@@ -64,22 +64,6 @@ export function createModel (builder: Builder): void {
     }
   })
 
-  builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverLove.trigger.OnKnock,
-    txMatch: {
-      objectClass: love.class.JoinRequest,
-      _class: core.class.TxCreateDoc
-    }
-  })
-
-  builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverLove.trigger.OnInvite,
-    txMatch: {
-      objectClass: love.class.Invite,
-      _class: core.class.TxCreateDoc
-    }
-  })
-
   builder.mixin(love.class.MeetingMinutes, core.class.Class, serverCore.mixin.SearchPresenter, {
     searchIcon: love.icon.MeetingMinutes,
     title: [['title']]

packages/presentation/package.json

@@ -62,6 +62,7 @@
     "@hcengineering/theme": "^0.6.5",
     "@hcengineering/retry": "^0.6.0",
     "@hcengineering/hulylake-client": "^0.6.0",
+    "@hcengineering/hulypulse-client": "^0.6.0",
     "fast-equals": "^5.2.2",
     "png-chunks-extract": "^1.0.0",
     "svelte": "^4.2.20",

packages/presentation/src/index.ts

@@ -78,3 +78,4 @@ export * from './drawingCommand'
 export * from './drawingCommandsProcessor'
 export * from './link-preview'
 export * from './communication'
+export * from './pulse'

plugins/presence-resources/src/pulse.ts → packages/presentation/src/pulse.ts

@@ -13,7 +13,7 @@
 
 import { HulypulseClient } from '@hcengineering/hulypulse-client'
 import { getMetadata } from '@hcengineering/platform'
-import presentation from '@hcengineering/presentation'
+import presentation from './plugin'
 
 let pulseclient: HulypulseClient | undefined
 

packages/ui/src/popups.ts

@@ -143,7 +143,7 @@ export function showPopup (
     id,
     close: closePopupOp,
     update: (props) => {
-      updatePopup(id, props)
+      updatePopup(id, { props })
     }
   }
 }

plugins/love-resources/package.json

@@ -65,6 +65,7 @@
     "@hcengineering/emoji-resources": "^0.6.0",
     "@hcengineering/theme": "^0.6.5",
     "@hcengineering/account-client": "^0.6.0",
+    "@hcengineering/hulypulse-client": "^0.6.0",
     "@livekit/krisp-noise-filter": "^0.3.0",
     "@livekit/track-processors": "^0.5.6",
     "livekit-client": "^2.15.6",

plugins/love-resources/src/components/PersonActionPopup.svelte

@@ -5,7 +5,8 @@
   import { ActionIcon } from '@hcengineering/ui'
   import love from '../plugin'
   import { myInfo } from '../stores'
-  import { joinMeeting, kick, sendInvites } from '../meetings'
+  import { joinMeeting, kick } from '../meetings'
+  import { sendInvites } from '../invites'
 
   export let room: Room
   export let person: Ref<Person>
@@ -30,7 +31,7 @@
       label={love.string.Invite}
       icon={love.icon.Invite}
       action={() => {
-        void sendInvites([person])
+        sendInvites([person])
       }}
     />
     {#if room.access === RoomAccess.Knock}

plugins/love-resources/src/components/WorkbenchExtension.svelte

@@ -5,6 +5,11 @@
   import love from '../plugin'
   import { liveKitClient, lk } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
+  import { subscribeInviteRequests, unsubscribeInviteRequests } from '../invites'
+  import { Room } from '@hcengineering/love'
+  import { subscribeJoinRequests, unsubscribeJoinRequests } from '../joinRequests'
+  import { Ref } from '@hcengineering/core'
+  import { myInfo } from '../stores'
 
   let parentElement: HTMLDivElement
 
@@ -33,13 +38,26 @@
     }
   }
 
-  onMount(() => {
+  function subscribeRoomRequests (room: Ref<Room> | undefined): void {
+    unsubscribeJoinRequests()
+      .then(() => subscribeJoinRequests(room))
+      .catch((e) => {
+        console.log(e)
+      })
+  }
+
+  $: subscribeRoomRequests($myInfo?.room)
+
+  onMount(async () => {
     pushRootBarComponent('left', love.component.ControlExt, 20)
     lk.on(RoomEvent.TrackSubscribed, handleTrackSubscribed)
     lk.on(RoomEvent.TrackUnsubscribed, handleTrackUnsubscribed)
+
+    await subscribeInviteRequests()
   })
 
   onDestroy(async () => {
+    await unsubscribeInviteRequests()
     lk.off(RoomEvent.TrackSubscribed, handleTrackSubscribed)
     lk.off(RoomEvent.TrackUnsubscribed, handleTrackUnsubscribed)
     if ($lkSessionConnected) {

plugins/love-resources/src/components/meeting/ControlExt.svelte

@@ -14,29 +14,17 @@
 -->
 <script lang="ts">
   import { IdMap, Ref, toIdMap } from '@hcengineering/core'
-  import { Invite, isOffice, JoinRequest, ParticipantInfo, RequestStatus, Room } from '@hcengineering/love'
-  import { createQuery, getClient } from '@hcengineering/presentation'
-  import {
-    closePopup,
-    eventToHTMLElement,
-    Location,
-    location,
-    PopupResult,
-    showPopup,
-    closeTooltip
-  } from '@hcengineering/ui'
+  import { isOffice, ParticipantInfo, Room } from '@hcengineering/love'
+  import { getClient } from '@hcengineering/presentation'
+  import { closePopup, eventToHTMLElement, Location, location, showPopup, closeTooltip } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import workbench from '@hcengineering/workbench'
   import { closeWidget, sidebarStore } from '@hcengineering/workbench-resources'
 
   import love from '../../plugin'
-  import { activeInvites, currentRoom, infos, myInfo, myInvites, myRequests, rooms } from '../../stores'
+  import { currentRoom, infos, myInfo, rooms } from '../../stores'
   import { createMeetingWidget, getRoomName } from '../../utils'
-  import ActiveInvitesPopup from './invites/ActiveInvitesPopup.svelte'
-  import InvitePopup from './invites/InvitePopup.svelte'
   import PersonActionPopup from '../PersonActionPopup.svelte'
-  import RequestPopup from './invites/RequestPopup.svelte'
-  import RequestingPopup from './invites/RequestingPopup.svelte'
   import RoomPopup from '../RoomPopup.svelte'
   import RoomButton from '../RoomButton.svelte'
   import { leaveMeeting, currentMeetingRoom } from '../../meetings'
@@ -70,112 +58,19 @@
 
   $: activeRooms = getActiveRooms($rooms, $infos)
 
-  const query = createQuery()
-  let requests: JoinRequest[] = []
-  query.query(love.class.JoinRequest, { status: RequestStatus.Pending }, (res) => {
-    requests = res
-  })
-
-  let activeRequest: JoinRequest | undefined = undefined
-  const joinRequestCategory = 'joinRequest'
-  function checkRequests (requests: JoinRequest[], $myInfo: ParticipantInfo | undefined): void {
-    if (activeRequest !== undefined) {
-      // try to find active request, if it not exists close popup
-      if (requests.find((r) => r._id === activeRequest?._id && r.room === $myInfo?.room) === undefined) {
-        closePopup(joinRequestCategory)
-        activeRequest = undefined
-      }
-    }
-    if (activeRequest === undefined) {
-      activeRequest = requests.find((r) => r.room === $myInfo?.room)
-      if (activeRequest !== undefined) {
-        showPopup(RequestPopup, { request: activeRequest }, undefined, undefined, undefined, {
-          category: joinRequestCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    }
-  }
-
-  const myJoinRequestCategory = 'MyJoinRequest'
-  let myRequestsPopup: PopupResult | undefined = undefined
-
-  function checkMyRequests (requests: JoinRequest[]): void {
-    if (requests.length > 0) {
-      if (myRequestsPopup === undefined) {
-        myRequestsPopup = showPopup(RequestingPopup, { request: requests[0] }, undefined, undefined, undefined, {
-          category: myJoinRequestCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    } else if (myRequestsPopup !== undefined) {
-      myRequestsPopup.close()
-      myRequestsPopup = undefined
-    }
-  }
-
-  $: checkMyRequests($myRequests)
-
-  $: checkRequests(requests, $myInfo)
-
   function openRoom (room: Room): (e: MouseEvent) => void {
     return (e: MouseEvent) => {
       closeTooltip()
       showPopup(RoomPopup, { room }, eventToHTMLElement(e))
     }
   }
 
-  let activeInvite: Invite | undefined = undefined
-  const inviteCategory = 'inviteReq'
-  function checkInvites (invites: Invite[]): void {
-    if (activeInvite !== undefined) {
-      // try to find active request, if it not exists close popup
-      if (invites.find((r) => r._id === activeInvite?._id) === undefined) {
-        closePopup(inviteCategory)
-        activeInvite = undefined
-      }
-    }
-    if (activeInvite === undefined) {
-      activeInvite = invites[0]
-      if (activeInvite !== undefined) {
-        showPopup(InvitePopup, { invite: activeInvite }, undefined, undefined, undefined, {
-          category: inviteCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    }
-  }
-
-  $: checkInvites($myInvites)
-
   const myInvitesCategory = 'myInvites'
 
-  let myInvitesPopup: PopupResult | undefined = undefined
-
-  function checkActiveInvites (invites: Invite[]): void {
-    if (invites.length > 0) {
-      if (myInvitesPopup === undefined) {
-        myInvitesPopup = showPopup(ActiveInvitesPopup, {}, undefined, undefined, undefined, {
-          category: myInvitesCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    } else if (myInvitesPopup !== undefined) {
-      myInvitesPopup.close()
-      myInvitesPopup = undefined
-    }
-  }
-
   $: reception = $rooms.find((f) => f._id === love.ids.Reception)
 
   $: receptionParticipants = $infos.filter((p) => p.room === love.ids.Reception)
 
-  $: checkActiveInvites($activeInvites)
-
   function checkActiveMeeting (loc: Location, meetingSessionConnected: boolean, room: Ref<Room> | undefined): void {
     const meetingWidgetState = $sidebarStore.widgetsState.get(love.ids.MeetingWidget)
     const isMeetingWidgetCreated = meetingWidgetState !== undefined
@@ -211,9 +106,6 @@
 
   onDestroy(() => {
     closePopup(myInvitesCategory)
-    closePopup(inviteCategory)
-    closePopup(joinRequestCategory)
-    closePopup(myJoinRequestCategory)
     closeWidget(love.ids.MeetingWidget)
   })