Skip to content

Fix scheduler task detail modal close flow #1712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ruizanthony wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix scheduler task detail modal close flow #1712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions webui/components/modals/scheduler/scheduler-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import { store as projectsStore } from "/components/projects/projects-store.js";
import { store as notificationsStore } from "/components/notifications/notification-store.js";

const VIEW_MODE_STORAGE_KEY = "scheduler_view_mode";
const SCHEDULER_MODAL_PATH = "modals/scheduler/scheduler-modal.html";
const TASK_DETAIL_MODAL_PATH = "modals/scheduler/scheduler-task-detail.html";
const NOTIFICATION_DURATION = {
success: 3,
info: 3,
Expand Down Expand Up @@ -470,6 +472,7 @@ const schedulerStoreModel = {
sortDirection: "asc",
viewMode: readPersistedViewMode(),
selectedTaskForDetail: null,
closeSchedulerAfterTaskDetail: false,

// Pagination ---------------------------------------------------------------
currentPage: 1,
Expand Down Expand Up @@ -987,28 +990,39 @@ const schedulerStoreModel = {
}

this.selectedTaskForDetail = snapshot;
const closePromise = window.openModal("modals/scheduler/scheduler-task-detail.html");
this.closeSchedulerAfterTaskDetail = Boolean(window.isModalOpen?.(SCHEDULER_MODAL_PATH));

const closePromise = window.openModal(TASK_DETAIL_MODAL_PATH);
if (closePromise && typeof closePromise.then === "function") {
closePromise.then(() => {
closePromise.then(async () => {
if (this.selectedTaskForDetail?.uuid === snapshot.uuid) {
this.selectedTaskForDetail = null;
}
if (this.closeSchedulerAfterTaskDetail) {
this.closeSchedulerAfterTaskDetail = false;
await window.closeModal?.(SCHEDULER_MODAL_PATH);
}
});
}
},

closeTaskDetail() {
async closeTaskDetail({ closeScheduler = this.closeSchedulerAfterTaskDetail } = {}) {
this.selectedTaskForDetail = null;
window.closeModal();
this.closeSchedulerAfterTaskDetail = false;
await window.closeModal?.(TASK_DETAIL_MODAL_PATH);
if (closeScheduler) {
await window.closeModal?.(SCHEDULER_MODAL_PATH);
}
},

async editFromDetail() {
const taskId = this.selectedTaskForDetail?.uuid;
if (!taskId) return;
this.closeTaskDetail();
await this.closeTaskDetail({ closeScheduler: false });
await this.startEditTask(taskId);
// Open main scheduler modal to show the editor
window.openModal("modals/scheduler/scheduler-modal.html");
// Open or focus the main scheduler modal to show the editor.
const openSchedulerModal = window.ensureModalOpen || window.openModal;
openSchedulerModal?.(SCHEDULER_MODAL_PATH);
},

async deleteFromDetail() {
Expand Down