@anchrd/intel-ui 0.8.3 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchrd/intel-ui",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "type": "module",
   "license": "UNLICENSED",
   "repository": {

package/src/data/intel-data-provider/intel-data-provider.ts

@@ -1,6 +1,7 @@
 import {
   AppendKnowledgeTableRowsInput,
   AppendKnowledgeTableRowsResult,
+  ArchiveFlowInput,
   ArchiveKnowledgeNodeInput,
   CompleteFlowRunStepInput,
   CreateFlowInput,
@@ -159,6 +160,9 @@ export function createIntelDataProvider(
     const params = new URLSearchParams(
       query.parentId === undefined ? {} : { parentId: query.parentId ?? "" },
     );
+    // Same rule as `parentId`: only the asked-for case is sent. The default is the server's, and a
+    // provider that spells it out anyway would have to be changed whenever the server's is.
+    if (query.includeArchived) params.set("includeArchived", "true");
     const search = params.toString();
     return await request(`/flows${search ? `?${search}` : ""}`, FlowList);
   }
@@ -366,6 +370,13 @@ export function createIntelDataProvider(
         body: JSON.stringify(parsed),
       });
     },
+    async archiveFlow(input) {
+      const parsed = ArchiveFlowInput.parse(input);
+      return await request(`/flows/${encodeURIComponent(parsed.flowId)}/archive`, Flow, {
+        method: "POST",
+        body: JSON.stringify(parsed),
+      });
+    },
     async saveFlow(input) {
       const parsed = SaveFlowVersionInput.parse(input);
       return await request(`/flows/${encodeURIComponent(parsed.flowId)}/versions`, FlowDocument, {

package/src/data/intel-data-provider/intel-data-provider.types.ts

@@ -1,6 +1,7 @@
 import type {
   AppendKnowledgeTableRowsInput,
   AppendKnowledgeTableRowsResult,
+  ArchiveFlowInput,
   ArchiveKnowledgeNodeInput,
   CompleteFlowRunStepInput,
   CreateFlowInput,
@@ -117,6 +118,9 @@ export interface IntelDataProvider {
   getFlowRequirements(flowId: string): Promise<FlowRequirements>;
   createFlow(input: CreateFlowInput): Promise<Flow>;
   updateFlow(input: UpdateFlowInput): Promise<Flow>;
+  // Archive a flow or take it back out. An archived flow leaves the tree, stops being startable and
+  // stops resolving as another flow's callee; its versions stay untouched.
+  archiveFlow(input: ArchiveFlowInput): Promise<Flow>;
   saveFlow(input: SaveFlowVersionInput): Promise<FlowDocument>;
   // Which version each sub-flow call will take once published, and which of them publishing
   // freezes. Read before publishing, so the author agrees to the pins rather than discovering them.

package/src/i18n/en.json

@@ -72,6 +72,7 @@
   "resource.menu": "More actions for {title}",
   "resource.rename": "Rename",
   "resource.renameTitle": "Rename {title}",
+  "resource.archive": "Archive",
   "resource.conflict": "It was not changed: somebody else changed this entry first. Reload it and try again.",
   "resource.forbidden": "It was not changed: you may not change this entry.",
   "resource.failed": "The change was not saved. Reload the latest version and try again.",
@@ -114,7 +115,6 @@
   "knowledge.shareUnreadableHint": "Nothing is blocked. A run of those flows will simply stop at that step for them.",
   "knowledge.versions": "Version history",
   "knowledge.version": "Version {sequence}",
-  "knowledge.archive": "Archive",
   "view.showGraph": "Show this level as a graph",
   "view.showEditor": "Back to the editor",
   "view.showRuns": "Show this flow's runs",

package/src/resource-menu/resource-menu.tsx

@@ -125,6 +125,7 @@ export function ResourceMenu({
   const [sharing, setSharing] = useState(false);
   const [linksOpen, setLinksOpen] = useState(false);
   const selected = useRouterState({ select: (state) => selectedFrom(state.location.search) });
+  const pathname = useRouterState({ select: (state) => state.location.pathname });
   // ⚠️ Dragging is a pointer gesture and nothing else: no keyboard, no screen reader, no touch worth
   // the name. #27 gave moving a second, equal route through a folder picker, and that route lived in
   // the tree row's menu. With the row menu gone (#58) it lives here, or it does not exist.
@@ -189,9 +190,20 @@ export function ResourceMenu({
     },
   });
 
+  // Both records take the same conflict route as a rename: `baseUpdatedAt` from the row that was on
+  // screen, so archiving something somebody else has just changed is refused rather than silently
+  // applied to a different state than the one that was read.
   const archive = useMutation({
     mutationFn: async () => {
-      if (target.type === "flow") throw new Error("A flow cannot be archived");
+      if (target.type === "flow") {
+        await data.archiveFlow({
+          flowId: target.flow.id,
+          baseUpdatedAt: target.flow.updatedAt,
+          archived: true,
+          idempotencyKey: crypto.randomUUID(),
+        });
+        return;
+      }
       await data.archiveKnowledge({
         nodeId: target.node.id,
         baseUpdatedAt: target.node.updatedAt,
@@ -203,7 +215,14 @@ export function ResourceMenu({
       await refresh();
       // The row is gone from the tree. If it was also what the screen was showing, the screen has
       // nothing left to show either.
-      if (selected === id) await navigate({ to: "/knowledge", search: {} });
+      //
+      // ⚠️ It drops the selection where it stands rather than always landing on /knowledge: a flow
+      // archived from the flow screen would otherwise throw the reader onto another screen for no
+      // reason they could see. A flow reached through the shared tree stays on /knowledge, which is
+      // where it was being read.
+      if (selected === id) {
+        await navigate({ to: pathname === "/flows" ? "/flows" : "/knowledge", search: {} });
+      }
     },
   });
 
@@ -260,18 +279,17 @@ export function ResourceMenu({
               {i18n.t("knowledge.share")}
             </DropdownMenuItem>
           ) : null}
-          {node ? (
-            <>
-              <DropdownMenuSeparator />
-              <DropdownMenuItem
-                onSelect={() => archive.mutate()}
-                className="text-destructive focus:text-destructive"
-              >
-                <Archive aria-hidden="true" />
-                {i18n.t("knowledge.archive")}
-              </DropdownMenuItem>
-            </>
-          ) : null}
+          {/* A flow is archived like a document (issue 109). It keeps its versions and its runs; what it
+              loses is reach — it leaves the tree, cannot be started, and stops resolving as another
+              flow's callee. */}
+          <DropdownMenuSeparator />
+          <DropdownMenuItem
+            onSelect={() => archive.mutate()}
+            className="text-destructive focus:text-destructive"
+          >
+            <Archive aria-hidden="true" />
+            {i18n.t("resource.archive")}
+          </DropdownMenuItem>
         </DropdownMenuContent>
       </DropdownMenu>
       {/* The menu closes on selection, so a refusal has nowhere to live inside it. It stands over