Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UBERF-5012: remove extra key (avoid reloading after notifications deleting) #4399

Merged
merged 2 commits into from
Jan 22, 2024
Merged

UBERF-5012: remove extra key (avoid reloading after notifications deleting) #4399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb79389
UBERF-5012: remove extra key
kristina-fefelova Jan 22, 2024
22a3c69
UBERF-5012: fix format
kristina-fefelova Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions plugins/notification-resources/src/components/inbox/Inbox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand 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

Expand All @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -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) ?? []
Expand Down Expand Up @@ -246,7 +244,6 @@
is={viewlet.$lookup.descriptor.component}
props={{
notifications: filteredNotifications,
checkedContexts,
viewlets,
selectedContext
}}
Expand Down
44 changes: 21 additions & 23 deletions plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
28 changes: 13 additions & 15 deletions plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down