mirror of
https://github.com/portainer/portainer.git
synced 2025-08-05 05:45:22 +02:00
fix(docker): missing browse volume option [EE-7179] (#11901)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
This commit is contained in:
parent
6486a5d971
commit
4d586f7a85
8 changed files with 61 additions and 42 deletions
|
@ -8,6 +8,7 @@ import { BasicTableSettings } from '@@/datatables/types';
|
|||
import { Button } from '@@/buttons';
|
||||
import { TableState } from '@@/datatables/useTableState';
|
||||
import { withMeta } from '@@/datatables/extend-options/withMeta';
|
||||
import { mergeOptions } from '@@/datatables/extend-options/mergeOptions';
|
||||
|
||||
import { FileData } from './types';
|
||||
import { columns } from './columns';
|
||||
|
@ -86,15 +87,17 @@ export function FilesTable({
|
|||
Dir: false,
|
||||
},
|
||||
}}
|
||||
extendTableOptions={withMeta({
|
||||
table: 'files',
|
||||
isEdit,
|
||||
setIsEdit,
|
||||
onRename,
|
||||
onBrowse,
|
||||
onDownload,
|
||||
onDelete,
|
||||
})}
|
||||
extendTableOptions={mergeOptions(
|
||||
withMeta({
|
||||
table: 'files',
|
||||
isEdit,
|
||||
setIsEdit,
|
||||
onRename,
|
||||
onBrowse,
|
||||
onDownload,
|
||||
onDelete,
|
||||
})
|
||||
)}
|
||||
disableSelect
|
||||
data-cy="files-datatable"
|
||||
renderTableActions={() => {
|
||||
|
|
|
@ -6,6 +6,7 @@ import { createPersistedStore } from '@@/datatables/types';
|
|||
import { useTableState } from '@@/datatables/useTableState';
|
||||
import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable';
|
||||
import { withMeta } from '@@/datatables/extend-options/withMeta';
|
||||
import { mergeOptions } from '@@/datatables/extend-options/mergeOptions';
|
||||
|
||||
import { ContainerListViewModel } from '../../types';
|
||||
|
||||
|
@ -60,10 +61,12 @@ export function ContainerNetworksDatatable({
|
|||
selectedNetworks={networks.map((n) => n.id)}
|
||||
/>
|
||||
}
|
||||
extendTableOptions={withMeta({
|
||||
table: 'container-networks',
|
||||
containerId: container.Id,
|
||||
})}
|
||||
extendTableOptions={mergeOptions(
|
||||
withMeta({
|
||||
table: 'container-networks',
|
||||
containerId: container.Id,
|
||||
})
|
||||
)}
|
||||
data-cy="container-networks-datatable"
|
||||
/>
|
||||
);
|
||||
|
|
|
@ -13,6 +13,7 @@ import { useTableState } from '@@/datatables/useTableState';
|
|||
import { useRepeater } from '@@/datatables/useRepeater';
|
||||
import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
|
||||
import { withMeta } from '@@/datatables/extend-options/withMeta';
|
||||
import { mergeOptions } from '@@/datatables/extend-options/mergeOptions';
|
||||
|
||||
import { useColumns } from './columns';
|
||||
|
||||
|
@ -52,10 +53,12 @@ export function NodesDatatable({
|
|||
dataset={dataset || []}
|
||||
isLoading={!dataset}
|
||||
settingsManager={tableState}
|
||||
extendTableOptions={withMeta({
|
||||
table: 'nodes',
|
||||
haveAccessToNode,
|
||||
})}
|
||||
extendTableOptions={mergeOptions(
|
||||
withMeta({
|
||||
table: 'nodes',
|
||||
haveAccessToNode,
|
||||
})
|
||||
)}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
<TableSettingsMenuAutoRefresh
|
||||
|
|
|
@ -14,6 +14,7 @@ import { useRepeater } from '@@/datatables/useRepeater';
|
|||
import { useTableState } from '@@/datatables/useTableState';
|
||||
import { withMeta } from '@@/datatables/extend-options/withMeta';
|
||||
import { withColumnFilters } from '@@/datatables/extend-options/withColumnFilters';
|
||||
import { mergeOptions } from '@@/datatables/extend-options/mergeOptions';
|
||||
|
||||
import { DecoratedVolume } from '../types';
|
||||
|
||||
|
@ -69,16 +70,13 @@ export function VolumesDatatable({
|
|||
/>
|
||||
</TableSettingsMenu>
|
||||
)}
|
||||
extendTableOptions={
|
||||
(withMeta({
|
||||
extendTableOptions={mergeOptions(
|
||||
withMeta({
|
||||
table: 'volumes',
|
||||
isBrowseVisible,
|
||||
}),
|
||||
withColumnFilters(
|
||||
tableState.columnFilters,
|
||||
tableState.setColumnFilters
|
||||
))
|
||||
}
|
||||
withColumnFilters(tableState.columnFilters, tableState.setColumnFilters)
|
||||
)}
|
||||
data-cy="docker-volumes-datatable"
|
||||
/>
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue