Merge pull request #91 from InseeFr/fix/multiple-issues

fix: solve multiple issue
InseeFr · Oct 23, 2024 · 4106284 · 4106284
2 parents c23c726 + 84a683d
commit 4106284
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/public/configuration.json b/public/configuration.json
@@ -0,0 +1 @@
+{}
diff --git a/src/App.jsx b/src/App.jsx
@@ -9,6 +9,7 @@ function Editor({ endpoint, queries, prefix }) {
     const [yasgui, setYasgui] = useState();
     const [counter, setCounter] = useState(0);
     const ref = useRef(null);
+    const editorRef = useRef(null);
 
     const [inserted, setInserted] = useState(false);
 
@@ -33,10 +34,15 @@ function Editor({ endpoint, queries, prefix }) {
     };
 
     useLayoutEffect(() => {
+        if (editorRef.current.getAttribute("data-yasgui") === "true") {
+            return;
+        }
+
         localStorage.removeItem("yagui__config");
+        editorRef.current.setAttribute("data-yasgui", "true");
         setYasgui(
             // eslint-disable-next-line no-undef
-            new Yasgui(document.getElementById("editor"), {
+            new Yasgui(editorRef.current, {
                 requestConfig: {
                     endpoint
                 }
@@ -48,14 +54,15 @@ function Editor({ endpoint, queries, prefix }) {
         <>
             <div className="queries-block" ref={ref}>
                 {queries.map((query, i) => (
-                    <button key={i} onClick={() => click(query)}>
+                    <button type="button" key={i} onClick={() => click(query)}>
                         {" "}
                         {query.label}{" "}
                     </button>
                 ))}
             </div>
             <div
                 id="editor"
+                ref={editorRef}
                 onClick={e => {
                     if (
                         endpoint !== defaultEndpoint &&

diff --git a/vite.config.ts b/vite.config.ts
@@ -1,6 +1,8 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react-swc'
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react-swc";
 import { configDefaults } from "vitest/config";
+import { readFileSync } from "fs";
+import { resolve } from "path";
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -19,6 +21,30 @@ export default defineConfig({
         outDir: "temp_dist"
     },
     server: {
-        port: 3000
+        port: 3000,
+        proxy: {
+            "/queries/queries.json": {
+                bypass: function (req, res) {
+                    res.setHeader("Content-Type", "application/json");
+                    res.end(
+                        readFileSync(
+                            resolve(import.meta.dirname, "pages/queries/queries.json")
+                        ).toString()
+                    );
+                    return false;
+                }
+            },
+            "^/queries/.*.txt": {
+                bypass: function (req, res) {
+                    res.setHeader("Content-Type", "application/json");
+                    res.end(
+                        readFileSync(
+                            resolve(import.meta.dirname, "pages/", req.url!.replace("/", ""))
+                        ).toString()
+                    );
+                    return false;
+                }
+            }
+        }
     }
 });