Merge Dev into Feature Branch (#441)

* MMGIS 2.6.0 (#160) * Added function to set initial layer times based on current time * Remove debug print out (#126) * #127 DrawTool - enable panning around without dropping points while d… (#128) * #127 DrawTool - enable panning around without dropping points while drawing * DrawTool - make active layer deselectable * DrawTool - Fix uploaded file edit panel * #129 BottomBar UI Visibility Modal (#130) * Fix PUBLIC_URL configure urls (#131) * env comment on DB_HOST in docker * Fix controlled layer returning null * Sublayers on Controlled Layers * #134 - Any Projection Image Marker Attachments (#137) * #139 Control Raster Filters in LithoSphere (#140) * Update litho to css friendly filter effects * #138 Projection agnostic Uncertain Ellipses, touch ups (#141) * Minor colorramp dropdown fix * leaflet-imagetransfrom map check * Dockerfile node:16 (#145) * Update README.md Node 10.10 -> Node 14.9.0 * Implement webhooks feature (#146) * First implementation of webhooks * Remove webhooktoken field * Reorganize files and functions * Clean up webhook cards * Add routes for testing webhooks when using development environment * Fix Config subpage scrollbar issue * Fix delete button Co-authored-by: Tariq Soliman <Tariq.K.Soliman@jpl.nasa.gov> * Added docs for how to use remote virtual layers via GDAL - Also updated Measure Tool to support remote DEMs * A bit more info on gdalwmscache directory in docs * Remote_Virtual_Layer typo fixes * Curtain Support (#152) * Curtain part 2 * rgrams styles * Touch ups * Use litho 1.3.0 * #151 Support 3D Uncertainty Ellipses on Point Features (#153) * 3D Uncertainty ellipses * #151 Upgrade lithosphere, more uncertainty ellipse options, docs * Fix minor bugs (#155) * Upgrade litho * Litho 1.3.2 * Litho 1.3.3 * Add LineString functions (#156) * Add function to trim layers containing LineString features * Add appendLineString function and clean up trimLineString function * Remove debug code * Minor fixes * Add args to dockerfile so PUBLIC_URL can be specified at image build time (#157) Co-authored-by: David Lees <david.lees@nasa.gov> * Update the globe when vector layers are modified (#158) * Update the globe when vector layers are modified * Remove extraneous code * Remove extra variable * Fixed vector time updates not actually refreshing when told to reload (#159) * Dropdowns can expand up, draw tests * Bump to 2.6.0 Co-authored-by: Joe Roberts <joe.t.roberts@jpl.nasa.gov> Co-authored-by: ac-61 <ac-61@users.noreply.github.com> Co-authored-by: dsl3000 <dsl3001@gmail.com> Co-authored-by: David Lees <david.lees@nasa.gov> * Description should be updated to match example code (#189) * ci: build docker image and push to GitHub Container Registry (#316) * Update docker-build workflow to trigger on deve branch and releases * #336 Add GitHub Templates (#338) * #399 Crashes if Layers are valid JSON but not valid GeoJSON (#400) * #399 Add geojson validater to map * #399 allow overloaded coordinates in geojson for extended geojson * #401 Extend CSSO timeout check to main client (#402) * #401 Main site timeout notification part 1 * #401 Main site timeout notification part 2 * #401 Main site timeout notification - warn at 20 min * #403 rightClickMenuActions - Polygons and WKT (#404) * #403 - Bugfixes and rightclick finds features * #403 ContextMenu, Actions on features, WKT link populate * #405 DrawTool - Template - Incrementer - Move to backend (#406) * Mini fix to allow [] as empty geojson layer data * Fix DrawTool Incrementer self collision bug * Convert layer data [<FeatureCollection>] to geojson * #407 Click intersects on Query and Draw layers (#408) * #407 Include Query layers in click intersections * #407 Support intersects on DrawTool layers too * Allow the legend tool to be right justified on the screen * #409 Added example config in description for LegendTool * #410 Draw Tool - Time Integration (#411) * ts-410 DrawTool - Temporal part 1 * #410 DrawlTool - Temporal Integration * #410 Clearer DrawTool Template Date Start/End Icons * #412 Add Configuration Option to set TimeUI Extent (#413) * #414 IdentifierTool works again with human layer names (#415) * #422 Removed event blocking popup functions (#423) * Bump to 2.9.0 * #425 Description Item fixes (#426) * #425 Description Item fixes * Remove outdated comment * Remove odd duplicate triggerWebhookds * Fix draw upload webhook not populating geojson field * Remove extra log * Fix DrawTool deleting tag closing modal bug * DrawTool - Remove timetoggle when tool closes * DrawTool - Deselect file when turning off * #427 Expandable Tools (#428) * #427 Allow DrawTool names to expand too * #429 Hotkeys (#430) * #239 Hotkeys 1 * #429 DrawTool toggle last file hotkey * shortcutSuffix and raw variables for tile layers * Update Dependencies (#431) * #365 Separate out dev deps in package.json * Closer but webapck is broken * Dev server works - build still broken * Fix build * Update Expressjs * docker build workflow - add no-cache param * Update ModuleScopePlugin * #432 Image Overlay Fixes (#433) * #435 DrawTool - Reorder Template fields (#436) * #437 Add CONTRIBUTING.md (#438) * Update README.md * #439 DrawTool - Add Advanced Search and Filter UI to Shapes Tab (#440) * #439 DrawTool Shape Tab Filter * #439 DrawTool - Features Tab filter 2 * Support booleans in LocalFilterer --------- Co-authored-by: fcalef <49040273+fcalef@users.noreply.github.com> Co-authored-by: Joe Roberts <joe.t.roberts@jpl.nasa.gov> Co-authored-by: ac-61 <ac-61@users.noreply.github.com> Co-authored-by: dsl3000 <dsl3001@gmail.com> Co-authored-by: David Lees <david.lees@nasa.gov> Co-authored-by: David Tsay <3614296+davetsay@users.noreply.github.com> Co-authored-by: James Montalvo <jamesmontalvo3@gmail.com>
NASA-AMMOS · Oct 23, 2023 · 1c96ab5 · 1c96ab5
1 parent 4f73c17
commit 1c96ab5
Show file tree

Hide file tree

Showing 87 changed files with 34,351 additions and 23,789 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,59 @@
+name: Bug Report Form
+description: Report a bug to help us improve
+title: "[Bug]: "
+labels: "bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > _Thanks for filing a bug ticket. We appreciate your time and effort. Please answer a few questions._
+  - type: dropdown
+    id: checked-for-duplicates
+    attributes:
+      label: Checked for duplicates
+      description: Have you checked for duplicate issue tickets?
+      multiple: false
+      options:
+        - "Yes - I've already checked"
+        - "No - I haven't checked"
+    validations:
+      required: yes
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is. Plain-text snippets preferred but screenshots welcome.
+      placeholder: Tell us what you saw
+      value: "When I did [...] action, I noticed [...]"
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: What did you expect?
+      description: A clear and concise description of what you expect to happen
+      placeholder: Tell us what you expected
+      value: "I expected [...]"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproducible steps
+      description: "How would we reproduce this bug? Please walk us through it step by step. Plain-text snippets preferred but screenshots welcome."
+      value: |
+        1.
+        2.
+        3.
+        ...
+      render: bash
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: "What is your environment? Include any computer hardware, operating system, framework, browser, time-of-day or other contextual information related to your issue"
+      value: |
+        - Version of this software [e.g. vX.Y.Z]
+        - Operating System: [e.g. MacOSX with Docker Desktop vX.Y]
+        ...
+      render: bash
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,48 @@
+name: New Feature Form
+description: Suggest a new feature for us to implement
+title: "[New Feature]: "
+labels: "enhancement"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > _Thanks for filing a new feature request. We appreciate your time and effort. Please answer a few questions._
+  - type: dropdown
+    id: checked-for-duplicates
+    attributes:
+      label: Checked for duplicates
+      description: Have you checked for duplicate issue tickets?
+      multiple: false
+      options:
+        - "Yes - I've already checked"
+        - "No - I haven't checked"
+    validations:
+      required: yes
+  - type: dropdown
+    id: checked-alternatives
+    attributes:
+      label: Alternatives considered
+      description: Have you considered alternative solutions to your feature request?
+      options:
+        - "Yes - and alternatives don't suffice"
+        - "No - I haven't considered"
+    validations:
+      required: yes
+  - type: textarea
+    id: related-problems
+    attributes:
+      label: Related problems
+      description: Is your feature request related to any problems? Please help us understand if so, including linking to any other issue tickets.
+      placeholder: Tell us the problems
+      value: "I'm frustrated when [...] happens as documented in issue-XYZ"
+    validations:
+      required: false
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature request
+      description: A clear and concise description of your request. 
+      placeholder: Tell us what you want
+      value: "I need or want [...]"
+    validations:
+      required: true
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+## Purpose
+- Clear, easy-to-understand sentences outlining the purpose of the PR
+## Proposed Changes
+- [ADD] ...
+- [CHANGE] ...
+- [FIX] ...
+## Issues
+- Links to relevant issues
+- Example: issue-XYZ
+## Testing
+- Provide some proof you've tested your changes 
+- Example: test results available at ...
+- Example: tested on operating system ...
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -111,7 +111,7 @@ jobs:
         run: echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io
 
       - name: Docker build
-        run: docker build ${{ steps.generate.outputs.REGISTRY_TAGS }} .
+        run: docker build --no-cache ${{ steps.generate.outputs.REGISTRY_TAGS }} .
 
       - name: Docker push
         run: docker push ${{ steps.generate.outputs.IMAGE_ID }} --all-tags
diff --git a/API/Backend/Config/routes/configs.js b/API/Backend/Config/routes/configs.js
@@ -456,7 +456,7 @@ router.get("/missions", function (req, res, next) {
       .query(
         "SELECT DISTINCT ON (mission) mission, version, config FROM configs ORDER BY mission ASC"
       )
-      .spread((results) => {
+      .then(([results]) => {
         res.send({ status: "success", missions: results });
         return null;
       })

diff --git a/API/Backend/Datasets/models/datasets.js b/API/Backend/Datasets/models/datasets.js
@@ -79,7 +79,7 @@ function makeNewDatasetTable(name, columns, success, failure) {
       } else {
         sequelize
           .query("SELECT COUNT(*) FROM datasets")
-          .spread((results) => {
+          .then(([results]) => {
             let newTable = "d" + (parseInt(results[0].count) + 1) + "_datasets";
             Datasets.create({
               name: name,

diff --git a/API/Backend/Datasets/routes/datasets.js b/API/Backend/Datasets/routes/datasets.js
@@ -54,7 +54,7 @@ function get(req, res, next) {
                 },
               }
             )
-            .spread((r) => {
+            .then(([r]) => {
               results.push({
                 ...queries[i],
                 table: result.dataValues.table,
@@ -130,7 +130,7 @@ router.post("/search", function (req, res, next) {
               },
             }
           )
-          .spread((results) => {
+          .then(([results]) => {
             let r = [];
             for (let i = 0; i < results.length; i++) {
               let feature = JSON.parse(results[i].st_asgeojson);

diff --git a/API/Backend/Draw/models/userfiles.js b/API/Backend/Draw/models/userfiles.js
@@ -131,7 +131,7 @@ const makeMasterFiles = (intents) => {
         public: "1",
         hidden: "0",
       },
-    }).spread(function (userResult, created) {
+    }).then(function ([userResult, created]) {
       // userResult is the user instance
 
       if (created) {