mirror of
https://github.com/fleetdm/fleet
synced 2026-05-24 09:28:54 +00:00
## Addresses #20467 – part 2 ### Aggregate software: #### Software titles <img width="1616" alt="sw-titles-updated" src="https://github.com/user-attachments/assets/0b9922c7-e36e-4d2f-b204-95c3cdf9b602"> #### Software versions <img width="1616" alt="Screenshot 2024-07-29 at 6 14 21 PM" src="https://github.com/user-attachments/assets/5a097700-cd6c-45b1-a21f-9d76a733f0ae"> #### Host software <img width="1616" alt="Screenshot 2024-07-29 at 6 23 01 PM" src="https://github.com/user-attachments/assets/84e18695-f47a-4022-bd53-7f5d37ce452a"> ### Add software modal (VPP) _screenshots use mocked data - UI is flexible enough to display cleanly before and after backend is in place:_ <img width="1339" alt="happy" src="https://github.com/user-attachments/assets/8900aa93-316c-4a09-8e5a-1a1e45b0c458"> #### No apps: <img width="1572" alt="Screenshot 2024-07-29 at 6 35 03 PM" src="https://github.com/user-attachments/assets/466b9b6c-4d3d-49dd-94a9-94e395d89cb7"> #### Not enabled: <img width="1572" alt="Screenshot 2024-07-29 at 6 37 45 PM" src="https://github.com/user-attachments/assets/9bcfd480-8741-4d95-ba3b-550dee4dc673"> #### Error: <img width="1572" alt="Screenshot 2024-07-29 at 6 39 39 PM" src="https://github.com/user-attachments/assets/e944dd40-676e-4aba-9cd9-49ff319bf402"> ### Vuln support – Not supported for now: _see above screenshots for `list` endpoints_ #### Software title detail <img width="1616" alt="Screenshot 2024-07-29 at 6 47 29 PM" src="https://github.com/user-attachments/assets/2e30fd0a-21e4-4d19-bf9b-71a994bfd0e7"> #### Software version and OS detail: <img width="1616" alt="Screenshot 2024-07-29 at 6 48 28 PM" src="https://github.com/user-attachments/assets/e8fec769-ba97-4b6b-b10c-9bb4c973c732"> <img width="1616" alt="Screenshot 2024-07-29 at 6 50 25 PM" src="https://github.com/user-attachments/assets/0ac15727-e0cb-447c-8758-c58b79656d1a"> - [x] Changes file added for user-visible changes in `changes/`, - [x] Added/updated tests - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
135 lines
4 KiB
TypeScript
135 lines
4 KiB
TypeScript
import React from "react";
|
|
import { CellProps, Column } from "react-table";
|
|
import { InjectedRouter } from "react-router";
|
|
|
|
import { buildQueryStringFromParams } from "utilities/url";
|
|
import {
|
|
formatSoftwareType,
|
|
ISoftwareVersion,
|
|
ISoftwareVulnerability,
|
|
} from "interfaces/software";
|
|
import { IHeaderProps, IStringCellProps } from "interfaces/datatable_config";
|
|
import PATHS from "router/paths";
|
|
|
|
import HeaderCell from "components/TableContainer/DataTable/HeaderCell";
|
|
import TextCell from "components/TableContainer/DataTable/TextCell";
|
|
import ViewAllHostsLink from "components/ViewAllHostsLink";
|
|
import SoftwareNameCell from "components/TableContainer/DataTable/SoftwareNameCell";
|
|
|
|
import VulnerabilitiesCell from "../../components/VulnerabilitiesCell";
|
|
|
|
// NOTE: cellProps come from react-table
|
|
// more info here https://react-table.tanstack.com/docs/api/useTable#cell-properties
|
|
|
|
type ISoftwareVersionsTableConfig = Column<ISoftwareVersion>;
|
|
type ITableStringCellProps = IStringCellProps<ISoftwareVersion>;
|
|
type IVulnerabilitiesCellProps = CellProps<
|
|
ISoftwareVersion,
|
|
ISoftwareVulnerability[] | null
|
|
>;
|
|
type IHostCountCellProps = CellProps<ISoftwareVersion, number | undefined>;
|
|
|
|
type ITableHeaderProps = IHeaderProps<ISoftwareVersion>;
|
|
|
|
const generateTableHeaders = (
|
|
router: InjectedRouter,
|
|
teamId?: number
|
|
): ISoftwareVersionsTableConfig[] => {
|
|
const softwareTableHeaders: ISoftwareVersionsTableConfig[] = [
|
|
{
|
|
Header: (cellProps: ITableHeaderProps) => (
|
|
<HeaderCell value="Name" isSortedDesc={cellProps.column.isSortedDesc} />
|
|
),
|
|
disableSortBy: false,
|
|
accessor: "name",
|
|
Cell: (cellProps: ITableStringCellProps) => {
|
|
const { id, name, source } = cellProps.row.original;
|
|
|
|
const teamQueryParam = buildQueryStringFromParams({
|
|
team_id: teamId,
|
|
});
|
|
const softwareVersionDetailsPath = `${PATHS.SOFTWARE_VERSION_DETAILS(
|
|
id.toString()
|
|
)}?${teamQueryParam}`;
|
|
|
|
return (
|
|
<SoftwareNameCell
|
|
name={name}
|
|
source={source}
|
|
path={softwareVersionDetailsPath}
|
|
router={router}
|
|
/>
|
|
);
|
|
},
|
|
sortType: "caseInsensitive",
|
|
},
|
|
{
|
|
Header: "Version",
|
|
disableSortBy: true,
|
|
accessor: "version",
|
|
Cell: (cellProps: ITableStringCellProps) => (
|
|
<TextCell value={cellProps.cell.value} />
|
|
),
|
|
},
|
|
{
|
|
Header: "Type",
|
|
disableSortBy: true,
|
|
accessor: "source",
|
|
Cell: (cellProps: ITableStringCellProps) => (
|
|
<TextCell value={formatSoftwareType(cellProps.row.original)} />
|
|
),
|
|
},
|
|
{
|
|
Header: "Vulnerabilities",
|
|
disableSortBy: true,
|
|
accessor: "vulnerabilities",
|
|
Cell: (cellProps: IVulnerabilitiesCellProps) => {
|
|
if (
|
|
["ipados_apps", "ios_apps"].includes(cellProps.row.original.source)
|
|
) {
|
|
return <TextCell value="Not supported" grey />;
|
|
}
|
|
return <VulnerabilitiesCell vulnerabilities={cellProps.cell.value} />;
|
|
},
|
|
},
|
|
{
|
|
Header: (cellProps: ITableHeaderProps) => (
|
|
<HeaderCell
|
|
value="Hosts"
|
|
disableSortBy={false}
|
|
isSortedDesc={cellProps.column.isSortedDesc}
|
|
/>
|
|
),
|
|
disableSortBy: false,
|
|
accessor: "hosts_count",
|
|
Cell: (cellProps: IHostCountCellProps) => (
|
|
<TextCell value={cellProps.cell.value} />
|
|
),
|
|
},
|
|
{
|
|
Header: "",
|
|
id: "view-all-hosts",
|
|
disableSortBy: true,
|
|
Cell: (cellProps: ITableStringCellProps) => {
|
|
return (
|
|
<>
|
|
{cellProps.row.original && (
|
|
<ViewAllHostsLink
|
|
queryParams={{
|
|
software_version_id: cellProps.row.original.id,
|
|
team_id: teamId, // TODO: do we need team id here?
|
|
}}
|
|
className="software-link"
|
|
rowHover
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
},
|
|
},
|
|
];
|
|
|
|
return softwareTableHeaders;
|
|
};
|
|
|
|
export default generateTableHeaders;
|