Skip to content
Open
Changes from all commits
Commits
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
30 changes: 4 additions & 26 deletions src/lib/stores/configurable-table-columns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { page } from '$app/stores';

import type { Settings } from '$lib/types/global';

import { namespaces } from './namespaces';
import { persistStore } from './persist-store';
import { customSearchAttributes } from './search-attributes';

Expand Down Expand Up @@ -166,19 +165,12 @@ export const persistedSchedulesTableColumns = persistStore<State>(
);

export const configurableTableColumns: Readable<TableColumns> = derived(
[
namespaces,
page,
persistedWorkflowTableColumns,
persistedSchedulesTableColumns,
],
[page, persistedWorkflowTableColumns, persistedSchedulesTableColumns],
([
$namespaces,
$page,
$persistedWorkflowTableColumns,
$persistedSchedulesTableColumns,
]) => {
const state: TableColumns = {};
const useOrAddDefaultTableColumnsToNamespace = (
columns: State,
namespace: string,
Expand Down Expand Up @@ -216,24 +208,10 @@ export const configurableTableColumns: Readable<TableColumns> = derived(
),
});

const namespaceColumns =
$namespaces?.reduce(
(namespaceToColumnsMap, { namespaceInfo: { name } }): TableColumns => {
return {
...namespaceToColumnsMap,
[name]: getTableColumns(name),
};
},
state,
) ?? {};
const { namespace: currentNamespace } = $page.params;

return namespaceColumns[currentNamespace]
? namespaceColumns
: {
...namespaceColumns,
[currentNamespace]: getTableColumns(currentNamespace),
};
return {
[currentNamespace]: getTableColumns(currentNamespace),
};
},
);

Expand Down
Loading