Schedule rerun time (#77)

* added scheduling option for rerunning task

.github/workflows/main.yml

@@ -75,4 +75,4 @@ jobs:
           dockerfile_directory: ./example-app/
           dockerfile_name: Dockerfile
           docker_options: "--no-cache"
-          process_type: web
+          process_type: web

db-scheduler-ui-frontend/src/components/common/HeaderBar.tsx

@@ -22,7 +22,7 @@ import {
   Button,
 } from '@chakra-ui/react';
 import { FilterBy } from 'src/models/QueryParams';
-import { FilterBox } from '../input/FilterBox';
+import { FilterBox } from 'src/components/input/FilterBox';
 import { RefreshButton } from 'src/components/input/RefreshButton';
 import { QueryObserverResult, InfiniteData } from '@tanstack/react-query';
 import { InfiniteScrollResponse } from 'src/models/TasksResponse';
@@ -32,7 +32,7 @@ import { POLL_LOGS_QUERY_KEY, pollLogs } from 'src/services/pollLogs';
 import { POLL_TASKS_QUERY_KEY, pollTasks } from 'src/services/pollTasks';
 import { PlayIcon, RepeatIcon } from 'src/assets/icons';
 import colors from 'src/styles/colors';
-import { RunAllAlert } from './RunAllAlert';
+import { RunAllAlert } from 'src/components/scheduled/RunAllAlert';
 import { TaskDetailsRequestParams } from 'src/models/TaskRequestParams';
 import { useParams } from 'react-router-dom';
 

db-scheduler-ui-frontend/src/components/input/DateTimeInput.tsx

@@ -19,11 +19,13 @@ import colors from 'src/styles/colors';
 interface DateTimeInputProps {
   selectedDate: Date | null;
   onChange: (date: Date | null) => void;
+  forceFutureTime?: boolean;
 }
 
 export const DateTimeInput: React.FC<DateTimeInputProps> = ({
   selectedDate,
   onChange,
+  forceFutureTime,
 }) => {
   return (
     <Box
@@ -32,6 +34,7 @@ export const DateTimeInput: React.FC<DateTimeInputProps> = ({
       borderColor={colors.primary[300]}
       borderWidth={1}
       backgroundColor={colors.primary[100]}
+      w="fit-content"
     >
       <DatePicker
         selected={selectedDate}
@@ -41,6 +44,15 @@ export const DateTimeInput: React.FC<DateTimeInputProps> = ({
         dateFormat={'yyyy-MM-dd HH:mm'}
         placeholderText={'YYYY-MM-DD HH:mm'}
         useWeekdaysShort
+        minTime={
+          selectedDate?.toDateString() === new Date().toDateString() &&
+          forceFutureTime
+            ? new Date()
+            : new Date(0, 0, 1)
+        }
+        maxTime={new Date(2100, 0, 1, 23, 59, 59, 999)}
+        minDate={forceFutureTime ? new Date() : new Date(0)}
+        maxDate={new Date(2100, 0, 1)}
       ></DatePicker>
     </Box>
   );

db-scheduler-ui-frontend/src/components/input/DotButton.tsx

@@ -28,24 +28,28 @@ import {
 } from '@chakra-ui/react';
 import deleteTask from 'src/services/deleteTask';
 import React from 'react';
-import { DeleteIcon, InfoOutlineIcon } from '@chakra-ui/icons';
+import { CalendarIcon, DeleteIcon, InfoOutlineIcon } from '@chakra-ui/icons';
 import { IoEllipsisVerticalIcon } from '../../assets/icons';
 import { useNavigate } from 'react-router-dom';
+import { ScheduleRunAlert } from './ScheduleRunAlert';
 
 interface TaskProps {
   taskName: string;
   taskInstance: string;
   style?: React.CSSProperties;
+  refetch?: () => void;
 }
 
 export const DotButton: React.FC<TaskProps> = ({
   taskName,
   taskInstance,
   style,
+  refetch,
 }) => {
-  const [isOpen, setIsOpen] = React.useState(false);
+  const [deleteOpen, setDeleteOpen] = React.useState(false);
+  const [scheduleOpen, setScheduleOpen] = React.useState(false);
   const navigate = useNavigate();
-  const onClose = () => setIsOpen(false);
+  const onClose = () => setDeleteOpen(false);
   const cancelRef = React.useRef(null);
   return (
     <Box style={style}>
@@ -60,6 +64,17 @@ export const DotButton: React.FC<TaskProps> = ({
         />
 
         <MenuList padding={0}>
+          <MenuItem
+            rounded={6}
+            minBlockSize={10}
+            onClick={(event) => {
+              event.stopPropagation();
+              setScheduleOpen(true);
+            }}
+            icon={<CalendarIcon boxSize={4} />}
+          >
+            Update execution time
+          </MenuItem>
           <MenuItem
             rounded={6}
             minBlockSize={10}
@@ -76,16 +91,24 @@ export const DotButton: React.FC<TaskProps> = ({
             minBlockSize={10}
             onClick={(event) => {
               event.stopPropagation();
-              setIsOpen(true);
+              setDeleteOpen(true);
             }}
             icon={<DeleteIcon boxSize={4} />}
           >
             Delete task
           </MenuItem>
         </MenuList>
       </Menu>
+      <ScheduleRunAlert
+        failed={true}
+        isOpen={scheduleOpen}
+        setIsopen={setScheduleOpen}
+        taskId={taskInstance}
+        taskName={taskName}
+        refetch={refetch ?? (() => {})}
+      />
       <AlertDialog
-        isOpen={isOpen}
+        isOpen={deleteOpen}
         leastDestructiveRef={cancelRef}
         onClose={onClose}
       >

db-scheduler-ui-frontend/src/components/input/ScheduleRunAlert.tsx

@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) Bekk
+ *
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogContent,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogOverlay,
+  Button,
+} from '@chakra-ui/react';
+import React from 'react';
+import colors from 'src/styles/colors';
+import { DateTimeInput } from './DateTimeInput';
+import runTask from 'src/services/runTask';
+
+interface TaskProps {
+  failed: boolean;
+  taskName: string;
+  taskId: string;
+  isOpen: boolean;
+  setIsopen: React.Dispatch<React.SetStateAction<boolean>>;
+  refetch: () => void;
+}
+
+export const ScheduleRunAlert: React.FC<TaskProps> = ({
+  failed,
+  isOpen,
+  taskId,
+  taskName,
+  setIsopen,
+  refetch,
+}) => {
+  const cancelRef = React.useRef(null);
+  const [time, setTime] = React.useState<Date | null>(new Date());
+
+  return (
+    <AlertDialog
+      isOpen={isOpen}
+      leastDestructiveRef={cancelRef}
+      onClose={() => setIsopen(false)}
+    >
+      <AlertDialogOverlay>
+        <AlertDialogContent>
+          <AlertDialogHeader fontSize="lg" fontWeight="bold">
+            {failed ? 'Rerun Task At Time' : 'Run Task At Time'}
+          </AlertDialogHeader>
+
+          <AlertDialogBody p={4}>
+            <DateTimeInput
+              onChange={(e) => setTime(e)}
+              selectedDate={time}
+              forceFutureTime
+            />
+          </AlertDialogBody>
+
+          <AlertDialogFooter justifyContent={'space-between'}>
+            <Button
+              onClick={() => {
+                setIsopen(false);
+              }}
+            >
+              Cancel
+            </Button>
+            <Button
+              bgColor={failed ? colors.running[300] : colors.running[100]}
+              _hover={{
+                backgroundColor: failed
+                  ? colors.running[200]
+                  : colors.running[100],
+              }}
+              _active={{
+                backgroundColor: failed
+                  ? colors.running[200]
+                  : colors.running[300],
+              }}
+              textColor={failed ? colors.primary[100] : colors.running[500]}
+              onClick={() => {
+                time &&
+                  runTask(taskId, taskName, time).then(() => {
+                    refetch();
+                  });
+                setIsopen(false);
+              }}
+              ml={3}
+            >
+              {failed ? 'Update Rerun Time' : 'Update Run Time'}
+            </Button>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialogOverlay>
+    </AlertDialog>
+  );
+};

db-scheduler-ui-frontend/src/components/scheduled/TaskAccordionButton.tsx

@@ -139,6 +139,7 @@ export const TaskAccordionButton: React.FC<TaskAccordionButtonProps> = (
                       ? 'visible'
                       : 'hidden',
                 }}
+                refetch={refetch}
               />
             </Box>
             <AccordionIcon

db-scheduler-ui-frontend/src/services/runTask.ts

@@ -15,9 +15,16 @@ const API_BASE_URL: string =
   (import.meta.env.VITE_API_BASE_URL as string) ??
   window.location.origin + '/db-scheduler-api';
 
-const runTask = async (id: string, name: string) => {
+const runTask = async (id: string, name: string, scheduleTime?:Date) => {
+
+  const queryParams = new URLSearchParams();
+
+  queryParams.append('id', id);
+  queryParams.append('name', name);
+  scheduleTime&&queryParams.append('scheduleTime', scheduleTime.toISOString());
+
   const response = await fetch(
-    `${API_BASE_URL}/tasks/rerun?id=${id}&name=${name}`,
+    `${API_BASE_URL}/tasks/rerun?${queryParams}`,
     {
       method: 'POST',
     },

db-scheduler-ui/src/main/java/no/bekk/dbscheduler/ui/controller/TaskController.java

@@ -13,6 +13,7 @@
  */
 package no.bekk.dbscheduler.ui.controller;
 
+import java.time.Instant;
 import no.bekk.dbscheduler.ui.model.GetTasksResponse;
 import no.bekk.dbscheduler.ui.model.PollResponse;
 import no.bekk.dbscheduler.ui.model.TaskDetailsRequestParams;
@@ -48,8 +49,9 @@ public PollResponse pollForUpdates(TaskDetailsRequestParams params) {
   }
 
   @PostMapping("/rerun")
-  public void runNow(@RequestParam String id, @RequestParam String name) {
-    taskLogic.runTaskNow(id, name);
+  public void runNow(
+      @RequestParam String id, @RequestParam String name, @RequestParam Instant scheduleTime) {
+    taskLogic.runTaskNow(id, name, scheduleTime);
   }
 
   @PostMapping("/rerunGroup")

db-scheduler-ui/src/main/java/no/bekk/dbscheduler/ui/service/TaskLogic.java

@@ -45,12 +45,14 @@ public TaskLogic(Scheduler scheduler, Caching caching, boolean showData) {
     this.showData = showData;
   }
 
-  public void runTaskNow(String taskId, String taskName) {
+  public void runTaskNow(String taskId, String taskName, Instant scheduleTime) {
     Optional<ScheduledExecution<Object>> scheduledExecutionOpt =
         scheduler.getScheduledExecution(TaskInstanceId.of(taskName, taskId));
 
     if (scheduledExecutionOpt.isPresent() && !scheduledExecutionOpt.get().isPicked()) {
-      scheduler.reschedule(scheduledExecutionOpt.get().getTaskInstance(), Instant.now());
+      scheduler.reschedule(
+          scheduledExecutionOpt.get().getTaskInstance(),
+          scheduleTime != null ? scheduleTime : Instant.now());
     } else {
       throw new ResponseStatusException(
           HttpStatus.NOT_FOUND,
@@ -68,7 +70,8 @@ public void runTaskGroupNow(String taskName, boolean onlyFailed) {
                 try {
                   runTaskNow(
                       execution.getTaskInstance().getId(),
-                      execution.getTaskInstance().getTaskName());
+                      execution.getTaskInstance().getTaskName(),
+                      Instant.now());
                 } catch (ResponseStatusException e) {
                   System.out.println("Failed to run task: " + e.getMessage());
                 }

pom.xml

@@ -383,4 +383,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>