Features/use asgi (#11)

boadadf · daniel-fernandez-boada · web-flow · commit d86805e77038 · 2025-12-05T22:38:23.000+01:00
* Use asgi

* Use asgi

* Fix sonar

* Fix sonar

---------

Co-authored-by: FERNANDEZ BOADA Daniel &lt;daniel.boada@soprasteria.com&gt;
diff --git a/openscada_lite/web/config_editor/routes.py b/openscada_lite/web/config_editor/routes.py
@@ -23,21 +23,23 @@
 
 logger = logging.getLogger(__name__)
 
+SYSTEM_CONFIG_FILENAME = "system_config.json"
 
 CONFIG_FILE = os.path.join(
-    os.path.dirname(__file__), "..", "..", "..", "config", "system_config.json"
+    os.path.dirname(__file__), "..", "..", "..", "config", SYSTEM_CONFIG_FILENAME
 )
 
 config_router = APIRouter(prefix="/config-editor/api", tags=["ConfigEditor"])
 
 
 def normalize_config_filename(name: str) -> str:
-    # Always return a valid config filename
-    if name.endswith("system_config.json"):
+    if name == "system_config":
+        return SYSTEM_CONFIG_FILENAME
+    if name.endswith(SYSTEM_CONFIG_FILENAME):
         return name
     if name.endswith(".json"):
         return name
-    return f"{name}_system_config.json"
+    return f"{name}_{SYSTEM_CONFIG_FILENAME}"
 
 
 @config_router.get("/config/{name}", response_class=JSONResponse)
@@ -55,9 +57,9 @@ async def get_config_by_name(name: str):
 @config_router.get("/configs", response_class=JSONResponse)
 async def list_configs():
     config_dir = os.path.dirname(CONFIG_FILE)
-    files = [f for f in os.listdir(config_dir) if f.endswith("_system_config.json")]
+    files = [f for f in os.listdir(config_dir) if f.endswith(f"_{SYSTEM_CONFIG_FILENAME}")]
     # Strip suffix for user display
-    display_names = [f.replace("_system_config.json", "") for f in files]
+    display_names = [f.replace(f"_{SYSTEM_CONFIG_FILENAME}", "") for f in files]
     return display_names
 
 
diff --git a/openscada_lite/web/config_editor/static/frontend/src/App.jsx b/openscada_lite/web/config_editor/static/frontend/src/App.jsx
@@ -92,8 +92,16 @@ export default function App() {
   async function openLoadDialog() {
     try {
       const res = await fetch('/config-editor/api/configs');
-      const files = await res.json();
+      let files = await res.json();
+      // Ensure system_config is present and first
+      if (!files.includes("system_config")) {
+        files.unshift("system_config");
+      } else {
+        // Move to first position if not already
+        files = ["system_config", ...files.filter(f => f !== "system_config")];
+      }
       setAvailableConfigs(files);
+      setSelectedConfig("system_config"); // Default selection
       setShowLoadDialog(true);
     } catch (err) {
       alert('Failed to list configs: ' + err.message);
diff --git a/openscada_lite/web/config_editor/static/frontend/src/components/StreamsTab.jsx b/openscada_lite/web/config_editor/static/frontend/src/components/StreamsTab.jsx
@@ -86,7 +86,7 @@ export default function StreamsTab({ config, setConfig }) {
 
             <label>Port:</label>
             <input
-              type="number"
+              type="text"
               value={streams[selectedKey].port || ""}
               onChange={(e) => updateField("port", e.target.value)}
             />
diff --git a/openscada_lite/web/scada/static/frontend/src/App.jsx b/openscada_lite/web/scada/static/frontend/src/App.jsx
@@ -17,7 +17,7 @@ import MainView from "./components/MainView";
 import "leaflet/dist/leaflet.css";
 
 const TAB_COMPONENTS = {
-  Main: MainView,
+  GIS: MainView,
   Image: ImageView,
   Datapoints: DatapointsView,
   Communications: CommunicationsView,
