Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import 'fetch';
import 'rc-tree-select/assets/index.less';

import React, { useContext, useEffect, useRef, useState } from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import ReactGridLayout, {
getLayoutItem,
sortLayoutItemsByRowCol as sortLayout,
Expand Down Expand Up @@ -353,17 +353,19 @@ const App = () => {
};

const onEnvUpdate = (data) => {
var layoutLists = storeMeta.layoutLists;
for (var envIdx in data) {
if (!layoutLists.has(data[envIdx])) {
layoutLists.set(data[envIdx], new Map([[DEFAULT_LAYOUT, new Map()]]));
setStoreMeta((prev) => {
const layoutLists = new Map(prev.layoutLists);
for (var envIdx in data) {
if (!layoutLists.has(data[envIdx])) {
layoutLists.set(data[envIdx], new Map([[DEFAULT_LAYOUT, new Map()]]));
}
}
}
setStoreMeta((prev) => ({
...prev,
envList: data,
layoutLists: layoutLists,
}));
return {
...prev,
envList: data,
layoutLists: layoutLists,
};
});
};

// remove paneID from pane list
Expand Down Expand Up @@ -808,6 +810,17 @@ const App = () => {
localStorage.setItem('filter', filterString);
}, [filterString]);

useEffect(() => {
$('[data-toggle="tooltip"]').tooltip({
container: 'body',
delay: {
show: 600,
hide: 100,
},
trigger: 'hover',
});
}, []);

const onWidthChange = (width, cols) => {
windowSize.current.cols = cols;
windowSize.current.width = width;
Expand Down Expand Up @@ -1095,19 +1108,9 @@ function AppWithApi() {
}

function load() {
ReactDOM.render(<AppWithApi />, document.getElementById('app'));
const root = createRoot(document.getElementById('app'));
root.render(<AppWithApi />);
document.removeEventListener('DOMContentLoaded', load);
}

document.addEventListener('DOMContentLoaded', load);

$(document).ready(function () {
$('[data-toggle="tooltip"]').tooltip({
container: 'body',
delay: {
show: 600,
hide: 100,
},
trigger: 'hover',
});
});
2 changes: 1 addition & 1 deletion js/panes/PlotPane.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ var PlotPane = (props) => {
min="1"
max={maxsmoothvalue}
value={smoothvalue}
onInput={(ev) => updateSmoothSlider(ev.target.value)}
onChange={(ev) => updateSmoothSlider(ev.target.value)}
/>
<span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
"jquery": "^4.0.0",
"ml-savitzky-golay-generalized": "^5.0.0",
"rc-tree-select": "^5.27.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^19.2.7",
"react-dom": "^19.2.7",
"react-grid-layout": "^2.2.3",
"react-modal": "^3.16.3",
"react-scroll-to-bottom": "^4.2.0",
"react-resize-detector": "^9.1.1",
"react-resize-detector": "^12.3.0",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"style-loader": "^4.0.0",
Expand Down
53 changes: 25 additions & 28 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2779,6 +2779,11 @@ es-to-primitive@^1.3.0:
is-date-object "^1.0.5"
is-symbol "^1.0.4"

es-toolkit@^1.39.6:
version "1.49.0"
resolved "https://registry.yarnpkg.com/es-toolkit/-/es-toolkit-1.49.0.tgz#93c5b031865792fc03cbf5bd20c132a4f976a52a"
integrity sha512-G5iZ6Pc/FNRY/soKZHC+TxGDD83rHUDXxzaWhGCX44vAv/tMs56WMusnm/KMNK+luUPsgA9U28cGr4RDlSzL2g==

es6-error@^4.1.1:
version "4.1.1"
resolved "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"
Expand Down Expand Up @@ -4293,7 +4298,7 @@ lodash.truncate@^4.4.2:
resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==

lodash@^4.17.21, lodash@^4.17.23:
lodash@^4.17.23:
version "4.18.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
Expand All @@ -4317,7 +4322,7 @@ log-update@^6.1.0:
strip-ansi "^7.1.0"
wrap-ansi "^9.0.0"

loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
loose-envify@^1.0.0, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
Expand Down Expand Up @@ -5098,14 +5103,12 @@ react-devtools@^7.0.1:
react-devtools-core "7.0.1"
update-notifier "^2.1.0"

react-dom@^17.0.2:
version "17.0.2"
resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
react-dom@^19.2.7:
version "19.2.7"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.7.tgz#0450dc9ae9ddbff76ef196401cd8b8c7fb466ccc"
integrity sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "^0.20.2"
scheduler "^0.27.0"

react-draggable@^4.4.6, react-draggable@^4.5.0:
version "4.7.0"
Expand Down Expand Up @@ -5160,12 +5163,12 @@ react-resizable@^3.1.3:
prop-types "15.x"
react-draggable "^4.5.0"

react-resize-detector@^9.1.1:
version "9.1.1"
resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-9.1.1.tgz#ce13cf55b9b09d9978fc51e0c87bb3639704921e"
integrity sha512-siLzop7i4xIvZIACE/PHTvRegA8QRCEt0TfmvJ/qCIFQJ4U+3NuYcF8tNDmDWxfIn+X1eNCyY2rauH4KRxge8w==
react-resize-detector@^12.3.0:
version "12.3.0"
resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-12.3.0.tgz#f273586fccef9da5282909a160ce1ff44c7d5669"
integrity sha512-mIDOVrTHKGnKe6qEUWi8dFdfHM5CPyTOpqoHctdMQf89Ljm/0qqDIzkP3vTRZZJi9/raaMiRxDEOqO4you5x+A==
dependencies:
lodash "^4.17.21"
es-toolkit "^1.39.6"

react-scroll-to-bottom@^4.2.0:
version "4.2.0"
Expand All @@ -5180,13 +5183,10 @@ react-scroll-to-bottom@^4.2.0:
prop-types "15.7.2"
simple-update-in "2.2.0"

react@^17.0.2:
version "17.0.2"
resolved "https://registry.npmjs.org/react/-/react-17.0.2.tgz"
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
react@^19.2.7:
version "19.2.7"
resolved "https://registry.yarnpkg.com/react/-/react-19.2.7.tgz#1f47a1bfc06f8ec885752c6f4af14369a9f8260b"
integrity sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==

readable-stream@^3.5.0, readable-stream@^3.6.0:
version "3.6.0"
Expand Down Expand Up @@ -5460,13 +5460,10 @@ sax@^1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.6.0.tgz#da59637629307b97e7c4cb28e080a7bc38560d5b"
integrity sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==

scheduler@^0.20.2:
version "0.20.2"
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz"
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler@^0.27.0:
version "0.27.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd"
integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==

schema-utils@^4.3.0, schema-utils@^4.3.3:
version "4.3.3"
Expand Down
Loading