Merging main back to develop (#97)

* /version v1.0.0-rc.1 * /version v1.0.0-rc.2 * Pull in recent changes to 1.0.0 * /version v1.0.0-rc.3 * Fix umm-t record * /version v1.0.0-rc.4 * Fix umm-t record * /version v1.0.0-rc.5 * Fix umm-t record * /version v1.0.0-rc.6 * /version v1.0.0-rc.7 * issue/manual-granule-input-hotfix: fixed how ranged of scenes are processed (#86) Co-authored-by: jbyrne <[email protected]> * Issues/swodlr UI 72 essential UI bug fixes (#87) * issues/swodlr-ui-72: fix cps url params bug * issues/swodlr-ui-72 * issues/swodlr-ui-75: fixed a couple bugs * issues/swodlr-ui-72: fixed map movement, adjust options, data page limit, etc * issues/swodlr-ui-72: changed spatial search beginning date in range * issues/swodlr-ui-72-essential-fixes: cleaned up comments --------- Co-authored-by: jbyrne <[email protected]> * /version v1.0.0-rc.8 * Deploying * Update build.yml - OPS environment variable for release * Update build.yml - add OPS choice * /version 1.0.0 * Update build.yml - check for staged changes * Deploying * Update build.yml - checks if tag exists * Update build.yml - check for tag on remote * Update build.yml - replace tag if exists * Update build.yml - trying force tag * Update build.yml - allow release update * Deploying * Issues/swodlr UI final fixes - bug fixed before version 1.0 release (#91) * issues/swodlr-ui-final-fixes: fixed spatial search speed and tutorial back fix * issues/swodlr-ui-final-fixes: fixed spinner, 10 limit, tutorial, map on reload * issues/swodlr-ui-final-fixes: fixed delete bug and added success alert for generation * issues/swodlr-ui-final-fixes: made alert message for search area too large * issues/swodlr-ui-final-fixes: changed search area too large message * issues/swodlr-ui-final-fixes: start search polygon url param * issues/swodlr-ui-final-fixed: removed skip from tutorial, added copy/download tooltips product url * issues/swodlr-ui-final-fixes: added tutorial close confirmation modal * issues/swodlr-ui-final-fixes: added cmr SWOT collection permissions check * issues/swodlr-ui-final-fixes: made cmr permissions alert conditional * issues/swodlr-ui-final-fixes: fixed tutorial back error and no data history tutorial error --------- Co-authored-by: jbyrne <[email protected]> --------- Co-authored-by: frankinspace <[email protected]> Co-authored-by: Frank Greguska <[email protected]> Co-authored-by: Jonathan M Smolenski <[email protected]> Co-authored-by: jonathansmolenski <[email protected]> Co-authored-by: Jimmy <[email protected]> Co-authored-by: jbyrne <[email protected]> Co-authored-by: cqbanh <[email protected]>
podaac · Mar 27, 2024 · 3699105 · 3699105
1 parent 272047c
commit 3699105
Show file tree

Hide file tree

Showing 37 changed files with 865 additions and 515 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,6 +27,7 @@ on:
         options:
           - SIT
           - UAT
+          - OPS
       commit:
         type: string
         description: Custom commit hash
@@ -113,6 +114,7 @@ jobs:
           THE_VERSION=${{ steps.package-version.outputs.current-version}}
           echo "software_version=${THE_VERSION//-*}" >> $GITHUB_ENV
           npm --no-git-tag-version version --allow-same-version ${THE_VERSION//-*}
+          echo "TARGET_ENV=OPS" >> $GITHUB_ENV
       - name: Set the target environment to ${{ env.TARGET_ENV }}
         id: set-env
         run: |
@@ -172,10 +174,14 @@ jobs:
           steps.rc.conclusion == 'success'      ||
           steps.release.conclusion == 'success'
         run: |
-          git config user.name "${GITHUB_ACTOR}"
-          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-          git commit -am "/version ${{ env.software_version }}"
-          git push
+          if ! git diff --cached --exit-code; then
+            git config user.name "${GITHUB_ACTOR}"
+            git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+            git commit -am "/version ${{ env.software_version }}"
+            git push
+          else
+            echo "No staged changes"
+          fi
       - name: Push Tag
         if: |
           steps.alpha.conclusion == 'success'   ||
@@ -184,8 +190,9 @@ jobs:
         run: |
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-          git tag -a "${{ env.software_version }}" -m "Version ${{ env.software_version }}"
-          git push origin "${{ env.software_version }}"
+                    
+          git tag -a "${{ env.software_version }}" -m "Version ${{ env.software_version }}" --force
+          git push origin "${{ env.software_version }}" --force
       - name: Create GH release
         if: |
           steps.alpha.conclusion == 'success'   ||
@@ -197,6 +204,7 @@ jobs:
           name: ${{ env.software_version }}
           prerelease: ${{ steps.alpha.conclusion == 'success' || steps.rc.conclusion == 'success'}}
           tag: ${{ env.software_version }}
+          allowUpdates: true
       - name: Set github SHA for deployment
         id: update-sha
         run: |
@@ -256,7 +264,7 @@ jobs:
         run:
           aws s3 sync ${{steps.download.outputs.download-path}} s3://${{ env.SWODLR_UI_BUCKET }} --delete
       - name: Publish UMM-T with new version
-        uses: podaac/cmr-umm-updater@0.5.0
+        uses: podaac/cmr-umm-updater@0.6.0
         if: |
           needs.build.outputs.deploy_env == 'UAT' ||
           needs.build.outputs.deploy_env == 'OPS'
@@ -269,6 +277,7 @@ jobs:
           disable_removal: 'true'
           umm_type: 'umm-t'
           use_associations: 'false'
+          umm_version: '1.2.0'
         env:
           LAUNCHPAD_TOKEN_SIT: ${{secrets.LAUNCHPAD_TOKEN_SIT}}
           LAUNCHPAD_TOKEN_UAT: ${{secrets.LAUNCHPAD_TOKEN_UAT}}
@@ -295,4 +304,4 @@ jobs:
           payload: |
             {
               "message": "ERROR: ${{ github.repository }} [version ${{ needs.build.outputs.software_version }}] has encountered an error while trying to deploy to the ${{ needs.build.outputs.deploy_env }} environment"
-            }
+            }
diff --git a/CHANGE b/CHANGE
@@ -0,0 +1 @@
+podaac/swodlr-ui deployment 
diff --git a/cmr/ops_swodlr_cmr_umm_t.json b/cmr/ops_swodlr_cmr_umm_t.json
@@ -1,91 +1,90 @@
-
 {
-    "Name": "SWODLR",
-    "LongName": "SWOT On-Demand Level 2 Raster Generation",
-    "Type": "Web User Interface",
-    "Version": "#.#.#",
-    "URL": {
-        "URLContentType": "DistributionURL",
-        "Type": "GOTO WEB TOOL",
-        "URLValue": "http://swodlr.podaac.earthdatacloud.nasa.gov/"
+  "Name": "SWODLR",
+  "LongName": "SWOT On-Demand Level 2 Raster Generation",
+  "Type": "Web User Interface",
+  "Version": "#.#.#",
+  "Description": "SWODLR (swaa·dler) is an open-source software system developed to generate custom Level 2 raster data products for the SWOT mission. It provides an Application Programming Interface (API) and Graphical User Interface (GUI) that allows end-users to provide custom configurations to generate on-demand raster data products from underlying standard data products (PIXC, PIXCVec).",
+  "ToolKeywords": [
+    {
+      "ToolCategory": "EARTH SCIENCE SERVICES",
+      "ToolTopic": "DATA ANALYSIS AND VISUALIZATION",
+      "ToolTerm": "DATA VISUALIZATION"
     },
-    "Description": "SWODLR (swaa·dler) is an open-source software system developed to generate custom Level 2 raster data products for the SWOT mission. It provides an Application Programming Interface (API) and Graphical User Interface (GUI) that allows end-users to provide custom configurations to generate on-demand raster data products from underlying standard data products (PIXC, PIXCVec).",
-    "ToolKeywords" : [
-        {
-            "ToolCategory": "EARTH SCIENCE SERVICES",
-            "ToolTopic": "DATA ANALYSIS AND VISUALIZATION",
-            "ToolTerm": "DATA VISUALIZATION"
-        },
-        {
-            "ToolCategory": "EARTH SCIENCE SERVICES",
-            "ToolTopic": "DATA MANAGEMENT/DATA HANDLING",
-            "ToolTerm": "SUBSETTING/SUPERSETTING",
-            "ToolSpecificTerm": "SPATIAL SUBSETTING"
-        },
-        {
-            "ToolCategory": "EARTH SCIENCE SERVICES",
-            "ToolTopic": "DATA MANAGEMENT/DATA HANDLING",
-            "ToolTerm": "SUBSETTING/SUPERSETTING",
-            "ToolSpecificTerm": "VARIABLE SUBSETTING"
-        },
-        {
-            "ToolCategory": "EARTH SCIENCE SERVICES",
-            "ToolTopic": "DATA ANALYSIS AND VISUALIZATION",
-            "ToolTerm": "GEOGRAPHIC INFORMATION SYSTEMS",
-            "ToolSpecificTerm": "WEB-BASED GEOGRAPHIC INFORMATION SYSTEMS"
-        },
-        {
-            "ToolCategory": "EARTH SCIENCE SERVICES",
-            "ToolTopic": "DATA MANAGEMENT/DATA HANDLING",
-            "ToolTerm": "DATA ACCESS/RETRIEVAL"
-        }
-    ],
-    "PotentialAction": {
-        "Type": "SearchAction",
-        "Target": {
-            "Type": "EntryPoint",
-            "ResponseContentType": [
-                "text/html"
-            ],
-            "UrlTemplate": "http://swodlr.podaac.earthdatacloud.nasa.gov/l={+layers}&ve={+bbox}&d={+date}",
-            "Description": "SWODLR (swaa·dler) is an open-source software system developed to generate custom Level 2 raster data products for the SWOT mission. It provides an Application Programming Interface (API) and Graphical User Interface (GUI) that allows end-users to provide custom configurations to generate on-demand raster data products from underlying standard data products (PIXC, PIXCVec).",
-            "HttpMethod": [
-                "GET"
-            ]
-        },
-        "QueryInput": [
-            {
-                "ValueName": "layers",
-                "Description": "A comma-separated list of visualization layer ids, as defined by GIBS. These layers will be portrayed on the web application",
-                "ValueRequired": true,
-                "ValueType": "https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+API+for+Developers#GIBSAPIforDevelopers-LayerNaming"
-            },
-            {
-                "ValueName": "date",
-                "Description": "A UTC ISO DateTime. The layers portrayed will correspond to this date.",
-                "ValueRequired": false,
-                "ValueType": "https://schema.org/startDate"
-            },
-            {
-                "ValueName": "bbox",
-                "Description": "A spatial bounding box that will set the spatial extent of the portrayed layers. The first point is the lower corner, the second point is the upper corner. A box is expressed as two points separated by a space character.",
-                "ValueRequired": false,
-                "ValueType": "https://schema.org/box"
-            }
-        ]
+    {
+      "ToolCategory": "EARTH SCIENCE SERVICES",
+      "ToolTopic": "DATA MANAGEMENT/DATA HANDLING",
+      "ToolTerm": "SUBSETTING/SUPERSETTING",
+      "ToolSpecificTerm": "SPATIAL SUBSETTING"
     },
-    "Organizations": [
-        {
-            "Roles": [
-                "ORIGINATOR"
-            ],
-            "ShortName": "NASA/JPL/PODAAC",
-            "LongName": "Physical Oceanography Distributed Active Archive Center, Jet Propulsion Laboratory, NASA"
-        }
-    ],
-    "MetadataSpecification": {
-        "URL": "https://cdn.earthdata.nasa.gov/umm/tool/v1.1.1",
-        "Name": "UMM-T",
-        "Version": "1.1.1"
+    {
+      "ToolCategory": "EARTH SCIENCE SERVICES",
+      "ToolTopic": "DATA MANAGEMENT/DATA HANDLING",
+      "ToolTerm": "SUBSETTING/SUPERSETTING",
+      "ToolSpecificTerm": "VARIABLE SUBSETTING"
+    },
+    {
+      "ToolCategory": "EARTH SCIENCE SERVICES",
+      "ToolTopic": "DATA ANALYSIS AND VISUALIZATION",
+      "ToolTerm": "GEOGRAPHIC INFORMATION SYSTEMS",
+      "ToolSpecificTerm": "WEB-BASED GEOGRAPHIC INFORMATION SYSTEMS"
+    },
+    {
+      "ToolCategory": "EARTH SCIENCE SERVICES",
+      "ToolTopic": "DATA MANAGEMENT/DATA HANDLING",
+      "ToolTerm": "DATA ACCESS/RETRIEVAL"
     }
-}
+  ],
+  "Organizations": [
+    {
+      "Roles": [
+        "ORIGINATOR"
+      ],
+      "ShortName": "NASA/JPL/PODAAC",
+      "LongName": "Physical Oceanography Distributed Active Archive Center, Jet Propulsion Laboratory, NASA"
+    }
+  ],
+  "URL": {
+    "URLContentType": "DistributionURL",
+    "Type": "GOTO WEB TOOL",
+    "URLValue": "http://swodlr.podaac.earthdatacloud.nasa.gov/"
+  },
+  "MetadataSpecification": {
+    "URL": "https://cdn.earthdata.nasa.gov/umm/tool/v1.2.0",
+    "Name": "UMM-T",
+    "Version": "1.2.0"
+  },
+  "PotentialAction": {
+    "Type": "SearchAction",
+    "Target": {
+      "Type": "EntryPoint",
+      "ResponseContentType": [
+        "text/html"
+      ],
+      "UrlTemplate": "http://swodlr.podaac.earthdatacloud.nasa.gov/l={+layers}&ve={+bbox}&d={+date}",
+      "Description": "SWODLR (swaa·dler) is an open-source software system developed to generate custom Level 2 raster data products for the SWOT mission. It provides an Application Programming Interface (API) and Graphical User Interface (GUI) that allows end-users to provide custom configurations to generate on-demand raster data products from underlying standard data products (PIXC, PIXCVec).",
+      "HttpMethod": [
+        "GET"
+      ]
+    },
+    "QueryInput": [
+      {
+        "ValueName": "layers",
+        "Description": "A comma-separated list of visualization layer ids, as defined by GIBS. These layers will be portrayed on the web application",
+        "ValueRequired": true,
+        "ValueType": "https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+API+for+Developers#GIBSAPIforDevelopers-LayerNaming"
+      },
+      {
+        "ValueName": "date",
+        "Description": "A UTC ISO DateTime. The layers portrayed will correspond to this date.",
+        "ValueRequired": false,
+        "ValueType": "https://schema.org/startDate"
+      },
+      {
+        "ValueName": "bbox",
+        "Description": "A spatial bounding box that will set the spatial extent of the portrayed layers. The first point is the lower corner, the second point is the upper corner. A box is expressed as two points separated by a space character.",
+        "ValueRequired": false,
+        "ValueType": "https://schema.org/box"
+      }
+    ]
+  }
+}
diff --git a/cmr/sit_swodlr_cmr_umm_t.json b/cmr/sit_swodlr_cmr_umm_t.json
@@ -84,8 +84,8 @@
         }
     ],
     "MetadataSpecification": {
-        "URL": "https://cdn.earthdata.nasa.gov/umm/tool/v1.1.1",
+        "URL": "https://cdn.earthdata.nasa.gov/umm/tool/v1.2.0",
         "Name": "UMM-T",
-        "Version": "1.1.1"
+        "Version": "1.2.0"
     }
-}
+}