v1.10.2 (#413)

dagu-org · Mar 19, 2023 · d0b5465 · d0b5465
1 parent 4d39b07
commit d0b5465
Show file tree

Hide file tree

Showing 34 changed files with 980 additions and 641 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ scheduler: build-dir
 	./bin/dagu scheduler
 
 .PHONY: test
-test: build
+test:
 	go test -v ./...
 
 .PHONY: test-clean

diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ Dagu is a tool for scheduling and running tasks based on a directed acyclic grap
 - [FAQ](#faq)
   - [How to Contribute?](#how-to-contribute)
   - [How Long Will the History Data be Stored?](#how-long-will-the-history-data-be-stored)
-  - [How to Use Specific Host and Port for `dagu server`?](#how-to-use-specific-host-and-port-for-dagu-server)
+  - [How to Use Specific Host and Port eor `dagu server`?](#how-to-use-specific-host-and-port-eor-dagu-server)
   - [How to Specify the DAGs Directory for `dagu server` and `dagu scheduler`?](#how-to-specify-the-dags-directory-for-dagu-server-and-dagu-scheduler)
   - [How Can I Retry a DAG from a Specific Task?](#how-can-i-retry-a-dag-from-a-specific-task)
   - [How Does It Track Running Processes Without DBMS?](#how-does-it-track-running-processes-without-dbms)
@@ -160,7 +160,7 @@ Start the server with `dagu server` and browse to `http://127.0.0.1:8080` to exp
 
 Create a DAG by clicking the `New DAG` button on the top page of the web UI. Input `example` in the dialog.
 
-*Note: DAG (YAML) files will be placed in `~/.dagu/dags` by default. See [Admin Configuration](#admin-configuration) for more details.*
+*Note: DAG (YAML) files will be placed in `~/.dagu/dags` by default. See [Configuration Options](#configuration-options) for more details.*
 
 ### 3. Edit the DAG
 
@@ -186,7 +186,7 @@ You can execute the example by pressing the `Start` button.
 - `dagu scheduler [--dags=<path/to/the DAGs directory>]` - Starts the scheduler process
 - `dagu version` - Shows the current binary version
 
-The `--config=<config>` option is available to all commands. It allows to specify different dagu configuration for the commands. Which enables you to manage multiple dagu process in a single instance. See [Admin Configuration](#admin-configuration) for more details.
+The `--config=<config>` option is available to all commands. It allows to specify different dagu configuration for the commands. Which enables you to manage multiple dagu process in a single instance. See [Configuration Options](#configuration-options) for more details.
 
 For example:
 
@@ -618,7 +618,7 @@ output:
 }
 ```
 
-The `jq` result can be used in following steps via [Output](#output) or [Stdout Redirection](#stdout-and-stderr-redirection).
+The `jq` result can be used in following steps via [Output](#setting-environment-variables-with-standard-output) or [Stdout Redirection](#redirecting-stdout-and-stderr).
 
 ### Command Execution over SSH
 
@@ -693,7 +693,7 @@ If you want to use the same settings for all DAGs, set them to the [base configu
 
 ## Base Configuration for all DAGs
 
-Creating a base configuration (default path: `~/.dagu/config.yaml`) is a convenient way to organize shared settings among all DAGs. The path to the base configuration file can be configured. See [Admin Configuration](#admin-configuration) for more details.
+Creating a base configuration (default path: `~/.dagu/config.yaml`) is a convenient way to organize shared settings among all DAGs. The path to the base configuration file can be configured. See [Configuration Options](#configuration-options) for more details.
 
 ```yaml
 # directory path to save logs from standard output
@@ -930,7 +930,7 @@ Feel free to contribute in any way you want. Share ideas, questions, submit issu
 
 By default, the execution history data is retained for 30 days. However, you can customize this setting by modifying the `histRetentionDays` field in a YAML file.
 
-### How to Use Specific Host and Port for `dagu server`?
+### How to Use Specific Host and Port eor `dagu server`?
 
 To configure the host and port for `dagu server`, you can set the environment variables `DAGU_HOST` and `DAGU_PORT`. Refer to the [Configuration Options](#configuration-options) for more details.
 

diff --git a/admin/src/components/molecules/DAGActions.tsx b/admin/src/components/molecules/DAGActions.tsx
@@ -167,7 +167,6 @@ function DAGActions({
         </Stack>
       </ConfirmModal>
       <StartDAGModal
-        defaultParams={dag.DefaultParams}
         dag={dag}
         visible={isStartModal}
         onSubmit={(params) => {

diff --git a/admin/src/components/molecules/StartDAGModal.tsx b/admin/src/components/molecules/StartDAGModal.tsx
@@ -7,12 +7,12 @@ import {
   Typography,
 } from '@mui/material';
 import React from 'react';
+import { Parameter, parseParams, stringifyParams } from '../../lib/parseParams';
 import { DAG } from '../../models';
 import LabeledItem from '../atoms/LabeledItem';
 
 type Props = {
   visible: boolean;
-  defaultParams: string;
   dag: DAG;
   dismissModal: () => void;
   onSubmit: (params: string) => void;
@@ -30,13 +30,7 @@ const style = {
   p: 4,
 };
 
-function StartDAGModal({
-  visible,
-  defaultParams,
-  dag,
-  dismissModal,
-  onSubmit,
-}: Props) {
+function StartDAGModal({ visible, dag, dismissModal, onSubmit }: Props) {
   React.useEffect(() => {
     const callback = (event: KeyboardEvent) => {
       const e = event || window.event;
@@ -52,11 +46,18 @@ function StartDAGModal({
 
   const ref = React.useRef<HTMLInputElement>(null);
 
-  const [params, setParams] = React.useState<string>(dag.DefaultParams);
+  const parsedParams = React.useMemo(() => {
+    if (dag.DefaultParams.trim() == '') {
+      return [];
+    }
+    return parseParams(dag.DefaultParams);
+  }, [dag.DefaultParams]);
+
+  const [params, setParams] = React.useState<Parameter[]>([]);
 
   React.useEffect(() => {
-    ref.current?.focus();
-  }, [ref.current]);
+    setParams(parsedParams);
+  }, [parsedParams]);
 
   return (
     <Modal open={visible} onClose={dismissModal}>
@@ -71,30 +72,81 @@ function StartDAGModal({
           spacing={2}
           mt={2}
         >
-          {dag.DefaultParams != '' ? (
-            <>
-              <Stack direction={'column'}>
-                <LabeledItem label="Default parameters">{null}</LabeledItem>
-                <Box sx={{ backgroundColor: '#eee' }}>{dag.DefaultParams}</Box>
-              </Stack>
-              <TextField
-                label="parameters"
-                multiline
-                variant="outlined"
-                style={{
-                  flex: 0.5,
-                }}
-                inputRef={ref}
-                InputProps={{
-                  value: params,
-                  onChange: (e) => {
-                    setParams(e.target.value);
-                  },
-                }}
-              />
-            </>
-          ) : null}
-          <Button variant="contained" onClick={() => onSubmit(params)}>
+          {parsedParams.map((p, i) => {
+            if (p.Name != undefined) {
+              return (
+                <React.Fragment key={i}>
+                  <TextField
+                    label={p.Name}
+                    multiline
+                    placeholder={p.Value}
+                    variant="outlined"
+                    style={{
+                      flex: 0.5,
+                    }}
+                    inputRef={ref}
+                    InputProps={{
+                      value: params.find((pp) => pp.Name == p.Name)?.Value,
+                      onChange: (e) => {
+                        if (p.Name) {
+                          setParams(
+                            params.map((pp) => {
+                              if (pp.Name == p.Name) {
+                                return {
+                                  ...pp,
+                                  Value: e.target.value,
+                                };
+                              } else {
+                                return pp;
+                              }
+                            })
+                          );
+                        }
+                      },
+                    }}
+                  />
+                </React.Fragment>
+              );
+            } else {
+              return (
+                <React.Fragment key={i}>
+                  <TextField
+                    label={`Parameter ${i + 1}`}
+                    multiline
+                    placeholder={p.Value}
+                    variant="outlined"
+                    style={{
+                      flex: 0.5,
+                    }}
+                    inputRef={ref}
+                    InputProps={{
+                      value: params.find((_, j) => i == j)?.Value,
+                      onChange: (e) => {
+                        setParams(
+                          params.map((pp, j) => {
+                            if (j == i) {
+                              return {
+                                ...pp,
+                                Value: e.target.value,
+                              };
+                            } else {
+                              return pp;
+                            }
+                          })
+                        );
+                      },
+                    }}
+                  />
+                </React.Fragment>
+              );
+            }
+          })}
+          <Button
+            variant="contained"
+            onClick={() => {
+              onSubmit(stringifyParams(params));
+            }}
+          >
             Start
           </Button>
           <Button variant="contained" color="error" onClick={dismissModal}>

diff --git a/admin/src/lib/parseParams.ts b/admin/src/lib/parseParams.ts
@@ -0,0 +1,39 @@
+export type Parameter = {
+  Name?: string;
+  Value: string;
+};
+
+export function parseParams(input: string): Parameter[] {
+  const paramRegex = /(?:([^\s=]+)=)?("(?:\\"|[^"])*"|[^"\s]+)/g;
+  const params: Parameter[] = [];
+
+  let match;
+  while ((match = paramRegex.exec(input)) !== null) {
+    const [, name, value] = match;
+
+    const param: Parameter = {
+      Value: value.startsWith('"')
+        ? value.slice(1, -1).replace(/\\"/g, '"')
+        : value,
+    };
+
+    if (name) {
+      param.Name = name;
+    }
+
+    params.push(param);
+  }
+
+  return params;
+}
+
+export function stringifyParams(params: Parameter[]): string {
+  return params
+    .map((param) => {
+      const escapedValue = param.Value.replace(/"/g, '\\"');
+      const quotedValue = `"${escapedValue}"`;
+
+      return param.Name ? `${param.Name}=${quotedValue}` : quotedValue;
+    })
+    .join(' ');
+}
diff --git a/admin/src/pages/dags/dag/index.tsx b/admin/src/pages/dags/dag/index.tsx
@@ -37,8 +37,7 @@ function DAGDetails() {
   const { mutate } = useSWRConfig();
 
   const refreshFn = React.useCallback(() => {
-    mutate(`${baseUrl}/*`);
-    return;
+    mutate(`${baseUrl}/`);
   }, [mutate, baseUrl]);
 
   React.useEffect(() => {

diff --git a/admin/src/pages/dags/index.tsx b/admin/src/pages/dags/index.tsx
@@ -17,14 +17,14 @@ function DAGs() {
   const group = query.get('group') || '';
   const appBarContext = React.useContext(AppBarContext);
 
-  const { mutate } = useSWRConfig();
+  const { cache, mutate } = useSWRConfig();
   const { data } = useSWR<GetDAGsResponse>('/', null, {
     refreshInterval: 10000,
   });
 
   const refreshFn = React.useCallback(() => {
-    mutate('*');
-  }, [mutate]);
+    setTimeout(() => mutate('/'), 500);
+  }, [mutate, cache]);
 
   React.useEffect(() => {
     appBarContext.setTitle('DAGs');