WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-30 13:35:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

New Activity - squashed (#4032)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
Co-authored-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Kristina
2023-12-11 18:54:36 +07:00
committed by GitHub
co-authored by Andrey Sobolev
parent 119d65653a
commit ea3eb4af83
212 changed files with 7611 additions and 3159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/workbench-resources/src/components/Workbench.svelte
+36 -1
View File
@@ -163,11 +163,21 @@
)
let hasNotification = false
// let hasInboxNotifications = false
const notificationClient = NotificationClientImpl.getClient()
notificationClient.docUpdates.subscribe((res) => {
hasNotification = res.some((p) => !p.hidden && p.txes.some((p) => p.isNew))
})
// const newNotificationClient = InboxNotificationsClientImpl.getClient()
//
// newNotificationClient.inboxNotificationsByContext.subscribe((inboxNotificationsByContext) => {
// hasInboxNotifications = Array.from(inboxNotificationsByContext.entries()).some(
// ([docNotifyContext, notifications]) => !docNotifyContext.hidden && notifications.some(({ isViewed }) => !isViewed)
// )
// })
const workspaceId = $location.path[1]
const doSyncLoc = async (loc: Location): Promise<void> => {
@@ -369,6 +379,11 @@
setSpaceSpecial(special)
}
}
if (special !== currentSpecial && (navigatorModel?.aside || currentApplication?.aside)) {
asideId = special
}
if (app !== undefined) {
localStorage.setItem(`${locationStorageKeyId}_${app}`, originalLoc)
}
@@ -655,6 +670,26 @@
notify={hasNotification}
/>
</NavLink>
<!-- NOTE: temporarily disabled -->
<!-- <NavLink app={inboxId} shrink={0}>-->
<!-- <AppItem-->
<!-- icon={notification.icon.Notifications}-->
<!-- label={notification.string.Inbox}-->
<!-- selected={currentAppAlias === inboxId || inboxPopup !== undefined}-->
<!-- on:click={(e) => {-->
<!-- if (e.metaKey || e.ctrlKey) return-->
<!-- if (currentAppAlias === inboxId && lastLoc !== undefined) {-->
<!-- e.preventDefault()-->
<!-- e.stopPropagation()-->
<!-- navigate(lastLoc)-->
<!-- lastLoc = undefined-->
<!-- } else {-->
<!-- lastLoc = $location-->
<!-- }-->
<!-- }}-->
<!-- notify={hasInboxNotifications}-->
<!-- />-->
<!-- </NavLink>-->
<Applications apps={getApps(apps)} active={currentApplication?._id} direction={appsDirection} />
</div>
<div class="info-box {appsDirection}" class:vertical-mobile={appsDirection === 'vertical'} class:mini={appsMini}>
@@ -780,7 +815,7 @@
<SpaceView {currentSpace} {currentView} {createItemDialog} {createItemLabel} />
{/if}
</div>
{#if asideId && currentSpace}
{#if asideId}
{@const asideComponent = navigatorModel?.aside ?? currentApplication?.aside}
{#if asideComponent !== undefined}
<Separator name={'workbench'} index={1} />