Fix geodataset append and update backward compatibility

Author: tariqksoliman

API/Backend/Geodatasets/models/geodatasets.js

@@ -109,6 +109,16 @@ function makeNewGeodatasetTable(
   Geodatasets.findOne({ where: { name: name } })
     .then((result) => {
       if (result) {
+        // Ignore some columns if they're unused/nonexistent
+        if (result.dataValues.start_time_field == null)
+          delete attributes.start_time;
+        if (result.dataValues.end_time_field == null)
+          delete attributes.end_time;
+        if (result.dataValues.group_id_field == null)
+          delete attributes.group_id;
+        if (result.dataValues.feature_id_field == null)
+          delete attributes.feature_id;
+
         let GeodatasetTable = sequelize.define(
           result.dataValues.table,
           attributes,

API/logger.js

@@ -45,40 +45,44 @@ const logger = function (level, message, caller, req, err) {
     user: req && req.user ? req.user : "HOST",
   };
 
-  let crop = 512;
-  if (req && req.body) {
-    let cleanBody = JSON.parse(JSON.stringify(req.body));
-    if (cleanBody.password) {
-      cleanBody.password = "_redacted_";
+  try {
+    let crop = 512;
+    if (req && req.body) {
+      let cleanBody = JSON.parse(JSON.stringify(req.body));
+      if (cleanBody.password) {
+        cleanBody.password = "_redacted_";
+      }
+      for (let k in cleanBody) {
+        if (JSON.stringify(cleanBody[k]).length > crop)
+          cleanBody[k] = "[Too Long...]";
+      }
+      if (Object.keys(cleanBody).length > 0) {
+        log.req = log.req || {};
+        log.req.body = cleanBody;
+      }
     }
-    for (let k in cleanBody) {
-      if (JSON.stringify(cleanBody[k]).length > crop)
-        cleanBody[k] = "[Too Long...]";
+    if (req && req.query) {
+      let cleanQuery = JSON.parse(JSON.stringify(req.query));
+      if (cleanQuery.password) {
+        cleanQuery.password = "_redacted_";
+      }
+      for (let k in cleanQuery) {
+        if (JSON.stringify(cleanQuery[k]).length > crop)
+          cleanQuery[k] = "[Too Long...]";
+      }
+      if (Object.keys(cleanQuery).length > 0) {
+        log.req = log.req || {};
+        log.req.query = cleanQuery;
+      }
     }
-    if (Object.keys(cleanBody).length > 0) {
-      log.req = log.req || {};
-      log.req.body = cleanBody;
+    if (err) {
+      log.err = err;
     }
-  }
-  if (req && req.query) {
-    let cleanQuery = JSON.parse(JSON.stringify(req.query));
-    if (cleanQuery.password) {
-      cleanQuery.password = "_redacted_";
-    }
-    for (let k in cleanQuery) {
-      if (JSON.stringify(cleanQuery[k]).length > crop)
-        cleanQuery[k] = "[Too Long...]";
-    }
-    if (Object.keys(cleanQuery).length > 0) {
-      log.req = log.req || {};
-      log.req.query = cleanQuery;
-    }
-  }
-  if (err) {
-    log.err = err;
-  }
 
-  log = JSON.stringify(log);
+    log = JSON.stringify(log);
+  } catch (err2) {
+    log.err = err2;
+  }
 
   if (process.env.NODE_ENV === "development") {
     switch (level) {

configure/src/pages/GeoDatasets/Modals/AppendGeoDatasetModal/AppendGeoDatasetModal.js

@@ -45,8 +45,8 @@ const useStyles = makeStyles((theme) => ({
   contents: {
     background: theme.palette.primary.main,
     height: "100%",
-    width: "700px",
-    maxWidth: "700px !important",
+    width: "1200px",
+    maxWidth: "1200px !important",
   },
   heading: {
     height: theme.headHeights[2],
@@ -133,7 +133,7 @@ const useStyles = makeStyles((theme) => ({
     "& > p:first-child": { fontWeight: "bold", letterSpacing: "1px" },
     "& > p:last-child": { fontSize: "14px", fontStyle: "italic" },
   },
-  timeFields: {
+  fields: {
     display: "flex",
     "& > div:first-child": {
       marginRight: "5px",
@@ -187,13 +187,17 @@ const AppendGeoDatasetModal = (props) => {
   const [fileName, setFileName] = useState(null);
   const [startTimeField, setStartTimeField] = useState(null);
   const [endTimeField, setEndTimeField] = useState(null);
+  const [groupIdField, setGroupIdField] = useState(null);
+  const [featureIdField, setFeatureIdField] = useState(null);
   const [fileProgress, setFileProgress] = useState(false);
   const [progress, setProgress] = useState(false);
   const [progressPercent, setProgressPercent] = useState(false);
 
   useEffect(() => {
     setStartTimeField(modal?.geoDataset?.start_time_field);
     setEndTimeField(modal?.geoDataset?.end_time_field);
+    setGroupIdField(modal?.geoDataset?.group_id_field);
+    setFeatureIdField(modal?.geoDataset?.feature_id_field);
   }, [JSON.stringify(modal)]);
 
   const handleClose = () => {
@@ -455,19 +459,20 @@ const AppendGeoDatasetModal = (props) => {
           <div>{fileName || "No File Selected"}</div>
         </div>
 
-        <div className={c.timeFields}>
+        <div className={c.fields}>
           <div>
             <TextField
               className={c.missionNameInput}
               label="Start Time Field"
               variant="filled"
               value={startTimeField}
+              disabled
               onChange={(e) => {
                 setStartTimeField(e.target.value);
               }}
             />
             <Typography className={c.subtitle2}>
-              {`If this GeoDataset already has a Start Time Field attached, the name of that start time field inside each feature's "properties" object for which to create a temporal index for the geodataset. Take care in using time field names for the appended GeoJSON features that are different from that of the existing features.`}
+              {`The name of a start time field inside each feature's "properties" object for which to create a temporal index for the geodataset. This enables time queries on GeoDatasets.`}
             </Typography>
           </div>
           <div>
@@ -476,12 +481,45 @@ const AppendGeoDatasetModal = (props) => {
               label="End Time Field"
               variant="filled"
               value={endTimeField}
+              disabled
               onChange={(e) => {
                 setEndTimeField(e.target.value);
               }}
             />
             <Typography className={c.subtitle2}>
-              {`If this GeoDataset already has a End Time Field attached, the name of that end time field inside each feature's "properties" object for which to create a temporal index for the geodataset. Take care in using time field names for the appended GeoJSON features that are different from that of the existing features.`}
+              {`The name of an end time field inside each feature's "properties" object for which to create a temporal index for the geodataset. This enables time queries on GeoDatasets.`}
+            </Typography>
+          </div>
+        </div>
+        <div className={c.fields}>
+          <div>
+            <TextField
+              className={c.missionNameInput}
+              label="Group Id Field"
+              variant="filled"
+              value={groupIdField}
+              disabled
+              onChange={(e) => {
+                setGroupIdField(e.target.value);
+              }}
+            />
+            <Typography className={c.subtitle2}>
+              {`The name of a field inside each feature's "properties" object to serve as a group id. This field cannot be changed after the GeoDataset is created.`}
+            </Typography>
+          </div>
+          <div>
+            <TextField
+              className={c.missionNameInput}
+              label="Feature Id Field"
+              variant="filled"
+              value={featureIdField}
+              disabled
+              onChange={(e) => {
+                setFeatureIdField(e.target.value);
+              }}
+            />
+            <Typography className={c.subtitle2}>
+              {`The name of a field inside each feature's "properties" object to serve as a feature id. This field cannot be changed after the GeoDataset is created.`}
             </Typography>
           </div>
         </div>