Skip to content

Commit 393c791

Browse files
joshavantjoshavant
committed
UI: remove redundant cron refresh wrapper
1 parent 22b82b6 commit 393c791

5 files changed

Lines changed: 24 additions & 28 deletions

File tree

‎src/ui-app-settings.agents-files-refresh.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ vi.mock("../ui/src/ui/controllers/channels.ts", () => ({
4444
}));
4545

4646
vi.mock("../ui/src/ui/controllers/cron.ts", () => ({
47-
loadCronJobs: vi.fn(async () => undefined),
47+
loadCronJobsPage: vi.fn(async () => undefined),
4848
loadCronRuns: vi.fn(async () => undefined),
4949
loadCronStatus: vi.fn(async () => undefined),
5050
}));

‎ui/src/ui/app-render.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,20 +1387,20 @@ export function renderApp(state: AppViewState) {
13871387
},
13881388
onSelectPanel: (panel) => {
13891389
state.agentsPanel = panel;
1390-
if (panel === "files" && resolvedAgentId) {
1391-
if (state.agentFilesList?.agentId !== resolvedAgentId) {
1392-
state.agentFilesList = null;
1393-
state.agentFilesError = null;
1394-
state.agentFileActive = null;
1395-
state.agentFileContents = {};
1396-
state.agentFileDrafts = {};
1397-
void loadAgentFiles(state, resolvedAgentId);
1398-
}
1390+
if (
1391+
panel === "files" &&
1392+
resolvedAgentId &&
1393+
state.agentFilesList?.agentId !== resolvedAgentId
1394+
) {
1395+
state.agentFilesList = null;
1396+
state.agentFilesError = null;
1397+
state.agentFileActive = null;
1398+
state.agentFileContents = {};
1399+
state.agentFileDrafts = {};
1400+
void loadAgentFiles(state, resolvedAgentId);
13991401
}
1400-
if (panel === "skills") {
1401-
if (resolvedAgentId) {
1402-
void loadAgentSkills(state, resolvedAgentId);
1403-
}
1402+
if (panel === "skills" && resolvedAgentId) {
1403+
void loadAgentSkills(state, resolvedAgentId);
14041404
}
14051405
if (panel === "tools" && resolvedAgentId) {
14061406
if (

‎ui/src/ui/app-settings.refresh-active-tab.node.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const mocks = vi.hoisted(() => ({
1313
loadConfigMock: vi.fn(async () => {}),
1414
loadConfigSchemaMock: vi.fn(async () => {}),
1515
loadCronStatusMock: vi.fn(async () => {}),
16-
loadCronJobsMock: vi.fn(async () => {}),
16+
loadCronJobsPageMock: vi.fn(async () => {}),
1717
loadCronRunsMock: vi.fn(async () => {}),
1818
loadLogsMock: vi.fn(async () => {}),
1919
}));
@@ -55,7 +55,7 @@ vi.mock("./controllers/config.ts", () => ({
5555

5656
vi.mock("./controllers/cron.ts", () => ({
5757
loadCronStatus: mocks.loadCronStatusMock,
58-
loadCronJobs: mocks.loadCronJobsMock,
58+
loadCronJobsPage: mocks.loadCronJobsPageMock,
5959
loadCronRuns: mocks.loadCronRunsMock,
6060
}));
6161

@@ -126,7 +126,7 @@ describe("refreshActiveTab", () => {
126126
expectCommonAgentsTabRefresh(host);
127127
expect(mocks.loadChannelsMock).toHaveBeenCalledWith(host, false);
128128
expect(mocks.loadCronStatusMock).toHaveBeenCalledOnce();
129-
expect(mocks.loadCronJobsMock).toHaveBeenCalledOnce();
129+
expect(mocks.loadCronJobsPageMock).toHaveBeenCalledOnce();
130130
expect(mocks.loadCronRunsMock).toHaveBeenCalledWith(host, "job-123");
131131
expect(mocks.loadAgentFilesMock).not.toHaveBeenCalled();
132132
expect(mocks.loadAgentSkillsMock).not.toHaveBeenCalled();
@@ -144,7 +144,7 @@ describe("refreshActiveTab", () => {
144144
expect(mocks.loadAgentSkillsMock).not.toHaveBeenCalled();
145145
expect(mocks.loadChannelsMock).not.toHaveBeenCalled();
146146
expect(mocks.loadCronStatusMock).not.toHaveBeenCalled();
147-
expect(mocks.loadCronJobsMock).not.toHaveBeenCalled();
147+
expect(mocks.loadCronJobsPageMock).not.toHaveBeenCalled();
148148
expect(mocks.loadCronRunsMock).not.toHaveBeenCalled();
149149
});
150150

‎ui/src/ui/app-settings.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { loadAgentSkills } from "./controllers/agent-skills.ts";
1414
import { loadAgents } from "./controllers/agents.ts";
1515
import { loadChannels } from "./controllers/channels.ts";
1616
import { loadConfig, loadConfigSchema } from "./controllers/config.ts";
17-
import { loadCronJobs, loadCronRuns, loadCronStatus } from "./controllers/cron.ts";
17+
import { loadCronJobsPage, loadCronRuns, loadCronStatus } from "./controllers/cron.ts";
1818
import { loadDebug } from "./controllers/debug.ts";
1919
import { loadDevices } from "./controllers/devices.ts";
2020
import { loadDreamDiary, loadDreamingStatus } from "./controllers/dreaming.ts";
@@ -545,7 +545,7 @@ export async function loadOverview(host: SettingsHost) {
545545
loadPresence(app),
546546
loadSessions(app),
547547
loadCronStatus(app),
548-
loadCronJobs(app),
548+
loadCronJobsPage(app),
549549
loadDebug(app),
550550
loadSkills(app),
551551
loadUsage(app),
@@ -689,7 +689,7 @@ export async function loadCron(host: SettingsHost) {
689689
await Promise.all([
690690
loadChannels(app, false),
691691
loadCronStatus(app),
692-
loadCronJobs(app),
692+
loadCronJobsPage(app),
693693
loadCronRuns(app, activeCronJobId),
694694
]);
695695
}

‎ui/src/ui/controllers/cron.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,6 @@ async function withCronBusy(
242242
}
243243
}
244244

245-
export async function loadCronJobs(state: CronState) {
246-
return await loadCronJobsPage(state, { append: false });
247-
}
248-
249245
function normalizeCronPageMeta(params: {
250246
totalRaw: unknown;
251247
offsetRaw: unknown;
@@ -714,15 +710,15 @@ export async function addCronJob(state: CronState) {
714710
await client.request("cron.add", job);
715711
resetCronFormToDefaults(state);
716712
}
717-
await loadCronJobs(state);
713+
await loadCronJobsPage(state);
718714
await loadCronStatus(state);
719715
});
720716
}
721717

722718
export async function toggleCronJob(state: CronState, job: CronJob, enabled: boolean) {
723719
await withCronBusy(state, async (client) => {
724720
await client.request("cron.update", { id: job.id, patch: { enabled } });
725-
await loadCronJobs(state);
721+
await loadCronJobsPage(state);
726722
await loadCronStatus(state);
727723
});
728724
}
@@ -744,7 +740,7 @@ export async function removeCronJob(state: CronState, job: CronJob) {
744740
state.cronRunsJobId = null;
745741
clearCronRunsPage(state);
746742
}
747-
await loadCronJobs(state);
743+
await loadCronJobsPage(state);
748744
await loadCronStatus(state);
749745
});
750746
}

0 commit comments

Comments
 (0)