From 1440584d062f41fa606c489d77bacefb96a269b3 Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:59:53 -0500 Subject: [PATCH] Fleet UI: Surface VS code extensions in UI (#17333) --- changes/15997-vscode-extensions | 1 + frontend/interfaces/software.ts | 1 + .../SoftwarePage/components/icons/index.ts | 1 + .../cards/Software/SoftwareTableConfig.tsx | 24 ++----------------- 4 files changed, 5 insertions(+), 22 deletions(-) create mode 100644 changes/15997-vscode-extensions diff --git a/changes/15997-vscode-extensions b/changes/15997-vscode-extensions new file mode 100644 index 0000000000..b7190024e1 --- /dev/null +++ b/changes/15997-vscode-extensions @@ -0,0 +1 @@ +- Surface VS code extensions in the software inventory diff --git a/frontend/interfaces/software.ts b/frontend/interfaces/software.ts index b38b6d324e..3ce5f5d268 100644 --- a/frontend/interfaces/software.ts +++ b/frontend/interfaces/software.ts @@ -105,6 +105,7 @@ export const SOURCE_TYPE_CONVERSION: Record = { ie_extensions: "Browser plugin (IE)", chocolatey_packages: "Package (Chocolatey)", pkg_packages: "Package (pkg)", + vscode_extensions: "IDE extension (VS Code)", } as const; const BROWSER_TYPE_CONVERSION: Record = { diff --git a/frontend/pages/SoftwarePage/components/icons/index.ts b/frontend/pages/SoftwarePage/components/icons/index.ts index 2262c04248..f101759110 100644 --- a/frontend/pages/SoftwarePage/components/icons/index.ts +++ b/frontend/pages/SoftwarePage/components/icons/index.ts @@ -59,6 +59,7 @@ export const SOFTWARE_SOURCE_TO_ICON_MAP = { ie_extensions: Extension, chocolatey_packages: Package, pkg_packages: Package, + vscode_extensions: Extension, } as const; export const SOFTWARE_ICON_SIZES: Record = { diff --git a/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx b/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx index d50abb64ff..b61680dc63 100644 --- a/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx +++ b/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx @@ -4,7 +4,7 @@ import ReactTooltip from "react-tooltip"; import { formatDistanceToNow } from "date-fns"; -import { ISoftware } from "interfaces/software"; +import { ISoftware, SOURCE_TYPE_CONVERSION } from "interfaces/software"; import PATHS from "router/paths"; import HeaderCell from "components/TableContainer/DataTable/HeaderCell/HeaderCell"; @@ -68,28 +68,8 @@ interface IDataColumn { // or one of the custom `filterTypes` defined for the `useTable` instance (see `DataTable`) } -const TYPE_CONVERSION: Record = { - apt_sources: "Package (APT)", - deb_packages: "Package (deb)", - portage_packages: "Package (Portage)", - rpm_packages: "Package (RPM)", - yum_sources: "Package (YUM)", - npm_packages: "Package (NPM)", - atom_packages: "Package (Atom)", // Atom packages were removed from software inventory. Mapping is maintained for backwards compatibility. (2023-12-04) - python_packages: "Package (Python)", - apps: "Application (macOS)", - chrome_extensions: "Browser plugin (Chrome)", - firefox_addons: "Browser plugin (Firefox)", - safari_extensions: "Browser plugin (Safari)", - homebrew_packages: "Package (Homebrew)", - programs: "Program (Windows)", - ie_extensions: "Browser plugin (IE)", - chocolatey_packages: "Package (Chocolatey)", - pkg_packages: "Package (pkg)", -}; - const formatSoftwareType = (source: string) => { - const DICT = TYPE_CONVERSION; + const DICT = SOURCE_TYPE_CONVERSION; return DICT[source] || "Unknown"; };