Skip to content

Commit bcf44ee

Browse files
authored
feat(webui): Migrate to npm workspace; Update taskfile and the package scripts accordingly. (#1119)
1 parent de423fc commit bcf44ee

File tree

34 files changed

+14239
-13326
lines changed

34 files changed

+14239
-13326
lines changed

components/clp-package-utils/clp_package_utils/scripts/start_clp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ def start_webui(
843843
get_clp_home() / "var" / "www" / "webui" / "client" / "settings.json"
844844
)
845845
server_settings_json_path = (
846-
get_clp_home() / "var" / "www" / "webui" / "server" / "dist" / "server" / "settings.json"
846+
get_clp_home() / "var" / "www" / "webui" / "server" / "dist" / "settings.json"
847847
)
848848

849849
validate_webui_config(clp_config, client_settings_json_path, server_settings_json_path)
@@ -964,7 +964,7 @@ def start_webui(
964964

965965
node_cmd = [
966966
str(CONTAINER_CLP_HOME / "bin" / "node-22"),
967-
str(container_webui_dir / "server" / "dist" / "server" / "src" / "main.js"),
967+
str(container_webui_dir / "server" / "dist" / "src" / "main.js"),
968968
]
969969
cmd = container_cmd + node_cmd
970970
subprocess.run(cmd, stdout=subprocess.DEVNULL, check=True)

components/webui/client/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "webui-client",
2+
"name": "@webui/client",
33
"version": "0.1.0",
44
"description": "",
55
"main": "src/main.tsx",
@@ -18,9 +18,10 @@
1818
"@emotion/styled": "^11.14.0",
1919
"@monaco-editor/react": "^4.7.0",
2020
"@mui/joy": "^5.0.0-beta.51",
21-
"@sinclair/typebox": "^0.34.25",
21+
"@sinclair/typebox": "^0.34.38",
2222
"@tanstack/react-query": "^5.81.5",
2323
"@tanstack/react-query-devtools": "^5.81.5",
24+
"@webui/common": "*",
2425
"antd": "^5.24.5",
2526
"axios": "^1.7.9",
2627
"chart.js": "^4.4.9",
@@ -43,8 +44,8 @@
4344
"@types/react-dom": "^19.0.4",
4445
"@types/react-syntax-highlighter": "^15.5.13",
4546
"@vitejs/plugin-react": "^4.3.4",
46-
"eslint-config-yscope": "latest",
47-
"typescript": "~5.6.2",
47+
"eslint-config-yscope": "1.1.1",
48+
"typescript": "~5.7.3",
4849
"vite": "^6.3.5"
4950
}
5051
}

components/webui/client/src/api/socket/MongoSocketCollection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
ClientToServerEvents,
33
ServerToClientEvents,
4-
} from "@common/index.js";
4+
} from "@webui/common";
55
import {Socket} from "socket.io-client";
66

77
import {MongoSocketCursor} from "./MongoSocketCursor.js";

components/webui/client/src/api/socket/MongoSocketCursor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
QueryId,
44
Response,
55
ServerToClientEvents,
6-
} from "@common/index.js";
6+
} from "@webui/common";
77
import {Socket} from "socket.io-client";
88

99
import {Nullable} from "../../typings/common";

components/webui/client/src/api/socket/SocketSingleton.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
ClientToServerEvents,
33
ServerToClientEvents,
4-
} from "@common/index.js";
4+
} from "@webui/common";
55
import {
66
io,
77
Socket,

components/webui/client/src/config/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {CLP_QUERY_ENGINES} from "../../../common/index.js";
1+
import {CLP_QUERY_ENGINES} from "@webui/common";
2+
23
import {settings} from "../settings";
34

45

components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTable/Presto/PrestoResultsVirtualTable/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {
33
useMemo,
44
} from "react";
55

6-
import type {PrestoSearchResult} from "../../../../../../../../common/index.js";
6+
import type {PrestoSearchResult} from "@webui/common";
7+
78
import VirtualTable from "../../../../../../components/VirtualTable";
89
import useSearchStore from "../../../../SearchState/index";
910
import {usePrestoSearchResults} from "./usePrestoSearchResults";

components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTable/Presto/PrestoResultsVirtualTable/usePrestoSearchResults.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import type {PrestoSearchResult} from "../../../../../../../../common/index.js";
1+
import type {PrestoSearchResult} from "@webui/common";
2+
23
import MongoSocketCollection from "../../../../../../api/socket/MongoSocketCollection";
34
import {useCursor} from "../../../../../../api/socket/useCursor";
45
import useSearchStore, {SEARCH_STATE_DEFAULT} from "../../../../SearchState/index";

components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTable/Presto/PrestoResultsVirtualTable/utils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
import type {PrestoSearchResult} from "@webui/common";
12
import {TableProps} from "antd";
23

3-
import type {PrestoSearchResult} from "../../../../../../../../common/index.js";
4-
54

65
/**
76
* Generates dynamic columns configuration for Presto query engine.

components/webui/client/src/pages/SearchPage/SearchState/useResultsMetadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {SearchResultsMetadataDocument} from "@common/index.js";
1+
import {SearchResultsMetadataDocument} from "@webui/common";
22

33
import MongoSocketCollection from "../../../api/socket/MongoSocketCollection";
44
import {useCursor} from "../../../api/socket/useCursor";

0 commit comments

Comments
 (0)