Skip to content

Commit 4067897

Browse files
sam4codingsam4coding
committed
feat(rebase): resolve merge conflicts and fix build errors
1 parent ed6f7de commit 4067897

8 files changed

Lines changed: 91 additions & 124 deletions

File tree

‎.logs/start/api-server.log‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
INFO: Started server process [1773135]
1+
INFO: Started server process [1802573]
22
INFO: Waiting for application startup.
33
INFO: Application startup complete.
44
INFO: Uvicorn running on http://0.0.0.0:4242 (Press CTRL+C to quit)
55
================================================================================
66
EHTOOL ROUTER MODULE LOADED - VERSION: DEBUG v2
77
================================================================================
8-
INFO: 127.0.0.1:45152 - "GET /health HTTP/1.1" 200 OK
9-
INFO: 127.0.0.1:35264 - "GET /files HTTP/1.1" 200 OK
10-
INFO: 127.0.0.1:35264 - "GET /files HTTP/1.1" 200 OK
11-
INFO: 127.0.0.1:35264 - "GET /files/preview/1 HTTP/1.1" 200 OK
12-
INFO: 127.0.0.1:35266 - "GET /files/preview/2 HTTP/1.1" 200 OK
13-
INFO: 127.0.0.1:35326 - "GET /api/pm/data HTTP/1.1" 200 OK
14-
INFO: 127.0.0.1:35326 - "GET /api/pm/data HTTP/1.1" 200 OK
15-
INFO: 127.0.0.1:55482 - "POST /api/pm/login HTTP/1.1" 200 OK
16-
INFO: 127.0.0.1:60408 - "POST /api/pm/login HTTP/1.1" 200 OK
8+
INFO: 127.0.0.1:52216 - "GET /health HTTP/1.1" 200 OK
9+
INFO: 127.0.0.1:39000 - "GET /api/pm/data HTTP/1.1" 200 OK
10+
INFO: 127.0.0.1:38992 - "GET /files?parent=root HTTP/1.1" 200 OK
11+
INFO: 127.0.0.1:39000 - "GET /api/pm/data HTTP/1.1" 200 OK
12+
INFO: 127.0.0.1:55914 - "OPTIONS /api/pm/login HTTP/1.1" 200 OK
13+
INFO: 127.0.0.1:55930 - "POST /api/pm/login HTTP/1.1" 200 OK
1714
INFO: Shutting down
1815
INFO: Waiting for application shutdown.
1916
INFO: Application shutdown complete.
20-
INFO: Finished server process [1773135]
17+
INFO: Finished server process [1802573]

‎.logs/start/data-server.log‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
127.0.0.1 - - [26/Mar/2026 12:15:12] "GET / HTTP/1.1" 200 -
1+
127.0.0.1 - - [26/Mar/2026 14:48:47] "GET / HTTP/1.1" 200 -

‎.logs/start/pytc-server.log‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INFO: Started server process [1773188]
1+
INFO: Started server process [1802650]
22
INFO: Waiting for application startup.
33
INFO: Application startup complete.
44
INFO: Uvicorn running on http://0.0.0.0:4243 (Press CTRL+C to quit)
@@ -14,8 +14,8 @@ Working directory: /home/sam/Workshop/pytc-client
1414
SERVER_PYTC: Starting Uvicorn server on port 4243...
1515
================================================================================
1616

17-
INFO: 127.0.0.1:52514 - "GET /hello HTTP/1.1" 200 OK
17+
INFO: 127.0.0.1:50152 - "GET /hello HTTP/1.1" 200 OK
1818
INFO: Shutting down
1919
INFO: Waiting for application shutdown.
2020
INFO: Application shutdown complete.
21-
INFO: Finished server process [1773188]
21+
INFO: Finished server process [1802650]

‎.logs/start/react-build.log‎

Lines changed: 26 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13,88 +13,58 @@ src/components/FilePickerModal.js
1313
Line 124:35: Function declared in a loop contains unsafe references to variable(s) 'currParentId' no-loop-func
1414
Line 243:15: The href attribute is required for an anchor to be keyboard accessible. Provide a valid, navigable address as the href value. If you cannot provide an href, but still need the element to resemble a link, use a button and change it with appropriate styles. Learn more: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/HEAD/docs/rules/anchor-is-valid.md jsx-a11y/anchor-is-valid
1515

16-
src/components/NeuroglancerViewer.js
17-
Line 25:6: React Hook useEffect has a missing dependency: 'loadViewer'. Either include it or remove the dependency array react-hooks/exhaustive-deps
18-
19-
src/components/WorkflowSelector.js
20-
Line 11:3: 'BarChartOutlined' is defined but never used no-unused-vars
21-
2216
src/components/YamlFileUploader.js
23-
Line 349:6: React Hook useEffect has missing dependencies: 'getCurrentConfig' and 'syncYamlContext'. Either include them or remove the dependency array react-hooks/exhaustive-deps
24-
Line 363:6: React Hook useEffect has missing dependencies: 'getCurrentConfig', 'setCurrentConfig', and 'updateInputSelectorInformation'. Either include them or remove the dependency array react-hooks/exhaustive-deps
25-
Line 376:6: React Hook useMemo has a missing dependency: 'getCurrentConfig'. Either include it or remove the dependency array react-hooks/exhaustive-deps
26-
27-
src/views/EHTool.js
28-
Line 25:6: React Hook useEffect has a missing dependency: 'sessionId'. Either include it or remove the dependency array react-hooks/exhaustive-deps
17+
Line 347:6: React Hook useEffect has missing dependencies: 'getCurrentConfig' and 'syncYamlContext'. Either include them or remove the dependency array react-hooks/exhaustive-deps
18+
Line 361:6: React Hook useEffect has missing dependencies: 'getCurrentConfig', 'setCurrentConfig', and 'updateInputSelectorInformation'. Either include them or remove the dependency array react-hooks/exhaustive-deps
19+
Line 374:6: React Hook useMemo has a missing dependency: 'getCurrentConfig'. Either include it or remove the dependency array react-hooks/exhaustive-deps
2920

3021
src/views/FilesManager.js
31-
Line 202:27: Function declared in a loop contains unsafe references to variable(s) 'curr' no-loop-func
32-
Line 528:32: Function declared in a loop contains unsafe references to variable(s) 'descendantSizeKb', 'descendantSizeKb', 'descendantSizeKb', 'descendantSizeKb' no-loop-func
33-
Line 825:6: React Hook useEffect has missing dependencies: 'finishCreateFolder', 'finishRename', 'handleCopy', 'handleCut', 'handleDelete', and 'handlePaste'. Either include them or remove the dependency array react-hooks/exhaustive-deps
34-
35-
src/views/ProofReading.js
36-
Line 22:21: 'setProjectId' is assigned a value but never used no-unused-vars
37-
Line 29:6: React Hook useEffect has missing dependencies: 'fetchNeuroglancerUrl' and 'fetchSynapses'. Either include them or remove the dependency array react-hooks/exhaustive-deps
38-
Line 70:6: React Hook useEffect has missing dependencies: 'goToNext', 'goToPrevious', 'saveCurrent', and 'updateStatus'. Either include them or remove the dependency array react-hooks/exhaustive-deps
22+
Line 81:31: Function declared in a loop contains unsafe references to variable(s) 'current' no-loop-func
23+
Line 420:27: Function declared in a loop contains unsafe references to variable(s) 'curr' no-loop-func
24+
Line 772:32: Function declared in a loop contains unsafe references to variable(s) 'descendantSizeKb', 'descendantSizeKb', 'descendantSizeKb', 'descendantSizeKb' no-loop-func
25+
Line 1069:6: React Hook useEffect has missing dependencies: 'finishCreateFolder', 'finishRename', 'handleCopy', 'handleCut', 'handleDelete', and 'handlePaste'. Either include them or remove the dependency array react-hooks/exhaustive-deps
3926

4027
src/views/Views.js
41-
Line 12:3: 'BarChartOutlined' is defined but never used no-unused-vars
42-
43-
src/views/Visualization.js
44-
Line 1:39: 'useEffect' is defined but never used no-unused-vars
45-
Line 28:11: 'files' is assigned a value but never used no-unused-vars
46-
47-
src/views/ehtool/DetectionWorkflow.js
48-
Line 225:6: React Hook useEffect has a missing dependency: 'loadInstances'. Either include it or remove the dependency array react-hooks/exhaustive-deps
49-
Line 274:20: The ref value 'schedulerRef.current' will likely have changed by the time this effect cleanup function runs. If this ref points to a node rendered by React, copy 'schedulerRef.current' to a variable inside the effect, and use that variable in the cleanup function react-hooks/exhaustive-deps
50-
Line 314:6: React Hook useEffect has a missing dependency: 'loadInstanceView'. Either include it or remove the dependency array react-hooks/exhaustive-deps
51-
Line 355:6: React Hook useEffect has a missing dependency: 'loadInstanceView'. Either include it or remove the dependency array react-hooks/exhaustive-deps
52-
Line 416:6: React Hook useEffect has missing dependencies: 'goToNextInstance', 'goToPreviousInstance', 'handleAxisChange', and 'handleInstanceClassify'. Either include them or remove the dependency array react-hooks/exhaustive-deps
53-
Line 524:6: React Hook useEffect has a missing dependency: 'clearFrameCaches'. Either include it or remove the dependency array react-hooks/exhaustive-deps
54-
55-
src/views/ehtool/ProofreadingEditor.js
56-
Line 140:8: React Hook useEffect has a missing dependency: 'loadImages'. Either include it or remove the dependency array react-hooks/exhaustive-deps
57-
Line 148:8: React Hook useEffect has missing dependencies: 'drawCanvas' and 'drawMinimap'. Either include them or remove the dependency array react-hooks/exhaustive-deps
58-
Line 163:8: React Hook useEffect has missing dependencies: 'drawCanvas' and 'drawMinimap'. Either include them or remove the dependency array react-hooks/exhaustive-deps
59-
Line 403:8: React Hook useEffect has a missing dependency: 'loadOverlayImage'. Either include it or remove the dependency array react-hooks/exhaustive-deps
60-
Line 407:8: React Hook useEffect has a missing dependency: 'loadOverlayImage'. Either include it or remove the dependency array react-hooks/exhaustive-deps
61-
Line 653:7: React Hook useMemo has a missing dependency: 'glasbeyColor'. Either include it or remove the dependency array react-hooks/exhaustive-deps
62-
Line 662:8: React Hook useEffect has missing dependencies: 'drawCanvas' and 'drawMinimap'. Either include them or remove the dependency array react-hooks/exhaustive-deps
63-
Line 899:9: Expected a default case default-case
64-
Line 940:8: React Hook useEffect has missing dependencies: 'handleRedo', 'handleSave', and 'handleUndo'. Either include them or remove the dependency array react-hooks/exhaustive-deps
28+
Line 11:3: 'BarChartOutlined' is defined but never used no-unused-vars
29+
30+
src/views/mask-proofreading/MaskProofreading.js
31+
Line 5:10: 'ehToolSession' is assigned a value but never used no-unused-vars
32+
Line 5:25: 'setEhToolSession' is assigned a value but never used no-unused-vars
33+
Line 6:10: 'refreshTrigger' is assigned a value but never used no-unused-vars
34+
Line 6:26: 'setRefreshTrigger' is assigned a value but never used no-unused-vars
6535

6636
src/views/project-manager/AnnotationDashboard.js
67-
Line 177:9: 'isAdmin' is assigned a value but never used no-unused-vars
37+
Line 340:5: 'isAdmin' is assigned a value but never used no-unused-vars
6838

6939
src/views/project-manager/ModelQualityDashboard.js
7040
Line 40:7: 'CONFUSION_MATRIX' is assigned a value but never used no-unused-vars
7141

7242
src/views/project-manager/ProjectManager.js
73-
Line 11:5: 'UserOutlined' is defined but never used no-unused-vars
74-
Line 12:5: 'CrownOutlined' is defined but never used no-unused-vars
75-
Line 33:9: 'loading' is assigned a value but never used no-unused-vars
43+
Line 19:3: 'UserOutlined' is defined but never used no-unused-vars
44+
Line 20:3: 'CrownOutlined' is defined but never used no-unused-vars
45+
Line 38:61: 'loading' is assigned a value but never used no-unused-vars
7646

7747
src/views/project-manager/ProjectManagerLogin.js
78-
Line 14:15: 'success' is assigned a value but never used no-unused-vars
48+
Line 14:11: 'success' is assigned a value but never used no-unused-vars
7949

8050
src/views/project-manager/ProofreaderProgress.js
81-
Line 120:8: React Hook useMemo has a missing dependency: 'getStats'. Either include it or remove the dependency array react-hooks/exhaustive-deps
51+
Line 163:6: React Hook useMemo has a missing dependency: 'getStats'. Either include it or remove the dependency array react-hooks/exhaustive-deps
8252

8353
src/views/project-manager/QuotaManagement.js
84-
Line 29:5: 'SaveOutlined' is defined but never used no-unused-vars
85-
Line 91:9: 'activeWorker' is assigned a value but never used no-unused-vars
54+
Line 29:3: 'SaveOutlined' is defined but never used no-unused-vars
55+
Line 98:5: 'activeWorker' is assigned a value but never used no-unused-vars
8656

8757
src/views/project-manager/VolumeTracker.js
88-
Line 4:61: 'Popconfirm' is defined but never used no-unused-vars
89-
Line 99:8: React Hook useMemo has an unnecessary dependency: 'isAdmin'. Either exclude it or remove the dependency array react-hooks/exhaustive-deps
90-
Line 134:23: 'cfg' is assigned a value but never used no-unused-vars
58+
Line 16:3: 'Popconfirm' is defined but never used no-unused-vars
59+
Line 127:6: React Hook useMemo has an unnecessary dependency: 'isAdmin'. Either exclude it or remove the dependency array react-hooks/exhaustive-deps
60+
Line 184:15: 'cfg' is assigned a value but never used no-unused-vars
9161

9262
Search for the keywords to learn more about each warning.
9363
To ignore, add // eslint-disable-next-line to the line before.
9464

9565
File sizes after gzip:
9666

97-
581.44 kB build/static/js/main.5121cd1e.js
67+
553.16 kB build/static/js/main.be80df26.js
9868
465 B build/static/css/main.40821645.css
9969

10070
The bundle size is significantly larger than recommended.

‎.logs/start/react-dev.log‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
> react-scripts start
44

55
[baseline-browser-mapping] The data in this module is over two months old. To ensure accurate Baseline data, please update: `npm i baseline-browser-mapping@latest -D`
6-
(node:1773478) [DEP_WEBPACK_DEV_SERVER_ON_AFTER_SETUP_MIDDLEWARE] DeprecationWarning: 'onAfterSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option.
6+
(node:1802959) [DEP_WEBPACK_DEV_SERVER_ON_AFTER_SETUP_MIDDLEWARE] DeprecationWarning: 'onAfterSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option.
77
(Use `node --trace-deprecation ...` to show where the warning was created)
8-
(node:1773478) [DEP_WEBPACK_DEV_SERVER_ON_BEFORE_SETUP_MIDDLEWARE] DeprecationWarning: 'onBeforeSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option.
8+
(node:1802959) [DEP_WEBPACK_DEV_SERVER_ON_BEFORE_SETUP_MIDDLEWARE] DeprecationWarning: 'onBeforeSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option.
99
Starting the development server...
1010

1111
Compiled successfully!
@@ -19,4 +19,3 @@ Note that the development build is not optimized.
1919
To create a production build, use npm run build.
2020

2121
webpack compiled successfully
22-
The build failed because the process exited too early. This probably means the system ran out of memory or someone called `kill -9` on the process.

0 commit comments

Comments
 (0)