**Related issue:** Resolves #50070 The "YAML docs" link in the GitOps callout on the custom-package flows pointed at the unregistered slug `learn-more-about/software-yaml`, returning a 404. Corrected to the registered `learn-more-about/yaml-software` (302 → `docs/configuration/yaml-files#software`). The link lives in the shared `GitOpsCustomPackageBanner`, so this fixes it in both places it renders: the **Add software → Custom package** page and the **Add package** modal on the software title details page. Also updated the two unit tests that asserted the old slug. # Checklist for submitter ## Testing - [x] Added/updated automated tests - [ ] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [x] Confirmed that the fix is not expected to adversely impact load test results <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Documentation** * Updated the GitOps custom package “YAML docs” link to direct users to the new YAML software documentation page. * **Bug Fixes** * Corrected YAML documentation links in the custom package banner and package addition modal. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
222 lines
6.8 KiB
TypeScript
222 lines
6.8 KiB
TypeScript
import React, { useContext, useState } from "react";
|
|
import { InjectedRouter } from "react-router";
|
|
import { useQuery, useQueryClient } from "react-query";
|
|
|
|
import PATHS from "router/paths";
|
|
import {
|
|
DEFAULT_USE_QUERY_OPTIONS,
|
|
LEARN_MORE_ABOUT_BASE_LINK,
|
|
} from "utilities/constants";
|
|
import { getFileDetails, IFileDetails } from "utilities/file/fileUtils";
|
|
import { getPathWithQueryParams, QueryParams } from "utilities/url";
|
|
import softwareAPI from "services/entities/software";
|
|
import labelsAPI, { getCustomLabels } from "services/entities/labels";
|
|
|
|
import { AppContext } from "context/app";
|
|
import useBlockNavigation from "hooks/useBlockNavigation";
|
|
import useGitOpsMode from "hooks/useGitOpsMode";
|
|
import { ILabelSummary } from "interfaces/label";
|
|
|
|
import { notify } from "components/ToastNotification";
|
|
import CustomLink from "components/CustomLink";
|
|
import FileProgressModal from "components/FileProgressModal";
|
|
import InfoBanner from "components/InfoBanner";
|
|
import PremiumFeatureMessage from "components/PremiumFeatureMessage";
|
|
import Spinner from "components/Spinner";
|
|
import DataError from "components/DataError";
|
|
import CategoriesEndUserExperienceModal from "pages/SoftwarePage/components/modals/CategoriesEndUserExperienceModal";
|
|
|
|
import PackageForm from "pages/SoftwarePage/components/forms/PackageForm";
|
|
import { IPackageFormData } from "pages/SoftwarePage/components/forms/PackageForm/PackageForm";
|
|
|
|
import { getErrorMessage } from "./helpers";
|
|
|
|
const baseClass = "software-custom-package";
|
|
|
|
/** Shared GitOps-mode banner for the custom-package flows. Rendered by this
|
|
* page (single-package add) and by `PackageForm`'s multi-package Add modal. */
|
|
export const GitOpsCustomPackageBanner = () => (
|
|
<InfoBanner
|
|
icon="info-outline"
|
|
iconColor="ui-fleet-black-50"
|
|
borderRadius="medium"
|
|
>
|
|
Add custom packages in GitOps mode so Fleet can host your software. After
|
|
adding, copy its SHA-256 hash into your YAML so the next GitOps workflow
|
|
doesn't delete it.{" "}
|
|
<CustomLink
|
|
url={`${LEARN_MORE_ABOUT_BASE_LINK}/yaml-software`}
|
|
text="YAML docs"
|
|
newTab
|
|
/>
|
|
</InfoBanner>
|
|
);
|
|
|
|
interface ISoftwarePackageProps {
|
|
currentTeamId: number;
|
|
router: InjectedRouter;
|
|
isSidePanelOpen: boolean;
|
|
setSidePanelOpen: (isOpen: boolean) => void;
|
|
}
|
|
|
|
const SoftwareCustomPackage = ({
|
|
currentTeamId,
|
|
router,
|
|
isSidePanelOpen,
|
|
setSidePanelOpen,
|
|
}: ISoftwarePackageProps) => {
|
|
const { isPremiumTier } = useContext(AppContext);
|
|
const queryClient = useQueryClient();
|
|
const { gitOpsModeEnabled } = useGitOpsMode("software");
|
|
|
|
const [uploadProgress, setUploadProgress] = useState(0);
|
|
const [uploadDetails, setUploadDetails] = useState<IFileDetails | null>(null);
|
|
const [
|
|
showPreviewEndUserExperience,
|
|
setShowPreviewEndUserExperience,
|
|
] = useState(false);
|
|
const [
|
|
isIpadOrIphoneSoftwareSource,
|
|
setIsIpadOrIphoneSoftwareSource,
|
|
] = useState(false);
|
|
|
|
const {
|
|
data: labels,
|
|
isLoading: isLoadingLabels,
|
|
isError: isErrorLabels,
|
|
} = useQuery<ILabelSummary[], Error>(
|
|
["custom_labels"],
|
|
() =>
|
|
labelsAPI
|
|
.summary(currentTeamId)
|
|
.then((res) => getCustomLabels(res.labels)),
|
|
{
|
|
...DEFAULT_USE_QUERY_OPTIONS,
|
|
enabled: isPremiumTier,
|
|
}
|
|
);
|
|
|
|
// Block tab close / hard navigation while an upload is in flight.
|
|
useBlockNavigation(!!uploadDetails);
|
|
|
|
const onClickPreviewEndUserExperience = (isIosOrIpadosApp = false) => {
|
|
setShowPreviewEndUserExperience(!showPreviewEndUserExperience);
|
|
setIsIpadOrIphoneSoftwareSource(isIosOrIpadosApp);
|
|
};
|
|
|
|
const onCancel = () => {
|
|
router.push(
|
|
getPathWithQueryParams(PATHS.SOFTWARE_LIBRARY, {
|
|
fleet_id: currentTeamId,
|
|
})
|
|
);
|
|
};
|
|
|
|
const onSubmit = async (formData: IPackageFormData) => {
|
|
if (!formData.software) {
|
|
notify.error(`Couldn't add. Please refresh the page and try again.`);
|
|
return;
|
|
}
|
|
|
|
setUploadDetails(getFileDetails(formData.software));
|
|
|
|
// Note: This TODO is copied to onSaveSoftwareChanges in EditSoftwareModal
|
|
// TODO: confirm we are deleting the second sentence (not modifying it) for non-self-service installers
|
|
try {
|
|
const {
|
|
software_package: { title_id: softwarePackageTitleId },
|
|
} = await softwareAPI.addSoftwarePackage({
|
|
data: formData,
|
|
teamId: currentTeamId,
|
|
onUploadProgress: (progressEvent) => {
|
|
const progress = progressEvent.progress || 0;
|
|
// for large uploads it seems to take a bit for the server to finalize its response so we'll keep the
|
|
// progress bar at 97% until the server response is received
|
|
setUploadProgress(Math.max(progress - 0.03, 0.01));
|
|
},
|
|
});
|
|
|
|
if (!gitOpsModeEnabled) {
|
|
notify.success(
|
|
<>
|
|
<b>{formData.software?.name}</b> successfully added.
|
|
{formData.selfService
|
|
? " The end user can install from Fleet Desktop."
|
|
: ""}
|
|
</>
|
|
);
|
|
}
|
|
|
|
queryClient.invalidateQueries({
|
|
queryKey: [{ scope: "software-titles" }],
|
|
});
|
|
queryClient.invalidateQueries({
|
|
queryKey: [{ scope: "software-library" }],
|
|
});
|
|
|
|
const newQueryParams: QueryParams = {
|
|
fleet_id: currentTeamId,
|
|
};
|
|
router.push(
|
|
getPathWithQueryParams(
|
|
PATHS.SOFTWARE_TITLE_DETAILS(softwarePackageTitleId.toString()),
|
|
newQueryParams
|
|
)
|
|
);
|
|
} catch (e) {
|
|
notify.error(getErrorMessage(e, formData.software?.name), {
|
|
response: e,
|
|
});
|
|
}
|
|
setUploadDetails(null);
|
|
};
|
|
|
|
const renderContent = () => {
|
|
if (isLoadingLabels) {
|
|
return <Spinner />;
|
|
}
|
|
|
|
if (isErrorLabels) {
|
|
return <DataError verticalPaddingSize="pad-xxxlarge" />;
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{gitOpsModeEnabled && <GitOpsCustomPackageBanner />}
|
|
<PackageForm
|
|
labels={labels || []}
|
|
showSchemaButton={!isSidePanelOpen}
|
|
onClickShowSchema={() => setSidePanelOpen(true)}
|
|
className={`${baseClass}__package-form`}
|
|
onCancel={onCancel}
|
|
onSubmit={onSubmit}
|
|
onClickPreviewEndUserExperience={onClickPreviewEndUserExperience}
|
|
/>
|
|
{uploadDetails && (
|
|
<FileProgressModal
|
|
fileDetails={uploadDetails}
|
|
fileProgress={uploadProgress}
|
|
/>
|
|
)}
|
|
{showPreviewEndUserExperience && (
|
|
<CategoriesEndUserExperienceModal
|
|
onCancel={onClickPreviewEndUserExperience}
|
|
teamId={currentTeamId}
|
|
isIosOrIpadosApp={isIpadOrIphoneSoftwareSource}
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
if (!isPremiumTier) {
|
|
return (
|
|
<PremiumFeatureMessage className={`${baseClass}__premium-message`} />
|
|
);
|
|
}
|
|
|
|
return <div className={baseClass}>{renderContent()}</div>;
|
|
};
|
|
|
|
export default SoftwareCustomPackage;
|