From b6e37c4d47f9033f623aa3ae98f5b75a2d8ab480 Mon Sep 17 00:00:00 2001 From: falsycat Date: Sun, 13 Jul 2025 09:54:29 +0900 Subject: [PATCH] rename node -> nodes --- src/pages/Screening/Runner.tsx | 11 ++++------- src/pages/Screening/index.tsx | 6 +++--- src/pages/Screening/{node => nodes}/Base.tsx | 0 src/pages/Screening/{node => nodes}/fetch.tsx | 0 src/pages/Screening/{node => nodes}/index.tsx | 0 src/pages/Screening/{node => nodes}/present.tsx | 0 src/pages/Screening/{node => nodes}/style.module.scss | 0 7 files changed, 7 insertions(+), 10 deletions(-) rename src/pages/Screening/{node => nodes}/Base.tsx (100%) rename src/pages/Screening/{node => nodes}/fetch.tsx (100%) rename src/pages/Screening/{node => nodes}/index.tsx (100%) rename src/pages/Screening/{node => nodes}/present.tsx (100%) rename src/pages/Screening/{node => nodes}/style.module.scss (100%) diff --git a/src/pages/Screening/Runner.tsx b/src/pages/Screening/Runner.tsx index 373df30..e80bb8d 100644 --- a/src/pages/Screening/Runner.tsx +++ b/src/pages/Screening/Runner.tsx @@ -2,24 +2,20 @@ import { Node } from "@xyflow/react"; import Bus from "./Bus"; import { Emitter } from "mitt"; -import nodes from "./node/"; +import * as nodes from "./nodes/"; export interface Iface { }; export class Impl implements Iface { _bus: Bus; - _threads: Set; constructor(bus: Bus) { - this._bus = bus; - this._threads = new Set(); + this._bus = bus; } _schedule(node: Node) { - this._threads.add(node.id); - run(this._bus, node). - finally(()=>this._threads.delete(node.id)); + run(this._bus, node); } }; @@ -46,6 +42,7 @@ async function execTask(bus: Bus, node: Node, aborted: Promise) { const data: nodes.fetch.ToshoListedData = node.data; data; const sleep = new Promise(resolve => setTimeout(resolve, 1)); + // TODO await Promise.race([sleep, aborted]); bus.emit("onNodeRunning", { id: node.id, symbols: ["T/1234"], remaining: 32 }); break; diff --git a/src/pages/Screening/index.tsx b/src/pages/Screening/index.tsx index 2026015..bd66143 100644 --- a/src/pages/Screening/index.tsx +++ b/src/pages/Screening/index.tsx @@ -12,15 +12,15 @@ import { applyNodeChanges, applyEdgeChanges, } from "@xyflow/react"; -import * as node from "./node/"; +import * as nodes from "./nodes/"; import "@xyflow/react/dist/style.css"; import Bus, { createBus, BusContext, Events } from "./Bus"; const nodeTypes = { - fetch_ToshoListed: node.fetch.ToshoListed, - present_TableDisplay: node.present.TableDisplay, + fetch_ToshoListed: nodes.fetch.ToshoListed, + present_TableDisplay: nodes.present.TableDisplay, }; const initialNodes: Node[] = [ { diff --git a/src/pages/Screening/node/Base.tsx b/src/pages/Screening/nodes/Base.tsx similarity index 100% rename from src/pages/Screening/node/Base.tsx rename to src/pages/Screening/nodes/Base.tsx diff --git a/src/pages/Screening/node/fetch.tsx b/src/pages/Screening/nodes/fetch.tsx similarity index 100% rename from src/pages/Screening/node/fetch.tsx rename to src/pages/Screening/nodes/fetch.tsx diff --git a/src/pages/Screening/node/index.tsx b/src/pages/Screening/nodes/index.tsx similarity index 100% rename from src/pages/Screening/node/index.tsx rename to src/pages/Screening/nodes/index.tsx diff --git a/src/pages/Screening/node/present.tsx b/src/pages/Screening/nodes/present.tsx similarity index 100% rename from src/pages/Screening/node/present.tsx rename to src/pages/Screening/nodes/present.tsx diff --git a/src/pages/Screening/node/style.module.scss b/src/pages/Screening/nodes/style.module.scss similarity index 100% rename from src/pages/Screening/node/style.module.scss rename to src/pages/Screening/nodes/style.module.scss