From 2603a3300b5ee7165524c9f3a89b6843c5011e77 Mon Sep 17 00:00:00 2001
From: jonnvega <47796239+jonnvega@users.noreply.github.com>
Date: Tue, 3 Oct 2023 12:27:22 +0200
Subject: [PATCH 01/19] add buttons

---
 src/js/imagery/collectionMenuControls.jsx | 53 +++++++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/js/imagery/collectionMenuControls.jsx b/src/js/imagery/collectionMenuControls.jsx
index 288c433ac..e1af380cf 100644
--- a/src/js/imagery/collectionMenuControls.jsx
+++ b/src/js/imagery/collectionMenuControls.jsx
@@ -3,6 +3,7 @@ import React from "react";
 import Select from "../components/Select";
 import { mercator } from "../utils/mercator";
 import { monthlyMapping } from "../utils/generalUtils";
+import SvgIcon from "../components/svg/SvgIcon";
 
 export class PlanetMenu extends React.Component {
   constructor(props) {
@@ -193,6 +194,8 @@ export class PlanetNICFIMenu extends React.Component {
       selectedTime: this.props.sourceConfig.time,
       selectedBand: this.props.sourceConfig.band,
       nicfiLayers: [],
+      isDisabledLeft: false,
+      isDisabledRight: true
     };
   }
 
@@ -201,10 +204,22 @@ export class PlanetNICFIMenu extends React.Component {
     this.getNICFILayers();
   }
 
-  componentDidUpdate(prevProps) {
+  componentDidUpdate(prevProps, prevState) {
     if (this.props.visible && prevProps.visible !== this.props.visible) {
       this.updateImageryInformation();
     }
+   
+    if (prevState.selectedTime !== this.state.selectedTime) {
+      this.setState((state) => {
+        const { nicfiLayers, selectedTime } = state;
+        const index = nicfiLayers.indexOf(selectedTime);
+
+        return {
+          isDisabledLeft: index >= nicfiLayers.length - 1,
+          isDisabledRight: index <= 0
+        }
+      })
+    }
   }
 
   getNICFILayers = () => {
@@ -231,6 +246,21 @@ export class PlanetNICFIMenu extends React.Component {
     }
   };
 
+  switchImagery = (direction) => {
+    this.setState((prevState) => {
+      const { nicfiLayers, selectedTime } = prevState;
+      const currentIndex = nicfiLayers.indexOf(selectedTime);
+
+      const move = direction === "forward" ? -1 : 1;
+      const newIndex = currentIndex + move;
+
+      // Check boundary conditions
+      if (newIndex < 0 || newIndex >= nicfiLayers.length) return {};
+
+      return { selectedTime: nicfiLayers[newIndex] };
+    });
+  }
+
   updatePlanetLayer = () => {
     this.updateImageryInformation();
     mercator.updateLayerSource(
@@ -250,14 +280,15 @@ export class PlanetNICFIMenu extends React.Component {
     return (
       nicfiLayers.length > 0 && (
         <div className="my-2" style={{ display: this.props.visible ? "block" : "none" }}>
-          <div className="slide-container">
-            <label className="mb-0 mr-3" htmlFor="time-selection">
+          <div className="slide-container v-center justify-content-center">
+            <label className="mb-0 mr-2" htmlFor="time-selection">
               Select Time
             </label>
             <select
               id="time-selection"
               onChange={(e) => this.setState({ selectedTime: e.target.value })}
               value={selectedTime}
+              className="mb-0 mr-1"
             >
               {nicfiLayers.map((time) => (
                 <option key={time} value={time}>
@@ -265,6 +296,22 @@ export class PlanetNICFIMenu extends React.Component {
                 </option>
               ))}
             </select>
+            <button
+              className="btn btn-outline-lightgreen btn-sm mr-1"
+              type="button"
+              onClick={() => this.switchImagery("backward")}
+              disabled={this.state.isDisabledLeft}
+            >
+              <SvgIcon icon="leftArrow" size="0.9rem" />
+            </button>
+            <button
+              className="btn btn-outline-lightgreen btn-sm"
+              type="button"
+              onClick={() => this.switchImagery("forward")}
+              disabled={this.state.isDisabledRight}
+            >
+              <SvgIcon icon="rightArrow" size="0.9rem" />
+            </button>
           </div>
           <div className="slide-container">
             <div id="radio-group">

From d89e85f48bbd3b596debf83193e7dbce3f93fe35 Mon Sep 17 00:00:00 2001
From: jonnvega <47796239+jonnvega@users.noreply.github.com>
Date: Tue, 10 Oct 2023 15:17:25 +0200
Subject: [PATCH 02/19] removing update button and running updatePlanetLayer
 with user input change

---
 src/js/imagery/collectionMenuControls.jsx | 31 +++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/js/imagery/collectionMenuControls.jsx b/src/js/imagery/collectionMenuControls.jsx
index e1af380cf..ccd4df761 100644
--- a/src/js/imagery/collectionMenuControls.jsx
+++ b/src/js/imagery/collectionMenuControls.jsx
@@ -286,7 +286,9 @@ export class PlanetNICFIMenu extends React.Component {
             </label>
             <select
               id="time-selection"
-              onChange={(e) => this.setState({ selectedTime: e.target.value })}
+              onChange={(e) => {
+                this.setState({ selectedTime: e.target.value }, this.updatePlanetLayer);
+              }}
               value={selectedTime}
               className="mb-0 mr-1"
             >
@@ -299,7 +301,10 @@ export class PlanetNICFIMenu extends React.Component {
             <button
               className="btn btn-outline-lightgreen btn-sm mr-1"
               type="button"
-              onClick={() => this.switchImagery("backward")}
+              onClick={() => {
+                this.switchImagery("backward");
+                this.updatePlanetLayer();
+              }}
               disabled={this.state.isDisabledLeft}
             >
               <SvgIcon icon="leftArrow" size="0.9rem" />
@@ -307,7 +312,10 @@ export class PlanetNICFIMenu extends React.Component {
             <button
               className="btn btn-outline-lightgreen btn-sm"
               type="button"
-              onClick={() => this.switchImagery("forward")}
+              onClick={() => {
+                this.switchImagery("forward");
+                this.updatePlanetLayer();
+              }}
               disabled={this.state.isDisabledRight}
             >
               <SvgIcon icon="rightArrow" size="0.9rem" />
@@ -320,7 +328,9 @@ export class PlanetNICFIMenu extends React.Component {
                   checked={selectedBand === "rgb"}
                   className="form-check-input"
                   id="visible"
-                  onChange={() => this.setState({ selectedBand: "rgb" })}
+                  onChange={() => {
+                    this.setState({ selectedBand: "rgb" }, this.updatePlanetLayer);
+                  }}
                   type="radio"
                 />
                 <label className="form-check-label" htmlFor="visible">
@@ -332,7 +342,9 @@ export class PlanetNICFIMenu extends React.Component {
                   checked={selectedBand === "cir"}
                   className="form-check-input"
                   id="infrared"
-                  onChange={() => this.setState({ selectedBand: "cir" })}
+                  onChange={() => {
+                    this.setState({ selectedBand: "cir" }, this.updatePlanetLayer);
+                  }}
                   type="radio"
                 />
                 <label className="form-check-label" htmlFor="infrared">
@@ -341,15 +353,6 @@ export class PlanetNICFIMenu extends React.Component {
               </div>
             </div>
           </div>
-          <div className="slide-container">
-            <button
-              className="btn btn-lightgreen btn-sm"
-              onClick={this.updatePlanetLayer}
-              type="button"
-            >
-              Update Map
-            </button>
-          </div>
         </div>
       )
     );

From 62a641737047726c62c31bd2d11f9dfb034de7ca Mon Sep 17 00:00:00 2001
From: Andrew Carlile <acarlile@sig-gis.com>
Date: Wed, 11 Oct 2023 16:52:32 -0400
Subject: [PATCH 03/19] implements select single date and updating widget title
 for imagerywidget

---
 src/js/geodash/form/BasemapSelector.jsx | 61 +++++++++++++++++++++++--
 src/js/widgetLayoutEditor.jsx           |  7 ++-
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/js/geodash/form/BasemapSelector.jsx b/src/js/geodash/form/BasemapSelector.jsx
index 74a2accc2..37fd55c3b 100644
--- a/src/js/geodash/form/BasemapSelector.jsx
+++ b/src/js/geodash/form/BasemapSelector.jsx
@@ -1,11 +1,61 @@
-import React, { useContext } from "react";
+import React, { useContext, useState, useEffect } from "react";
 
 import { EditorContext } from "../constants";
 import SvgIcon from "../../components/svg/SvgIcon";
 
+
 export default function BasemapSelector() {
   const { setWidgetDesign, getWidgetDesign, imagery, getInstitutionImagery, institutionId } =
-    useContext(EditorContext);
+        useContext(EditorContext);
+  const [nicfiLayers, setNICFILayers] = useState([]);
+  const [imageryType, setImageryType] = useState("");
+  
+  function nicfiDateSelector(){
+    const options = (
+      nicfiLayers || []).map(
+        (l)=>{
+          const name = l.slice(34, l.length - 7); 
+          return (
+            <option
+              value={l}
+              key={name}
+            >
+              {name}
+            </option>);}
+      );
+    
+    return (
+      <select
+        className="form-control"
+        id="nicfi-layer"
+        onChange={(e)=>{setWidgetDesign("basemapNICFIDate", e.target.value);}}
+        value={getWidgetDesign("basemapNICFIDate") || ""}         
+      >
+        {options}
+      </select>);
+  }
+  
+  const getNICFILayers = () => {
+    fetch("/get-nicfi-dates")
+      .then((response) => (response.ok ? response.json() : Promise.reject(response)))
+      .then((layers) => {
+        setNICFILayers(layers);
+        setWidgetDesign("basemapNICFIDate", layers[0]);        
+      })
+      .catch((error) => console.error(error));
+  };
+  
+  useEffect(()=> {
+    (imageryType === "PlanetNICFI") ?
+      getNICFILayers() 
+      : setWidgetDesign("basemapNICFIDate", null);
+  }, [imageryType]);
+  
+  useEffect(()=>{
+    setImageryType((imagery || []).filter((i)=> i.id === getWidgetDesign("basemapId"))[0].sourceConfig.type);
+    
+  }, [imagery]);
+  
   return (
     <div className="form-group">
       <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
@@ -22,16 +72,19 @@ export default function BasemapSelector() {
       <select
         className="form-control"
         id="basemap-select"
-        onChange={(e) => setWidgetDesign("basemapId", parseInt(e.target.value))}
+        onChange={(e) => {
+          setWidgetDesign("basemapId", parseInt(e.target.value));
+          setImageryType(imagery.filter((i)=> i.id.toString() === e.target.value)[0].sourceConfig.type);}}
         value={getWidgetDesign("basemapId")}
         required
       >
-        {(imagery || []).map(({ id, title }) => (
+        {(imagery || []).map(({ id, title}) => (
           <option key={id} value={id}>
             {title}
           </option>
         ))}
       </select>
+      {(imageryType === "PlanetNICFI") && nicfiDateSelector()}
       <div style={{ fontSize: ".85em", padding: "0 .5rem" }}>
         Adding imagery to basemaps is available on the&nbsp;
         <a
diff --git a/src/js/widgetLayoutEditor.jsx b/src/js/widgetLayoutEditor.jsx
index 1dadd588d..cfe8ceb76 100644
--- a/src/js/widgetLayoutEditor.jsx
+++ b/src/js/widgetLayoutEditor.jsx
@@ -461,7 +461,12 @@ class WidgetLayoutEditor extends React.PureComponent {
             className="form-control"
             id="widgetTitle"
             onChange={(e) => this.updateTitle(e.target.value)}
-            placeholder="Enter title"
+            placeholder={
+              this.getWidgetDesign("basemapNICFIDate") ?
+                "Planet NICFI " +
+                this.getWidgetDesign("basemapNICFIDate").slice(
+                  34, this.getWidgetDesign("basemapNICFIDate").length - 7)
+                : "Enter Title"}
             type="text"
             value={this.state.title}
           />

From 4dba5d6696c2753de1b5775d838e60611faae599 Mon Sep 17 00:00:00 2001
From: Andrew Carlile <acarlile@sig-gis.com>
Date: Wed, 11 Oct 2023 17:21:11 -0400
Subject: [PATCH 04/19] injects user-selected NICFI date layer into tile
 request

---
 src/js/geodash/MapWidget.jsx            | 7 +++++--
 src/js/geodash/form/BasemapSelector.jsx | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/js/geodash/MapWidget.jsx b/src/js/geodash/MapWidget.jsx
index 4eb501dce..9b05270c9 100644
--- a/src/js/geodash/MapWidget.jsx
+++ b/src/js/geodash/MapWidget.jsx
@@ -157,10 +157,13 @@ export default class MapWidget extends React.Component {
     const { sourceConfig, id, attribution, isProxied } =
       this.props.imageryList.find((imagery) => imagery.id === widget.basemapId) ||
       this.props.imageryList.find((imagery) => imagery.title === "Open Street Map") ||
-      this.props.imageryList[0];
+          this.props.imageryList[0];
+    console.log("getting widget type", widget);
     const basemapLayer = new TileLayer({
       source: mercator.createSource(
-        sourceConfig,
+        (widget.basemapType === "PlanetNICFI") ? 
+          {... sourceConfig, time: widget.basemapNICFIDate}
+        : sourceConfig,
         id,
         attribution,
         isProxied,
diff --git a/src/js/geodash/form/BasemapSelector.jsx b/src/js/geodash/form/BasemapSelector.jsx
index 37fd55c3b..e9dfbfe48 100644
--- a/src/js/geodash/form/BasemapSelector.jsx
+++ b/src/js/geodash/form/BasemapSelector.jsx
@@ -46,6 +46,7 @@ export default function BasemapSelector() {
   };
   
   useEffect(()=> {
+    setWidgetDesign("basemapType", imageryType);
     (imageryType === "PlanetNICFI") ?
       getNICFILayers() 
       : setWidgetDesign("basemapNICFIDate", null);

From f77e786e55d9b87ebc016413f59550484e8ed731 Mon Sep 17 00:00:00 2001
From: Andrew Carlile <acarlile@sig-gis.com>
Date: Thu, 12 Oct 2023 16:26:37 -0400
Subject: [PATCH 05/19] updates to nicfi date persist to dashboard

---
 src/js/geodash/MapWidget.jsx            |  1 -
 src/js/geodash/TimeSeriesDesigner.jsx   |  1 -
 src/js/geodash/form/BasemapSelector.jsx | 37 +++++++++++++++----------
 src/js/widgetLayoutEditor.jsx           |  6 ++--
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/js/geodash/MapWidget.jsx b/src/js/geodash/MapWidget.jsx
index 9b05270c9..145963e63 100644
--- a/src/js/geodash/MapWidget.jsx
+++ b/src/js/geodash/MapWidget.jsx
@@ -158,7 +158,6 @@ export default class MapWidget extends React.Component {
       this.props.imageryList.find((imagery) => imagery.id === widget.basemapId) ||
       this.props.imageryList.find((imagery) => imagery.title === "Open Street Map") ||
           this.props.imageryList[0];
-    console.log("getting widget type", widget);
     const basemapLayer = new TileLayer({
       source: mercator.createSource(
         (widget.basemapType === "PlanetNICFI") ? 
diff --git a/src/js/geodash/TimeSeriesDesigner.jsx b/src/js/geodash/TimeSeriesDesigner.jsx
index c26e22537..d50b0a187 100644
--- a/src/js/geodash/TimeSeriesDesigner.jsx
+++ b/src/js/geodash/TimeSeriesDesigner.jsx
@@ -24,7 +24,6 @@ export async function getBandsFromGateway(setBands, assetId, assetType) {
       }
       );
       const data = await res.json();
-      console.log("data is: ", data);
       if (data.hasOwnProperty("bands")) {
         setBands(data.bands);
       } else if (data.hasOwnProperty("errMsg")) {
diff --git a/src/js/geodash/form/BasemapSelector.jsx b/src/js/geodash/form/BasemapSelector.jsx
index e9dfbfe48..0d996a956 100644
--- a/src/js/geodash/form/BasemapSelector.jsx
+++ b/src/js/geodash/form/BasemapSelector.jsx
@@ -5,11 +5,12 @@ import SvgIcon from "../../components/svg/SvgIcon";
 
 
 export default function BasemapSelector() {
-  const { setWidgetDesign, getWidgetDesign, imagery, getInstitutionImagery, institutionId } =
+  const { widget, widgetDesign, setWidgetDesign, getWidgetDesign, imagery, getInstitutionImagery, institutionId } =
         useContext(EditorContext);
   const [nicfiLayers, setNICFILayers] = useState([]);
   const [imageryType, setImageryType] = useState("");
-  
+  const [basemap, setBasemap] = useState(imagery.filter((i)=>i.id === getWidgetDesign("basemapId")));
+
   function nicfiDateSelector(){
     const options = (
       nicfiLayers || []).map(
@@ -22,17 +23,22 @@ export default function BasemapSelector() {
             >
               {name}
             </option>);}
-      );
-    
+      );    
     return (
-      <select
-        className="form-control"
-        id="nicfi-layer"
-        onChange={(e)=>{setWidgetDesign("basemapNICFIDate", e.target.value);}}
-        value={getWidgetDesign("basemapNICFIDate") || ""}         
-      >
-        {options}
-      </select>);
+      <div>
+        <label htmlFor="nicfi-layer">Select Date:</label> 
+        <select
+          className="form-control"
+          id="nicfi-layer"
+          onChange={(e)=>{            
+            setWidgetDesign("basemapNICFIDate", e.target.value);
+          }}
+          value={
+            getWidgetDesign("basemapNICFIDate")}         
+        >          
+          {options}
+        </select>
+      </div>);
   }
   
   const getNICFILayers = () => {
@@ -40,7 +46,7 @@ export default function BasemapSelector() {
       .then((response) => (response.ok ? response.json() : Promise.reject(response)))
       .then((layers) => {
         setNICFILayers(layers);
-        setWidgetDesign("basemapNICFIDate", layers[0]);        
+        setWidgetDesign("basemapNICFIDate", widget[0].basemapNICFIDate);        
       })
       .catch((error) => console.error(error));
   };
@@ -54,13 +60,13 @@ export default function BasemapSelector() {
   
   useEffect(()=>{
     setImageryType((imagery || []).filter((i)=> i.id === getWidgetDesign("basemapId"))[0].sourceConfig.type);
-    
+    setBasemap((imagery || []).filter((i)=> i.id === getWidgetDesign("basemapId"))[0]);
   }, [imagery]);
   
   return (
     <div className="form-group">
       <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-        <label htmlFor="basemap-select">Basemap</label>
+        <label htmlFor="basemap-select">Basemap</label> 
         <button
           className="btn btn-sm btn-secondary mb-1"
           onClick={getInstitutionImagery}
@@ -75,6 +81,7 @@ export default function BasemapSelector() {
         id="basemap-select"
         onChange={(e) => {
           setWidgetDesign("basemapId", parseInt(e.target.value));
+          setBasemap(imagery.filter((i)=> i.id.toString() === e.target.value)[0]);
           setImageryType(imagery.filter((i)=> i.id.toString() === e.target.value)[0].sourceConfig.type);}}
         value={getWidgetDesign("basemapId")}
         required
diff --git a/src/js/widgetLayoutEditor.jsx b/src/js/widgetLayoutEditor.jsx
index cfe8ceb76..14f41b5e1 100644
--- a/src/js/widgetLayoutEditor.jsx
+++ b/src/js/widgetLayoutEditor.jsx
@@ -312,9 +312,10 @@ class WidgetLayoutEditor extends React.PureComponent {
   };
 
   buildNewWidget = () => {
-    const { title, type, widgetDesign } = this.state;
+    const { title, type, widgetDesign, basemapNICFIDate } = this.state;
     return {
       name: title,
+      basemapNICFIDate,
       type,
       ...widgetDesign,
     };
@@ -346,7 +347,7 @@ class WidgetLayoutEditor extends React.PureComponent {
   saveWidgetEdits = () => {
     const {
       originalWidget: { id, layout },
-    } = this.state;
+    } = this.state;    
     const errors = this.getWidgetErrors();
     if (errors.length) {
       alert(errors.join("\n\n"));
@@ -502,6 +503,7 @@ class WidgetLayoutEditor extends React.PureComponent {
           setWidgetDesign: this.setWidgetDesign,
           widgetDesign: this.state.widgetDesign,
           imagery: this.state.imagery,
+          widget: this.state.widgets.filter((w)=>w.basemapId === this.state.widgetDesign.basemapId)[0],
           getInstitutionImagery: this.getInstitutionImagery,
         }}
       >

From d36a8a4d1b8f97e15714790b3ad69297519e9cd6 Mon Sep 17 00:00:00 2001
From: Andrew Carlile <acarlile@sig-gis.com>
Date: Fri, 13 Oct 2023 12:59:08 -0400
Subject: [PATCH 06/19] adds alert to plotdesign step

---
 src/js/project/PlotDesign.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/js/project/PlotDesign.jsx b/src/js/project/PlotDesign.jsx
index ade920e2c..bcbc1aacb 100644
--- a/src/js/project/PlotDesign.jsx
+++ b/src/js/project/PlotDesign.jsx
@@ -430,6 +430,7 @@ export class PlotDesign extends React.Component {
       },
       shp: {
         display: "SHP File",
+        alert: "CEO may overestimate the number of project plots when using a ShapeFile.",
         description:
           "Specify your own plot boundaries by uploading a zipped Shapefile (containing SHP, SHX, DBF, and PRJ files) of polygon features. Each feature must have a unique PLOTID value.",
         layout: this.renderFileInput("shp"),
@@ -456,6 +457,8 @@ export class PlotDesign extends React.Component {
               </select>
             </div>
             <p className="font-italic ml-2">{`- ${plotOptions[plotDistribution].description}`}</p>
+            {plotOptions[plotDistribution].alert &&
+              <p className="alert">- {plotOptions[plotDistribution].alert}</p>}
           </div>
           <div>{plotOptions[plotDistribution].layout}</div>
           <p

From a5041cdf177d9c80e8806d9085a4e0e32624f376 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Mon, 30 Oct 2023 04:32:14 -0300
Subject: [PATCH 07/19] Add grid to map in collection page

---
 src/js/collection.jsx    | 16 ++++++++++++++++
 src/js/utils/mercator.js | 30 +++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/js/collection.jsx b/src/js/collection.jsx
index b01d29985..bfccf8e33 100644
--- a/src/js/collection.jsx
+++ b/src/js/collection.jsx
@@ -1585,9 +1585,15 @@ class ImageryOptions extends React.Component {
     super(props);
     this.state = {
       showImageryOptions: true,
+      enableGrid: false,
     };
   }
 
+  enableGrid() {
+    this.setState({ enableGrid: !this.state.enableGrid });
+    return mercator.addGridLayer(this.props.mapConfig, !this.state.enableGrid);
+  }
+
   render() {
     const { props } = this;
     const commonProps = {
@@ -1658,6 +1664,16 @@ class ImageryOptions extends React.Component {
                 }[imagery.sourceConfig.type]
               );
             })}
+          <input
+            checked={this.state.enableGrid}
+            className="form-check-input"
+            id="grid-check"
+            onChange={() => this.enableGrid()}
+            type="checkbox"
+          />
+          <label className="form-check-label" htmlFor="grid-check">
+            Enable Map Grid
+          </label>
         </div>
       </div>
     );
diff --git a/src/js/utils/mercator.js b/src/js/utils/mercator.js
index b1d3cb064..d28ad5969 100644
--- a/src/js/utils/mercator.js
+++ b/src/js/utils/mercator.js
@@ -23,7 +23,7 @@ import { platformModifierKeyOnly } from "ol/events/condition";
 import { Circle, LineString, Point, Polygon } from "ol/geom";
 import { DragBox, Select, Draw, Modify, Snap } from "ol/interaction";
 import { GeoJSON, KML } from "ol/format";
-import { Tile as TileLayer, Vector as VectorLayer, Group as LayerGroup } from "ol/layer";
+import { Tile as TileLayer, Vector as VectorLayer, Group as LayerGroup, Graticule } from "ol/layer";
 import { BingMaps, Cluster, OSM, TileWMS, Vector as VectorSource, XYZ } from "ol/source";
 import { Circle as CircleStyle, Fill, Stroke, Style, Text as StyleText } from "ol/style";
 import { fromLonLat, transform, transformExtent, getPointResolution } from "ol/proj";
@@ -475,6 +475,34 @@ mercator.addVectorLayer = (mapConfig, layerId, vectorSource, style) => {
   return mapConfig;
 };
 
+mercator.addGridLayer = (mapConfig, showLayer) => {
+  const gridIntervals = [90, 45, 30, 20, 10, 5, 2, 1, 30/60, 20/60,
+                         10/60, 5/60, 2/60, 1/60, 30/3600, 20/3600,
+                         10/3600, 5/3600, 2/3600, 1/3600, 0.8/3600,
+                         0.5/3600, 0.3/3600, 0.2/3600, 0.1/3600];
+  const grid = new Graticule({
+    // the style to use for the lines, optional.
+    strokeStyle: new Stroke({
+      color: 'rgba(255,120,0,0.9)',
+      width: 2,
+      lineDash: [0.5, 4],
+    }),
+    id: 9999,
+    showLabels: false,
+    minResolution: 0.0001,
+    intervals: gridIntervals,
+    wrapX: false,
+  });
+  if(showLayer) {
+    mapConfig.map.addLayer(grid);
+  } else {
+    const layerId = 9999;
+    const layer = mercator.getLayerById(layerId);
+    mapConfig.map.removeLayer(layer);
+  }
+  return mapConfig;
+};
+
 /*****************************************************************************
  ***
  *** Functions to verify map input arguments

From 670d4a432d337bd7f31952d30ae0301709421053 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Mon, 30 Oct 2023 04:46:26 -0300
Subject: [PATCH 08/19] Fix input types for institutional imagery

---
 src/js/imagery/imageryOptions.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/js/imagery/imageryOptions.js b/src/js/imagery/imageryOptions.js
index 1d1a45017..c55f12862 100644
--- a/src/js/imagery/imageryOptions.js
+++ b/src/js/imagery/imageryOptions.js
@@ -253,18 +253,18 @@ export const imageryOptions = [
       {
         key: "min",
         display: "Min",
-        type: "number",
+        type: "text",
         options: {
-          placeholder: "1-100",
+          placeholder: "[1-100] | [0.1,0.2,0.1]",
           step: "0.01",
         },
       },
       {
         key: "max",
         display: "Max",
-        type: "number",
+        type: "text",
         options: {
-          placeholder: "2800-3200",
+          placeholder: "[2800-3200] | [0.3,0.5,0.3]",
           step: "0.01",
         },
       },
@@ -309,18 +309,18 @@ export const imageryOptions = [
       {
         key: "min",
         display: "Min",
-        type: "number",
+        type: "text",
         options: {
-          placeholder: "1-100",
+          placeholder: "[1-100] | [0.1,0.2,0.1]",
           step: "0.01",
         },
       },
       {
         key: "max",
         display: "Max",
-        type: "number",
+        type: "text",
         options: {
-          placeholder: "2800-3200",
+          placeholder: "[2800-3200] | [0.3,0.5,0.3]",
           step: "0.01",
         },
       },

From c273836512ed8c304a5b19adb7201238cd90945a Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Mon, 30 Oct 2023 05:02:53 -0300
Subject: [PATCH 09/19] Fix disable mapgrid

---
 src/js/utils/mercator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/utils/mercator.js b/src/js/utils/mercator.js
index d28ad5969..9004a7561 100644
--- a/src/js/utils/mercator.js
+++ b/src/js/utils/mercator.js
@@ -497,7 +497,7 @@ mercator.addGridLayer = (mapConfig, showLayer) => {
     mapConfig.map.addLayer(grid);
   } else {
     const layerId = 9999;
-    const layer = mercator.getLayerById(layerId);
+    const layer = mercator.getLayerById(mapConfig, layerId);
     mapConfig.map.removeLayer(layer);
   }
   return mapConfig;

From 893bc675d6479e0633964ad2c290e77193096de1 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Wed, 1 Nov 2023 12:20:32 -0300
Subject: [PATCH 10/19] Making the worker function public

---
 src/clj/collect_earth_online/workers.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/collect_earth_online/workers.clj b/src/clj/collect_earth_online/workers.clj
index aa6a8e601..ba2143704 100644
--- a/src/clj/collect_earth_online/workers.clj
+++ b/src/clj/collect_earth_online/workers.clj
@@ -19,7 +19,7 @@
             file (reverse (file-seq d))]
       (io/delete-file file))))
 
-(defn- start-clean-up-service! []
+(defn start-clean-up-service! []
   (log-str "Starting temp file removal service.")
   (future
     (while true

From c42c90c14e98d818321f95d076de5e343ebdcef3 Mon Sep 17 00:00:00 2001
From: Gary Johnson <lambdatronic@disroot.org>
Date: Wed, 1 Nov 2023 12:02:10 -0400
Subject: [PATCH 11/19] Switch CEO to use
 triangulum.handler/authenticated-routing-handler

---
 config.example.edn                        |  6 ++-
 src/clj/collect_earth_online/handlers.clj | 33 ++++++++++++++++
 src/clj/collect_earth_online/routing.clj  | 48 ++---------------------
 3 files changed, 41 insertions(+), 46 deletions(-)
 create mode 100644 src/clj/collect_earth_online/handlers.clj

diff --git a/config.example.edn b/config.example.edn
index b09ea8329..d69737579 100644
--- a/config.example.edn
+++ b/config.example.edn
@@ -7,12 +7,16 @@
  :triangulum.server/mode              "dev"
  :triangulum.server/log-dir           "logs"
 
- :triangulum.server/handler           collect-earth-online.routing/authenticated-routing-handler
+ :triangulum.server/handler           triangulum.handler/authenticated-routing-handler
  :triangulum.server/keystore-file     "keystore.pkcs12"
  :triangulum.server/keystore-type     "pkcs12"
  :triangulum.server/keystore-password "foobar"
 
  ;; handler (server)
+ :triangulum.handler/not-found-handler   triangulum.views/not-found-page
+ :triangulum.handler/redirect-handler    collect-earth-online.handlers/redirect-handler
+ :triangulum.handler/route-authenticator collect-earth-online.handlers/route-authenticator
+ :triangulum.handler/routing-tables      [collect-earth-online.routing/routes]
  :triangulum.handler/session-key           "changeme12345678" ; must be 16 characters
  :triangulum.handler/bad-tokens            #{".php"}
  :triangulum.handler/private-request-keys  #{:base64Image :plotFileBase64 :sampleFileBase64}
diff --git a/src/clj/collect_earth_online/handlers.clj b/src/clj/collect_earth_online/handlers.clj
new file mode 100644
index 000000000..33c7f4005
--- /dev/null
+++ b/src/clj/collect_earth_online/handlers.clj
@@ -0,0 +1,33 @@
+(ns collect-earth-online.handlers
+  (:require [collect-earth-online.db.institutions :refer [is-inst-admin?]]
+            [collect-earth-online.db.projects     :refer [can-collect? is-proj-admin?]]
+            [ring.util.codec                      :refer [url-encode]]
+            [ring.util.response                   :refer [redirect]]
+            [triangulum.response                  :refer [no-cross-traffic?]]
+            [triangulum.type-conversion           :refer [val->int]]))
+
+(defn route-authenticator [{:keys [session params headers] :as _request} auth-type]
+  (let [user-id        (:userId session -1)
+        institution-id (val->int (:institutionId params))
+        project-id     (val->int (:projectId params))
+        token-key      (:tokenKey params)]
+    (condp = auth-type
+      :user    (pos? user-id)
+      :super   (= 1 user-id)
+      :collect (can-collect? user-id project-id token-key)
+      :token   (can-collect? -99 project-id token-key)
+      :admin   (cond
+                 (pos? project-id)     (is-proj-admin? user-id project-id token-key)
+                 (pos? institution-id) (is-inst-admin? user-id institution-id))
+      :no-cross (no-cross-traffic? headers)
+      true)))
+
+(defn redirect-handler [{:keys [session query-string uri] :as _request}]
+  (let [full-url (url-encode (str uri (when query-string (str "?" query-string))))]
+    (if (:userId session)
+      (redirect (str "/home?flash_message=You do not have permission to access "
+                     full-url))
+      (redirect (str "/login?returnurl="
+                     full-url
+                     "&flash_message=You must login to see "
+                     full-url)))))
diff --git a/src/clj/collect_earth_online/routing.clj b/src/clj/collect_earth_online/routing.clj
index d9b09147a..9128517e5 100644
--- a/src/clj/collect_earth_online/routing.clj
+++ b/src/clj/collect_earth_online/routing.clj
@@ -1,17 +1,13 @@
 (ns collect-earth-online.routing
-  (:require [triangulum.views                     :refer [render-page not-found-page]]
-            [ring.util.response                   :refer [redirect]]
-            [ring.util.codec                      :refer [url-encode]]
-            [triangulum.type-conversion           :as tc]
-            [triangulum.response                  :refer [forbidden-response no-cross-traffic?]]
-            [collect-earth-online.db.doi          :as doi]
+  (:require [collect-earth-online.db.doi          :as doi]
             [collect-earth-online.db.geodash      :as geodash]
             [collect-earth-online.db.imagery      :as imagery]
             [collect-earth-online.db.institutions :as institutions]
             [collect-earth-online.db.plots        :as plots]
             [collect-earth-online.db.projects     :as projects]
             [collect-earth-online.db.users        :as users]
-            [collect-earth-online.proxy           :as proxy]))
+            [collect-earth-online.proxy           :as proxy]
+            [triangulum.views                     :refer [render-page]]))
 
 (def routes
   {;; Page Routes
@@ -194,41 +190,3 @@
    [:get  "/get-nicfi-tiles"]                {:handler     proxy/get-nicfi-tiles
                                               :auth-type   :no-cross
                                               :auth-action :block}})
-
-(defn- redirect-auth [user-id]
-  (fn [request]
-    (let [{:keys [query-string uri]} request
-          full-url (url-encode (str uri (when query-string (str "?" query-string))))]
-      (if (pos? user-id)
-        (redirect (str "/home?flash_message=You do not have permission to access "
-                       full-url))
-        (redirect (str "/login?returnurl="
-                       full-url
-                       "&flash_message=You must login to see "
-                       full-url))))))
-
-(defn authenticated-routing-handler [{:keys [uri request-method params headers session] :as request}]
-  (let [{:keys [auth-type auth-action handler] :as route} (get routes [request-method uri])
-        user-id        (:userId session -1)
-        institution-id (tc/val->int (:institutionId params))
-        project-id     (tc/val->int (:projectId params))
-        next-handler   (if route
-                         (if (condp = auth-type
-                               :user     (pos? user-id)
-                               :super    (= 1  user-id)
-                               :collect  (projects/can-collect? user-id project-id (:tokenKey params))
-                               :token    (projects/can-collect? -99 project-id (:tokenKey params))
-                               :admin    (cond
-                                           (pos? project-id)
-                                           (projects/is-proj-admin? user-id project-id (:tokenKey params))
-
-                                           (pos? institution-id)
-                                           (institutions/is-inst-admin? user-id institution-id))
-                               :no-cross (no-cross-traffic? headers)
-                               true)
-                           handler
-                           (if (= :redirect auth-action)
-                             (redirect-auth user-id)
-                             forbidden-response))
-                         not-found-page)]
-    (next-handler request)))

From 89642958de5b367928988902f5854bd9da3651ec Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Wed, 1 Nov 2023 16:32:12 -0300
Subject: [PATCH 12/19] Updating triangulum git hash

---
 deps.edn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps.edn b/deps.edn
index f31083d69..2acdfb329 100644
--- a/deps.edn
+++ b/deps.edn
@@ -7,7 +7,7 @@
         org.clojure/data.json     {:mvn/version "1.0.0"}
         ring/ring                 {:mvn/version "1.8.2"}
         sig-gis/triangulum        {:git/url "https://github.com/sig-gis/triangulum"
-                                   :git/sha "5cffefc2e8a8027a178d7ff1103cb2e38e174bba"}}
+                                   :git/sha "4aab4f9b6af8a7af1814c235f5709a27eb38f2c6"}}
 
  :aliases {:build-db         {:main-opts ["-m" "triangulum.build-db"]}
            :config           {:main-opts ["-m" "triangulum.config"]}

From 24a6b16c6d9aedcba5b2b6c808fcb6ecb59d738f Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Fri, 3 Nov 2023 03:08:03 -0300
Subject: [PATCH 13/19] Fix content-type header

---
 src/clj/collect_earth_online/db/doi.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/collect_earth_online/db/doi.clj b/src/clj/collect_earth_online/db/doi.clj
index bc5a38dfc..def503a20 100644
--- a/src/clj/collect_earth_online/db/doi.clj
+++ b/src/clj/collect_earth_online/db/doi.clj
@@ -116,7 +116,7 @@
   [bucket-url project-id zip-file]
   (let [headers    (req-headers)]
     (http/put (str bucket-url "/" project-id)
-              {:content-type :multipart/form-data
+              {:content-type "application/octet-stream"
                :headers      headers
                :as           :json
                :multipart    [{:name "Content/type" :content "application/octet-stream"}

From 899d243ca34a1dbdd0c43218cffde065f0500fe4 Mon Sep 17 00:00:00 2001
From: Andrew Carlile <acarlile@sig-gis.com>
Date: Mon, 6 Nov 2023 15:03:29 -0500
Subject: [PATCH 14/19] addresses notes

---
 src/js/geodash/MapWidget.jsx            | 2 +-
 src/js/geodash/form/BasemapSelector.jsx | 2 +-
 src/js/widgetLayoutEditor.jsx           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/geodash/MapWidget.jsx b/src/js/geodash/MapWidget.jsx
index 145963e63..0697c74c5 100644
--- a/src/js/geodash/MapWidget.jsx
+++ b/src/js/geodash/MapWidget.jsx
@@ -157,7 +157,7 @@ export default class MapWidget extends React.Component {
     const { sourceConfig, id, attribution, isProxied } =
       this.props.imageryList.find((imagery) => imagery.id === widget.basemapId) ||
       this.props.imageryList.find((imagery) => imagery.title === "Open Street Map") ||
-          this.props.imageryList[0];
+      this.props.imageryList[0];
     const basemapLayer = new TileLayer({
       source: mercator.createSource(
         (widget.basemapType === "PlanetNICFI") ? 
diff --git a/src/js/geodash/form/BasemapSelector.jsx b/src/js/geodash/form/BasemapSelector.jsx
index 0d996a956..bae824c50 100644
--- a/src/js/geodash/form/BasemapSelector.jsx
+++ b/src/js/geodash/form/BasemapSelector.jsx
@@ -66,7 +66,7 @@ export default function BasemapSelector() {
   return (
     <div className="form-group">
       <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-        <label htmlFor="basemap-select">Basemap</label> 
+        <label htmlFor="basemap-select">Basemap</label>
         <button
           className="btn btn-sm btn-secondary mb-1"
           onClick={getInstitutionImagery}
diff --git a/src/js/widgetLayoutEditor.jsx b/src/js/widgetLayoutEditor.jsx
index 14f41b5e1..547eae7de 100644
--- a/src/js/widgetLayoutEditor.jsx
+++ b/src/js/widgetLayoutEditor.jsx
@@ -347,7 +347,7 @@ class WidgetLayoutEditor extends React.PureComponent {
   saveWidgetEdits = () => {
     const {
       originalWidget: { id, layout },
-    } = this.state;    
+    } = this.state;
     const errors = this.getWidgetErrors();
     if (errors.length) {
       alert(errors.join("\n\n"));

From df7db123f28ba92d2f6838b913ccbd5fd84a6e75 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Wed, 8 Nov 2023 03:34:20 -0300
Subject: [PATCH 15/19] Bump triangulum version

---
 deps.edn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps.edn b/deps.edn
index 2acdfb329..3d5650efc 100644
--- a/deps.edn
+++ b/deps.edn
@@ -7,7 +7,7 @@
         org.clojure/data.json     {:mvn/version "1.0.0"}
         ring/ring                 {:mvn/version "1.8.2"}
         sig-gis/triangulum        {:git/url "https://github.com/sig-gis/triangulum"
-                                   :git/sha "4aab4f9b6af8a7af1814c235f5709a27eb38f2c6"}}
+                                   :git/sha "3d41dab63e1bc8ebe046f64db44ae3df986f5bdf"}}
 
  :aliases {:build-db         {:main-opts ["-m" "triangulum.build-db"]}
            :config           {:main-opts ["-m" "triangulum.config"]}

From f1b1bd2298ee2206e2c5dc734d0f81cb041915e8 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Thu, 9 Nov 2023 04:40:52 -0300
Subject: [PATCH 16/19] Enhance DOI experience

---
 src/clj/collect_earth_online/db/doi.clj       | 69 ++++++++++---------
 .../generators/external_file.clj              |  2 +-
 src/sql/functions/doi.sql                     | 11 +++
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/src/clj/collect_earth_online/db/doi.clj b/src/clj/collect_earth_online/db/doi.clj
index def503a20..d15c636ff 100644
--- a/src/clj/collect_earth_online/db/doi.clj
+++ b/src/clj/collect_earth_online/db/doi.clj
@@ -25,7 +25,7 @@
 (defn get-doi-reference
   [{:keys [params]}]
   (let [project-id (tc/val->int (:projectId params))
-        doi-path   (:doi_path (first (call-sql "select_doi_by_project" project-id)))]
+        doi-path   (:doi_path (last (call-sql "select_doi_by_project" project-id)))]
     (data-response {:doiPath doi-path})))
 
 (defn create-contributors-list
@@ -113,56 +113,63 @@
         (update :published_date #(str %)))))
 
 (defn upload-deposition-files!
-  [bucket-url project-id zip-file]
+  [doi-id zip-file]
   (let [headers    (req-headers)]
-    (http/put (str bucket-url "/" project-id)
-              {:content-type "application/octet-stream"
-               :headers      headers
-               :as           :json
-               :multipart    [{:name "Content/type" :content "application/octet-stream"}
-                              {:name "file" :content (io/file zip-file)}]})))
+    (http/post (str base-url "/deposit/depositions/" doi-id "/files")
+               {:headers      headers
+                :multipart    [{:name "Content/type" :content "application/octet-stream"}
+                               {:name "file" :content (io/file zip-file)}]})))
 
 (defn upload-doi-files!
   [doi-id project-id]
   (let [project-id   project-id
         doi          (first (call-sql "select_doi_by_id" doi-id))
-        bucket       (-> doi :full_data tc/jsonb->clj :links :bucket)
         project-data (json/write-str (get-project-data project-id))
         zip-file     (create-and-zip-files-for-doi project-id project-data)]
     (try
-      (:body (upload-deposition-files! bucket project-id zip-file))
-      (catch Exception _
+      (:body (upload-deposition-files! (:doi_uid doi) zip-file))
+      (catch Exception e
         (throw (ex-info "Failed to upload files."
                         {:details "Error in file upload to zenodo"}))))))
 
 (defn create-doi!
   [{:keys [params session]}]
-  (let [user-id          (:userId session -1)
-        project-id       (:projectId params)
-        project-name     (:projectName params)
-        institution-name (:name (first (call-sql "select_institution_by_id" (-> params :institution) user-id)))
-        description      (:description params)
-        creator          (first (call-sql "get_user_by_id" user-id))
-        contributors     (call-sql "select_assigned_users_by_project" project-id)]
-    (try
-      (->
-       (create-zenodo-deposition! institution-name project-name creator contributors description)
-       :body
-       (insert-doi! project-id user-id)
-       (upload-doi-files! project-id))
-      (data-response {:message "DOI created successfully"})
-      (catch Exception _
-        (data-response {:message "Failed to create DOI."}
-                       {:status 500})))))
+  (let [user-id            (:userId session -1)
+        project-id         (:projectId params)
+        project-name       (:projectName params)
+        institution-name   (:name (first (call-sql "select_institution_by_id" (-> params :institution) user-id)))
+        description        (:description params)
+        creator            (first (call-sql "get_user_by_id" user-id))
+        contributors       (call-sql "select_assigned_users_by_project" project-id)
+        project-published? (:availability (first (call-sql "select_project_by_id" project-id)))
+        doi-published?     (:submitted (last (call-sql "select_doi_by_project" project-id)))]
+    (cond
+      (not= "published" project-published?) (data-response {:message "In order to create a DOI, the project must be published"
+                                                            :status 500})
+      doi-published? (data-response {:message "A DOI for this project has already been published."
+                                     :status 500})
+      :else
+      (try
+        (->
+         (create-zenodo-deposition! institution-name project-name creator contributors description)
+         :body
+         (insert-doi! project-id user-id)
+         (upload-doi-files! project-id))
+        (data-response {:message "DOI created successfully"})
+        (catch Exception _
+          (data-response {:message "Failed to create DOI."}
+                         {:status 500}))))))
 
 (defn publish-doi!
   "request zenodo to publish the DOI on DataCite"
   [{:keys [params]}]
   (let [project-id (:projectId params)
-        doi-id     (:doi_uid (first (call-sql "select_doi_by_project" project-id)))]
+        doi-id     (:doi_uid (last (call-sql "select_doi_by_project" project-id)))
+        req        (http/post (str base-url "/deposit/depositions/" doi-id "/actions/publish")
+                              {:as :json
+                               :headers (req-headers)})]
     (try
-      (http/post (str base-url "/deposition/depositions/" doi-id "/actions/publish")
-                 {:headers (req-headers)})
+      (call-sql "update_doi" doi-id (tc/clj->jsonb (:body req)))
       (data-response {})
       (catch Exception _
         (data-response {:message "Failed to publish DOI"}
diff --git a/src/clj/collect_earth_online/generators/external_file.clj b/src/clj/collect_earth_online/generators/external_file.clj
index a64bf6843..c223e04eb 100644
--- a/src/clj/collect_earth_online/generators/external_file.clj
+++ b/src/clj/collect_earth_online/generators/external_file.clj
@@ -277,7 +277,7 @@
     (create-shape-files folder-name "sample" project-id)
     (create-data-file folder-name project-data)
     (sh-wrapper tmp-dir {}
-                (str "7z a " folder-name "/files" ".zip " folder-name "/*"))
+                (str "7z a " folder-name "files" ".zip " folder-name "*"))
     (str folder-name "files.zip")))
 
 (defn zip-shape-files
diff --git a/src/sql/functions/doi.sql b/src/sql/functions/doi.sql
index 0611575bd..0ae40b2e8 100644
--- a/src/sql/functions/doi.sql
+++ b/src/sql/functions/doi.sql
@@ -45,3 +45,14 @@ CREATE OR REPLACE FUNCTION insert_doi(_id integer, _project_id integer,
     RETURNING doi_uid
 
 $$ LANGUAGE SQL;
+
+-- Update DOI
+CREATE OR REPLACE FUNCTION update_doi(_id integer, _full_data jsonb)
+ RETURNS integer AS $$
+
+    UPDATE doi
+        set full_data = _full_data
+    WHERE doi_uid = _id
+    RETURNING doi_uid
+
+$$ LANGUAGE SQL;

From 2d849b8291d8b2923ba9ec774be736f9c56fc1e3 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Tue, 21 Nov 2023 09:13:29 -0300
Subject: [PATCH 17/19] Add confidence_comment field and fix css

---
 src/clj/collect_earth_online/db/plots.clj     | 26 ++++++++++---------
 src/css/custom.css                            |  5 +++-
 src/js/collection.jsx                         | 15 ++++++++++-
 src/js/survey/SurveyCollection.jsx            | 17 ++++++++++++
 src/js/utils/validation.js                    |  2 --
 .../2023-04-17-lowercase-user-emails.sql      |  1 -
 .../changes/2023-04-29-create-doi-table.sql   |  8 ------
 .../changes/2023-06-05-add-constraints.sql    |  4 ---
 ...23-11-20-add-confidence-comment-column.sql |  1 +
 src/sql/functions/plots.sql                   |  6 +++--
 10 files changed, 54 insertions(+), 31 deletions(-)
 delete mode 100644 src/sql/changes/2023-04-17-lowercase-user-emails.sql
 delete mode 100644 src/sql/changes/2023-04-29-create-doi-table.sql
 delete mode 100644 src/sql/changes/2023-06-05-add-constraints.sql
 create mode 100644 src/sql/changes/2023-11-20-add-confidence-comment-column.sql

diff --git a/src/clj/collect_earth_online/db/plots.clj b/src/clj/collect_earth_online/db/plots.clj
index cb5eec7ed..c0e63bc88 100644
--- a/src/clj/collect_earth_online/db/plots.clj
+++ b/src/clj/collect_earth_online/db/plots.clj
@@ -256,22 +256,23 @@
 ;;;
 
 (defn add-user-samples [{:keys [params session]}]
-  (let [project-id       (tc/val->int (:projectId params))
-        plot-id          (tc/val->int (:plotId params))
-        session-user-id  (:userId session -1)
-        current-user-id  (tc/val->int (:currentUserId params -1))
-        review-mode?     (and (tc/val->bool (:inReviewMode params))
+  (let [project-id         (tc/val->int (:projectId params))
+        plot-id            (tc/val->int (:plotId params))
+        session-user-id    (:userId session -1)
+        current-user-id    (tc/val->int (:currentUserId params -1))
+        review-mode?       (and (tc/val->bool (:inReviewMode params))
                               (pos? current-user-id)
                               (is-proj-admin? session-user-id project-id nil))
-        confidence       (tc/val->int (:confidence params))
-        collection-start (tc/val->long (:collectionStart params))
-        user-samples     (:userSamples params)
-        user-images      (:userImages params)
-        new-plot-samples (:newPlotSamples params)
-        user-id          (if review-mode? current-user-id session-user-id)
+        confidence         (tc/val->int (:confidence params))
+        confidence-comment (:confidenceComment params)
+        collection-start   (tc/val->long (:collectionStart params))
+        user-samples       (:userSamples params)
+        user-images        (:userImages params)
+        new-plot-samples   (:newPlotSamples params)
+        user-id            (if review-mode? current-user-id session-user-id)
         ;; Samples created in the UI have IDs starting with 1. When the new sample is created
         ;; in Postgres, it gets different ID.  The user sample ID needs to be updated to match.
-        id-translation   (when new-plot-samples
+        id-translation     (when new-plot-samples
                            (call-sql "delete_user_plot_by_plot" plot-id user-id)
                            (call-sql "delete_samples_by_plot" plot-id)
                            (reduce (fn [acc {:keys [id visibleId sampleGeom]}]
@@ -288,6 +289,7 @@
                 plot-id
                 user-id
                 (when (pos? confidence) confidence)
+                (when confidence-comment confidence-comment)
                 (when-not review-mode? (Timestamp. collection-start))
                 (tc/clj->jsonb (set/rename-keys user-samples id-translation))
                 (tc/clj->jsonb (set/rename-keys user-images id-translation)))
diff --git a/src/css/custom.css b/src/css/custom.css
index 14414bc46..8365183d3 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -541,6 +541,7 @@ a:hover {
 }
 #lPanel ul {
   padding-left: 0;
+  margin-left: 5px;
   list-style: none;
   margin-bottom: 0;
 }
@@ -859,5 +860,7 @@ input:checked + .switch-slider:before {
 }
 
 body {
-    padding-top:60px;
+    margin-left: 10px;
+    margin-top: 60px;
+    overflow-x: hidden;
 }
diff --git a/src/js/collection.jsx b/src/js/collection.jsx
index bfccf8e33..a7f6e8923 100644
--- a/src/js/collection.jsx
+++ b/src/js/collection.jsx
@@ -734,6 +734,9 @@ class Collection extends React.Component {
           confidence: this.state.currentProject.projectOptions.collectConfidence
             ? this.state.currentPlot.confidence
             : -1,
+          confidenceComment: this.state.currentProject.projectOptions.collectConfidence
+            ? this.state.currentPlot.confidenceComment
+            : null,
           collectionStart: this.state.collectionStart,
           userSamples: this.state.userSamples,
           userImages: this.state.userImages,
@@ -970,6 +973,9 @@ class Collection extends React.Component {
   setFlaggedReason = (flaggedReason) =>
     this.setState({ currentPlot: { ...this.state.currentPlot, flaggedReason } });
 
+  setConfidenceComment = (confidenceComment) =>
+    this.setState({ currentPlot: { ...this.state.currentPlot, confidenceComment } });
+
   render() {
     return (
       <div className="row" style={{ height: "-webkit-fill-available" }}>
@@ -1014,6 +1020,7 @@ class Collection extends React.Component {
           surveyQuestions={this.state.currentProject.surveyQuestions}
           toggleQuitModal={this.toggleQuitModal}
           userName={this.props.userName}
+          collectConfidence={this.state.currentProject.projectOptions?.collectConfidence}
         >
           <PlotNavigation
             collectConfidence={this.state.currentProject.projectOptions?.collectConfidence}
@@ -1071,6 +1078,7 @@ class Collection extends React.Component {
               answerMode={this.state.answerMode}
               collectConfidence={this.state.currentProject.projectOptions.collectConfidence}
               confidence={this.state.currentPlot.confidence}
+              confidenceComment={this.state.currentPlot.confidenceComment}
               flagged={this.state.currentPlot.flagged}
               flaggedReason={this.state.currentPlot.flaggedReason}
               getSelectedSampleIds={this.getSelectedSampleIds}
@@ -1085,6 +1093,7 @@ class Collection extends React.Component {
               }
               setAnswerMode={this.setAnswerMode}
               setConfidence={this.setConfidence}
+              setConfidenceComment={this.setConfidenceComment}
               setCurrentValue={this.setCurrentValue}
               setFlaggedReason={this.setFlaggedReason}
               setSelectedQuestion={this.setSelectedQuestion}
@@ -1127,7 +1136,8 @@ function ImageAnalysisPane({ imageryAttribution }) {
 
 class SideBar extends React.Component {
   checkCanSave = () => {
-    const { answerMode, currentPlot, inReviewMode, surveyQuestions } = this.props;
+    const { answerMode, currentPlot, inReviewMode, surveyQuestions, collectConfidence } = this.props;
+    const { confidence, confidenceComment } = currentPlot;
     const visibleSurveyQuestions = filterObject(surveyQuestions, ([_id, val]) => val.hideQuestion != true);
     const noneAnswered = everyObject(visibleSurveyQuestions, ([_id, sq]) => safeLength(sq.answered) === 0);
     const hasSamples = safeLength(currentPlot.samples) > 0;
@@ -1154,6 +1164,9 @@ class SideBar extends React.Component {
     } else if (!allAnswered) {
       alert("All questions must be answered to save the collection.");
       return false;
+    } else if (!(collectConfidence && (confidence && confidenceComment))) {
+      alert("You must input a confidence and write a comment about it before saving the interpretation.");
+      return false;
     } else {
       return true;
     }
diff --git a/src/js/survey/SurveyCollection.jsx b/src/js/survey/SurveyCollection.jsx
index 48277abc0..f60ca7446 100644
--- a/src/js/survey/SurveyCollection.jsx
+++ b/src/js/survey/SurveyCollection.jsx
@@ -625,6 +625,7 @@ export default class SurveyCollection extends React.Component {
                 ? this.renderQuestions()
                 : this.renderDrawTools()}
               {this.props.collectConfidence && !this.props.flagged && (
+                <>
                 <div
                   className="row mb-3 mx-1 slide-container py-3"
                   style={{
@@ -642,6 +643,22 @@ export default class SurveyCollection extends React.Component {
                   />
                   <label>Plot Confidence: {this.props.confidence}</label>
                 </div>
+                <div
+                  className="row mb-3 mx-1 slide-container py-3"
+                  style={{
+                    borderRadius: "6px",
+                    boxShadow: "0 0 2px 1px rgba(0, 0, 0, 0.15)",
+                  }}
+                >
+                  <label>Comment on the confidence:</label>
+                  <textarea
+                    className="form-control"
+                    id="confidenceComment"
+                    onChange={(e) => this.props.setConfidenceComment(e.target.value)}
+                    value={this.props.confidenceComment}
+                  />
+                </div>
+                </>
               )}
               {this.renderFlagClearButtons()}
             </>
diff --git a/src/js/utils/validation.js b/src/js/utils/validation.js
index 13b66314b..ddf70a3c7 100644
--- a/src/js/utils/validation.js
+++ b/src/js/utils/validation.js
@@ -111,11 +111,9 @@ export default function getErrors (form) {
         !sampleResolution &&
         "A sample spacing is required for gridded sample distribution.",
       sampleDistribution === "csv" &&
-        sampleFileNeeded &&
         !(sampleFileName || "").includes(".csv") &&
         "A sample CSV (.csv) file is required.",
       sampleDistribution === "shp" &&
-        sampleFileNeeded &&
         !(sampleFileName || "").includes(".zip") &&
         "A sample SHP (.zip) file is required.",
       sampleDistribution === "gridded" &&
diff --git a/src/sql/changes/2023-04-17-lowercase-user-emails.sql b/src/sql/changes/2023-04-17-lowercase-user-emails.sql
deleted file mode 100644
index dc7f5bb98..000000000
--- a/src/sql/changes/2023-04-17-lowercase-user-emails.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE users SET email = LOWER(email);
diff --git a/src/sql/changes/2023-04-29-create-doi-table.sql b/src/sql/changes/2023-04-29-create-doi-table.sql
deleted file mode 100644
index 09bef0429..000000000
--- a/src/sql/changes/2023-04-29-create-doi-table.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE doi(
-       doi_uid INTEGER NOT NULL PRIMARY KEY,
-       project_rid INTEGER NOT NULL REFERENCES projects (project_uid) ON DELETE CASCADE ON UPDATE CASCADE,
-       user_id INTEGER NOT NULL REFERENCES users (user_uid) ON DELETE CASCADE ON UPDATE CASCADE,
-       doi_path TEXT,
-       full_data jsonb NOT NULL,
-       created timestamp DEFAULT NOW()
-);
diff --git a/src/sql/changes/2023-06-05-add-constraints.sql b/src/sql/changes/2023-06-05-add-constraints.sql
deleted file mode 100644
index 2551b5df4..000000000
--- a/src/sql/changes/2023-06-05-add-constraints.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE IF EXISTS public.plot_locks DROP CONSTRAINT plot_locks_pkey;
-
-ALTER TABLE IF EXISTS public.plot_locks ADD CONSTRAINT plot_locks_plot_rid_key UNIQUE (plot_rid);
-ALTER TABLE IF EXISTS public.plot_locks ADD CONSTRAINT plot_locks_user_rid_key UNIQUE (user_rid);
diff --git a/src/sql/changes/2023-11-20-add-confidence-comment-column.sql b/src/sql/changes/2023-11-20-add-confidence-comment-column.sql
new file mode 100644
index 000000000..6341f4df0
--- /dev/null
+++ b/src/sql/changes/2023-11-20-add-confidence-comment-column.sql
@@ -0,0 +1 @@
+ALTER TABLE user_plots ADD COLUMN confidence_comment text;
diff --git a/src/sql/functions/plots.sql b/src/sql/functions/plots.sql
index 15167deaa..18530b9de 100644
--- a/src/sql/functions/plots.sql
+++ b/src/sql/functions/plots.sql
@@ -419,6 +419,7 @@ CREATE OR REPLACE FUNCTION upsert_user_samples(
     _plot_id             integer,
     _user_id             integer,
     _confidence          integer,
+    _confidence_comment  text,
     _collection_start    timestamp,
     _samples             jsonb,
     _images              jsonb
@@ -426,12 +427,13 @@ CREATE OR REPLACE FUNCTION upsert_user_samples(
 
     WITH user_plot_table AS (
         INSERT INTO user_plots AS up
-            (user_rid, plot_rid, confidence, collection_start, collection_time)
+            (user_rid, plot_rid, confidence, confidence_comment ,collection_start, collection_time)
         VALUES
-            (_user_id, _plot_id, _confidence, _collection_start, Now())
+            (_user_id, _plot_id, _confidence, _confidence_comment , _collection_start, Now())
         ON CONFLICT (user_rid, plot_rid) DO
             UPDATE
             SET confidence = coalesce(excluded.confidence, up.confidence),
+                confidence_comment = _confidence_comment,
                 collection_start = coalesce(excluded.collection_start, up.collection_start),
                 collection_time = CASE WHEN excluded.collection_start IS NOT NULL THEN localtimestamp ELSE up.collection_time END,
                 flagged = FALSE,

From 370aed8c32a6299dcff217858447dfefddb28e70 Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Tue, 21 Nov 2023 10:29:27 -0300
Subject: [PATCH 18/19] Fix DOI to work on closed projects as well

---
 src/clj/collect_earth_online/db/doi.clj | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/clj/collect_earth_online/db/doi.clj b/src/clj/collect_earth_online/db/doi.clj
index d15c636ff..7fdf05b3c 100644
--- a/src/clj/collect_earth_online/db/doi.clj
+++ b/src/clj/collect_earth_online/db/doi.clj
@@ -110,6 +110,7 @@
         (update :survey_questions #(tc/jsonb->clj %))
         (update :aoi_features #(tc/jsonb->clj %))
         (update :created_date #(str %))
+        (update :closed_date (fn [x] (when x (str x))))
         (update :published_date #(str %)))))
 
 (defn upload-deposition-files!
@@ -144,10 +145,11 @@
         project-published? (:availability (first (call-sql "select_project_by_id" project-id)))
         doi-published?     (:submitted (last (call-sql "select_doi_by_project" project-id)))]
     (cond
-      (not= "published" project-published?) (data-response {:message "In order to create a DOI, the project must be published"
-                                                            :status 500})
-      doi-published? (data-response {:message "A DOI for this project has already been published."
-                                     :status 500})
+      (and (not= "published" project-published?)
+           (not= "closed"    project-published?)) (data-response {:message "In order to create a DOI, the project must be published"}
+                                                                {:status 500})
+      doi-published? (data-response {:message "A DOI for this project has already been published."}
+                                    {:status 500})
       :else
       (try
         (->

From 7be22b9cae6e752a69b1b1fb8c0581c22be095ca Mon Sep 17 00:00:00 2001
From: a-luz <aluz@sig-gis.com>
Date: Tue, 21 Nov 2023 10:38:20 -0300
Subject: [PATCH 19/19] Fix doi table creation

---
 src/sql/tables/all.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sql/tables/all.sql b/src/sql/tables/all.sql
index 06a781b81..c014c72dc 100644
--- a/src/sql/tables/all.sql
+++ b/src/sql/tables/all.sql
@@ -204,7 +204,7 @@ CREATE INDEX project_widgets_project_rid       ON project_widgets (project_rid);
 -- Stores doi information for a project
 CREATE TABLE doi(
        doi_uid INTEGER NOT NULL PRIMARY KEY,
-       project_rid INTEGER UNIQUE NOT NULL REFERENCES projects (project_uid) ON DELETE CASCADE ON UPDATE CASCADE,
+       project_rid INTEGER NOT NULL REFERENCES projects (project_uid) ON DELETE CASCADE ON UPDATE CASCADE,
        user_id INTEGER NOT NULL REFERENCES users (user_uid) ON DELETE CASCADE ON UPDATE CASCADE,
        doi_path TEXT,
        full_data jsonb NOT NULL,