Skip to content

feat(web): group notifications list by importance #965

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

Closed
pujitm wants to merge 2 commits into from
Closed

feat(web): group notifications list by importance #965

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79bd9a6
feat(web): group notifications list by importance
pujitm Nov 20, 2024
4a7e766
fix(web): reset infinite scroll when notification filters change
pujitm Nov 20, 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
29 changes: 25 additions & 4 deletions web/components/Notifications/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CheckIcon } from '@heroicons/vue/24/solid';
import { useQuery } from '@vue/apollo-composable';
import { vInfiniteScroll } from '@vueuse/components';
import { useFragment } from '~/composables/gql/fragment-masking';
import type { Importance, NotificationType } from '~/composables/gql/graphql';
import { type Importance, type NotificationType } from '~/composables/gql/graphql';
import { getNotifications, NOTIFICATION_FRAGMENT } from './graphql/notification.query';

/**
Expand All @@ -21,7 +21,13 @@ const props = withDefaults(
}
);

/** whether we should load more notifications */
const canLoadMore = ref(true);
/** reset when props (e.g. props.type filter) change*/
watch(props, () => {
canLoadMore.value = true;
});

const { result, error, fetchMore } = useQuery(getNotifications, () => ({
filter: {
offset: 0,
Expand All @@ -32,7 +38,7 @@ const { result, error, fetchMore } = useQuery(getNotifications, () => ({
}));

watch(error, (newVal) => {
console.log('[getNotifications] error:', newVal);
console.log('[NotificationsList] getNotifications error:', newVal);
});

const notifications = computed(() => {
Expand All @@ -43,8 +49,13 @@ const notifications = computed(() => {
return list.filter((n) => n.type === props.type);
});

/** notifications grouped by importance/severity */
const notificationGroups = computed(() => {
return Object.groupBy(notifications.value, ({ importance }) => importance);
});

async function onLoadMore() {
console.log('[getNotifications] onLoadMore');
console.log('[NotificationsList] onLoadMore');
const incoming = await fetchMore({
variables: {
filter: {
Expand Down Expand Up @@ -74,7 +85,17 @@ async function onLoadMore() {
class="divide-y divide-gray-200 overflow-y-auto pl-7 pr-4 h-full"
>
<NotificationsItem
v-for="notification in notifications"
v-for="notification in notificationGroups.ALERT"
:key="notification.id"
v-bind="notification"
/>
<NotificationsItem
v-for="notification in notificationGroups.WARNING"
:key="notification.id"
v-bind="notification"
/>
<NotificationsItem
v-for="notification in notificationGroups.INFO"
:key="notification.id"
v-bind="notification"
/>
Expand Down