saving

Author: Marco

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

@@ -863,7 +863,7 @@ def start_webui(
         get_clp_home() / "var" / "www" / "webui" / "client" / "settings.json"
     )
     server_settings_json_path = (
-        get_clp_home() / "var" / "www" / "webui" / "server" / "dist" / "server" / "settings.json"
+        get_clp_home() / "var" / "www" / "webui" / "server" / "dist" / "settings.json"
     )
 
     validate_webui_config(clp_config, client_settings_json_path, server_settings_json_path)
@@ -978,7 +978,7 @@ def start_webui(
 
     node_cmd = [
         str(CONTAINER_CLP_HOME / "bin" / "node-22"),
-        str(container_webui_dir / "server" / "dist" / "server" / "src" / "main.js"),
+        str(container_webui_dir / "server" / "dist" / "src" / "main.js"),
     ]
     cmd = container_cmd + node_cmd
     subprocess.run(cmd, stdout=subprocess.DEVNULL, check=True)

components/webui/client/package.json

@@ -21,6 +21,7 @@
     "@sinclair/typebox": "^0.34.25",
     "@tanstack/react-query": "^5.81.5",
     "@tanstack/react-query-devtools": "^5.81.5",
+    "@webui/common": "^0.1.0",
     "antd": "^5.24.5",
     "axios": "^1.7.9",
     "chart.js": "^4.4.9",

components/webui/client/public/settings.json

@@ -1,6 +1,6 @@
 {
     "ClpStorageEngine": "clp",
-    "ClpQueryEngine": "native",
+    "ClpQueryEngine": "presto",
     "MongoDbSearchResultsMetadataCollectionName": "results-metadata",
     "SqlDbClpArchivesTableName": "clp_archives",
     "SqlDbClpDatasetsTableName": "clp_datasets",

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

@@ -1,7 +1,7 @@
 import {
     ClientToServerEvents,
     ServerToClientEvents,
-} from "@common/index.js";
+} from "@webui/common";
 import {Socket} from "socket.io-client";
 
 import {MongoSocketCursor} from "./MongoSocketCursor.js";

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

@@ -3,7 +3,7 @@ import {
     QueryId,
     Response,
     ServerToClientEvents,
-} from "@common/index.js";
+} from "@webui/common";
 import {Socket} from "socket.io-client";
 
 import {Nullable} from "../../typings/common";

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

@@ -1,7 +1,7 @@
 import {
     ClientToServerEvents,
     ServerToClientEvents,
-} from "@common/index.js";
+} from "@webui/common";
 import {
     io,
     Socket,

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

@@ -1,4 +1,4 @@
-import {SearchResultsMetadataDocument} from "@common/index.js";
+import {SearchResultsMetadataDocument} from "@webui/common";
 
 import MongoSocketCollection from "../../../api/socket/MongoSocketCollection";
 import {useCursor} from "../../../api/socket/useCursor";

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

@@ -1,6 +1,6 @@
 import {useEffect} from "react";
 
-import {SEARCH_SIGNAL} from "@common/index.js";
+import {SEARCH_SIGNAL} from "@webui/common";
 
 import useSearchStore from "./index";
 import {SEARCH_UI_STATE} from "./typings";

components/webui/client/tsconfig/tsconfig.app.json

@@ -2,7 +2,6 @@
   "extends": "./tsconfig.base.json",
   "include": [
     "../src",
-    "../common/**/*"
   ],
 
   "compilerOptions": {
@@ -17,9 +16,6 @@
     "tsBuildInfoFile": "../node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "useDefineForClassFields": true,
     "baseUrl": "../",
-    "paths": {
-      "@common/*": ["../common/*"], // Map imports from "@common/*" to the shared folder
-    },
 
     /* Bundler mode */
     "isolatedModules": true,

components/webui/client/vite.config.ts

@@ -1,5 +1,3 @@
-import path from "node:path";
-
 import react from "@vitejs/plugin-react";
 import {defineConfig} from "vite";
 
@@ -14,11 +12,6 @@ export default defineConfig({
         react(),
     ],
     publicDir: "public",
-    resolve: {
-        alias: {
-            "@common": path.resolve(__dirname, "../common"),
-        },
-    },
     server: {
         port: 8080,
         proxy: {
@@ -34,9 +27,5 @@ export default defineConfig({
                 ws: true,
             },
         },
-        fs: {
-            // allow serving files from one level up (common folder)
-            allow: [".."],
-        },
     },
 });