Merge branch 'development' into explore-openapi

Author: tariqksoliman

API/Backend/Config/routes/configs.js

@@ -668,18 +668,24 @@ function openWebSocket(body, response, info, forceClientUpdate) {
   }
 
   const port = parseInt(process.env.PORT || "8888", 10);
-  const path = `ws://localhost:${port}${
+  const path = `${
+    process.env.HTTPS == "true" ? "wss" : "ws"
+  }://localhost:${port}${
     process.env.WEBSOCKET_ROOT_PATH || process.env.ROOT_PATH || ""
   }/`;
-  const ws = new WebSocket(path);
-  ws.onopen = function () {
-    const data = {
-      info,
-      body,
-      forceClientUpdate,
+  try {
+    const ws = new WebSocket(path);
+    ws.onopen = function () {
+      const data = {
+        info,
+        body,
+        forceClientUpdate,
+      };
+      ws.send(JSON.stringify(data));
     };
-    ws.send(JSON.stringify(data));
-  };
+  } catch (err) {
+    console.log(err);
+  }
 }
 
 // === Quick API Functions ===

API/Backend/Draw/routes/draw.js

@@ -204,7 +204,7 @@ const clipOver = function (
           historyIndex: lastHistory[0].history_id + 1,
           history: lastHistory[0].history,
         };
-      } else return { historyIndex: 0, history: [] };
+      } else return { historyIndex: 0, history: null };
     })
     .then((historyObj) => {
       let history = historyObj.history;
@@ -335,7 +335,7 @@ const clipUnder = function (
           historyIndex: lastHistory[0].history_id + 1,
           history: lastHistory[0].history,
         };
-      } else return { historyIndex: 0, history: [] };
+      } else return { historyIndex: 0, history: null };
     })
     .then((historyObj) => {
       let history = historyObj.history;

configure/src/core/Maker.js

@@ -256,6 +256,9 @@ const getComponent = (
           }}
           value={value != null ? value : getIn(directConf, com.field, "")}
           onChange={(e) => {
+            updateConfiguration(forceField || com.field, e.target.value, layer);
+          }}
+          onBlur={(e) => {
             let v = e.target.value;
             // remove surrounding whitespace, " hi " -> "hi"
             if (typeof v === "string") v = v.trim();
@@ -280,6 +283,39 @@ const getComponent = (
           )}
         </div>
       );
+    case "textnotrim":
+      inner = (
+        <TextField
+          className={c.text}
+          label={com.name}
+          variant="filled"
+          size="small"
+          inputProps={{
+            autoComplete: "off",
+          }}
+          value={value != null ? value : getIn(directConf, com.field, "")}
+          onChange={(e) => {
+            updateConfiguration(forceField || com.field, e.target.value, layer);
+          }}
+        />
+      );
+      return (
+        <div>
+          {inlineHelp ? (
+            <>
+              {inner}
+              <div
+                className={c.subtitle2}
+                dangerouslySetInnerHTML={{ __html: com.description || "" }}
+              ></div>
+            </>
+          ) : (
+            <Tooltip title={com.description || ""} placement="top" arrow>
+              {inner}
+            </Tooltip>
+          )}
+        </div>
+      );
     case "button":
       inner = (
         <Button

configure/src/metaconfigs/layer-data-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "",
-              "type": "text",
+              "type": "textnotrim",
               "width": 8
             },
             {

configure/src/metaconfigs/layer-header-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "",
-              "type": "text",
+              "type": "textnotrim",
               "width": 8
             }
           ]

configure/src/metaconfigs/layer-model-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "A display name for the layer.",
-              "type": "text",
+              "type": "textnotrim",
               "width": 6
             },
             {

configure/src/metaconfigs/layer-query-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "A display name for the layer.",
-              "type": "text",
+              "type": "textnotrim",
               "width": 6
             },
             {

configure/src/metaconfigs/layer-tile-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "",
-              "type": "text",
+              "type": "textnotrim",
               "width": 4
             },
             {
@@ -201,7 +201,7 @@
               "field": "cogUnits",
               "name": "Units",
               "description": "Units string by which to suffix values. For instance if the units are meters, use 'm' so that values are displayed as '100m'.",
-              "type": "text",
+              "type": "textnotrim",
               "width": 2
             },
             {

configure/src/metaconfigs/layer-vector-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "A display name for the layer.",
-              "type": "text",
+              "type": "textnotrim",
               "width": 6
             },
             {

configure/src/metaconfigs/layer-vectortile-config.json

@@ -27,7 +27,7 @@
               "field": "name",
               "name": "Layer Name",
               "description": "A display name for the layer.",
-              "type": "text",
+              "type": "textnotrim",
               "width": 6
             },
             {