mirror of
https://github.com/fleetdm/fleet
synced 2026-05-06 06:48:54 +00:00
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #32632 # Details This PR updates the Script Library page in the following ways: * When no scripts are uploaded for a team, it shows the "Add script" UI with a button that opens a new "Add Script" modal * When scripts are uploaded, the "Add script" button is instead added to the header of the scripts list, and clicking it opens that modal # Checklist for submitter If some of the following don't apply, delete the relevant line. - [X] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [ ] Added/updated automated tests working on this - [X] QA'd all new/changed functionality manually - [X] Test empty state: go to controls/scripts/library for a team with no scripts. Clicking "upload" button in empty state should open the add script modal. - [X] In the modal, select a .ps1 script. Should not see additional text. - [X] Close modal without uploading. Re-open. File field should be cleared & upload button visible again. - [X] Select a .sh script. Should see additional text about macOS and Linux. - [X] Add script. Make sure script saves and modal closes. - [X] Once script has been added, make sure empty state is gone and "Add script" button is at the top of the list. - [X] Go to /controls/os-settings/custom-settings for a team with no profiles uploaded. Make sure empty state text styles match the empty state for script uploads. - [X] Open modal to add profile. Make sure upload text styles match the script upload modal. - [X] Enable GitOps mode. Go to controls/scripts/library for a team with scripts added. Make sure new "Add script" button is disabled w/ standard tooltip in GitOps mode. Scripts empty state: <img width="697" height="352" alt="image" src="https://github.com/user-attachments/assets/32f0f246-bddb-4bb7-bc39-48d9978de9fa" /> Scripts uploader: <img width="745" height="590" alt="image" src="https://github.com/user-attachments/assets/f82414e2-9318-4543-b5ca-41e759662587" /> Scripts uploader with .sh <img width="750" height="539" alt="image" src="https://github.com/user-attachments/assets/0b989067-921a-4d18-93ed-09aac90fc9cb" /> Scripts table: <img width="686" height="256" alt="image" src="https://github.com/user-attachments/assets/848f1b56-6e9e-48d4-9a03-6fdf5427301e" /> Profiles empty state: <img width="700" height="377" alt="image" src="https://github.com/user-attachments/assets/8f92bcd9-2215-41f6-a540-4774f7e9542b" /> Profiles uploader: <img width="707" height="682" alt="image" src="https://github.com/user-attachments/assets/eef216af-3447-48e7-882a-e42e888e1c17" />
80 lines
2.1 KiB
TypeScript
80 lines
2.1 KiB
TypeScript
import React, { useContext, useState } from "react";
|
|
import { NotificationContext } from "context/notification";
|
|
import scriptAPI from "services/entities/scripts";
|
|
|
|
import Button from "components/buttons/Button";
|
|
import Modal from "components/Modal";
|
|
import { getErrorMessage } from "./helpers";
|
|
import ScriptUploader from "../ScriptUploader";
|
|
|
|
const baseClass = "script-upload-modal";
|
|
|
|
interface IScriptUploadModal {
|
|
onExit: () => void;
|
|
onSubmit: () => void;
|
|
currentTeamId: number;
|
|
}
|
|
|
|
const ScriptUploadModal = ({
|
|
onSubmit,
|
|
onExit,
|
|
currentTeamId,
|
|
}: IScriptUploadModal) => {
|
|
const { renderFlash } = useContext(NotificationContext);
|
|
const [selectedFile, setSelectedFile] = useState<File | null>(null);
|
|
const [showLoading, setShowLoading] = useState(false);
|
|
|
|
const onUploadFile = async () => {
|
|
if (!selectedFile) {
|
|
return;
|
|
}
|
|
setShowLoading(true);
|
|
try {
|
|
await scriptAPI.uploadScript(selectedFile, currentTeamId);
|
|
renderFlash("success", "Successfully uploaded!");
|
|
onSubmit();
|
|
} catch (e) {
|
|
renderFlash("error", getErrorMessage(e));
|
|
} finally {
|
|
setShowLoading(false);
|
|
}
|
|
};
|
|
|
|
const additionalInfo =
|
|
selectedFile && selectedFile.name.match(/\.sh$/)
|
|
? 'On macOS and Linux, script will run according to the interpreter specified in the first line: "#!/bin/sh", "#!/bin/zsh", or "#!/bin/bash"'
|
|
: undefined;
|
|
|
|
return (
|
|
<Modal
|
|
title="Add script"
|
|
onExit={onExit}
|
|
onEnter={onSubmit}
|
|
className={baseClass}
|
|
>
|
|
<>
|
|
<div className={`${baseClass}__content`}>
|
|
<ScriptUploader
|
|
onFileSelected={(file) => setSelectedFile(file)}
|
|
selectedFile={selectedFile}
|
|
forModal
|
|
/>
|
|
</div>
|
|
{additionalInfo && (
|
|
<p className={`${baseClass}__additional-info`}>{additionalInfo}</p>
|
|
)}
|
|
<div className="modal-cta-wrap">
|
|
<Button
|
|
onClick={onUploadFile}
|
|
disabled={!selectedFile || showLoading}
|
|
isLoading={showLoading}
|
|
>
|
|
Add Script
|
|
</Button>
|
|
</div>
|
|
</>
|
|
</Modal>
|
|
);
|
|
};
|
|
|
|
export default ScriptUploadModal;
|