root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-2298): merge fusion/fn-2298

Browse Source
This commit is contained in:
gsxdsm
2026-04-23 12:00:05 -07:00
parent df2836c01d
commit 01e24dfbdb
3 changed files with 99 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/dashboard/app/components/ScheduledTasksModal.tsx
View File

@@ -1,5 +1,5 @@
import { useState, useEffect, useCallback, useMemo } from "react";
import { Plus, Zap, Globe, Folder } from "lucide-react";
import { Plus, Zap, Globe, Folder, X } from "lucide-react";
import type { Routine, RoutineCreateInput } from "@fusion/core";
import {
fetchRoutines,
@@ -250,11 +250,31 @@ export function ScheduledTasksModal({ onClose, addToast, projectId }: ScheduledT
return (
<div className="modal-overlay open" onClick={handleOverlayClick}>
<div className="modal modal-lg" role="dialog" aria-modal="true" aria-labelledby="schedules-modal-title">
<div className="modal-header">
<h3 id="schedules-modal-title">Automations</h3>
<div className="modal-header-actions">
{/* Scope selector */}
<div className="scheduling-scope-selector" role="group" aria-label="Scheduling scope">
<div className="modal-header scheduling-modal-header">
<div className="scheduling-header-main-row">
<div className="detail-title-row">
<Zap size={20} className="icon-triage" />
<h3 id="schedules-modal-title">Automations</h3>
</div>
<div className="modal-header-actions">
{isShowingList && (
<button
className="btn btn-primary btn-sm"
onClick={() => setRoutineView("create")}
aria-label="Create new automation"
>
<Plus size={14} />
New Automation
</button>
)}
<button className="modal-close" onClick={onClose} aria-label="Close">
<X size={20} />
</button>
</div>
</div>
<div className="scheduling-header-scope-row" role="group" aria-label="Scheduling scope">
<div className="scheduling-scope-selector">
<button
type="button"
className={`scope-btn${activeScope === "global" ? " active" : ""}`}
@@ -276,19 +296,6 @@ export function ScheduledTasksModal({ onClose, addToast, projectId }: ScheduledT
Project
</button>
</div>
{isShowingList && (
<button
className="btn btn-primary btn-sm"
onClick={() => setRoutineView("create")}
aria-label="Create new automation"
>
<Plus size={14} />
New Automation
</button>
)}
<button className="modal-close" onClick={onClose} aria-label="Close">
&times;
</button>
</div>
</div>

20
packages/dashboard/app/components/__tests__/ScheduledTasksModal.test.tsx
View File

@@ -21,6 +21,7 @@ vi.mock("lucide-react", () => ({
Globe: () => <span data-testid="icon-globe">Global</span>,
Folder: () => <span data-testid="icon-folder">Project</span>,
Layers: () => <span data-testid="icon-layers">Layers</span>,
X: () => <span data-testid="icon-x-close">Close</span>,
}));
vi.mock("@fusion/core", () => ({}));
@@ -130,6 +131,25 @@ describe("ScheduledTasksModal", () => {
expect(screen.getByText("New Automation")).toBeDefined();
});
it("renders scope controls in a dedicated header row", async () => {
mockFetchRoutines.mockResolvedValue([makeRoutine({ name: "Scoped Routine" })]);
const { container } = render(<ScheduledTasksModal onClose={onClose} addToast={addToast} />);
await waitFor(() => {
expect(screen.getByText("Scoped Routine")).toBeDefined();
});
const headerActions = container.querySelector(".scheduling-header-main-row .modal-header-actions");
const scopeRow = container.querySelector(".scheduling-header-scope-row");
const scopeSelector = container.querySelector(".scheduling-scope-selector");
expect(headerActions).toBeTruthy();
expect(scopeRow).toBeTruthy();
expect(scopeSelector).toBeTruthy();
expect(scopeRow?.contains(scopeSelector as Node)).toBe(true);
expect(headerActions?.contains(scopeSelector as Node)).toBe(false);
});
it("uses routine APIs with global scope by default", async () => {
render(<ScheduledTasksModal onClose={onClose} addToast={addToast} />);