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

fix(container): EE-3995 gpus console error under stack list page (#7530)

Browse source
This commit is contained in:
congs 2022-08-25 10:27:02 +12:00 • committed by GitHub
parent d4f4bb532f
commit e2789ab354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx
View file

@ -2,6 +2,7 @@ import _ from 'lodash';
import { Environment } from '@/portainer/environments/types';
import type { DockerContainer } from '@/react/docker/containers/types';
import { useShowGPUsColumn } from '@/react/docker/containers/utils';
import { TableSettingsMenu, Datatable } from '@@/datatables';
import {
@ -39,7 +40,8 @@ export function ContainersDatatable({
environment,
}: Props) {
const settings = useStore();
const columns = useColumns(isHostColumnVisible);
const isGPUsColumnVisible = useShowGPUsColumn(environment.Id);
const columns = useColumns(isHostColumnVisible, isGPUsColumnVisible);
const hidableColumns = _.compact(
columns.filter((col) => col.canHide).map((col) => col.id)
);

9
app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx
View file

@ -13,7 +13,10 @@ import { stack } from './stack';
import { state } from './state';
import { gpus } from './gpus';
export function useColumns(isHostColumnVisible: boolean) {
export function useColumns(
isHostColumnVisible: boolean,
isGPUsColumnVisible: boolean
) {
return useMemo(
() =>
_.compact([
@ -25,10 +28,10 @@ export function useColumns(isHostColumnVisible: boolean) {
created,
ip,
isHostColumnVisible && host,
gpus,
isGPUsColumnVisible && gpus,
ports,
ownership,
]),
[isHostColumnVisible]
[isHostColumnVisible, isGPUsColumnVisible]
);
}