Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Fleet UI: Fix dropdown from changing when vuln filters change (#27620)

Browse source
This commit is contained in:
RachelElysia 2025-03-28 10:46:22 -04:00 committed by GitHub
parent 6e32e31896
commit eaa3ce071c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/pages/SoftwarePage/SoftwareTitles/SoftwareTable/helpers.ts
View file

@ -88,6 +88,7 @@ export const buildSoftwareFilterQueryParams = (
} }
}; };
// TODO: Consider parsing SoftwarePage query params to change from type string
export const getSoftwareFilterFromQueryParams = (queryParams: QueryParams) => { export const getSoftwareFilterFromQueryParams = (queryParams: QueryParams) => {
const { available_for_install, self_service } = queryParams; const { available_for_install, self_service } = queryParams;
switch (true) { switch (true) {

16
frontend/pages/hosts/details/cards/Software/HostSoftware.tsx
View file

@ -30,14 +30,17 @@ import SoftwareFiltersModal from "pages/SoftwarePage/components/SoftwareFiltersM
import { import {
buildSoftwareFilterQueryParams, buildSoftwareFilterQueryParams,
buildSoftwareVulnFiltersQueryParams, buildSoftwareVulnFiltersQueryParams,
getSoftwareFilterFromQueryParams,
getSoftwareVulnFiltersFromQueryParams, getSoftwareVulnFiltersFromQueryParams,
ISoftwareVulnFiltersParams, ISoftwareVulnFiltersParams,
} from "pages/SoftwarePage/SoftwareTitles/SoftwareTable/helpers"; } from "pages/SoftwarePage/SoftwareTitles/SoftwareTable/helpers";
import { generateSoftwareTableHeaders as generateHostSoftwareTableConfig } from "./HostSoftwareTableConfig"; import { generateSoftwareTableHeaders as generateHostSoftwareTableConfig } from "./HostSoftwareTableConfig";
import { generateSoftwareTableHeaders as generateDeviceSoftwareTableConfig } from "./DeviceSoftwareTableConfig"; import { generateSoftwareTableHeaders as generateDeviceSoftwareTableConfig } from "./DeviceSoftwareTableConfig";
import HostSoftwareTable from "./HostSoftwareTable"; import HostSoftwareTable from "./HostSoftwareTable";
import { getInstallErrorMessage, getUninstallErrorMessage } from "./helpers"; import {
getHostSoftwareFilterFromQueryParams,
getInstallErrorMessage,
getUninstallErrorMessage,
} from "./helpers";
const baseClass = "software-card"; const baseClass = "software-card";
@ -131,7 +134,7 @@ const HostSoftware = ({
const isUnsupported = const isUnsupported =
isAndroid(platform) || (isIPadOrIPhone(platform) && queryParams.vulnerable); // no Android software and no vulnerable software for iOS isAndroid(platform) || (isIPadOrIPhone(platform) && queryParams.vulnerable); // no Android software and no vulnerable software for iOS
const softwareFilter = getSoftwareFilterFromQueryParams(queryParams); const softwareFilter = getHostSoftwareFilterFromQueryParams(queryParams);
// disables install/uninstall actions after click // disables install/uninstall actions after click
const [softwareIdActionPending, setSoftwareIdActionPending] = useState< const [softwareIdActionPending, setSoftwareIdActionPending] = useState<
@ -330,11 +333,6 @@ const HostSoftware = ({
] ]
); );
const getHostSoftwareFilterFromQueryParams = useCallback(() => {
const { available_for_install } = queryParams;
return available_for_install ? "installableSoftware" : "allSoftware";
}, [queryParams]);
const tableConfig = useMemo(() => { const tableConfig = useMemo(() => {
return isMyDevicePage return isMyDevicePage
? generateDeviceSoftwareTableConfig() ? generateDeviceSoftwareTableConfig()
@ -393,7 +391,7 @@ const HostSoftware = ({
searchQuery={queryParams.query} searchQuery={queryParams.query}
page={queryParams.page} page={queryParams.page}
pagePath={pathname} pagePath={pathname}
hostSoftwareFilter={getHostSoftwareFilterFromQueryParams()} hostSoftwareFilter={softwareFilter}
vulnFilters={getSoftwareVulnFiltersFromQueryParams(queryParams)} vulnFilters={getSoftwareVulnFiltersFromQueryParams(queryParams)}
onAddFiltersClick={toggleSoftwareFiltersModal} onAddFiltersClick={toggleSoftwareFiltersModal}
pathPrefix={pathname} pathPrefix={pathname}

10
frontend/pages/hosts/details/cards/Software/helpers.tsx
View file

@ -1,4 +1,5 @@
import React from "react"; import React from "react";
import { QueryParams } from "utilities/url";
import { getErrorReason } from "interfaces/errors"; import { getErrorReason } from "interfaces/errors";
import { trimEnd, upperFirst } from "lodash"; import { trimEnd, upperFirst } from "lodash";
@ -69,3 +70,12 @@ export const getUninstallErrorMessage = (e: unknown) => {
return DEFAULT_UNINSTALL_ERROR_MESSAGE; return DEFAULT_UNINSTALL_ERROR_MESSAGE;
}; };
// available_for_install string > boolean conversion in parseHostSoftwareQueryParams
export const getHostSoftwareFilterFromQueryParams = (
queryParams: QueryParams
) => {
const { available_for_install } = queryParams;
return available_for_install ? "installableSoftware" : "allSoftware";
};