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

feat(ui): renovate edge devices list page EE-3622 (#7210)

pull/7029/head^2
matias-portainer 2022-07-27 17:09:44 -03:00 committed by GitHub
parent cc0ab75aca
commit 52ac54f15c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
View File

@ -123,7 +123,17 @@ export function EdgeDevicesDatatable({
<div className="row"> <div className="row">
<div className="col-sm-12"> <div className="col-sm-12">
<TableContainer> <TableContainer>
<TableTitle icon="fa-plug" label="Edge Devices"> <TableTitle icon="box" featherIcon label="Edge Devices">
<SearchBar value={search} onChange={handleSearchBarChange} />
<TableActions>
<EdgeDevicesDatatableActions
selectedItems={selectedFlatRows.map((row) => row.original)}
isFDOEnabled={isFdoEnabled}
isOpenAMTEnabled={isOpenAmtEnabled}
setLoadingMessage={setLoadingMessage}
showWaitingRoomLink={showWaitingRoomLink}
/>
</TableActions>
<TableTitleActions> <TableTitleActions>
<ColumnVisibilityMenu<Environment> <ColumnVisibilityMenu<Environment>
columns={columnsToHide} columns={columnsToHide}
@ -135,15 +145,6 @@ export function EdgeDevicesDatatable({
</TableSettingsMenu> </TableSettingsMenu>
</TableTitleActions> </TableTitleActions>
</TableTitle> </TableTitle>
<TableActions>
<EdgeDevicesDatatableActions
selectedItems={selectedFlatRows.map((row) => row.original)}
isFDOEnabled={isFdoEnabled}
isOpenAMTEnabled={isOpenAmtEnabled}
setLoadingMessage={setLoadingMessage}
showWaitingRoomLink={showWaitingRoomLink}
/>
</TableActions>
{isOpenAmtEnabled && someDeviceHasAMTActivated && ( {isOpenAmtEnabled && someDeviceHasAMTActivated && (
<div className={styles.kvmTip}> <div className={styles.kvmTip}>
<TextTip color="blue"> <TextTip color="blue">
@ -161,7 +162,6 @@ export function EdgeDevicesDatatable({
</TextTip> </TextTip>
</div> </div>
)} )}
<SearchBar value={search} onChange={handleSearchBarChange} />
<Table <Table
className={tableProps.className} className={tableProps.className}
role={tableProps.role} role={tableProps.role}

9
app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
View File

@ -33,13 +33,13 @@ export function EdgeDevicesDatatableActions({
disabled={selectedItems.length < 1} disabled={selectedItems.length < 1}
color="danger" color="danger"
onClick={() => onDeleteEdgeDeviceClick()} onClick={() => onDeleteEdgeDeviceClick()}
icon="trash-2"
featherIcon
> >
<i className="fa fa-trash-alt space-right" aria-hidden="true" />
Remove Remove
</Button> </Button>
<Button onClick={() => onAddNewDeviceClick()}> <Button onClick={() => onAddNewDeviceClick()} icon="plus" featherIcon>
<i className="fa fa-plus-circle space-right" aria-hidden="true" />
Add Device Add Device
</Button> </Button>
@ -47,8 +47,9 @@ export function EdgeDevicesDatatableActions({
<Button <Button
disabled={selectedItems.length !== 1} disabled={selectedItems.length !== 1}
onClick={() => onAssociateOpenAMTClick(selectedItems)} onClick={() => onAssociateOpenAMTClick(selectedItems)}
icon="link"
featherIcon
> >
<i className="fa fa-link space-right" aria-hidden="true" />
Associate with OpenAMT Associate with OpenAMT
</Button> </Button>
)} )}