From 7c960d2663b7eaacc828b275c779d5371904ad23 Mon Sep 17 00:00:00 2001
From: Birm <birm@rbirm.us>
Date: Wed, 12 Feb 2025 18:24:17 -0500
Subject: [PATCH 1/5] upload button

---
 source/components/ESNavbar/ESNavbar.js |   2 +
 source/components/UploadButton.js      | 140 +++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 source/components/UploadButton.js

diff --git a/source/components/ESNavbar/ESNavbar.js b/source/components/ESNavbar/ESNavbar.js
index 9dca784c..796223e7 100644
--- a/source/components/ESNavbar/ESNavbar.js
+++ b/source/components/ESNavbar/ESNavbar.js
@@ -6,6 +6,7 @@ import Nav from 'react-bootstrap/Nav';
 import PropTypes from 'prop-types';
 import DownloadButton from '../DownloadButton';
 import HomeButton from '../HomeButton';
+import UploadButton from '../UploadButton';
 import Settings from '../Settings/Settings';
 
 function ESNavbar(props) {
@@ -24,6 +25,7 @@ function ESNavbar(props) {
     >
       {url ? <HomeButton url={url} /> : null}
       <DownloadButton data={data} title={title} />
+      <UploadButton />
       <Navbar.Brand href={url || '#'}>{title || 'Eaglescope'}</Navbar.Brand>
       <Nav className="mr-auto" />
       <Form inline="true">
diff --git a/source/components/UploadButton.js b/source/components/UploadButton.js
new file mode 100644
index 00000000..2f5fce8c
--- /dev/null
+++ b/source/components/UploadButton.js
@@ -0,0 +1,140 @@
+import React, { PureComponent } from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faUpload , faChartBar} from '@fortawesome/free-solid-svg-icons';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import * as d3 from 'd3';
+
+class UploadButton extends PureComponent {
+  constructor(props, ctx) {
+    super(props, ctx);
+    this.state = {
+      showModal: false,      // modal visibility
+      file: null,            // selected file
+      fileContent: null,     // file content
+      isLoading: false,
+    };
+
+    this.handleFileChange = this.handleFileChange.bind(this);
+    this.handleUpload = this.handleUpload.bind(this);
+    this.toggleModal = this.toggleModal.bind(this);
+    this.handleSampleAnalysis = this.handleSampleAnalysis.bind(this);
+  }
+
+  toggleModal() {
+    this.setState(prevState => ({
+      showModal: !prevState.showModal,
+    }));
+  }
+
+  handleFileChange(event) {
+    const file = event.target.files[0];
+    this.setState({ file });
+  }
+
+  handleUpload() {
+    const { file } = this.state;
+
+    if (!file) {
+      alert('Please select a CSV file to upload');
+      return;
+    }
+
+    this.setState({ isLoading: true });
+
+    // Use d3.csv to parse the uploaded file
+    d3.csv(URL.createObjectURL(file))
+      .then((data) => {
+        // Save the file and parsed content in local storage
+        localStorage.setItem('uploadedCSV', JSON.stringify(data));
+        this.setState({ fileContent: data, isLoading: false });
+
+        // Trigger sample analysis
+        this.handleSampleAnalysis(data);
+        this.toggleModal(); // Close the modal after successful upload
+      })
+      .catch((error) => {
+        alert('Error parsing the CSV file.');
+        console.error(error);
+        this.setState({ isLoading: false });
+      });
+  }
+
+  handleSampleAnalysis(data) {
+    console.error("TODO!!", data);
+  }
+
+  render() {
+    const { showModal, isLoading } = this.state;
+
+    return (
+      <div>
+        <Button
+          size="lg"
+          style={{
+            background: 'none',
+            border: '2px solid #ccc',  // Adding a subtle border
+            borderRadius: '12px',      // Rounded corners
+            position: 'relative',      // Position relative for absolute positioning of icons
+            width: '50px',             // Set width to fit icon size
+            height: '50px',            // Set height to fit icon size
+            padding: 0,                // Remove padding
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+          }}
+          onClick={this.toggleModal}
+        >
+          <FontAwesomeIcon
+            size="sm"
+            icon={faUpload}
+            style={{
+              position: 'absolute',
+              top: '5px',
+              left: '5px',
+            }}
+          />
+
+          <FontAwesomeIcon
+            size="sm"
+            icon={faChartBar}
+            style={{
+              position: 'absolute',
+              bottom: '5px',
+              right: '5px',
+            }}
+          />
+        </Button>
+
+        {/* Modal for file upload */}
+        <Modal show={showModal} onHide={this.toggleModal}>
+          <Modal.Header closeButton>
+            <Modal.Title>Upload CSV Data File</Modal.Title>
+          </Modal.Header>
+          <Modal.Body>
+            {isLoading ? (
+              <p>Processing your file...</p>
+            ) : (
+              <div>
+                <input
+                  type="file"
+                  accept=".csv"
+                  onChange={this.handleFileChange}
+                />
+                <Button
+                  variant="primary"
+                  onClick={this.handleUpload}
+                  disabled={!this.state.file}
+                >
+                  Upload
+                </Button>
+              </div>
+            )}
+          </Modal.Body>
+        </Modal>
+      </div>
+    );
+  }
+}
+
+export default UploadButton;

From c5c67e97e101c69abcff8e7462d2cc8c2362e9a6 Mon Sep 17 00:00:00 2001
From: Birm <birm@rbirm.us>
Date: Thu, 13 Feb 2025 12:31:43 -0500
Subject: [PATCH 2/5] add url, destination name to upload modal

---
 source/components/UploadButton.js | 89 ++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 25 deletions(-)

diff --git a/source/components/UploadButton.js b/source/components/UploadButton.js
index 2f5fce8c..89beb68a 100644
--- a/source/components/UploadButton.js
+++ b/source/components/UploadButton.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faUpload , faChartBar} from '@fortawesome/free-solid-svg-icons';
+import { faUpload, faChartBar } from '@fortawesome/free-solid-svg-icons';
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import * as d3 from 'd3';
@@ -9,22 +9,19 @@ class UploadButton extends PureComponent {
   constructor(props, ctx) {
     super(props, ctx);
     this.state = {
-      showModal: false,      // modal visibility
-      file: null,            // selected file
-      fileContent: null,     // file content
+      showModal: false, // modal visibility
+      file: null, // selected file
+      fileContent: null, // file content
       isLoading: false,
+      name: '', // name input field
+      url: '', // URL input field
     };
 
     this.handleFileChange = this.handleFileChange.bind(this);
     this.handleUpload = this.handleUpload.bind(this);
     this.toggleModal = this.toggleModal.bind(this);
     this.handleSampleAnalysis = this.handleSampleAnalysis.bind(this);
-  }
-
-  toggleModal() {
-    this.setState(prevState => ({
-      showModal: !prevState.showModal,
-    }));
+    this.handleInputChange = this.handleInputChange.bind(this);
   }
 
   handleFileChange(event) {
@@ -32,25 +29,32 @@ class UploadButton extends PureComponent {
     this.setState({ file });
   }
 
+  handleInputChange(event) {
+    const { name, value } = event.target;
+    this.setState({ [name]: value });
+  }
+
   handleUpload() {
-    const { file } = this.state;
+    const { file, url, name } = this.state;
 
-    if (!file) {
-      alert('Please select a CSV file to upload');
+    if (!file && !url) {
+      alert('Please select a CSV file or provide a URL');
       return;
     }
 
     this.setState({ isLoading: true });
 
-    // Use d3.csv to parse the uploaded file
-    d3.csv(URL.createObjectURL(file))
+    const fileUrl = url || (file && URL.createObjectURL(file));
+
+    // Use d3.csv to parse the uploaded file or the URL
+    d3.csv(fileUrl)
       .then((data) => {
         // Save the file and parsed content in local storage
         localStorage.setItem('uploadedCSV', JSON.stringify(data));
         this.setState({ fileContent: data, isLoading: false });
 
         // Trigger sample analysis
-        this.handleSampleAnalysis(data);
+        this.handleSampleAnalysis(data, name, url);
         this.toggleModal(); // Close the modal after successful upload
       })
       .catch((error) => {
@@ -61,11 +65,22 @@ class UploadButton extends PureComponent {
   }
 
   handleSampleAnalysis(data) {
-    console.error("TODO!!", data);
+    console.log('TODO!!', data, this.state.name);
+    if (this.state.url) {
+      console.log('I actually got a url source', this.state.url);
+    }
+  }
+
+  toggleModal() {
+    this.setState((prevState) => ({
+      showModal: !prevState.showModal,
+    }));
   }
 
   render() {
-    const { showModal, isLoading } = this.state;
+    const {
+      showModal, file, isLoading, name, url,
+    } = this.state;
 
     return (
       <div>
@@ -73,12 +88,12 @@ class UploadButton extends PureComponent {
           size="lg"
           style={{
             background: 'none',
-            border: '2px solid #ccc',  // Adding a subtle border
-            borderRadius: '12px',      // Rounded corners
-            position: 'relative',      // Position relative for absolute positioning of icons
-            width: '50px',             // Set width to fit icon size
-            height: '50px',            // Set height to fit icon size
-            padding: 0,                // Remove padding
+            border: '2px solid #ccc', // Adding a subtle border
+            borderRadius: '12px', // Rounded corners
+            position: 'relative', // Position relative for absolute positioning of icons
+            width: '50px', // Set width to fit icon size
+            height: '50px', // Set height to fit icon size
+            padding: 0, // Remove padding
             display: 'flex',
             alignItems: 'center',
             justifyContent: 'center',
@@ -121,10 +136,34 @@ class UploadButton extends PureComponent {
                   accept=".csv"
                   onChange={this.handleFileChange}
                 />
+                <div>
+                  <label>
+                    Name (optional):
+                    <input
+                      type="text"
+                      name="name"
+                      value={name}
+                      onChange={this.handleInputChange}
+                      placeholder="local dashboard name"
+                    />
+                  </label>
+                </div>
+                <div>
+                  <label>
+                    URL (optional):
+                    <input
+                      type="text"
+                      name="url"
+                      value={url}
+                      onChange={this.handleInputChange}
+                      placeholder="Enter CSV file URL"
+                    />
+                  </label>
+                </div>
                 <Button
                   variant="primary"
                   onClick={this.handleUpload}
-                  disabled={!this.state.file}
+                  disabled={!file && !url}
                 >
                   Upload
                 </Button>

From d23aee4cb19477289417c46428a664abfafd2e72 Mon Sep 17 00:00:00 2001
From: Birm <birm@rbirm.us>
Date: Mon, 31 Mar 2025 11:28:04 -0400
Subject: [PATCH 3/5] 8 not 7 chars

---
 source/hooks/useFetch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/hooks/useFetch.js b/source/hooks/useFetch.js
index d361d6a0..7828683e 100644
--- a/source/hooks/useFetch.js
+++ b/source/hooks/useFetch.js
@@ -35,7 +35,7 @@ const useFetch = (url, type = 'json') => {
 
       // Handle "local://" URLs
       if (url.startsWith('local://')) {
-        const localKey = url.slice(7); // Remove the "local://" prefix
+        const localKey = url.slice(8); // Remove the "local://" prefix
         try {
           const storedData = localStorage.getItem(`es-${localKey}`);
           if (storedData) {

From 83f9bbf335df5777206bccdc3487ae07226f8e87 Mon Sep 17 00:00:00 2001
From: Birm <birm@rbirm.us>
Date: Wed, 27 May 2026 11:06:42 -0400
Subject: [PATCH 4/5] recommend vis for uploaded data

---
 package-lock.json                             | 131 +++------
 source/common/dataAnalysis.js                 | 264 ++++++++++++++++++
 source/components/UploadButton.js             | 251 +++++++++++------
 .../VisRecommendations/VisRecommendations.js  |  93 ++++++
 source/hooks/useFetch.js                      |  17 +-
 5 files changed, 576 insertions(+), 180 deletions(-)
 create mode 100644 source/common/dataAnalysis.js
 create mode 100644 source/components/VisRecommendations/VisRecommendations.js

diff --git a/package-lock.json b/package-lock.json
index 1064bfd1..3da5eadb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -116,6 +116,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
       "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.0",
@@ -2404,7 +2405,6 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -2772,6 +2772,7 @@
       "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.13.3.tgz",
       "integrity": "sha512-SRZFtqGiaKHlZ2YAvf+NHvBFWS3GnkBvJMfOJM7kxJRK3M1bhbwJa/GgSdzqro5UVf9Bfj6E+pkdrRQIOZ7jMQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@mischnic/json-sourcemap": "^0.1.0",
         "@parcel/cache": "2.13.3",
@@ -4217,6 +4218,7 @@
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -4668,8 +4670,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -4721,7 +4722,6 @@
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -4731,7 +4731,6 @@
       "version": "3.7.7",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "peer": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -4769,6 +4768,7 @@
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
       "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
+      "peer": true,
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -4851,6 +4851,7 @@
       "version": "18.3.18",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
       "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
+      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -4875,7 +4876,8 @@
     "node_modules/@types/sortablejs": {
       "version": "1.15.8",
       "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.8.tgz",
-      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg=="
+      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+      "peer": true
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
@@ -4919,7 +4921,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
       "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.13.2",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
@@ -4928,26 +4929,22 @@
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "peer": true
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "peer": true
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "peer": true
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
       "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.13.2",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -4957,14 +4954,12 @@
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "peer": true
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
       "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -4976,7 +4971,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
       "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -4985,7 +4979,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
       "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -4993,14 +4986,12 @@
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "peer": true
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
       "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5016,7 +5007,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
       "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
@@ -5029,7 +5019,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
       "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5041,7 +5030,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
       "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -5055,7 +5043,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
       "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
@@ -5064,14 +5051,12 @@
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "peer": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "peer": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -5084,6 +5069,7 @@
       "version": "8.14.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5138,6 +5124,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5153,7 +5140,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "peer": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -5170,7 +5156,6 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -5185,8 +5170,7 @@
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "peer": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
@@ -5730,6 +5714,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -5872,6 +5857,7 @@
       "version": "2.9.4",
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
       "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
+      "peer": true,
       "dependencies": {
         "chartjs-color": "^2.1.0",
         "moment": "^2.10.2"
@@ -6814,8 +6800,7 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
@@ -6988,7 +6973,6 @@
       "version": "5.18.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
       "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
-      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -7138,8 +7122,7 @@
     "node_modules/es-module-lexer": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
-      "peer": true
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ=="
     },
     "node_modules/es-object-atoms": {
       "version": "1.1.0",
@@ -7240,6 +7223,7 @@
       "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -7393,6 +7377,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
       "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.8",
@@ -7447,6 +7432,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
       "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "aria-query": "^5.3.2",
         "array-includes": "^3.1.8",
@@ -7506,6 +7492,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
       "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
@@ -7538,6 +7525,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
       "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -7702,7 +7690,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "peer": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -7805,8 +7792,7 @@
           "type": "opencollective",
           "url": "https://opencollective.com/fastify"
         }
-      ],
-      "peer": true
+      ]
     },
     "node_modules/fastq": {
       "version": "1.18.0",
@@ -10166,6 +10152,7 @@
       "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz",
       "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==",
       "hasInstallScript": true,
+      "peer": true,
       "dependencies": {
         "is-in-browser": "^1.1.3",
         "symbol-observable": "^1.1.0",
@@ -10598,7 +10585,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "peer": true,
       "engines": {
         "node": ">=6.11.5"
       }
@@ -10687,7 +10673,6 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
-      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -10998,6 +10983,7 @@
       "version": "15.7.2",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
       "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -11008,6 +10994,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz",
       "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -11034,6 +11021,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -12060,6 +12048,7 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "peer": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -12087,7 +12076,6 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -12102,7 +12090,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -12114,8 +12101,7 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/process": {
       "version": "0.11.10",
@@ -12151,6 +12137,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -12244,7 +12231,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -12253,6 +12239,7 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -12343,6 +12330,7 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -12726,7 +12714,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12957,6 +12944,7 @@
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
       "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
       "devOptional": true,
+      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -13085,7 +13073,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "peer": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -13267,7 +13254,8 @@
     "node_modules/sortablejs": {
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.6.tgz",
-      "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A=="
+      "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==",
+      "peer": true
     },
     "node_modules/source-map": {
       "version": "0.6.1",
@@ -13302,20 +13290,6 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "node_modules/srcset": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/srcset/-/srcset-5.0.1.tgz",
-      "integrity": "sha512-/P1UYbGfJVlxZag7aABNRrulEXAwCSDo7fklafOQrantuPTDmYgijJMks2zusPCVzgW9+4P69mq7w6pYuZpgxw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -13582,7 +13556,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -13603,7 +13576,6 @@
       "version": "5.3.11",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
       "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
-      "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
@@ -13653,7 +13625,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -13665,7 +13636,6 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -13678,14 +13648,12 @@
     "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "peer": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
       "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -13704,7 +13672,6 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -13714,7 +13681,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13729,7 +13695,6 @@
       "version": "5.37.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
       "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -14199,6 +14164,7 @@
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/vega/-/vega-5.30.0.tgz",
       "integrity": "sha512-ZGoC8LdfEUV0LlXIuz7hup9jxuQYhSaWek2M7r9dEHAPbPrzSQvKXZ0BbsJbrarM100TGRpTVN/l1AFxCwDkWw==",
+      "peer": true,
       "dependencies": {
         "vega-crossfilter": "~4.1.2",
         "vega-dataflow": "~5.7.6",
@@ -14539,6 +14505,7 @@
       "version": "4.17.0",
       "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.17.0.tgz",
       "integrity": "sha512-MO2XsaVZqx6iWWmVA5vwYFamvhRUsKfVp7n0pNlkZ2/21cuxelSl92EePZ2YGmzL6z4/3K7r/45zaG8p+qNHeg==",
+      "peer": true,
       "dependencies": {
         "@types/clone": "~2.1.0",
         "@types/fast-json-stable-stringify": "^2.0.0",
@@ -15134,7 +15101,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
       "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -15146,8 +15112,7 @@
     "node_modules/watchpack/node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "peer": true
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "node_modules/weak-lru-cache": {
       "version": "1.2.2",
@@ -15177,7 +15142,6 @@
       "version": "5.97.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
       "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
@@ -15223,7 +15187,6 @@
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "peer": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -15232,7 +15195,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -15245,7 +15207,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -15253,14 +15214,12 @@
     "node_modules/webpack/node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "peer": true
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
diff --git a/source/common/dataAnalysis.js b/source/common/dataAnalysis.js
new file mode 100644
index 00000000..16868742
--- /dev/null
+++ b/source/common/dataAnalysis.js
@@ -0,0 +1,264 @@
+export function isNumeric(str) {
+  return typeof str === 'string' && /^[+-]?(?:\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/.test(str);
+}
+
+export function covertRaw(elt) {
+  Object.keys(elt).forEach((key) => {
+    const raw = elt[key];
+    if (isNumeric(raw)) {
+      elt[key] = +raw;
+    } else if (raw === 'true' || raw === 'false') {
+      elt[key] = raw === 'true';
+    }
+  });
+  return elt;
+}
+
+const NULL_VALUES = new Set([null, undefined, '', 'N/A']);
+
+function isNull(v) {
+  return NULL_VALUES.has(v);
+}
+
+export function analyzeDataset(data) {
+  if (!data || data.length === 0) return { rowCount: 0, fields: [] };
+
+  const fieldNames = Object.keys(data[0]);
+  const rowCount = data.length;
+
+  const fields = fieldNames.map((name) => {
+    const values = data.map((r) => r[name]);
+    const nonNull = values.filter((v) => !isNull(v));
+    const nullCount = values.length - nonNull.length;
+
+    const allNumeric = nonNull.length > 0 && nonNull.every((v) => typeof v === 'number');
+    const allBoolean = nonNull.length > 0 && nonNull.every((v) => typeof v === 'boolean');
+
+    let type;
+    if (allNumeric) type = 'numeric';
+    else if (allBoolean) type = 'boolean';
+    else type = 'categorical';
+
+    const uniqueSet = new Set(nonNull.map(String));
+    const uniqueCount = uniqueSet.size;
+    const cardinalityRatio = rowCount > 0 ? uniqueCount / rowCount : 0;
+
+    const samples = [...uniqueSet].slice(0, 5);
+
+    const info = {
+      name,
+      type,
+      uniqueCount,
+      nullCount,
+      cardinalityRatio,
+      samples,
+      min: null,
+      max: null,
+      mean: null,
+    };
+
+    if (allNumeric) {
+      info.min = Math.min(...nonNull);
+      info.max = Math.max(...nonNull);
+      info.mean = nonNull.reduce((a, b) => a + b, 0) / nonNull.length;
+    }
+
+    return info;
+  });
+
+  return { rowCount, fields };
+}
+
+export const RECOMMEND_THRESHOLD = 75;
+
+const ID_LIKE = /\b(id|index|key|code)\b/i;
+const CHART_SIZES = {
+  PIE_CHART: [1, 1],
+  BAR_CHART: [1, 1],
+  HORIZONTAL_BAR_CHART: [1, 1],
+  HISTOGRAM: [2, 2],
+  SCATTER_CHART: [2, 2],
+  DENSITY_2D: [2, 2],
+  HEATMAP: [2, 2],
+  PARALLEL_COORDINATES: [3, 2],
+  VIS_DATA_TABLE: [4, 2],
+};
+
+function makeConfig(chartType, fields, title, rationale, score, index) {
+  return {
+    id: `rec-${chartType.toLowerCase()}-${index}`,
+    title,
+    description: rationale,
+    chartType,
+    fields,
+    size: CHART_SIZES[chartType] || [2, 2],
+    priority: score,
+  };
+}
+
+export function recommendVisualizations(dataInfo) {
+  const { rowCount, fields } = dataInfo;
+  const recs = [];
+  let idx = 0;
+
+  const numericFields = fields.filter((f) => f.type === 'numeric');
+  const categoricalFields = fields.filter((f) => f.type === 'categorical');
+  const booleanFields = fields.filter((f) => f.type === 'boolean');
+  const lowCardCat = [...categoricalFields, ...booleanFields].filter((f) => f.uniqueCount <= 20);
+
+  // --- VIS_DATA_TABLE (always) ---
+  {
+    const tableFields = fields.map((f) => ({ dataKey: f.name, label: f.name }));
+    const rationale = `Tabular view of all ${fields.length} columns across ${rowCount.toLocaleString()} rows.`;
+    recs.push({
+      chartType: 'VIS_DATA_TABLE',
+      score: 55,
+      rationale,
+      config: makeConfig('VIS_DATA_TABLE', tableFields, 'Data Table', rationale, 55, idx++),
+    });
+  }
+
+  // --- HISTOGRAM per numeric field ---
+  {
+    const histRecs = numericFields.map((f) => {
+      let score = 70;
+      const nullRatio = f.nullCount / (rowCount || 1);
+      if (nullRatio < 0.1) score += 10;
+      if (rowCount >= 100) score += 5;
+      if (ID_LIKE.test(f.name)) score -= 20;
+      score = Math.min(score, 90);
+      const rationale = `Distribution of ${f.name} values (min ${f.min}, max ${f.max}).`;
+      return {
+        chartType: 'HISTOGRAM', score, rationale, field: f,
+      };
+    });
+    histRecs.sort((a, b) => b.score - a.score);
+    histRecs.slice(0, 4).forEach(({ score, rationale, field }) => {
+      recs.push({
+        chartType: 'HISTOGRAM',
+        score,
+        rationale,
+        config: makeConfig('HISTOGRAM', { x: field.name }, `Distribution: ${field.name}`, rationale, score, idx++),
+      });
+    });
+  }
+
+  // --- PIE_CHART for low-cardinality categorical ---
+  {
+    const eligible = lowCardCat.filter((f) => f.uniqueCount >= 2 && f.uniqueCount <= 8);
+    const pieRecs = eligible.map((f) => {
+      let score = 75;
+      if (f.uniqueCount <= 5) score += 10;
+      if (f.uniqueCount > 6) score -= 15;
+      const rationale = `Proportions of ${f.uniqueCount} distinct values in ${f.name}.`;
+      return { score, rationale, field: f };
+    });
+    pieRecs.sort((a, b) => b.score - a.score);
+    pieRecs.slice(0, 2).forEach(({ score, rationale, field }) => {
+      recs.push({
+        chartType: 'PIE_CHART',
+        score,
+        rationale,
+        config: makeConfig('PIE_CHART', { x: field.name }, `${field.name} Breakdown`, rationale, score, idx++),
+      });
+    });
+  }
+
+  // --- BAR_CHART (≤15 unique) / HORIZONTAL_BAR_CHART (16–40 unique) ---
+  {
+    const barRecs = lowCardCat
+      .filter((f) => f.uniqueCount >= 2 && f.uniqueCount <= 40)
+      .map((f) => {
+        const chartType = f.uniqueCount <= 15 ? 'BAR_CHART' : 'HORIZONTAL_BAR_CHART';
+        const fieldKey = chartType === 'BAR_CHART' ? 'x' : 'y';
+        const rationale = `Count of records per ${f.name} (${f.uniqueCount} categories).`;
+        return {
+          chartType, score: 72, rationale, field: f, fieldKey,
+        };
+      });
+    barRecs.sort((a, b) => b.score - a.score);
+    barRecs.slice(0, 2).forEach(({
+      chartType, score, rationale, field, fieldKey,
+    }) => {
+      recs.push({
+        chartType,
+        score,
+        rationale,
+        config: makeConfig(chartType, { [fieldKey]: field.name }, `${field.name} Counts`, rationale, score, idx++),
+      });
+    });
+  }
+
+  // --- SCATTER_CHART (rowCount ≤ 500) / DENSITY_2D (rowCount > 500) ---
+  if (numericFields.length >= 2) {
+    const pairs = [];
+    for (let i = 0; i < numericFields.length && pairs.length < 10; i++) {
+      for (let j = i + 1; j < numericFields.length && pairs.length < 10; j++) {
+        pairs.push([numericFields[i], numericFields[j]]);
+      }
+    }
+    const useDensity = rowCount > 500;
+    const chartType = useDensity ? 'DENSITY_2D' : 'SCATTER_CHART';
+    const scatterRecs = pairs.map(([fx, fy]) => {
+      let score = useDensity ? 72 : 68;
+      if (useDensity && rowCount > 1000) score += 5;
+      // boost if names share a common root word (first 4 chars)
+      if (fx.name.slice(0, 4).toLowerCase() === fy.name.slice(0, 4).toLowerCase()) score += 8;
+      const rationale = `Relationship between ${fx.name} and ${fy.name} across ${rowCount.toLocaleString()} rows.`;
+      return {
+        chartType, score, rationale, fx, fy,
+      };
+    });
+    scatterRecs.sort((a, b) => b.score - a.score);
+    scatterRecs.slice(0, 3).forEach(({
+      chartType: ct, score, rationale, fx, fy,
+    }) => {
+      recs.push({
+        chartType: ct,
+        score,
+        rationale,
+        config: makeConfig(ct, { x: fx.name, y: fy.name }, `${fx.name} vs ${fy.name}`, rationale, score, idx++),
+      });
+    });
+  }
+
+  // --- PARALLEL_COORDINATES (≥3 numeric fields) ---
+  if (numericFields.length >= 3) {
+    let score = 62;
+    if (numericFields.length >= 5) score += 10;
+    const axes = numericFields.slice(0, 6).map((f) => f.name);
+    const rationale = `Multi-axis view across ${axes.length} numeric dimensions.`;
+    recs.push({
+      chartType: 'PARALLEL_COORDINATES',
+      score,
+      rationale,
+      config: makeConfig('PARALLEL_COORDINATES', { y: axes }, 'Parallel Coordinates', rationale, score, idx++),
+    });
+  }
+
+  // --- HEATMAP (≥2 lowCardCat + ≥1 numeric) ---
+  if (lowCardCat.length >= 2 && numericFields.length >= 1) {
+    const catA = lowCardCat[0];
+    const catB = lowCardCat[1];
+    const numF = numericFields[0];
+    let score = 65;
+    if (catA.uniqueCount <= 10 && catB.uniqueCount <= 10) score += 10;
+    const rationale = `Mean ${numF.name} grouped by ${catA.name} × ${catB.name}.`;
+    recs.push({
+      chartType: 'HEATMAP',
+      score,
+      rationale,
+      config: makeConfig(
+        'HEATMAP',
+        { x: catA.name, y: catB.name, z: numF.name },
+        `${numF.name} by ${catA.name} & ${catB.name}`,
+        rationale,
+        score,
+        idx++,
+      ),
+    });
+  }
+
+  recs.sort((a, b) => b.score - a.score);
+  return recs.slice(0, 12);
+}
diff --git a/source/components/UploadButton.js b/source/components/UploadButton.js
index 89beb68a..479b5c47 100644
--- a/source/components/UploadButton.js
+++ b/source/components/UploadButton.js
@@ -4,24 +4,38 @@ import { faUpload, faChartBar } from '@fortawesome/free-solid-svg-icons';
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import * as d3 from 'd3';
+import { ConfigContext } from '../contexts/ConfigContext';
+import {
+  covertRaw,
+  analyzeDataset,
+  recommendVisualizations,
+  RECOMMEND_THRESHOLD,
+} from '../common/dataAnalysis';
+import VisRecommendations from './VisRecommendations/VisRecommendations';
 
 class UploadButton extends PureComponent {
   constructor(props, ctx) {
     super(props, ctx);
     this.state = {
-      showModal: false, // modal visibility
-      file: null, // selected file
-      fileContent: null, // file content
+      showModal: false,
+      file: null,
+      fileContent: null,
       isLoading: false,
-      name: '', // name input field
-      url: '', // URL input field
+      name: '',
+      url: '',
+      step: 1,
+      recommendations: [],
+      selectedRecs: new Set(),
     };
 
     this.handleFileChange = this.handleFileChange.bind(this);
     this.handleUpload = this.handleUpload.bind(this);
     this.toggleModal = this.toggleModal.bind(this);
-    this.handleSampleAnalysis = this.handleSampleAnalysis.bind(this);
     this.handleInputChange = this.handleInputChange.bind(this);
+    this.handleApplyRecommendations = this.handleApplyRecommendations.bind(this);
+    this.handleSkipRecommendations = this.handleSkipRecommendations.bind(this);
+    this.handleToggleRec = this.handleToggleRec.bind(this);
+    this.handleToggleAllRecs = this.handleToggleAllRecs.bind(this);
   }
 
   handleFileChange(event) {
@@ -38,6 +52,7 @@ class UploadButton extends PureComponent {
     const { file, url, name } = this.state;
 
     if (!file && !url) {
+      // eslint-disable-next-line no-alert
       alert('Please select a CSV file or provide a URL');
       return;
     }
@@ -45,55 +60,112 @@ class UploadButton extends PureComponent {
     this.setState({ isLoading: true });
 
     const fileUrl = url || (file && URL.createObjectURL(file));
+    const storageKey = name.trim() || 'uploaded';
 
-    // Use d3.csv to parse the uploaded file or the URL
-    d3.csv(fileUrl)
+    d3.csv(fileUrl, covertRaw)
       .then((data) => {
-        // Save the file and parsed content in local storage
-        localStorage.setItem('uploadedCSV', JSON.stringify(data));
-        this.setState({ fileContent: data, isLoading: false });
+        localStorage.setItem(`es-${storageKey}`, JSON.stringify(data));
 
-        // Trigger sample analysis
-        this.handleSampleAnalysis(data, name, url);
-        this.toggleModal(); // Close the modal after successful upload
+        const dataInfo = analyzeDataset(data);
+        const recommendations = recommendVisualizations(dataInfo);
+        const selectedRecs = new Set(
+          recommendations
+            .filter((r) => r.score >= RECOMMEND_THRESHOLD)
+            .map((r) => r.config.id),
+        );
+
+        this.setState({
+          fileContent: data,
+          isLoading: false,
+          step: 2,
+          recommendations,
+          selectedRecs,
+        });
       })
       .catch((error) => {
+        // eslint-disable-next-line no-alert
         alert('Error parsing the CSV file.');
         console.error(error);
         this.setState({ isLoading: false });
       });
   }
 
-  handleSampleAnalysis(data) {
-    console.log('TODO!!', data, this.state.name);
-    if (this.state.url) {
-      console.log('I actually got a url source', this.state.url);
+  handleToggleRec(id) {
+    this.setState((prev) => {
+      const selectedRecs = new Set(prev.selectedRecs);
+      if (selectedRecs.has(id)) selectedRecs.delete(id);
+      else selectedRecs.add(id);
+      return { selectedRecs };
+    });
+  }
+
+  handleToggleAllRecs() {
+    const { recommendations, selectedRecs } = this.state;
+    const allSelected = recommendations.every((r) => selectedRecs.has(r.config.id));
+    const next = allSelected
+      ? new Set()
+      : new Set(recommendations.map((r) => r.config.id));
+    this.setState({ selectedRecs: next });
+  }
+
+  handleApplyRecommendations() {
+    const { recommendations, selectedRecs } = this.state;
+    const toAdd = recommendations
+      .filter((r) => selectedRecs.has(r.config.id))
+      .map((r) => r.config);
+
+    const { setConfig } = this.context;
+    if (setConfig && toAdd.length > 0) {
+      setConfig((prev) => ({
+        ...prev,
+        VISUALIZATION_VIEW_CONFIGURATION: [
+          ...(prev.VISUALIZATION_VIEW_CONFIGURATION || []).filter(
+            (v) => !v.id.startsWith('rec-'),
+          ),
+          ...toAdd,
+        ],
+      }));
     }
+
+    this.toggleModal();
+  }
+
+  handleSkipRecommendations() {
+    this.toggleModal();
   }
 
   toggleModal() {
     this.setState((prevState) => ({
       showModal: !prevState.showModal,
+      step: 1,
+      recommendations: [],
+      selectedRecs: new Set(),
+      file: null,
+      name: '',
+      url: '',
+      fileContent: null,
     }));
   }
 
   render() {
     const {
-      showModal, file, isLoading, name, url,
+      showModal, file, isLoading, name, url, step, recommendations, selectedRecs,
     } = this.state;
 
+    const selectedCount = selectedRecs.size;
+
     return (
       <div>
         <Button
           size="lg"
           style={{
             background: 'none',
-            border: '2px solid #ccc', // Adding a subtle border
-            borderRadius: '12px', // Rounded corners
-            position: 'relative', // Position relative for absolute positioning of icons
-            width: '50px', // Set width to fit icon size
-            height: '50px', // Set height to fit icon size
-            padding: 0, // Remove padding
+            border: '2px solid #ccc',
+            borderRadius: '12px',
+            position: 'relative',
+            width: '50px',
+            height: '50px',
+            padding: 0,
             display: 'flex',
             alignItems: 'center',
             justifyContent: 'center',
@@ -103,77 +175,100 @@ class UploadButton extends PureComponent {
           <FontAwesomeIcon
             size="sm"
             icon={faUpload}
-            style={{
-              position: 'absolute',
-              top: '5px',
-              left: '5px',
-            }}
+            style={{ position: 'absolute', top: '5px', left: '5px' }}
           />
-
           <FontAwesomeIcon
             size="sm"
             icon={faChartBar}
-            style={{
-              position: 'absolute',
-              bottom: '5px',
-              right: '5px',
-            }}
+            style={{ position: 'absolute', bottom: '5px', right: '5px' }}
           />
         </Button>
 
-        {/* Modal for file upload */}
-        <Modal show={showModal} onHide={this.toggleModal}>
+        <Modal show={showModal} onHide={this.toggleModal} size={step === 2 ? 'lg' : undefined}>
           <Modal.Header closeButton>
-            <Modal.Title>Upload CSV Data File</Modal.Title>
+            <Modal.Title>
+              {step === 1 ? 'Upload CSV Data File' : 'Recommended Visualizations'}
+            </Modal.Title>
           </Modal.Header>
+
           <Modal.Body>
-            {isLoading ? (
-              <p>Processing your file...</p>
-            ) : (
-              <div>
-                <input
-                  type="file"
-                  accept=".csv"
-                  onChange={this.handleFileChange}
-                />
-                <div>
-                  <label>
-                    Name (optional):
-                    <input
-                      type="text"
-                      name="name"
-                      value={name}
-                      onChange={this.handleInputChange}
-                      placeholder="local dashboard name"
-                    />
-                  </label>
-                </div>
+            {step === 1 && (
+              isLoading ? (
+                <p>Processing your file...</p>
+              ) : (
                 <div>
-                  <label>
-                    URL (optional):
-                    <input
-                      type="text"
-                      name="url"
-                      value={url}
-                      onChange={this.handleInputChange}
-                      placeholder="Enter CSV file URL"
-                    />
-                  </label>
+                  <input
+                    type="file"
+                    accept=".csv"
+                    onChange={this.handleFileChange}
+                  />
+                  <div>
+                    <label>
+                      Name (optional):
+                      <input
+                        type="text"
+                        name="name"
+                        value={name}
+                        onChange={this.handleInputChange}
+                        placeholder="local dashboard name"
+                      />
+                    </label>
+                  </div>
+                  <div>
+                    <label>
+                      URL (optional):
+                      <input
+                        type="text"
+                        name="url"
+                        value={url}
+                        onChange={this.handleInputChange}
+                        placeholder="Enter CSV file URL"
+                      />
+                    </label>
+                  </div>
+                  <Button
+                    variant="primary"
+                    onClick={this.handleUpload}
+                    disabled={!file && !url}
+                  >
+                    Upload
+                  </Button>
                 </div>
-                <Button
-                  variant="primary"
-                  onClick={this.handleUpload}
-                  disabled={!file && !url}
-                >
-                  Upload
-                </Button>
-              </div>
+              )
+            )}
+
+            {step === 2 && (
+              <VisRecommendations
+                recommendations={recommendations}
+                selected={selectedRecs}
+                onToggle={this.handleToggleRec}
+                onToggleAll={this.handleToggleAllRecs}
+              />
             )}
           </Modal.Body>
+
+          {step === 2 && (
+            <Modal.Footer>
+              <Button variant="secondary" onClick={this.handleSkipRecommendations}>
+                Skip
+              </Button>
+              <Button
+                variant="primary"
+                onClick={this.handleApplyRecommendations}
+                disabled={selectedCount === 0}
+              >
+                Add to Dashboard (
+                {selectedCount}
+                )
+              </Button>
+            </Modal.Footer>
+          )}
         </Modal>
       </div>
     );
   }
 }
 
+UploadButton.contextType = ConfigContext;
+
 export default UploadButton;
diff --git a/source/components/VisRecommendations/VisRecommendations.js b/source/components/VisRecommendations/VisRecommendations.js
new file mode 100644
index 00000000..7fbb1370
--- /dev/null
+++ b/source/components/VisRecommendations/VisRecommendations.js
@@ -0,0 +1,93 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Badge from 'react-bootstrap/Badge';
+import Button from 'react-bootstrap/Button';
+import Form from 'react-bootstrap/Form';
+import ListGroup from 'react-bootstrap/ListGroup';
+import { RECOMMEND_THRESHOLD } from '../../common/dataAnalysis';
+
+const CHART_LABELS = {
+  PIE_CHART: 'Pie',
+  BAR_CHART: 'Bar',
+  HORIZONTAL_BAR_CHART: 'H-Bar',
+  HISTOGRAM: 'Histogram',
+  SCATTER_CHART: 'Scatter',
+  DENSITY_2D: 'Density 2D',
+  PARALLEL_COORDINATES: 'Parallel',
+  HEATMAP: 'Heatmap',
+  VIS_DATA_TABLE: 'Table',
+};
+
+function VisRecommendations({
+  recommendations, selected, onToggle, onToggleAll,
+}) {
+  const allSelected = recommendations.every((r) => selected.has(r.config.id));
+
+  return (
+    <div>
+      <div className="d-flex justify-content-between align-items-center mb-2">
+        <small className="text-muted">
+          {selected.size}
+          {' '}
+          of
+          {recommendations.length}
+          {' '}
+          selected
+        </small>
+        <Button variant="link" size="sm" className="p-0" onClick={onToggleAll}>
+          {allSelected ? 'Clear all' : 'Select all'}
+        </Button>
+      </div>
+      <ListGroup>
+        {recommendations.map((rec) => {
+          const checked = selected.has(rec.config.id);
+          const isTopPick = rec.score >= RECOMMEND_THRESHOLD;
+          return (
+            <ListGroup.Item
+              key={rec.config.id}
+              variant={isTopPick ? 'light' : undefined}
+              className="py-2 px-3"
+            >
+              <div className="d-flex align-items-start gap-2">
+                <Form.Check
+                  type="checkbox"
+                  checked={checked}
+                  onChange={() => onToggle(rec.config.id)}
+                  className="mt-1 flex-shrink-0"
+                />
+                <div className="flex-grow-1 min-width-0">
+                  <div className="d-flex align-items-center gap-2 flex-wrap">
+                    <span className="fw-semibold">{rec.config.title}</span>
+                    <Badge bg="secondary" className="fw-normal" style={{ fontSize: '0.7em' }}>
+                      {CHART_LABELS[rec.chartType] || rec.chartType}
+                    </Badge>
+                  </div>
+                  <div className="text-muted" style={{ fontSize: '0.82em' }}>{rec.rationale}</div>
+                </div>
+              </div>
+            </ListGroup.Item>
+          );
+        })}
+      </ListGroup>
+    </div>
+  );
+}
+
+VisRecommendations.propTypes = {
+  recommendations: PropTypes.arrayOf(
+    PropTypes.shape({
+      chartType: PropTypes.string.isRequired,
+      score: PropTypes.number.isRequired,
+      rationale: PropTypes.string.isRequired,
+      config: PropTypes.shape({
+        id: PropTypes.string.isRequired,
+        title: PropTypes.string.isRequired,
+      }).isRequired,
+    }),
+  ).isRequired,
+  selected: PropTypes.instanceOf(Set).isRequired,
+  onToggle: PropTypes.func.isRequired,
+  onToggleAll: PropTypes.func.isRequired,
+};
+
+export default VisRecommendations;
diff --git a/source/hooks/useFetch.js b/source/hooks/useFetch.js
index 7828683e..7cdc9609 100644
--- a/source/hooks/useFetch.js
+++ b/source/hooks/useFetch.js
@@ -1,21 +1,6 @@
 import { useEffect, useState } from 'react';
 import * as d3 from 'd3';
-
-function isNumeric(str) {
-  return typeof str === 'string' && /^[+-]?(?:\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/.test(str);
-}
-
-function covertRaw(elt) {
-  Object.keys(elt).forEach((key) => {
-    const raw = elt[key];
-    if (isNumeric(raw)) {
-      elt[key] = +raw;
-    } else if (raw === 'true' || raw === 'false') {
-      elt[key] = raw === 'true';
-    }
-  });
-  return elt;
-}
+import { covertRaw } from '../common/dataAnalysis';
 
 const useFetch = (url, type = 'json') => {
   const [data, setData] = useState(null);

From ef0bf0eb1b3f3ca485852bdf4f56102b77cd2d71 Mon Sep 17 00:00:00 2001
From: Birm <birm@rbirm.us>
Date: Wed, 27 May 2026 12:21:28 -0400
Subject: [PATCH 5/5] security fixes, filter performance, register saved
 data/configs

---
 source/common/localDataRegistry.js            | 35 +++++++++
 source/components/BaseVisualization.js        | 25 +++----
 source/components/HomeButton.js               | 11 ++-
 .../Layout/VisGridView/VisGridView.js         |  2 +-
 source/components/UploadButton.js             | 75 ++++++++++++++++++-
 .../VisualTools/VisDataTable/VisDataTable.js  | 11 ++-
 source/contexts/DataContext.js                | 60 +++++++++++----
 source/hooks/useFetch.js                      |  5 ++
 source/services/URLServices.js                | 23 +++++-
 9 files changed, 206 insertions(+), 41 deletions(-)
 create mode 100644 source/common/localDataRegistry.js

diff --git a/source/common/localDataRegistry.js b/source/common/localDataRegistry.js
new file mode 100644
index 00000000..84b0a80d
--- /dev/null
+++ b/source/common/localDataRegistry.js
@@ -0,0 +1,35 @@
+const REGISTRY_KEY = 'es-registry';
+
+export function getRegistry() {
+  try {
+    return JSON.parse(localStorage.getItem(REGISTRY_KEY) || '[]');
+  } catch {
+    return [];
+  }
+}
+
+export function updateRegistry(entry) {
+  const registry = getRegistry();
+  const idx = registry.findIndex((r) => r.storageKey === entry.storageKey);
+  if (idx >= 0) registry[idx] = entry;
+  else registry.unshift(entry);
+  localStorage.setItem(REGISTRY_KEY, JSON.stringify(registry));
+}
+
+export function saveVisConfigs(storageKey, configs) {
+  localStorage.setItem(`es-vis-${storageKey}`, JSON.stringify(configs));
+}
+
+export function loadVisConfigs(storageKey) {
+  try {
+    return JSON.parse(localStorage.getItem(`es-vis-${storageKey}`) || 'null');
+  } catch {
+    return null;
+  }
+}
+
+export function setLocalDataParam(storageKey) {
+  const url = new URL(window.location.href);
+  url.searchParams.set('localdata', storageKey);
+  window.history.replaceState({}, '', url.toString());
+}
diff --git a/source/components/BaseVisualization.js b/source/components/BaseVisualization.js
index fd346ff1..587e5609 100644
--- a/source/components/BaseVisualization.js
+++ b/source/components/BaseVisualization.js
@@ -34,6 +34,11 @@ class BaseVisualization extends React.Component {
     window.addEventListener('initData', this.initData, false);
   }
 
+  componentWillUnmount() {
+    window.removeEventListener('filterOut', this.filterOut);
+    window.removeEventListener('initData', this.initData);
+  }
+
   filterReset() {
     this.setState((prevState, props) => {
       console.log(prevState);
@@ -63,25 +68,13 @@ class BaseVisualization extends React.Component {
 
   // to be fired when data
   filterOut(e) {
-    const d = e.detail.data;
-    this.setState((prevState, props) => {
-      prevState.filteredData = d;
-      prevState.globalFilter = e.detail.filter;
-      if (e.detail.filter == {}) {
-        prevState.filter = {};
-      }
-    });
-    this.forceUpdate();
+    const nextState = { filteredData: e.detail.data, globalFilter: e.detail.filter };
+    if (Object.keys(e.detail.filter).length === 0) nextState.filter = {};
+    this.setState(nextState);
   }
 
   initData(e) {
-    const d = e.detail.data;
-    this.setState((prevState, props) => {
-      prevState.baseData = d;
-      prevState.filteredData = d;
-      prevState.ready = true;
-    });
-    this.forceUpdate();
+    this.setState({ baseData: e.detail.data, filteredData: e.detail.data, ready: true });
   }
 
   // TODO include other react lifecycle methods
diff --git a/source/components/HomeButton.js b/source/components/HomeButton.js
index 6a4bfd1a..ebef934b 100644
--- a/source/components/HomeButton.js
+++ b/source/components/HomeButton.js
@@ -13,7 +13,16 @@ class HomeButton extends PureComponent {
   goHome() {
     const query = new URLSearchParams(window.location.search);
     const homeUrl = this.props.url || query.get('homeurl') || '../';
-    window.location.href = homeUrl;
+    // Only allow relative paths or same-origin URLs
+    const isSafeRedirect = (u) => {
+      if (!u || /^(javascript|data):/i.test(u)) return false;
+      try {
+        return new URL(u, window.location.origin).origin === window.location.origin;
+      } catch {
+        return u.startsWith('/') || u.startsWith('./') || u.startsWith('../');
+      }
+    };
+    window.location.href = isSafeRedirect(homeUrl) ? homeUrl : '../';
   }
 
   render() {
diff --git a/source/components/Layout/VisGridView/VisGridView.js b/source/components/Layout/VisGridView/VisGridView.js
index 731fdb28..0b1d7037 100644
--- a/source/components/Layout/VisGridView/VisGridView.js
+++ b/source/components/Layout/VisGridView/VisGridView.js
@@ -14,7 +14,7 @@ function VisGridView({ fullVisScreenHandler, fullScreened, designation }) {
   const grid = config.UNIT_OF_GRID_VIEW;
   const margins = config.MARGIN_OF_GRID_VIEW;
   const AllVisConfig = config.VISUALIZATION_VIEW_CONFIGURATION;
-  const draggableHandle = config.GRAGGABLE ? '.draggable' : '';
+  const draggableHandle = config.DRAGGABLE ? '.draggable' : '';
   const isDraggable = config.DRAGGABLE || false;
   const isResizable = config.RESIZABLE || false;
 
diff --git a/source/components/UploadButton.js b/source/components/UploadButton.js
index 479b5c47..e1b2530a 100644
--- a/source/components/UploadButton.js
+++ b/source/components/UploadButton.js
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUpload, faChartBar } from '@fortawesome/free-solid-svg-icons';
 import Button from 'react-bootstrap/Button';
+import ListGroup from 'react-bootstrap/ListGroup';
 import Modal from 'react-bootstrap/Modal';
 import * as d3 from 'd3';
 import { ConfigContext } from '../contexts/ConfigContext';
@@ -11,6 +12,13 @@ import {
   recommendVisualizations,
   RECOMMEND_THRESHOLD,
 } from '../common/dataAnalysis';
+import {
+  getRegistry,
+  updateRegistry,
+  saveVisConfigs,
+  loadVisConfigs,
+  setLocalDataParam,
+} from '../common/localDataRegistry';
 import VisRecommendations from './VisRecommendations/VisRecommendations';
 
 class UploadButton extends PureComponent {
@@ -26,6 +34,8 @@ class UploadButton extends PureComponent {
       step: 1,
       recommendations: [],
       selectedRecs: new Set(),
+      storageKey: null,
+      registry: getRegistry(),
     };
 
     this.handleFileChange = this.handleFileChange.bind(this);
@@ -36,6 +46,7 @@ class UploadButton extends PureComponent {
     this.handleSkipRecommendations = this.handleSkipRecommendations.bind(this);
     this.handleToggleRec = this.handleToggleRec.bind(this);
     this.handleToggleAllRecs = this.handleToggleAllRecs.bind(this);
+    this.handleLoadPrevious = this.handleLoadPrevious.bind(this);
   }
 
   handleFileChange(event) {
@@ -66,6 +77,14 @@ class UploadButton extends PureComponent {
       .then((data) => {
         localStorage.setItem(`es-${storageKey}`, JSON.stringify(data));
 
+        updateRegistry({
+          name: name.trim() || storageKey,
+          storageKey,
+          rowCount: data.length,
+          uploadedAt: new Date().toISOString(),
+        });
+        setLocalDataParam(storageKey);
+
         const dataInfo = analyzeDataset(data);
         const recommendations = recommendVisualizations(dataInfo);
         const selectedRecs = new Set(
@@ -80,6 +99,7 @@ class UploadButton extends PureComponent {
           step: 2,
           recommendations,
           selectedRecs,
+          storageKey,
         });
       })
       .catch((error) => {
@@ -90,6 +110,24 @@ class UploadButton extends PureComponent {
       });
   }
 
+  handleLoadPrevious(entry) {
+    const { storageKey } = entry;
+    const visConfigs = loadVisConfigs(storageKey);
+
+    setLocalDataParam(storageKey);
+    this.context.setConfig((prev) => {
+      const next = { ...prev, DATA_RESOURCE_URL: `local://${storageKey}` };
+      if (visConfigs?.length > 0) {
+        next.VISUALIZATION_VIEW_CONFIGURATION = [
+          ...(prev.VISUALIZATION_VIEW_CONFIGURATION || []).filter((v) => !v.id.startsWith('rec-')),
+          ...visConfigs,
+        ];
+      }
+      return next;
+    });
+    this.toggleModal();
+  }
+
   handleToggleRec(id) {
     this.setState((prev) => {
       const selectedRecs = new Set(prev.selectedRecs);
@@ -109,11 +147,15 @@ class UploadButton extends PureComponent {
   }
 
   handleApplyRecommendations() {
-    const { recommendations, selectedRecs } = this.state;
+    const { recommendations, selectedRecs, storageKey } = this.state;
     const toAdd = recommendations
       .filter((r) => selectedRecs.has(r.config.id))
       .map((r) => r.config);
 
+    if (storageKey) {
+      saveVisConfigs(storageKey, toAdd);
+    }
+
     const { setConfig } = this.context;
     if (setConfig && toAdd.length > 0) {
       setConfig((prev) => ({
@@ -144,12 +186,14 @@ class UploadButton extends PureComponent {
       name: '',
       url: '',
       fileContent: null,
+      storageKey: null,
+      registry: !prevState.showModal ? getRegistry() : prevState.registry,
     }));
   }
 
   render() {
     const {
-      showModal, file, isLoading, name, url, step, recommendations, selectedRecs,
+      showModal, file, isLoading, name, url, step, recommendations, selectedRecs, registry,
     } = this.state;
 
     const selectedCount = selectedRecs.size;
@@ -197,6 +241,33 @@ class UploadButton extends PureComponent {
                 <p>Processing your file...</p>
               ) : (
                 <div>
+                  {registry.length > 0 && (
+                    <div className="mb-3">
+                      <p className="mb-1 fw-semibold">Previously uploaded</p>
+                      <ListGroup>
+                        {registry.map((entry) => (
+                          <ListGroup.Item
+                            key={entry.storageKey}
+                            action
+                            onClick={() => this.handleLoadPrevious(entry)}
+                            className="d-flex justify-content-between align-items-center"
+                          >
+                            <span>{entry.name}</span>
+                            <small className="text-muted">
+                              {entry.rowCount.toLocaleString()}
+                              {' '}
+                              rows
+                              {' · '}
+                              {new Date(entry.uploadedAt).toLocaleDateString()}
+                            </small>
+                          </ListGroup.Item>
+                        ))}
+                      </ListGroup>
+                      <hr />
+                    </div>
+                  )}
+
+                  <p className="mb-1 fw-semibold">Upload new</p>
                   <input
                     type="file"
                     accept=".csv"
diff --git a/source/components/VisualTools/VisDataTable/VisDataTable.js b/source/components/VisualTools/VisDataTable/VisDataTable.js
index bd5b9eda..e61fdc73 100644
--- a/source/components/VisualTools/VisDataTable/VisDataTable.js
+++ b/source/components/VisualTools/VisDataTable/VisDataTable.js
@@ -10,16 +10,19 @@ import PropTypes from 'prop-types';
 import VisDataTableControl from './VisDataTableControl/VisDataTableControl';
 import './VisDataTable.css';
 
+const isSafeBase = (u) => /^https?:\/\//i.test(u);
+
 const cellRenderer = (d, f) => {
   let urlElt;
-  if (f.link && f.link.url && f.link.field) {
-    const urlbase = f.link.url || '';
+  if (f.link && f.link.url && isSafeBase(f.link.url) && f.link.field) {
+    const urlbase = f.link.url;
+    const fieldVal = encodeURIComponent(String(d.rowData[f.link.field] ?? ''));
     urlElt = (
-      <a target="_parent" href={urlbase + d.rowData[f.link.field]}>
+      <a target="_parent" href={`${urlbase}${fieldVal}`}>
         {d.cellData}
       </a>
     );
-  } else if (f.link && f.link.url) {
+  } else if (f.link && f.link.url && isSafeBase(f.link.url)) {
     urlElt = (
       <a target="_parent" href={f.link.url}>
         {d.cellData}
diff --git a/source/contexts/DataContext.js b/source/contexts/DataContext.js
index 49160dd0..e977f82f 100644
--- a/source/contexts/DataContext.js
+++ b/source/contexts/DataContext.js
@@ -5,9 +5,14 @@ import PropTypes from 'prop-types';
 import useFetch from '../hooks/useFetch';
 import { ConfigContext } from './ConfigContext';
 import { updateURL, clearURL, initURL } from '../services/URLServices';
+import { loadVisConfigs } from '../common/localDataRegistry';
 
-function filterData(data, filters) {
-  return data.filter((record) => {
+function buildSearchIndex(data) {
+  return data.map((r) => Object.values(r).join('|').toLowerCase());
+}
+
+function filterData(data, filters, searchIndex) {
+  return data.filter((record, rowIdx) => {
     for (let i = 0; i < filters.length; i++) {
       const filter = filters[i];
       const { operation } = filter;
@@ -41,15 +46,18 @@ function filterData(data, filters) {
       if (!broken && operation === 'has') {
         broken = broken || !(val && val.some((v) => filter.values === v));
       }
-      if (!broken && operation === 'nhas') { // TODO test
-        broken = broken || !(val && val.find((v) => filter.values === v));
+      if (!broken && operation === 'nhas') {
+        broken = broken
+          || !(val && Array.isArray(val) && val.some((v) => filter.values.includes(v)));
       }
       if (!broken && operation === 'range') {
         broken = broken || filter.values[0] > val || filter.values[1] < val;
       }
       // search operates on the whole record instead of val
       if (!broken && operation === 'search') {
-        broken = Object.values(record).join('|').indexOf(filter.values[0]) === -1;
+        const needle = String(filter.values[0]).toLowerCase();
+        const haystack = searchIndex ? searchIndex[rowIdx] : Object.values(record).join('|').toLowerCase();
+        broken = !haystack.includes(needle);
       }
       if (broken) {
         return false;
@@ -63,7 +71,27 @@ function filterData(data, filters) {
 export const DataContext = createContext();
 
 export default function DataContextProvider({ children, overrideData }) {
-  const { config } = useContext(ConfigContext);
+  const { config, setConfig } = useContext(ConfigContext);
+
+  // On first config load, apply ?localdata= URL param to DATA_RESOURCE_URL + restore vis configs
+  const localDataPatched = useRef(false);
+  useEffect(() => {
+    if (localDataPatched.current || !config) return;
+    const localDataKey = new URLSearchParams(window.location.search).get('localdata');
+    if (!localDataKey) return;
+    localDataPatched.current = true;
+    const visConfigs = loadVisConfigs(localDataKey);
+    setConfig((prev) => {
+      const next = { ...prev, DATA_RESOURCE_URL: `local://${localDataKey}` };
+      if (visConfigs?.length > 0) {
+        next.VISUALIZATION_VIEW_CONFIGURATION = [
+          ...(prev.VISUALIZATION_VIEW_CONFIGURATION || []).filter((v) => !v.id.startsWith('rec-')),
+          ...visConfigs,
+        ];
+      }
+      return next;
+    });
+  }, [config, setConfig]);
   const [loading, setLoading] = useState(true);
   const [filteredData, setFilteredData] = useState([]);
   const filtersRef = useRef();
@@ -77,19 +105,21 @@ export default function DataContextProvider({ children, overrideData }) {
     dataError = error;
     data = fetchedData;
   }
+
+  const searchIndex = useMemo(() => (data ? buildSearchIndex(data) : []), [data]);
+
   const addFiltersHandler = (toAddFilters) => {
-    const oldFilters = [...filtersRef.current];
-    // remove first
-    let newFilters = oldFilters.filter((of) => toAddFilters.every((nf) => !(of.id === nf.id)));
-    // add
-    newFilters = [...newFilters, ...toAddFilters];
-    // do filter
-    const datasetAfterFilter = filterData(data, newFilters);
+    const oldFilters = filtersRef.current || [];
+    const idsToRemove = new Set(toAddFilters.map((nf) => nf.id));
+    const newFilters = [
+      ...oldFilters.filter((of) => !idsToRemove.has(of.id)),
+      ...toAddFilters,
+    ];
+    const datasetAfterFilter = filterData(data, newFilters, searchIndex);
     setFilteredData(datasetAfterFilter);
     setFilters(newFilters);
     filtersRef.current = newFilters;
 
-    // handle url
     updateURL(newFilters);
   };
 
@@ -117,7 +147,7 @@ export default function DataContextProvider({ children, overrideData }) {
       return;
     }
 
-    const datasetAfterFilter = filterData(data, newFilters);
+    const datasetAfterFilter = filterData(data, newFilters, searchIndex);
     setFilteredData(datasetAfterFilter);
     setFilters(newFilters);
     filtersRef.current = newFilters;
diff --git a/source/hooks/useFetch.js b/source/hooks/useFetch.js
index 7cdc9609..472b1fa1 100644
--- a/source/hooks/useFetch.js
+++ b/source/hooks/useFetch.js
@@ -21,6 +21,11 @@ const useFetch = (url, type = 'json') => {
       // Handle "local://" URLs
       if (url.startsWith('local://')) {
         const localKey = url.slice(8); // Remove the "local://" prefix
+        if (!/^[\w-]+$/.test(localKey)) {
+          setIsPending(false);
+          setError(new Error(`Invalid local storage key: ${localKey}`));
+          return () => abortCont.abort();
+        }
         try {
           const storedData = localStorage.getItem(`es-${localKey}`);
           if (storedData) {
diff --git a/source/services/URLServices.js b/source/services/URLServices.js
index 94238c09..4bd1a638 100644
--- a/source/services/URLServices.js
+++ b/source/services/URLServices.js
@@ -14,13 +14,32 @@ const clearURL = () => {
   window.history.replaceState({}, document.title, newUrl);
 };
 
+const VALID_OPERATIONS = new Set([
+  'eq', 'gt', 'gte', 'lt', 'lte', 'ne', 'in', 'nin', 'has', 'nhas', 'range', 'search',
+]);
+
+const isValidFilter = (f) => (
+  f !== null
+  && typeof f === 'object'
+  && typeof f.field === 'string'
+  && !f.field.startsWith('__')
+  && typeof f.operation === 'string'
+  && VALID_OPERATIONS.has(f.operation)
+  && f.values !== undefined
+);
+
 const initURL = (addFiltersHandler, removeFiltersHandler) => {
   const thisUrl = new URL(window.location);
   const thisParams = new URLSearchParams(thisUrl.search);
   const thisFilterState = thisParams.get('filterState');
   if (thisFilterState) {
-    removeFiltersHandler('ALL');
-    addFiltersHandler(JSON.parse(thisFilterState));
+    try {
+      const parsed = JSON.parse(thisFilterState);
+      if (Array.isArray(parsed) && parsed.every(isValidFilter)) {
+        removeFiltersHandler('ALL');
+        addFiltersHandler(parsed);
+      }
+    } catch { /* ignore malformed filterState in URL */ }
   }
 };