Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 13:29:41 +02:00
Code Issues Releases Activity

fix(apps): persist table settings [r8s-120] (#10)

Browse source 
Co-authored-by: testA113 <aliharriss1995@gmail.com>
This commit is contained in:
Yajith Dayarathna 2024-10-14 11:27:04 +13:00 • committed by GitHub
parent fd0bc652a9
commit c88382ec1f
8 changed files with 13 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/react/kubernetes/applications/ListView/ApplicationsDatatable/ApplicationsDatatable.tsx
View file

@ -1,4 +1,4 @@
import { useEffect, useMemo } from 'react';
import { useMemo } from 'react';
import { BoxIcon } from 'lucide-react';
import { groupBy, partition } from 'lodash';
@ -36,8 +36,6 @@ export function ApplicationsDatatable({
namespace = '',
namespaces,
onNamespaceChange,
showSystem,
onShowSystemChange,
hideStacks,
}: {
onRefresh: () => void;
@ -45,8 +43,6 @@ export function ApplicationsDatatable({
namespace?: string;
namespaces: Array<Namespace>;
onNamespaceChange(namespace: string): void;
showSystem?: boolean;
onShowSystemChange(showSystem: boolean): void;
hideStacks: boolean;
}) {
const envId = useEnvironmentId();
@ -61,20 +57,13 @@ export function ApplicationsDatatable({
undefined,
false
);
const { setShowSystemResources } = tableState;
useEffect(() => {
setShowSystemResources(showSystem || false);
}, [showSystem, setShowSystemResources]);
const applicationsQuery = useApplications(envId, {
refetchInterval: tableState.autoRefreshRate * 1000,
namespace,
withDependencies: true,
});
const applications = useApplicationsRowData(applicationsQuery.data);
const filteredApplications = showSystem
const filteredApplications = tableState.showSystemResources
? applications
: applications.filter(
(application) =>
@ -127,10 +116,7 @@ export function ApplicationsDatatable({
}
renderTableSettings={() => (
<TableSettingsMenu>
<DefaultDatatableSettings
settings={tableState}
onShowSystemChange={onShowSystemChange}
/>
<DefaultDatatableSettings settings={tableState} />
</TableSettingsMenu>
)}
description={

29
app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
View file

@ -1,5 +1,4 @@
import { List } from 'lucide-react';
import { useEffect } from 'react';
import { useAuthorizations } from '@/react/hooks/useUser';
import { SystemResourceDescription } from '@/react/kubernetes/datatables/SystemResourceDescription';
@ -7,16 +6,17 @@ import { createStore } from '@/react/kubernetes/datatables/default-kube-datatabl
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
import { isSystemNamespace } from '@/react/kubernetes/namespaces/queries/useIsSystemNamespace';
import { useNamespacesQuery } from '@/react/kubernetes/namespaces/queries/useNamespacesQuery';
import { DefaultDatatableSettings } from '@/react/kubernetes/datatables/DefaultDatatableSettings';
import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable';
import { useTableState } from '@@/datatables/useTableState';
import { TableSettingsMenu } from '@@/datatables';
import { useApplications } from '../../application.queries';
import { columns } from './columns';
import { SubRows } from './SubRows';
import { Namespace, Stack } from './types';
import { StacksSettingsMenu } from './StacksSettingsMenu';
import { NamespaceFilter } from './NamespaceFilter';
import { TableActions } from './TableActions';
import { getStacksFromApplications } from './getStacksFromApplications';
@ -30,8 +30,6 @@ interface Props {
namespace?: string;
namespaces: Array<Namespace>;
onNamespaceChange(namespace: string): void;
showSystem?: boolean;
setSystemResources(showSystem: boolean): void;
}
export function ApplicationsStacksDatatable({
@ -39,17 +37,9 @@ export function ApplicationsStacksDatatable({
namespace = '',
namespaces,
onNamespaceChange,
showSystem,
setSystemResources,
}: Props) {
const tableState = useTableState(settingsStore, storageKey);
const { setShowSystemResources } = tableState;
useEffect(() => {
setShowSystemResources(showSystem || false);
}, [showSystem, setShowSystemResources]);
const envId = useEnvironmentId();
const applicationsQuery = useApplications(envId, {
refetchInterval: tableState.autoRefreshRate * 1000,
@ -58,7 +48,7 @@ export function ApplicationsStacksDatatable({
});
const namespaceListQuery = useNamespacesQuery(envId);
const applications = applicationsQuery.data ?? [];
const filteredApplications = showSystem
const filteredApplications = tableState.showSystemResources
? applications
: applications.filter(
(item) =>
@ -90,12 +80,14 @@ export function ApplicationsStacksDatatable({
namespaces={namespaces}
value={namespace}
onChange={onNamespaceChange}
showSystem={showSystem}
showSystem={tableState.showSystemResources}
/>
</div>
<div className="space-y-2">
<SystemResourceDescription showSystemResources={showSystem} />
<SystemResourceDescription
showSystemResources={tableState.showSystemResources}
/>
</div>
</div>
}
@ -103,10 +95,9 @@ export function ApplicationsStacksDatatable({
<TableActions selectedItems={selectedItems} onRemove={onRemove} />
)}
renderTableSettings={() => (
<StacksSettingsMenu
setSystemResources={setSystemResources}
settings={tableState}
/>
<TableSettingsMenu>
<DefaultDatatableSettings settings={tableState} />
</TableSettingsMenu>
)}
getRowId={(row) => `${row.Name}-${row.ResourcePool}`}
data-cy="applications-stacks-datatable"

31
app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/StacksSettingsMenu.tsx
View file

@ -1,31 +0,0 @@
import { SystemResourcesSettings } from '@/react/kubernetes/datatables/SystemResourcesSettings';
import { TableSettingsMenu } from '@@/datatables';
import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
import { type TableSettings } from './types';
export function StacksSettingsMenu({
settings,
setSystemResources,
}: {
settings: TableSettings;
setSystemResources(showSystem: boolean): void;
}) {
return (
<TableSettingsMenu>
<SystemResourcesSettings
value={settings.showSystemResources}
onChange={(value) => {
setSystemResources(value);
settings.setShowSystemResources(value);
}}
/>
<TableSettingsMenuAutoRefresh
onChange={settings.setAutoRefreshRate}
value={settings.autoRefreshRate}
/>
</TableSettingsMenu>
);
}