Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

small fixes to CA story (#27679)

Browse source 
For #27678

adds another error message to UI for custom profiles.

also fixes an issue with the wrong link for private key, and also
This commit is contained in:
Gabriel Hernandez 2025-03-31 16:53:52 +01:00 committed by GitHub
parent 29034bb230
commit 8f056c83d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/pages/ManageControlsPage/OSSettings/cards/CustomSettings/components/ProfileUploader/helpers.tsx
View file

@ -88,9 +88,12 @@ export const getErrorMessage = (err: AxiosResponse<IApiError>) => {
return generateSecretErrMsg(err);
}
if (apiReason.includes("Fleet variable")) {
if (
apiReason.includes("Fleet variable") &&
apiReason.includes("not supported in configuration profiles")
) {
return generateUnsupportedVariableErrMsg(apiReason);
}
return apiReason || DEFAULT_ERROR_MESSAGE;
return `Couldn't add. ${apiReason}` || DEFAULT_ERROR_MESSAGE;
};

6
frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/AddCertAuthorityModal/helpers.tsx
View file

@ -1,9 +1,11 @@
import React from "react";
import CustomLink from "components/CustomLink";
import { LEARN_MORE_ABOUT_BASE_LINK } from "utilities/constants";
import { IDropdownOption } from "interfaces/dropdownOption";
import { getErrorReason } from "interfaces/errors";
import CustomLink from "components/CustomLink";
const DEFAULT_CERT_AUTHORITY_OPTIONS: IDropdownOption[] = [
{ label: "DigiCert", value: "digicert" },
{
@ -42,7 +44,7 @@ const PRIVATE_KEY_NOT_CONFIGURED_ERROR = (
Private key must be configured.{" "}
<CustomLink
text="Learn more"
url="https://learn-more-about/fleet-server-private-key"
url={`${LEARN_MORE_ABOUT_BASE_LINK}/fleet-server-private-key`}
newTab
variant="flash-message-link"
/>