mirror of
https://github.com/fleetdm/fleet
synced 2026-05-21 16:08:47 +00:00
## For #26229 – Part 1

- This PR contains the core abstractions, routes, API updates, and types
for GitOps mode in the UI. Since this work will touch essentially every
part of the Fleet UI, it is ripe for merge conflicts. To mitigate such
conflicts, I'll be merging this work in a number of iterative PRs. ~To
effectively gate any of this work from showing until it is all merged to
`main`, [this commit](feedbb2d4c) hides
the settings section that allows enabling/disabling this setting,
effectively feature flagging the entire thing. In the last of these
iterative PRs, that commit will be reverted to engage the entire
feature. For testing purposes, reviewers can `git revert
feedbb2d4c25ec2e304e1f18d409cee62f6752ed` locally~ The new settings
section for this feature is feature flagged until all PRs are merged -
to show the setting section while testing, run `ALLOW_GITOPS_MODE=true
NODE_ENV=development yarn run webpack --progress --watch` in place of
`make generate-dev`
- Changes file will be added and feature flag removed in the last PR
- [x] Settings page with routing, form, API integration (hidden until
last PR)
- [x] Activities
- [x] Navbar indicator
- Apply GOM conditional UI to:
- [x] Manage enroll secret modal: .5
- Controls >
- [x] Scripts:
- Setup experience >
- [x] Install software > Select software modal
- [x] OS Settings >
- [x] Custom settings
- [x] Disk encryption
- [x] OS Updates
2/18/25, added to this PR:
- [x] Controls > Setup experience > Run script
- [x] Software >
- [x] Manage automations modal
- [x] Add software >
- [x] App Store (VPP)
- [x] Custom package
- [x] Queries
- [x] Manage
- [x] Automations modal
- [x] New
- [x] Edit
- [x] Policies
- [x] Manage
- [x] New
- [x] Edit
- Manage automations
- [x] Calendar events
- [x] Manual QA for all new/changed functionality
---------
Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
110 lines
3.1 KiB
TypeScript
110 lines
3.1 KiB
TypeScript
import React from "react";
|
|
|
|
import { ITeam } from "interfaces/team";
|
|
import { IEnrollSecret } from "interfaces/enroll_secret";
|
|
|
|
import GitOpsModeTooltipWrapper from "components/GitOpsModeTooltipWrapper";
|
|
import Modal from "components/Modal";
|
|
import Button from "components/buttons/Button";
|
|
import Icon from "components/Icon/Icon";
|
|
import EnrollSecretTable from "../EnrollSecretTable";
|
|
|
|
interface IEnrollSecretModal {
|
|
selectedTeam: number;
|
|
onReturnToApp: () => void;
|
|
teams: ITeam[];
|
|
toggleSecretEditorModal: () => void;
|
|
toggleDeleteSecretModal: () => void;
|
|
setSelectedSecret: React.Dispatch<
|
|
React.SetStateAction<IEnrollSecret | undefined>
|
|
>;
|
|
globalSecrets?: IEnrollSecret[] | undefined;
|
|
}
|
|
|
|
const baseClass = "enroll-secret-modal";
|
|
|
|
const EnrollSecretModal = ({
|
|
onReturnToApp,
|
|
selectedTeam,
|
|
teams,
|
|
toggleSecretEditorModal,
|
|
toggleDeleteSecretModal,
|
|
setSelectedSecret,
|
|
globalSecrets,
|
|
}: IEnrollSecretModal): JSX.Element => {
|
|
const renderTeam = () => {
|
|
if (typeof selectedTeam === "string") {
|
|
selectedTeam = parseInt(selectedTeam, 10);
|
|
}
|
|
|
|
if (selectedTeam <= 0) {
|
|
return { name: "No team", secrets: globalSecrets }; // TODO: Should "No team" be "Fleet" for free tier?
|
|
}
|
|
return teams.find((team) => team.id === selectedTeam);
|
|
};
|
|
|
|
const addNewSecretClick = () => {
|
|
setSelectedSecret(undefined);
|
|
toggleSecretEditorModal();
|
|
};
|
|
const team = renderTeam();
|
|
return (
|
|
<Modal
|
|
onExit={onReturnToApp}
|
|
onEnter={onReturnToApp}
|
|
title="Manage enroll secrets"
|
|
className={baseClass}
|
|
>
|
|
<div className={`${baseClass} form`}>
|
|
{team?.secrets?.length ? (
|
|
<>
|
|
<div className={`${baseClass}__description`}>
|
|
Use these secret(s) to enroll hosts to <b>{renderTeam()?.name}</b>
|
|
:
|
|
</div>
|
|
<EnrollSecretTable
|
|
secrets={team?.secrets}
|
|
toggleSecretEditorModal={toggleSecretEditorModal}
|
|
toggleDeleteSecretModal={toggleDeleteSecretModal}
|
|
setSelectedSecret={setSelectedSecret}
|
|
/>
|
|
</>
|
|
) : (
|
|
<>
|
|
<div className={`${baseClass}__description`}>
|
|
<p>
|
|
<b>You have no enroll secrets.</b>
|
|
</p>
|
|
<p>
|
|
Add secret(s) to enroll hosts to <b>{renderTeam()?.name}</b>.
|
|
</p>
|
|
</div>
|
|
</>
|
|
)}
|
|
<div className={`${baseClass}__add-secret`}>
|
|
<GitOpsModeTooltipWrapper
|
|
position="right"
|
|
tipOffset={8}
|
|
renderChildren={(disableChildren) => (
|
|
<Button
|
|
disabled={disableChildren}
|
|
onClick={addNewSecretClick}
|
|
className={`${baseClass}__add-secret-btn`}
|
|
variant="text-icon"
|
|
>
|
|
Add secret <Icon name="plus" />
|
|
</Button>
|
|
)}
|
|
/>
|
|
</div>
|
|
<div className="modal-cta-wrap">
|
|
<Button onClick={onReturnToApp} variant="brand">
|
|
Done
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</Modal>
|
|
);
|
|
};
|
|
|
|
export default EnrollSecretModal;
|