github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(notifications): sort by newest first by default [EE-4467] (#7891)

pull/7812/head^2
itsconquest 2022-10-19 15:25:20 +13:00 committed by GitHub
parent 58947fee69
commit c1f94be9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/react/components/datatables/types.ts
View File

@ -24,10 +24,11 @@ export interface SortableTableSettings {
export function sortableSettings( export function sortableSettings(
set: Set<SortableTableSettings>, set: Set<SortableTableSettings>,
initialSortBy = 'name' initialSortBy = 'name',
desc = false
): SortableTableSettings { ): SortableTableSettings {
return { return {
sortBy: { id: initialSortBy, desc: false }, sortBy: { id: initialSortBy, desc },
setSortBy: (id: string, desc: boolean) => set({ sortBy: { id, desc } }), setSortBy: (id: string, desc: boolean) => set({ sortBy: { id, desc } }),
}; };
} }

2
app/react/portainer/notifications/NotificationsView.tsx
View File

@ -18,7 +18,7 @@ import { columns } from './columns';
import { createStore } from './datatable-store'; import { createStore } from './datatable-store';
const storageKey = 'notifications-list'; const storageKey = 'notifications-list';
const useSettingsStore = createStore(storageKey, 'time'); const useSettingsStore = createStore(storageKey, 'time', true);
export function NotificationsView() { export function NotificationsView() {
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();

8
app/react/portainer/notifications/datatable-store.ts
View File

@ -19,11 +19,15 @@ interface TableSettings
SettableColumnsTableSettings, SettableColumnsTableSettings,
RefreshableTableSettings {} RefreshableTableSettings {}
export function createStore(storageKey: string, initialSortBy?: string) { export function createStore(
storageKey: string,
initialSortBy?: string,
desc?: boolean
) {
return create<TableSettings>()( return create<TableSettings>()(
persist( persist(
(set) => ({ (set) => ({
...sortableSettings(set, initialSortBy), ...sortableSettings(set, initialSortBy, desc),
...paginationSettings(set), ...paginationSettings(set),
...hiddenColumnsSettings(set), ...hiddenColumnsSettings(set),
...refreshableSettings(set), ...refreshableSettings(set),