@godv61/dsh-task-engine 0.5.0 → 0.5.1

package/lib/client.js

@@ -4232,6 +4232,8 @@ function TaskEngineSection(props) {
   const [config, setConfig] = (0, import_react.useState)(null);
   const [source, setSource] = (0, import_react.useState)("default");
   const [savedAt, setSavedAt] = (0, import_react.useState)("");
+  const [loadError, setLoadError] = (0, import_react.useState)("");
+  const [loadedProblems, setLoadedProblems] = (0, import_react.useState)([]);
   (0, import_react.useEffect)(() => {
     if (workspaces.length > 0 && workspace === "") {
       setWorkspace(workspaces[0].path);
@@ -4240,20 +4242,50 @@ function TaskEngineSection(props) {
   (0, import_react.useEffect)(() => {
     if (workspace === "") return;
     let alive = true;
+    setLoadError("");
     void remote.read(workspace).then((result) => {
       if (!alive) return;
       if (result.ok) {
         setConfig(result.value.config);
         setSource(result.value.source);
+        setLoadedProblems(result.value.source === "invalid" ? result.value.problems : []);
         setSavedAt("");
+      } else {
+        setLoadError("\u8BFB\u53D6\u914D\u7F6E\u5931\u8D25\uFF1A" + describeError(result.error));
       }
+    }, (error) => {
+      if (alive) setLoadError("\u8BFB\u53D6\u914D\u7F6E\u5931\u8D25\uFF1A" + describeError(error));
     });
     return () => {
       alive = false;
     };
   }, [remote, workspace]);
   const problems = (0, import_react.useMemo)(() => config === null ? [] : validateWorkflow(config), [config]);
-  if (config === null) return e("div", { style: styles.wrap }, e("p", null, "\u52A0\u8F7D\u4E2D\u2026"));
+  const notice = problems.length === 0 && loadedProblems.length > 0 ? loadedProblems : [];
+  if (workspaces.length === 0) {
+    return e(
+      "div",
+      { style: styles.wrap },
+      e("h2", { style: styles.title }, "\u5DE5\u7A0B\u6D41\u7A0B\u914D\u7F6E"),
+      e("p", { style: styles.problems }, "\u5F53\u524D\u6CA1\u6709\u4EFB\u4F55\u5DE5\u4F5C\u533A\uFF1A\u8BF7\u5148\u5728\u4FA7\u680F\u521B\u5EFA\u4E00\u4E2A\u5DE5\u4F5C\u533A\u3002")
+    );
+  }
+  if (loadError !== "") {
+    return e(
+      "div",
+      { style: styles.wrap },
+      e("h2", { style: styles.title }, "\u5DE5\u7A0B\u6D41\u7A0B\u914D\u7F6E"),
+      e("p", { style: styles.problems }, loadError)
+    );
+  }
+  if (config === null) {
+    return e(
+      "div",
+      { style: styles.wrap },
+      e("h2", { style: styles.title }, "\u5DE5\u7A0B\u6D41\u7A0B\u914D\u7F6E"),
+      e("p", null, "\u52A0\u8F7D\u4E2D\u2026")
+    );
+  }
   return e(
     "div",
     { style: styles.wrap },
@@ -4283,11 +4315,17 @@ function TaskEngineSection(props) {
       { style: styles.problems },
       e("strong", null, `\u6709 ${problems.length} \u4E2A\u95EE\u9898\uFF08\u4FDD\u5B58\u4F1A\u88AB\u62D2\u7EDD\uFF09\uFF1A`),
       e("ul", null, ...problems.map((p) => e("li", { key: p }, p)))
+    ) : notice.length > 0 ? e(
+      "div",
+      { style: styles.problems },
+      e("strong", null, "\u539F .dsh/eng.json \u65E0\u6CD5\u89E3\u6790\uFF1A"),
+      e("ul", null, ...notice.map((p) => e("li", { key: p }, p))),
+      e("p", { style: styles.muted }, "\u5F53\u524D\u663E\u793A\u5185\u7F6E\u9ED8\u8BA4\u914D\u7F6E\uFF1B\u70B9\u51FB\u4FDD\u5B58\u4F1A\u8986\u76D6\u539F\u6587\u4EF6\u3002")
     ) : e("p", { style: styles.ok }, source === "default" ? "\u5F53\u524D\u4F7F\u7528\u5185\u7F6E\u9ED8\u8BA4\u914D\u7F6E\u3002" : "\u914D\u7F6E\u6709\u6548\u3002"),
     e(
       "div",
       { style: styles.actions },
-      e("button", { onClick: () => save(props, config, workspace, setSavedAt, setSource), disabled: problems.length > 0 }, "\u4FDD\u5B58\u5230 .dsh/eng.json"),
+      e("button", { onClick: () => save(props, config, workspace, setSavedAt, setSource, setLoadedProblems), disabled: problems.length > 0 }, "\u4FDD\u5B58\u5230 .dsh/eng.json"),
       savedAt !== "" ? e("span", { style: styles.ok }, savedAt) : null
     )
   );
@@ -4435,12 +4473,15 @@ function selectOf(config, value, onChange) {
 function update(config, setConfig, fn) {
   setConfig(fn(config));
 }
-async function save(props, config, workspace, setSavedAt, setSource) {
+async function save(props, config, workspace, setSavedAt, setSource, setLoadedProblems) {
   const result = await props.remote.write({ path: workspace, config });
-  if (result.ok) {
-    setSource(result.value.source);
-    setSavedAt("\u5DF2\u4FDD\u5B58");
+  if (!result.ok) {
+    setSavedAt("\u4FDD\u5B58\u5931\u8D25\uFF1A" + describeError(result.error));
+    return;
   }
+  setSource(result.value.source);
+  setLoadedProblems(result.value.source === "invalid" ? result.value.problems : []);
+  setSavedAt(result.value.ok ? "\u5DF2\u4FDD\u5B58" : "");
 }
 function splitList(text) {
   return text.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
@@ -4448,6 +4489,11 @@ function splitList(text) {
 function toggle(list, value, on) {
   return on ? list.includes(value) ? list : [...list, value] : list.filter((v) => v !== value);
 }
+function describeError(error) {
+  if (error instanceof Error) return error.message;
+  if (typeof error === "string") return error;
+  return "\u672A\u77E5\u9519\u8BEF";
+}
 var styles = {
   wrap: { padding: "16px", maxWidth: "760px", display: "flex", flexDirection: "column", gap: "8px" },
   title: { margin: "0 0 4px" },
@@ -4467,7 +4513,11 @@ var styles = {
 var inject = ["remote", "slots"];
 async function apply(ctx) {
   const disposeRemote = await ctx.remote.$mount(remote_default);
-  const taskEngine = ctx.remote["task-engine"];
+  const taskEngine = ctx.get("remote.task-engine");
+  if (taskEngine === void 0) {
+    await disposeRemote();
+    throw new Error("task-engine: remote.task-engine namespace failed to mount");
+  }
   ctx.slots.inject("settings.section", () => ctx.slots.register({
     name: "settings.section",
     id: "task-engine",