From e0306dca20ada41223469aeacbd4b1efbaf7c490 Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:16:52 -0500 Subject: [PATCH] Fleet UI: Add missing custom install vpp help text (Unreleased) (#26299) --- .../components/TargetLabelSelector/TargetLabelSelector.tsx | 2 +- .../SoftwareVppForm/SoftwareVppForm.tsx | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/components/TargetLabelSelector/TargetLabelSelector.tsx b/frontend/components/TargetLabelSelector/TargetLabelSelector.tsx index d4fe8c6468..6e17037477 100644 --- a/frontend/components/TargetLabelSelector/TargetLabelSelector.tsx +++ b/frontend/components/TargetLabelSelector/TargetLabelSelector.tsx @@ -156,7 +156,7 @@ interface ITargetLabelSelectorProps { customTargetOptions: IDropdownOption[]; selectedLabels: Record; labels: ILabelSummary[]; - /** set this prop to show a help text. If it is encluded then it will override + /** set this prop to show a help text. If it is included then it will override * the selected options defined `helpText` */ dropdownHelpText?: ReactNode; diff --git a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareAppStoreVpp/SoftwareVppForm/SoftwareVppForm.tsx b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareAppStoreVpp/SoftwareVppForm/SoftwareVppForm.tsx index 4612d1b22e..3e09c11836 100644 --- a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareAppStoreVpp/SoftwareVppForm/SoftwareVppForm.tsx +++ b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareAppStoreVpp/SoftwareVppForm/SoftwareVppForm.tsx @@ -15,6 +15,7 @@ import TargetLabelSelector from "components/TargetLabelSelector"; import SoftwareIcon from "pages/SoftwarePage/components/icons/SoftwareIcon"; import { CUSTOM_TARGET_OPTIONS, + generateHelpText, generateSelectedLabels, getCustomTarget, getTargetType, @@ -224,6 +225,9 @@ const SoftwareVppForm = ({ onSelectCustomTarget={onSelectCustomTargetOption} onSelectLabel={onSelectLabel} labels={labels || []} + dropdownHelpText={ + generateHelpText("manual", formData.customTarget) // maps to manual install help text + } /> {renderSelfServiceContent(softwareVppForEdit.platform)} @@ -253,6 +257,9 @@ const SoftwareVppForm = ({ onSelectCustomTarget={onSelectCustomTargetOption} onSelectLabel={onSelectLabel} labels={labels || []} + dropdownHelpText={ + generateHelpText("manual", formData.customTarget) // maps to manual install help text + } /> {renderSelfServiceContent( ("selectedApp" in formData &&