Skip to content

Agent Zero AI framework

scheduler cleanup

3clyp507d1df7eaeb92
diff --git a/webui/components/modals/scheduler/scheduler-modal-store.js b/webui/components/modals/scheduler/scheduler-modal-store.js
deleted file mode 100644
index 2dd0062d1..000000000
--- a/webui/components/modals/scheduler/scheduler-modal-store.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { createStore } from "/js/AlpineStore.js";
-import { store as schedulerStore } from "/components/modals/scheduler/scheduler-store.js";
-
-const model = {
- closePromise: null,
-
- async open(options = {}) {
- // Open modal
- this.closePromise = window.openModal("modals/scheduler/scheduler-modal.html");
-
- // Setup cleanup on modal close
- if (this.closePromise?.then) {
- this.closePromise.then(() => this.cleanup());
- }
-
- // Notify scheduler store that modal opened
- schedulerStore.onTabActivated?.();
-
- // If taskId provided, show detail after load
- if (options.taskId) {
- setTimeout(async () => {
- await schedulerStore.fetchTasks({ manual: true });
- schedulerStore.showTaskDetail(options.taskId);
- }, 200);
- }
- },
-
- cleanup() {
- schedulerStore.onModalClosed?.();
- this.closePromise = null;
- },
-};
-
-export const store = createStore("schedulerModal", model);
-
diff --git a/webui/components/modals/scheduler/scheduler-modal.html b/webui/components/modals/scheduler/scheduler-modal.html
index 33770b3ad..5be54f0d7 100644
--- a/webui/components/modals/scheduler/scheduler-modal.html
+++ b/webui/components/modals/scheduler/scheduler-modal.html
@@ -2,14 +2,18 @@
<head>
<title>Task Scheduler</title>
<script type="module">
- import { store } from "/components/modals/scheduler/scheduler-modal-store.js";
+ import { store } from "/components/modals/scheduler/scheduler-store.js";
</script>
</head>
<body>
- <div x-data>
- <template x-if="$store.schedulerModal">
+ <div x-data x-init="$store.schedulerStore.onTabActivated()" x-destroy="$store.schedulerStore.onModalClosed()">
+ <template x-if="$store.schedulerStore">
<div class="scheduler-modal-content">
- <x-component path="modals/scheduler/scheduler-settings.html"></x-component>
+ <div id="scheduler-settings-root" class="scheduler-dashboard">
+ <div class="scheduler-dashboard-description">Manage scheduled tasks and automated processes for Agent Zero.</div>
+ <x-component path="modals/scheduler/scheduler-task-editor.html"></x-component>
+ <x-component path="modals/scheduler/scheduler-task-list.html"></x-component>
+ </div>
</div>
</template>
</div>
@@ -21,6 +25,12 @@
height: 100%;
min-height: 400px;
}
+ .scheduler-dashboard {
+ padding: 0;
+ }
+ .scheduler-dashboard-description {
+ padding: 1rem 1rem;
+ }
</style>
</body>
</html>
diff --git a/webui/components/modals/scheduler/scheduler-settings.html b/webui/components/modals/scheduler/scheduler-settings.html
deleted file mode 100644
index 9e31f6642..000000000
--- a/webui/components/modals/scheduler/scheduler-settings.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
- <script type="module">
- import { store } from "/components/modals/scheduler/scheduler-store.js";
- </script>
-</head>
-<body>
-<div x-data>
- <template x-if="$store.schedulerStore">
- <div id="scheduler-settings-root" class="scheduler-dashboard">
- <div class="scheduler-dashboard-description">Manage scheduled tasks and automated processes for Agent Zero.</div>
- <x-component path="modals/scheduler/scheduler-task-editor.html"></x-component>
- <x-component path="modals/scheduler/scheduler-task-list.html"></x-component>
- </div>
- </template>
-</div>
-
-<style>
- .scheduler-dashboard {
- padding: 0;
- }
- .scheduler-dashboard-description {
- padding: 1rem 1rem;
- }
-</style>
-</body>
-</html>
diff --git a/webui/components/modals/scheduler/scheduler-store.js b/webui/components/modals/scheduler/scheduler-store.js
index b1780284c..24db253fe 100644
--- a/webui/components/modals/scheduler/scheduler-store.js
+++ b/webui/components/modals/scheduler/scheduler-store.js
@@ -964,11 +964,13 @@ const schedulerStoreModel = {
window.closeModal();
},
- editFromDetail() {
+ async editFromDetail() {
const taskId = this.selectedTaskForDetail?.uuid;
if (!taskId) return;
this.closeTaskDetail();
- this.startEditTask(taskId);
+ await this.startEditTask(taskId);
+ // Open main scheduler modal to show the editor
+ window.openModal("modals/scheduler/scheduler-modal.html");
},
async deleteFromDetail() {
diff --git a/webui/components/sidebar/top-section/quick-actions.html b/webui/components/sidebar/top-section/quick-actions.html
index deaaa3799..8bcf0dd8c 100644
--- a/webui/components/sidebar/top-section/quick-actions.html
+++ b/webui/components/sidebar/top-section/quick-actions.html
@@ -3,11 +3,6 @@
<head>
<script type="module">
import { store } from "/components/sidebar/chats/chats-store.js";
- import { store as settingsStore } from "/components/settings/settings-store.js";
- import { store as schedulerModalStore } from "/components/modals/scheduler/scheduler-modal-store.js";
- // Expose for Alpine template access
- globalThis.openSettingsModal = () => settingsStore.open();
- globalThis.openSchedulerModal = () => schedulerModalStore.open();
</script>
</head>
@@ -18,7 +13,7 @@
<button class="config-button" id="loadChats" @click="$store.chats.loadChats()">Load Chat</button>
<button class="config-button" id="loadChat" @click="$store.chats.saveChat()">Save Chat</button>
<button class="config-button" id="restart" @click="$store.chats.restart()">Restart</button>
- <button class="config-button" id="settings" @click="openSettingsModal()"><svg
+ <button class="config-button" id="settings" @click="openModal('settings/settings.html')"><svg
xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-5.0 -17.0 110.0 135.0" fill="currentColor" width="24"
height="24">
<path
@@ -28,7 +23,7 @@
d="m50.301 66.5c-9 0-16.398-7.3008-16.398-16.398 0-9.1016 7.3008-16.398 16.398-16.398 9.1016 0 16.398 7.3008 16.398 16.398 0 9.0977-7.3984 16.398-16.398 16.398zm0-25.5c-5 0-9.1016 4.1016-9.1016 9.1016s4.1016 9.1016 9.1016 9.1016 9.1016-4.1016 9.1016-9.1016c-0.003906-5-4.1016-9.1016-9.1016-9.1016z">
</path>
</svg>Settings</button>
- <button class="config-button" id="scheduler" @click="openSchedulerModal()">
+ <button class="config-button" id="scheduler" @click="openModal('modals/scheduler/scheduler-modal.html')">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" width="24" height="24">
<path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm.5-13H11v6l5.25 3.15.75-1.23-4.5-2.67V7z"/>
</svg>Scheduler</button>