From 6a6ec5a8bc2d1d322902de974f784dc86796098d Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Fri, 5 Jan 2024 00:51:51 +0000 Subject: [PATCH 01/32] /version 4.17.1-0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f0ff3da..180ee86d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-18", + "version": "4.17.1-0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8e840e85..6bb9817a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-18", + "version": "4.17.1-0", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From edf22737456f2bd4f79bf32ce8e62b48ac22c146 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 10 Jan 2024 18:37:37 +0000 Subject: [PATCH 02/32] /version v4.17.0-19 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f0ff3da..f3000517 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-18", + "version": "4.17.0-19", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8e840e85..6e3a4d6b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-18", + "version": "4.17.0-19", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From e7cc3fbf18dbc306b0a2d28bcbed653f48b23bee Mon Sep 17 00:00:00 2001 From: Jimmy Date: Wed, 31 Jan 2024 14:13:51 -0800 Subject: [PATCH 03/32] issue/hitide-ui-42: made potential fix to image links (#50) * issue/hitide-ui-42: made potential fix to image links * /deploy sit * issue/hitide-ui-42: fixed bug with finding thumbnail url * /deploy sit * issue/hitide-ui-42: get cmr collection thumbnail from different object * /deploy sit * issue/hitide-ui-42: remove uneccessary changes * Delete .vscode/settings.json * issue/hitide-ui-42: revert layer control file back * issue/hitide-ui-42: updated changelog and release notes with latest bug fix --------- Co-authored-by: jbyrne --- CHANGELOG.md | 1 + src/jpl/dijit/LayerControl.js | 2 +- src/jpl/dijit/templates/HelpDialog.html | 8 ++++++++ src/jpl/utils/SearchDatasets.js | 10 +++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4569037b..144b7ff5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Removed ### Fixed +- issue-42: Fixed collection thumbnails not loading for certain collections ## [4.16.2] diff --git a/src/jpl/dijit/LayerControl.js b/src/jpl/dijit/LayerControl.js index 4f8062ca..ba592c32 100644 --- a/src/jpl/dijit/LayerControl.js +++ b/src/jpl/dijit/LayerControl.js @@ -257,7 +257,7 @@ define([ var variableName = this.variableId; var imageFilename = calculateImageFilename(granuleName, variableName); - + var relatedUrls = obj.granuleObj.umm.RelatedUrls; var objectURL for(var i=0; i < relatedUrls.length; i++){ diff --git a/src/jpl/dijit/templates/HelpDialog.html b/src/jpl/dijit/templates/HelpDialog.html index 60382881..2733d9f9 100644 --- a/src/jpl/dijit/templates/HelpDialog.html +++ b/src/jpl/dijit/templates/HelpDialog.html @@ -155,6 +155,14 @@
version #.# podaac.jpl.nasa.gov/HITIDE_feedback
+
+
+ Version 4.17.0 (1/31/2024) +
+
    +
  • Fixed Fixed collection thumbnails not loading for certain collections.
    • +
+
Version 4.16.2 (1/8/2024) diff --git a/src/jpl/utils/SearchDatasets.js b/src/jpl/utils/SearchDatasets.js index 8ea26f79..511fadc1 100644 --- a/src/jpl/utils/SearchDatasets.js +++ b/src/jpl/utils/SearchDatasets.js @@ -116,7 +116,6 @@ define([ "Dataset-PersistentId": doc.id, "DatasetCoverage-StartTimeLong": new Date(doc.time_start).getTime(), "DatasetCoverage-StopTimeLong": new Date(doc.time_end).getTime(), - "Dataset-ImageUrl": "https://podaac.jpl.nasa.gov/Podaac/thumbnails/" + doc.short_name + ".jpg", "Dataset-Description": doc.summary } }); @@ -135,6 +134,7 @@ define([ withCredentials: config.hitide.externalConfigurables.crossOriginCmrCookies }).then(function(response) { var resolutionAndCoordinateSystemObject = response.SpatialExtent.HorizontalSpatialDomain.ResolutionAndCoordinateSystem + var relatedUrlsArray = response.RelatedUrls if (resolutionAndCoordinateSystemObject) { var resolutionObjects = resolutionAndCoordinateSystemObject.HorizontalDataResolution.GenericResolutions if (resolutionObjects) { @@ -147,6 +147,14 @@ define([ }); } } + if (relatedUrlsArray) { + for(var i=0; i < relatedUrlsArray.length; i++) { + var currentRelatedUrlObject = relatedUrlsArray[i] + if (currentRelatedUrlObject['Description'] === 'Thumbnail') { + datasetObject["Dataset-ImageUrl"] = currentRelatedUrlObject['URL'] + } + } + } return datasetObject }) } From d1550493bb7a4b14512503ec84926b0c20e82f84 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 31 Jan 2024 22:14:52 +0000 Subject: [PATCH 04/32] /version v4.17.0-20 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3000517..05e93a10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-19", + "version": "4.17.0-20", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6e3a4d6b..118b873f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-19", + "version": "4.17.0-20", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 22003da0396d153a9f6fee25122fec1b01bebef8 Mon Sep 17 00:00:00 2001 From: James Wood Date: Wed, 31 Jan 2024 14:33:30 -0800 Subject: [PATCH 05/32] New release 4.17.0 --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 144b7ff5..c01a2f53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Removed ### Fixed -- issue-42: Fixed collection thumbnails not loading for certain collections +## [4.17.0] +### Added +### Changed +### Removed +### Fixed +- issue-42: Fixed collection thumbnails not loading for certain collections + ## [4.16.2] ### Added ### Changed From e65a88cd50caece7764980b6b1182ba1e1f1516a Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 31 Jan 2024 22:33:46 +0000 Subject: [PATCH 06/32] /version 4.17.1-0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05e93a10..180ee86d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-20", + "version": "4.17.1-0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 118b873f..6bb9817a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-20", + "version": "4.17.1-0", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From b2e65dcea746111d005e4b0401149360c9fef0b7 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 31 Jan 2024 22:35:03 +0000 Subject: [PATCH 07/32] /version v4.17.0-rc.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05e93a10..7e8ab275 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-20", + "version": "4.17.0-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 118b873f..ce2b6ed6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-20", + "version": "4.17.0-rc.1", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From a6e2e7b075ce86ed22abcb12e9b34d3c62eabf20 Mon Sep 17 00:00:00 2001 From: James Wood Date: Wed, 7 Feb 2024 14:26:54 -0800 Subject: [PATCH 08/32] removed some collections not needed in hitide-ui --- cmr/ops_associations.txt | 16 ---------------- cmr/uat_associations.txt | 19 ------------------- 2 files changed, 35 deletions(-) diff --git a/cmr/ops_associations.txt b/cmr/ops_associations.txt index c0853322..4e62a68b 100644 --- a/cmr/ops_associations.txt +++ b/cmr/ops_associations.txt @@ -20,13 +20,9 @@ C2205121384-POCLOUD C2205121394-POCLOUD C2208421887-POCLOUD C2152045877-POCLOUD -C2158350299-POCLOUD -C2158348264-POCLOUD C2205121315-POCLOUD C2152044763-POCLOUD -C2158348170-POCLOUD C2152046451-POCLOUD -C2158344213-POCLOUD C2147947806-POCLOUD C2254232941-POCLOUD C2251465126-POCLOUD @@ -61,33 +57,21 @@ C2036882397-POCLOUD C2036882499-POCLOUD C2036882482-POCLOUD C2036881016-POCLOUD -C2628593693-POCLOUD C2601584109-POCLOUD C2601581863-POCLOUD C2601583089-POCLOUD -C2628598397-POCLOUD C2628603830-POCLOUD C2604362899-POCLOUD C2098739529-POCLOUD C2098740781-POCLOUD -C2036878029-POCLOUD C2036882456-POCLOUD C1693233387-PODAAC C1693233348-PODAAC -C2628598809-POCLOUD C2746966926-POCLOUD -C2628600898-POCLOUD -C2628595723-POCLOUD C2746966927-POCLOUD C2746966657-POCLOUD -C2799465509-POCLOUD C2628607717-POCLOUD -C2799465529-POCLOUD -C2799465538-POCLOUD -C2799465526-POCLOUD C2799465428-POCLOUD C2628605380-POCLOUD C2799465507-POCLOUD -C2799465522-POCLOUD -C2799465518-POCLOUD C2799465497-POCLOUD diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt index 5454bb2f..9f14b801 100644 --- a/cmr/uat_associations.txt +++ b/cmr/uat_associations.txt @@ -40,12 +40,8 @@ C1256420925-POCLOUD C1256507988-POCLOUD C1256783378-POCLOUD C1256122852-POCLOUD -C1256507989-POCLOUD -C1256783386-POCLOUD C1256507990-POCLOUD -C1256783391-POCLOUD C1238658392-POCLOUD -C1256524295-POCLOUD C1256420924-POCLOUD C1240739719-POCLOUD C1238621092-POCLOUD @@ -70,7 +66,6 @@ C1238621111-POCLOUD C1238687534-POCLOUD C1238658050-POCLOUD C1238658086-POCLOUD -C1241042620-POCLOUD C1240739611-POCLOUD C1240739768-POCLOUD C1238658088-POCLOUD @@ -82,8 +77,6 @@ C1256445396-POCLOUD C1240817851-POCLOUD C1238621186-POCLOUD C1240739606-POCLOUD -C1241042621-POCLOUD -C1238621185-POCLOUD C1238621112-POCLOUD C1259115176-POCLOUD C1238657959-POCLOUD @@ -92,23 +85,11 @@ C1238621087-POCLOUD C1238658051-POCLOUD C1259115177-POCLOUD C1259115167-POCLOUD -C1259115178-POCLOUD -C1256783382-POCLOUD -C1256783388-POCLOUD -C1256783381-POCLOUD C1258237266-POCLOUD C1258237267-POCLOUD -C1261072659-POCLOUD -C1261072656-POCLOUD C1261072647-POCLOUD C1261072648-POCLOUD -C1261072658-POCLOUD -C1261072655-POCLOUD -C1261072652-POCLOUD C1261072646-POCLOUD C1261072645-POCLOUD -C1261072654-POCLOUD C1256783373-POCLOUD -C1261072651-POCLOUD C1256783374-POCLOUD -C1261072650-POCLOUD From 2f9d6a0f0cab269357b689bdea7f8dbe1cdc713c Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 7 Feb 2024 22:27:54 +0000 Subject: [PATCH 09/32] /version v4.17.1-1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 180ee86d..db54d565 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.1-0", + "version": "4.17.1-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6bb9817a..64a6f09e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.1-0", + "version": "4.17.1-1", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 4a995da25da4b5ccabdf481efe9c20dc32503790 Mon Sep 17 00:00:00 2001 From: James Wood Date: Wed, 7 Feb 2024 15:04:04 -0800 Subject: [PATCH 10/32] Removed more collections --- cmr/ops_associations.txt | 5 ----- cmr/uat_associations.txt | 4 ---- 2 files changed, 9 deletions(-) diff --git a/cmr/ops_associations.txt b/cmr/ops_associations.txt index 4e62a68b..2c76d7f5 100644 --- a/cmr/ops_associations.txt +++ b/cmr/ops_associations.txt @@ -60,18 +60,13 @@ C2036881016-POCLOUD C2601584109-POCLOUD C2601581863-POCLOUD C2601583089-POCLOUD -C2628603830-POCLOUD C2604362899-POCLOUD C2098739529-POCLOUD C2098740781-POCLOUD C2036882456-POCLOUD -C1693233387-PODAAC -C1693233348-PODAAC C2746966926-POCLOUD C2746966927-POCLOUD C2746966657-POCLOUD -C2628607717-POCLOUD C2799465428-POCLOUD -C2628605380-POCLOUD C2799465507-POCLOUD C2799465497-POCLOUD diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt index 9f14b801..0ac4b597 100644 --- a/cmr/uat_associations.txt +++ b/cmr/uat_associations.txt @@ -25,14 +25,10 @@ C1240739734-POCLOUD C1240739726-POCLOUD C1242387592-POCLOUD C1242387601-POCLOUD -C1242387620-POCLOUD C1238658389-POCLOUD -C1242387600-POCLOUD -C1242387624-POCLOUD C1243175554-POCLOUD C1242387586-POCLOUD C1242387621-POCLOUD -C1242387602-POCLOUD C1240739713-POCLOUD C1238621088-POCLOUD C1244810554-POCLOUD From 33902db664f745bc7086ab78b66d18084a6dfb2c Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 7 Feb 2024 23:05:10 +0000 Subject: [PATCH 11/32] /version v4.17.1-2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index db54d565..36d71d62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.1-1", + "version": "4.17.1-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 64a6f09e..1d3c2d17 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.1-1", + "version": "4.17.1-2", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 9d8c49a548ab38d777e350604de0d8000b4d1c12 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 7 Feb 2024 23:06:18 +0000 Subject: [PATCH 12/32] /version v4.17.0-rc.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e8ab275..8105b378 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.1", + "version": "4.17.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ce2b6ed6..ff8f2ec9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.1", + "version": "4.17.0-rc.2", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 6008766564e220575a1dd46be29b00fc62030233 Mon Sep 17 00:00:00 2001 From: James Wood Date: Wed, 7 Feb 2024 15:47:31 -0800 Subject: [PATCH 13/32] update actions versions --- .github/workflows/build.yml | 6 +++--- .github/workflows/release_created.yml | 2 +- .github/workflows/umm_t_sync.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8210e078..0a95f4a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: steps: # Checkout - name: Checkout project to build and deploy - uses: actions/checkout@v2 + uses: actions/checkout@v4 ## Read the json file into the environment variables - name: JSON to variables @@ -180,7 +180,7 @@ jobs: # Setup Node to install and test - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 14 @@ -207,7 +207,7 @@ jobs: echo "TARGET_ENV_UPPERCASE=${override_env_upper}" >> $GITHUB_ENV - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-west-2 role-session-name: GitHubActions diff --git a/.github/workflows/release_created.yml b/.github/workflows/release_created.yml index 0056c87e..1f4f23a2 100644 --- a/.github/workflows/release_created.yml +++ b/.github/workflows/release_created.yml @@ -17,7 +17,7 @@ jobs: steps: # Checks-out the develop branch - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: 'refs/heads/develop' - name: Bump minor version diff --git a/.github/workflows/umm_t_sync.yml b/.github/workflows/umm_t_sync.yml index 1a278a30..56b5c5d3 100644 --- a/.github/workflows/umm_t_sync.yml +++ b/.github/workflows/umm_t_sync.yml @@ -21,9 +21,9 @@ jobs: steps: # Checkout - name: Checkout project to build and deploy - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: 3.9 From 4bc66ebb5c3f4bdd0d5e9c79ee9746d4ed42c571 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 7 Feb 2024 23:48:53 +0000 Subject: [PATCH 14/32] /version v4.17.1-3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36d71d62..2452632f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.1-2", + "version": "4.17.1-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1d3c2d17..7edf43bb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.1-2", + "version": "4.17.1-3", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 8b2a865663f267c041a726ed61711dcd7fdcd1bc Mon Sep 17 00:00:00 2001 From: Simon Liu <69875423+sliu008@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:26:29 -0800 Subject: [PATCH 15/32] Feature/update ummt sync (#54) * update ummt sync github action * update so we run cron at 1 am pst * update again --- .github/workflows/umm_t_sync.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/umm_t_sync.yml b/.github/workflows/umm_t_sync.yml index 56b5c5d3..625f65bc 100644 --- a/.github/workflows/umm_t_sync.yml +++ b/.github/workflows/umm_t_sync.yml @@ -4,7 +4,7 @@ name: Hourly Build Sync CMR Association Text Files # Controls when the workflow will run on: schedule: - - cron: '0 * * * *' + - cron: '0 9 * * *' push: branches: - develop @@ -17,7 +17,6 @@ jobs: name: Build, Test, Deploy # The type of runner that the job will run on runs-on: ubuntu-latest - steps: # Checkout - name: Checkout project to build and deploy @@ -32,6 +31,7 @@ jobs: - name: Run cmr_association_diff command id: cmr_association_diff + run: | update_git_message="Adding collections" @@ -51,9 +51,13 @@ jobs: cat ${{ github.workspace }}/uat_success.txt >> ${{ github.workspace }}/cmr/uat_associations.txt fi - echo "::set-output name=ops_collection::$OPS_COLLECTION" - echo "::set-output name=uat_collection::$UAT_COLLECTION" - echo "::set-output name=update_git_message::$update_git_message" + echo "ops_collection=$OPS_COLLECTION" >> "$GITHUB_OUTPUT" + echo "uat_collection=$UAT_COLLECTION" >> "$GITHUB_OUTPUT" + echo "update_git_message=$update_git_message" >> "$GITHUB_OUTPUT" + + #echo "::set-output name=ops_collection::$OPS_COLLECTION" + #echo "::set-output name=uat_collection::$UAT_COLLECTION" + #echo "::set-output name=update_git_message::$update_git_message" - name: Push Develop env: @@ -61,7 +65,7 @@ jobs: UAT_COLLECTION: ${{ steps.cmr_association_diff.outputs.uat_collection }} UPDATE_GIT_MESSAGE: ${{ steps.cmr_association_diff.outputs.update_git_message }} run: | - if [[ -z "${{ env.UAT_COLLECTIONS }}" && -z "${{ env.OPS_COLLECTIONS }}" ]]; then + if [[ -z "${{ env.UAT_COLLECTION }}" && -z "${{ env.OPS_COLLECTION }}" ]]; then echo "No collections were different." else git config --global user.name 'hitide-ui bot' From 11fd690fc8630712672d4818fc077c045916a364 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 14 Feb 2024 18:26:50 +0000 Subject: [PATCH 16/32] Adding collections UAT: C1242274070-POCLOUDC1242274079-POCLOUDC1240739758-POCLOUDC1240739573-POCLOUDC1259966654-POCLOUDC1240739508-POCLOUDC1240739686-POCLOUD --- cmr/uat_associations.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt index 0ac4b597..e35ff874 100644 --- a/cmr/uat_associations.txt +++ b/cmr/uat_associations.txt @@ -89,3 +89,10 @@ C1261072646-POCLOUD C1261072645-POCLOUD C1256783373-POCLOUD C1256783374-POCLOUD +C1242274070-POCLOUD +C1242274079-POCLOUD +C1240739758-POCLOUD +C1240739573-POCLOUD +C1259966654-POCLOUD +C1240739508-POCLOUD +C1240739686-POCLOUD From 0eea9db83a24746738f9151b5d921322c20df06a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Fri, 16 Feb 2024 15:38:59 -0800 Subject: [PATCH 17/32] issue/hitide-ui-48: help catch collection resolution errors (#53) * issue/hitide-ui-48: help catch collection resolution errors * issue/hitide-ui-48: delete unused docker and jenkins folders * issue/hitide-ui-48: removed cmr Dockerfile * issue/hitide-ui-48: add Not Available message * issue/hitide-ui-48: address comments to fix code comments * issue/hitide-ui-48: remove No Error message * issue/hitide-ui-48: changed to Not Available in Search Datasets * issue/hitide-ui-48: fixed Image Not Available not showing up * Add read_collection.py back in after removing it * issue/hitide-ui-48: unstage read_collection.py * issue/hitide-ui-48: add read_collection.py and update Changelog/HelpDialog * Removed non-user experience items --------- Co-authored-by: jbyrne Co-authored-by: James Wood --- .../workflows}/read_collection.py | 0 .github/workflows/umm_t_sync.yml | 4 +- CHANGELOG.md | 3 + Jenkins/Jenkinsfile | 390 ------------------ Jenkins/JenkinsfileUMMTSync | 85 ---- Jenkins/build.Dockerfile | 25 -- cmr/cmr.Dockerfile | 29 -- docker/Dockerfile | 19 - docker/doc | 83 ---- docker/docker-start-command | 24 -- docker/nginx.conf | 100 ----- docker/snyk.Dockerfile | 8 - src/jpl/dijit/templates/HelpDialog.html | 32 +- src/jpl/dijit/ui/MetadataDialog.js | 60 +-- src/jpl/utils/SearchDatasets.js | 16 +- 15 files changed, 50 insertions(+), 828 deletions(-) rename {Jenkins => .github/workflows}/read_collection.py (100%) delete mode 100644 Jenkins/Jenkinsfile delete mode 100644 Jenkins/JenkinsfileUMMTSync delete mode 100644 Jenkins/build.Dockerfile delete mode 100644 cmr/cmr.Dockerfile delete mode 100644 docker/Dockerfile delete mode 100755 docker/doc delete mode 100755 docker/docker-start-command delete mode 100644 docker/nginx.conf delete mode 100644 docker/snyk.Dockerfile diff --git a/Jenkins/read_collection.py b/.github/workflows/read_collection.py similarity index 100% rename from Jenkins/read_collection.py rename to .github/workflows/read_collection.py diff --git a/.github/workflows/umm_t_sync.yml b/.github/workflows/umm_t_sync.yml index 625f65bc..b8c28897 100644 --- a/.github/workflows/umm_t_sync.yml +++ b/.github/workflows/umm_t_sync.yml @@ -37,7 +37,7 @@ jobs: OPS_COLLECTION=$(set +x; cmr_association_diff -e ops -t tool -a ${{ github.workspace }}/cmr/ops_associations.txt -p POCLOUD -n 'HiTIDE' -o ${{ github.workspace }}/ops_output_json.txt --token ${{secrets.LAUNCHPAD_TOKEN_OPS}}; set -x) if [[ ${OPS_COLLECTION} ]]; then - python -u ${{ github.workspace }}/Jenkins/read_collection.py -e ops -i ${{ github.workspace }}/ops_output_json.txt -o ${{ github.workspace }} + python -u ${{ github.workspace }}/.github/workflows/read_collection.py -e ops -i ${{ github.workspace }}/ops_output_json.txt -o ${{ github.workspace }} ops_success_collection=$(cat ${{ github.workspace }}/ops_success.txt | tr -d '\n') update_git_message+=" OPS: $ops_success_collection" cat ${{ github.workspace }}/ops_success.txt >> ${{ github.workspace }}/cmr/ops_associations.txt @@ -45,7 +45,7 @@ jobs: UAT_COLLECTION=$(set +x; cmr_association_diff -e uat -t tool -a ${{ github.workspace }}/cmr/uat_associations.txt -p POCLOUD -n 'HiTIDE' -o ${{ github.workspace }}/uat_output_json.txt --token ${{secrets.LAUNCHPAD_TOKEN_UAT}}; set -x) if [[ ${UAT_COLLECTION} ]]; then - python -u ${{ github.workspace }}/Jenkins/read_collection.py -e uat -i ${{ github.workspace }}/uat_output_json.txt -o ${{ github.workspace }} + python -u ${{ github.workspace }}/.github/workflows/read_collection.py -e uat -i ${{ github.workspace }}/uat_output_json.txt -o ${{ github.workspace }} uat_success_collection=$(cat ${{ github.workspace }}/uat_success.txt | tr -d '\n') update_git_message+=" UAT: $uat_success_collection" cat ${{ github.workspace }}/uat_success.txt >> ${{ github.workspace }}/cmr/uat_associations.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 144b7ff5..b1bb5b85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed - issue-42: Fixed collection thumbnails not loading for certain collections +- issue-48: Fixed collection resolution error handling +- issue-49: Removed unused Docker and Jenkins folders/files from HiTIDE-UI +- issue-52: Fixed missing thumbnail placeholder ## [4.16.2] diff --git a/Jenkins/Jenkinsfile b/Jenkins/Jenkinsfile deleted file mode 100644 index 02d66b54..00000000 --- a/Jenkins/Jenkinsfile +++ /dev/null @@ -1,390 +0,0 @@ -pipeline { - agent none - options { - preserveStashes(buildCount: 5) - } - environment{ - VCS_CREDENTIALS_ID = "github_podaac" - GHE_CREDENTIALS_ID = "github.jpl.nasa.gov_devops_pw" - ARTIFACTORY_CREDENTIALS_ID = "jenkins.cae.artifactory" - ARTIFACTORY_URL = "https://cae-artifactory.jpl.nasa.gov/artifactory" - ARTIFACTORY_DOCKER_REGISTRY = "cae-artifactory.jpl.nasa.gov:16003" - ARTIFACTORY_NPM_REPO = "artifactory.jpl.nasa.gov:443/artifactory/api/npm/npm-release-local/" - SNYK_CREDENTIALS_ID = "snyk_api_key" - } - stages{ - stage("Checkout"){ - agent { - docker { - image 'podaac/service/build-node-14:latest' - label 'devops1' - registryUrl "https://${env.ARTIFACTORY_DOCKER_REGISTRY}" - } - } - steps{ - checkout([ - $class: 'GitSCM', - branches: scm.branches, - extensions: scm.extensions + [ - [$class: 'CleanBeforeCheckout'], - [$class: 'WipeWorkspace'], - [$class: 'LocalBranch', localBranch: '**'], - [$class: 'PruneStaleBranch'] - ], - userRemoteConfigs: scm.userRemoteConfigs - ]) - script{ - def packageJson = readJSON file: 'package.json' - the_service = packageJson.name - the_version = packageJson.version - the_env = sh(returnStdout: true, script: "printenv").trim() - deploy_env = 'sit' - } - writeYaml file: 'build-info.yaml', data: ['service_name': the_service, 'source_service_version': the_version, 'build_environment': the_env, 'deploy_env': deploy_env], overwrite: true - stash name: 'build-info', includes: 'build-info.yaml' - echo "Checked out $the_service $the_version" - } - } - stage("Skip Build"){ - when { - anyOf{ - changelog '^/version.*' - changelog '^/jenkins skip' - } - } - agent { - docker { - image 'podaac/service/build-node-14:latest' - label 'devops1' - registryUrl "https://${env.ARTIFACTORY_DOCKER_REGISTRY}" - } - } - steps{ - echo "Build Skipped." - script { - currentBuild.result = 'NOT_BUILT' - } - } - } - stage("Run Build"){ - when { - not{ - anyOf{ - changelog '^/version.*' - changelog '^/jenkins skip' - } - } - } - agent { - docker { - image 'podaac/service/build-node-14:latest' - label 'devops1' - alwaysPull true - registryUrl "https://${env.ARTIFACTORY_DOCKER_REGISTRY}" - } - } - stages{ - stage("Version"){ - stages { - stage("Pre Alpha"){ - when { - anyOf{ - branch 'feature/*' - branch 'bugfix/*' - changeRequest target: 'develop' - } - } - environment { - GIT_COMMIT_SHORT = sh(script: "printf \$(git rev-parse --short ${GIT_COMMIT})", returnStdout: true).trim() - } - steps{ - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - build_info.build_service_version = sh(returnStdout: true, script: - "npm --no-git-tag-version --allow-same-version version ${build_info.source_service_version}-${GIT_BRANCH.replaceAll('/', '-')}.${BUILD_NUMBER}" - ).trim() - build_info.artifactory_npm_repo = "artifactory.jpl.nasa.gov:443/artifactory/api/npm/npm-develop-local/" - build_info.deploy_env = "sit" - } - writeYaml file: 'build-info.yaml', data: build_info, overwrite: true - stash name: 'build-info', includes: 'build-info.yaml' - } - } - stage("Alpha"){ - when { - branch 'develop' - } - steps{ - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - the_version = sh(returnStdout: true, script: "npm --no-git-tag-version version prerelease").trim() - build_info.build_service_version = the_version - build_info.artifactory_npm_repo = "artifactory.jpl.nasa.gov:443/artifactory/api/npm/npm-stage-local/" - build_info.deploy_env = "sit" - } - writeYaml file: 'build-info.yaml', data: build_info, overwrite: true - stash name: 'build-info', includes: 'build-info.yaml' - } - } - stage("Minor"){ - when { - allOf{ - branch 'release/*' - not{ - changeRequest() - } - } - } - steps{ - - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - build_info.deploy_env = "uat" - } - writeYaml file: 'build-info.yaml', data: build_info, overwrite: true - stash name: 'build-info', includes: 'build-info.yaml' - - dir("temp"){ - - withCredentials([usernamePassword(credentialsId: env.GHE_CREDENTIALS_ID, usernameVariable: 'GIT_USERNAME', passwordVariable: 'GIT_PASSWORD')]) { - checkout([ - $class: 'GitSCM', - branches: [[name: 'develop']], - extensions: [ - [$class: 'LocalBranch', localBranch: '**'] - ], - userRemoteConfigs: scm.userRemoteConfigs - ]) - - unstash name: 'build-info' - - script{ - build_info = readYaml file: 'build-info.yaml' - - cur_ver = build_info['source_service_version'] - string_version = env.BRANCH_NAME.split('/')[-1] - patch_version = string_version.tokenize('.')[-1] - - // Only update develop on releases that aren't rc and releases that aren't bug fixes - if(!cur_ver.contains("rc") && patch_version == "0"){ - sh(""" - git config --local user.name "podaac" - git config --local user.email podaac-tva@jpl.nasa.gov - git config --local credential.helper "!f() { echo username=\$GIT_USERNAME; echo password=\$GIT_PASSWORD; }; f" - npm version --no-git-tag-version ${env.BRANCH_NAME.split('/')[-1]} - npm version preminor -f -m '/version %s' - git push origin HEAD:develop - """) - } - else{ - echo("SKIP UPDATING DEVELOP VERSION") - } - } - } - deleteDir() - } - } - post { - always { - sh "git config --local --unset credential.helper || true" - } - } - } - stage("Release Candidate"){ - when { - changeRequest target: 'master' - } - steps{ - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - cur_ver = build_info['source_service_version'] - if(cur_ver.contains("rc")){ - // increment release candidate version - the_version = sh(returnStdout: true, script: "npm --no-git-tag-version version prerelease --preid rc").trim() - }else{ - // set release candidate to version 1 and on release branch name - the_version = sh(returnStdout: true, script: "npm --no-git-tag-version version ${env.CHANGE_BRANCH.split('/')[-1]}-rc.1").trim() - } - build_info.build_service_version = the_version - build_info.artifactory_npm_repo = "artifactory.jpl.nasa.gov:443/artifactory/api/npm/npm-stage-local/" - build_info.deploy_env = "uat" - } - writeYaml file: 'build-info.yaml', data: build_info, overwrite: true - stash name: 'build-info', includes: 'build-info.yaml' - } - } - stage("Release"){ - when { - branch 'master' - } - steps{ - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - the_version = build_info['source_service_version'].split('-')[0] - build_info.build_service_version = the_version - build_info.artifactory_npm_repo = "artifactory.jpl.nasa.gov:443/artifactory/api/npm/npm-release-local/" - build_info.deploy_env = "ops" - } - sh "npm --no-git-tag-version version $the_version" - writeYaml file: 'build-info.yaml', data: build_info, overwrite: true - stash name: 'build-info', includes: 'build-info.yaml' - } - } - } - } - stage("Build Software"){ - steps{ - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - } - // Build and configure correct hitide config javascript file - sh """ - npm install - npm run build - cat ./configs/hitideConfig-${build_info.deploy_env}.js > ./dist/hitideConfig.js - tar -czvf hitide-${build_info.build_service_version}.tar.tgz dist/ - """ - } - post { - success { - archiveArtifacts artifacts: 'hitide-*.tar.tgz' - stash name: 'artifacts', includes: 'hitide-*.tar.tgz' - } - } - } - stage("Publish"){ - when { - anyOf{ - branch 'develop' - branch 'master' - changeRequest target: 'master' - changelog '^/jenkins deploy' - } - } - stages{ - stage("Tag Version"){ - environment{ - THE_BRANCH = "${(env.CHANGE_BRANCH?:env.BRANCH_NAME)}" - } - when { - anyOf { - branch 'develop' - branch 'master' - changeRequest target: 'master' - } - } - steps{ - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - } - withCredentials([usernamePassword(credentialsId: env.GHE_CREDENTIALS_ID, usernameVariable: 'GIT_USERNAME', passwordVariable: 'GIT_PASSWORD')]) { - sh(""" - git config --local user.name "podaac" - git config --local user.email podaac-tva@jpl.nasa.gov - git config --local credential.helper "!f() { echo username=\$GIT_USERNAME; echo password=\$GIT_PASSWORD; }; f" - git commit -am '/version ${build_info.build_service_version}' - """) - script{ - if(env.BRANCH_NAME == 'master'){ - sh "git tag -a ${build_info.build_service_version} -m 'Release of v${build_info.build_service_version}'" - }else{ - sh "git tag ${build_info.build_service_version}" - } - } - sh(""" - git push origin HEAD:${env.THE_BRANCH} - git push origin ${build_info.build_service_version} - """) - } - } - post { - always { - sh "git config --local --unset credential.helper || true" - } - failure { - // If the push fails, delete the local tag so when the build reruns it won't fail because the tag already exists - sh "git tag -d ${build_info.build_service_version}" - } - } - } - stage("Upload to Artifactory"){ - steps{ - unstash name: 'artifacts' - unstash name: 'build-info' - withCredentials([usernamePassword(credentialsId: env.ARTIFACTORY_CREDENTIALS_ID, usernameVariable: 'ARTIFACTORY_USER', passwordVariable: 'ARTIFACTORY_PASSWORD')]){ - script{ - pwbase64 = sh(returnStdout: true, script: "echo -n ${env.ARTIFACTORY_PASSWORD} | base64").trim() - } - dir(".npm"){ - writeFile file:".npmrc", text:"""\ - @gov.nasa.jpl.podaac:registry=https://${build_info.artifactory_npm_repo} - //${build_info.artifactory_npm_repo}:_password=${pwbase64} - //${build_info.artifactory_npm_repo}:username=${env.ARTIFACTORY_USER} - //${build_info.artifactory_npm_repo}:email=podaac-tva@jpl.nasa.gov - //${build_info.artifactory_npm_repo}:always-auth=true - """.stripIndent() - } - sh "npm publish --userconfig ${env.WORKSPACE}/.npm/.npmrc --registry https://${build_info.artifactory_npm_repo} --scope=@gov.nasa.jpl.podaac" - } - } - } - } - } - } - } - stage("Deploy"){ - when { - not{ - anyOf { - changelog '^/version.*' - changelog '^/jenkins skip' - } - } - anyOf{ - branch 'develop' - branch 'master' - changeRequest target: 'master' - changelog '^/jenkins deploy' - } - } - agent { - docker { - image "${env.ARTIFACTORY_DOCKER_REGISTRY}/podaac/service/deploy-terraform-0.12.31" - label 'devops1' - alwaysPull true - args '-v /home/cm/.aws:/home/dockeruser/.aws:ro' - } - } - options { - skipDefaultCheckout() - } - steps{ - unstash 'artifacts' - script { - hitide_tar_file = sh(returnStdout: true, script: 'find . -name hitide-*.tar.tgz -type f -print -quit').trim() - } - sh("tar -xzvf ${hitide_tar_file}") - unstash name: 'build-info' - script{ - build_info = readYaml file: 'build-info.yaml' - } - echo "Publishing ${build_info.build_service_version} to ${build_info.deploy_env} S3" - dir('terraform'){ - sh "bin/deploy.sh -v ${build_info.deploy_env} --app-version ${build_info.build_service_version}" - sh "terraform output hitide-bucket-name" - script{ - bucket_name = sh(returnStdout: true, script: "terraform output hitide-bucket-name").trim() - } - } - sh("aws s3 sync ./dist s3://${bucket_name} --exclude dataset-configs/* --exclude palettes/* --delete --profile ngap-service-${build_info.deploy_env}") - } - } - } -} diff --git a/Jenkins/JenkinsfileUMMTSync b/Jenkins/JenkinsfileUMMTSync deleted file mode 100644 index 18a850db..00000000 --- a/Jenkins/JenkinsfileUMMTSync +++ /dev/null @@ -1,85 +0,0 @@ -pipeline { - agent { - dockerfile { - filename 'build.Dockerfile' - dir 'Jenkins' - label 'devops1-cm' - args '-v $HOME/.netrc:/home/dockeruser/.netrc -v /home/cm/certs/:/home/dockeruser/certs' - } - } - stages { - stage('Checkout') { - steps { - - sh label: '', script: 'rm -rf *' - - sh('mkdir hitide-ui') - - checkout([ - $class: 'GitSCM', - branches: [[name: 'refs/heads/develop']], - extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'hitide-ui']], - userRemoteConfigs: [[url: 'git@github.com:podaac/hitide-ui.git', credentialsId:'github.com_devops']] - ]) - - sh('ls -la hitide-ui') - } - } - stage('Sync txt'){ - steps{ - script{ - - UAT_TOKEN = sh(returnStdout: true, script:'jq -r .token /home/dockeruser/certs/launchpad_token_ngap_uat.json').trim() - OPS_TOKEN = sh(returnStdout: true, script:'jq -r .token /home/dockeruser/certs/launchpad_token_ngap_ops.json').trim() - - UAT_COLLECTION = sh(returnStdout: true, script:"set +x; cmr_association_diff -e uat -t tool -a $WORKSPACE/hitide-ui/cmr/uat_associations.txt -p POCLOUD -n \'HiTIDE\' -o $WORKSPACE/uat_output_json.txt --token $UAT_TOKEN; set -x").trim() - - OPS_COLLECTION = sh(returnStdout: true, script:"set +x; cmr_association_diff -e ops -t tool -a $WORKSPACE/hitide-ui/cmr/ops_associations.txt -p POCLOUD -n \'HiTIDE\' -o $WORKSPACE/ops_output_json.txt --token $OPS_TOKEN; set -x").trim() - - if(OPS_COLLECTION || UAT_COLLECTION){ - dir("temp"){ - - withCredentials([sshUserPrivateKey(credentialsId: "github.com_devops", keyFileVariable: "SSH_KEY")]){ - - checkout([ - $class: 'GitSCM', - branches: [[name: 'develop']], - userRemoteConfigs: [[url: 'git@github.com:podaac/hitide-ui.git', credentialsId:'github.com_devops']] - ]) - - update_git_message = "Adding collections" - - if(UAT_COLLECTION){ - sh(script: "python -u $WORKSPACE/hitide-ui/Jenkins/read_collection.py -e uat -i $WORKSPACE/uat_output_json.txt -o $WORKSPACE") - - uat_success_collection = sh(returnStdout: true, script: "echo \$(cat $WORKSPACE/uat_success.txt)").trim() - update_git_message = update_git_message + " UAT: " + uat_success_collection - sh('cat $WORKSPACE/uat_success.txt >> ./cmr/uat_associations.txt') - } - if(OPS_COLLECTION){ - sh(script: "python -u $WORKSPACE/hitide-ui/Jenkins/read_collection.py -e ops -i $WORKSPACE/ops_output_json.txt -o $WORKSPACE") - - ops_success_collection = sh(returnStdout: true, script: "echo \$(cat $WORKSPACE/ops_success.txt)").trim() - update_git_message = update_git_message + " OPS: " + ops_success_collection - sh('cat $WORKSPACE/ops_success.txt >> ./cmr/ops_associations.txt') - } - - sh(""" - mkdir ~/.ssh - touch ~/.ssh/known_hosts - ssh-keyscan -H github.com >> ~/.ssh/known_hosts - export GIT_SSH_COMMAND="ssh -i $SSH_KEY" - git config --local user.name "podaac" - git config --local user.email podaac-tva@jpl.nasa.gov - git commit -a -m \'$update_git_message\' - git push origin HEAD:develop - """) - } - deleteDir() - } - } - } - } - } - } -} \ No newline at end of file diff --git a/Jenkins/build.Dockerfile b/Jenkins/build.Dockerfile deleted file mode 100644 index 121cfe00..00000000 --- a/Jenkins/build.Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM python:3.8-slim - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \ - gcc \ - libnetcdf-dev \ - libhdf5-dev \ - hdf5-helpers \ - && apt-get -y install git \ - && apt-get install -y jq \ - && apt-get clean \ - && pip3 install git+https://github.com/podaac/cmr-association-diff.git@develop - - -RUN adduser --quiet --disabled-password --shell /bin/sh --home /home/dockeruser --uid 300 dockeruser - -USER dockeruser -WORKDIR "/home/dockeruser" - -# Add artifactory as a trusted pip index -ENV HOME /home/dockeruser -ENV PYTHONPATH "${PYTHONPATH}:/home/dockeruser/.local/bin" -ENV PATH="/home/dockeruser/.local/bin:${PATH}" - -CMD ["sh"] \ No newline at end of file diff --git a/cmr/cmr.Dockerfile b/cmr/cmr.Dockerfile deleted file mode 100644 index 9ff247e4..00000000 --- a/cmr/cmr.Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM python:3.8-slim - -## Create a new user -RUN adduser --quiet --disabled-password --shell /bin/sh --home /home/dockeruser --gecos "" --uid 300 dockeruser - -# Get jq -RUN apt update -y -RUN apt install jq -y - -USER dockeruser -ENV HOME /home/dockeruser -ENV PYTHONPATH "${PYTHONPATH}:/home/dockeruser/.local/bin" -ENV PATH="/home/dockeruser/.local/bin:${PATH}" - -# Add artifactory as a trusted pip index -RUN mkdir $HOME/.pip -RUN echo "[global]" >> $HOME/.pip/pip.conf -RUN echo "index-url = https://cae-artifactory.jpl.nasa.gov/artifactory/api/pypi/pypi-release-virtual/simple" >> $HOME/.pip/pip.conf -RUN echo "trusted-host = cae-artifactory.jpl.nasa.gov pypi.org" >> $HOME/.pip/pip.conf -RUN echo "extra-index-url = https://pypi.org/simple" >> $HOME/.pip/pip.conf - -WORKDIR "/home/dockeruser" - -RUN pip install --upgrade pip \ - && pip install awscli --upgrade \ - && pip install 'podaac-dev-tools>=0.7.0' - -RUN pip list -CMD ["sh"] diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 2a4edf87..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM nginx:1.20 - -ENV SRV_DIR /app -ENV NGINX_CONF /etc/nginx/nginx.conf -ENV WORK_DIR /work - -# Create the srv directory -RUN mkdir ${SRV_DIR} - -# Copy the built files to nginx -COPY ./dist ${SRV_DIR} - -# Move over the server config -COPY ./docker/nginx.conf ${NGINX_CONF} - -# Copy the start command -COPY ./docker/docker-start-command ${WORK_DIR}/docker-start-command - -CMD ${WORK_DIR}/docker-start-command \ No newline at end of file diff --git a/docker/doc b/docker/doc deleted file mode 100755 index 20d6ce88..00000000 --- a/docker/doc +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Set directory variables -current_dir=$(pwd) -script_dir=$(dirname $0) -app_path=$( cd ${script_dir}/.. && echo $(pwd) ) -config_path=$( cd ${app_path}/../config && echo $(pwd) ) - -# Set name variables -dev_env_image_name=podaac-ci.jpl.nasa.gov:5000/podaac-hitide-dev/nginx-and-node:1.15-12.x -tag_name=podaac-ci.jpl.nasa.gov:5000/podaac-hitide-dev/hitide-ui:4.8.1-001 -dev_container_name=hitide-ui-dev-container -build_container_name=hitide-ui-build-container - - - - - -# -# General Purpose Docker Utilities -# -if [ "$1" = "sh" ]; then - docker container exec -it $2 sh - -elif [ "$1" = "rm" ]; then - docker container rm -f $2 - -elif [ "$1" = "rma" ]; then - docker container rm -f $(docker container ls -aq) - -elif [ "$1" = "ls" ]; then - docker container ls - -elif [ "$1" = "lsa" ]; then - docker container ls -a - - -# -# Dev Related Commands -# -elif [ "$1" = "startdev" ]; then - docker container run -d --name ${dev_container_name}\ - -v $app_path:/app:rw \ - -v $app_path/hitide_nginx.conf:/etc/nginx/nginx.conf:rw \ - -v $config_path:/config:rw \ - -p 8901:8080 \ - -p 8902:8443 \ - $dev_env_image_name - -elif [ "$1" = "rmdev" ]; then - doc rm ${dev_container_name} - -elif [ "$1" = "shdev" ]; then - doc sh ${dev_container_name} - - -# -# Production Related Commands -# -elif [ "$1" = "tag" ]; then - docker build -t $tag_name -f $script_dir/Dockerfile $app_path - -elif [ "$1" = "push" ]; then - docker push $tag_name - -elif [ "$1" = "start" ]; then - docker container run -d \ - --name hitide-ui \ - -v $config_path:/config:ro \ - -p 8901:8080 \ - -p 8902:8443 \ - $tag_name - -elif [ "$1" = "stop" ]; then - doc rm hitide-ui - - - - - -else - echo "did not enter valid command: $1" -fi diff --git a/docker/docker-start-command b/docker/docker-start-command deleted file mode 100755 index c14c276a..00000000 --- a/docker/docker-start-command +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -config_dir=/config -work_dir=/work -app_dir=/app -nginx_dir=/etc/nginx/ - -if [ -e "${config_dir}/server.crt" ]; then - cp ${config_dir}/server.crt ${work_dir}/server.crt -fi; - -if [ -e "${config_dir}/server.key" ]; then - cp ${config_dir}/server.key ${work_dir}/server.key -fi; - -if [ -e "${config_dir}/hitideConfig.js" ]; then - cp ${config_dir}/hitideConfig.js ${app_dir}/hitideConfig.js -fi; - -if [ -e "${config_dir}/nginx.conf" ]; then - cp ${config_dir}/nginx.conf ${nginx_dir}/nginx.conf -fi; - -nginx -g "daemon off;" diff --git a/docker/nginx.conf b/docker/nginx.conf deleted file mode 100644 index 036f067a..00000000 --- a/docker/nginx.conf +++ /dev/null @@ -1,100 +0,0 @@ -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - #tcp_nopush on; - keepalive_timeout 65; - - # gzip config from http://stackoverflow.com/a/12644530 - gzip on; - gzip_disable "msie6"; - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/rss+xml - image/svg+xml; - - server { - - # - # http port. Best controlled by docker -p/--publish, but this - # can be commented out / changed as needed. - # - listen 8080; - - # - # https port. Be sure to update certificate/key locations. May - # change port if needed, but best controlled by docker -p/--publish - # - listen 8443 ssl; - ssl_certificate /config/server.crt; - ssl_certificate_key /config/server.key; - - root /app; - index index.html index.htm; - autoindex off; - - # - # Initially deny all requests. The requests we want to serve will - # be specified below. - # - location / { - deny all; - } - - - # - # The location for hitide/ index.html and all required resources. - # - location /hitide { - alias /app; - } - - - # - # This location functions as reverse proxy for hitide-profile - # API endpoints. Update proxy_pass directive to address of - # hitide-profile service. - # - # location /hitide/api { - # access_log /var/log/nginx/access.proxy.log; - # proxy_pass https://podaac-devwhale1.jpl.nasa.gov:8906/hitide/api; - # } - - - - #error_page 404 /404.html; - # redirect server error pages to the static page /50x.html - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - - } - -} \ No newline at end of file diff --git a/docker/snyk.Dockerfile b/docker/snyk.Dockerfile deleted file mode 100644 index 9751b439..00000000 --- a/docker/snyk.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM alpine:latest - -RUN apk --no-cache add curl - -# Downloading and installing Snyk -RUN curl https://static.snyk.io/cli/v1.666.0/snyk-linux -o snyk \ - && chmod +x ./snyk \ - && mv ./snyk /usr/local/bin/ \ No newline at end of file diff --git a/src/jpl/dijit/templates/HelpDialog.html b/src/jpl/dijit/templates/HelpDialog.html index 2733d9f9..e0fea025 100644 --- a/src/jpl/dijit/templates/HelpDialog.html +++ b/src/jpl/dijit/templates/HelpDialog.html @@ -38,16 +38,6 @@

Help

version #.#.#
- - -
As a HiTIDE user, does it make any difference if a dataset has transitioned to the cloud services or not?
Here are the current differences between Classic Datasets (which have not yet transitioned to cloud services) and Cloud Datasets:

@@ -95,26 +85,6 @@
version #.# The information provided by users when they register for Earthdata Login helps NASA better understand how our data are being used and the diverse needs of multiple user communities. This helps us prioritize improvements in data discovery, access, and usability. Registration also allows us to inform users with pertinent information such as the availability of new or updated data products, or data quality issues. In the future, it will allow for new value-added features and customized services resulting in a better user experience. For questions regarding Earthdata Login, see https://urs.earthdata.nasa.gov/documentation.
- -
Where did the "Cut Scanline" download option go?
The Cut Scanline feature is now always applied when subsetting datasets in HiTIDE. This download option has been removed since classic datasets have been phased out and replaced by cloud datasets. We automatically cut the scanline for you meaning that you download only your region of interest after it is subsetted.
@@ -160,7 +130,7 @@
version #.# Version 4.17.0 (1/31/2024)
    -
  • Fixed Fixed collection thumbnails not loading for certain collections.
    • +
  • Fixed Fixed collection thumbnails not loading properly for certain collections.
diff --git a/src/jpl/dijit/ui/MetadataDialog.js b/src/jpl/dijit/ui/MetadataDialog.js index b3c104a6..893a6813 100644 --- a/src/jpl/dijit/ui/MetadataDialog.js +++ b/src/jpl/dijit/ui/MetadataDialog.js @@ -73,7 +73,7 @@ define([ var metadata = this.dataset; /* Set image url */ - var metadataImgSrc = metadata["Dataset-ImageUrl"] !== "https://podaac.jpl.nasa.gov/Podaac/thumbnails/image_not_available.jpg" ? metadata["Dataset-ImageUrl"] : "jpl/assets/images/earth.jpg"; + var metadataImgSrc = metadata["Dataset-ImageUrl"] domAttr.set(this.metadataDatasetImage, "src", metadataImgSrc); /* Set long name */ @@ -81,7 +81,7 @@ define([ /* Set along/across-track resolution */ var datasetResolution = metadata["Dataset-Resolution"] - if(datasetResolution) { + if (datasetResolution) { // Set the resolution to display. Allow for multiple resolutions of one collection. var unit = "km" var multiplier = 0.001 @@ -91,37 +91,41 @@ define([ // if meters, convert to km unless less than 1000 // if kilometers, keep as km for(var i=0; i 2) { + alongTrackString = parseFloat(parseFloat(alongTrackString).toFixed(2)).toString() + } + if (acrossTrackString.split(".")[1] && acrossTrackString.split("."[1]).length > 2) { + acrossTrackString = parseFloat(parseFloat(acrossTrackString).toFixed(2)).toString() + } + + resolutionString += alongTrackString + unit + " x " + acrossTrackString + unit + connectingSting + } else { + resolutionString = datasetResolutionError } - - // if on the last dataset resolution object - if (i === datasetResolution.length - 1) { - connectingSting = "" - } - - var alongTrackString = (parseFloat(datasetResolution[i]["Dataset-AlongTrackResolution"]) * multiplier).toString() - var acrossTrackString = (parseFloat(datasetResolution[i]["Dataset-AcrossTrackResolution"]) * multiplier).toString() - // round resolution strings to precision of 2 without trailing zeros if too long - if (alongTrackString.split(".")[1] && alongTrackString.split(".")[1].length > 2) { - alongTrackString = parseFloat(parseFloat(alongTrackString).toFixed(2)).toString() - } - if (acrossTrackString.split(".")[1] && acrossTrackString.split("."[1]).length > 2) { - acrossTrackString = parseFloat(parseFloat(acrossTrackString).toFixed(2)).toString() - } - - resolutionString += alongTrackString + unit + " x " + acrossTrackString + unit + connectingSting } domAttr.set(this.metadataAlongAcrossRes, "innerHTML", resolutionString); + } else { + domAttr.set(this.metadataAlongAcrossRes, "innerHTML", "Not Available"); } - else - // domAttr.set(this.metadataAlongAcrossRes, "innerHTML", "Not Available"); - domAttr.set(this.metadataAlongAcrossRes, "innerHTML", "Not Applicable"); - + /* Set date range */ var startDate = metadata["DatasetCoverage-StartTimeLong"]; var formattedStart = "Unknown"; diff --git a/src/jpl/utils/SearchDatasets.js b/src/jpl/utils/SearchDatasets.js index 511fadc1..5707cd87 100644 --- a/src/jpl/utils/SearchDatasets.js +++ b/src/jpl/utils/SearchDatasets.js @@ -27,6 +27,7 @@ define([ var promises = []; if(typeof cmrSearchUrl === 'string') promises.push(searchCmr(options)); if(promises.length === 0) { + // eslint-disable-next-line no-console console.log('Did not enable cmr datasets'); } @@ -119,7 +120,6 @@ define([ "Dataset-Description": doc.summary } }); - return datasets; } @@ -133,28 +133,36 @@ define([ }, withCredentials: config.hitide.externalConfigurables.crossOriginCmrCookies }).then(function(response) { + datasetObject["Dataset-Resolution"] = [] var resolutionAndCoordinateSystemObject = response.SpatialExtent.HorizontalSpatialDomain.ResolutionAndCoordinateSystem var relatedUrlsArray = response.RelatedUrls if (resolutionAndCoordinateSystemObject) { var resolutionObjects = resolutionAndCoordinateSystemObject.HorizontalDataResolution.GenericResolutions if (resolutionObjects) { - datasetObject["Dataset-Resolution"] = [] resolutionObjects.forEach(function(resolutionObject) { var acrossTrack = resolutionObject.XDimension var alongTrack = resolutionObject.YDimension var unit = resolutionObject.Unit datasetObject["Dataset-Resolution"].push({"Dataset-AcrossTrackResolution": acrossTrack, "Dataset-AlongTrackResolution": alongTrack, "Unit": unit}) }); + } else { + // Resolution not available by error + datasetObject["Dataset-Resolution"].push({"error": "Not Available"}) } + } else { + // Key [Collection]/SpatialExtent/HorizontalSpatialDomain/ResolutionAndCoordinateSystem does not exist. This likely was intentional to indicate resolution is not applicable to this collection. + datasetObject["Dataset-Resolution"].push({"error": "Not Applicable"}) } if (relatedUrlsArray) { + var urlDatasetImageUrl = 'https://podaac.jpl.nasa.gov/Podaac/thumbnails/image_not_available.jpg' for(var i=0; i < relatedUrlsArray.length; i++) { var currentRelatedUrlObject = relatedUrlsArray[i] if (currentRelatedUrlObject['Description'] === 'Thumbnail') { - datasetObject["Dataset-ImageUrl"] = currentRelatedUrlObject['URL'] + urlDatasetImageUrl = currentRelatedUrlObject['URL'] } } - } + datasetObject["Dataset-ImageUrl"] = urlDatasetImageUrl + } return datasetObject }) } From 6d372da78a0cc599e920a06e320d0f607213bc62 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Fri, 16 Feb 2024 23:40:09 +0000 Subject: [PATCH 18/32] /version v4.17.1-4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2452632f..3892461b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.1-3", + "version": "4.17.1-4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7edf43bb..3206dbab 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.1-3", + "version": "4.17.1-4", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 50fc5f354cbb36c1c8a23df8bdcd45d93221757e Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Fri, 16 Feb 2024 23:49:20 +0000 Subject: [PATCH 19/32] /version v4.17.0-rc.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8105b378..5cf7fa3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.2", + "version": "4.17.0-rc.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ff8f2ec9..5201acb5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.2", + "version": "4.17.0-rc.3", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From e4e8b54cc3a1d264d991efe49e2e5cb767579a40 Mon Sep 17 00:00:00 2001 From: Simon Liu <69875423+sliu008@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:48:32 -0800 Subject: [PATCH 20/32] Feature/fix swot alignment (#55) * update ummt sync github action * update so we run cron at 1 am pst * update again * add in global grid from hitide configurations to fix swot 2.0 alignment * update changelog --- CHANGELOG.md | 1 + src/hitideConfig.js | 4 ++-- src/jpl/dijit/LayerControl.js | 30 +++++++++++++++++++++++++----- src/jpl/dijit/LegendsAndOpacity.js | 5 ++++- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1bb5b85..6c76ab50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Added global_grid configuration check to make a global extent for images. ### Changed ### Removed ### Fixed diff --git a/src/hitideConfig.js b/src/hitideConfig.js index befd159a..43686899 100644 --- a/src/hitideConfig.js +++ b/src/hitideConfig.js @@ -1,7 +1,7 @@ var hitideProfileOrigin = "https://hitide.profile.podaac.uat.earthdatacloud.nasa.gov/hitide/api"; window.hitideConfig = { - paletteService: "https://hitide.podaac.uat.earthdatacloud.nasa.gov/palettes", + paletteService: "https://hitide.podaac.earthdatacloud.nasa.gov/palettes", cmrDatasetSearchService: hitideProfileOrigin + "/cmr/search/collections.json?tool_name=HiTIDE", cmrGranuleSearchService: hitideProfileOrigin + "/cmr/search/granules.umm_json", @@ -25,4 +25,4 @@ window.hitideConfig = { maxGranulesPerDownload: 999999999, googleTagManagerId: "GTM-M5D83V6", earthDataAppClientId: "dxpH2WeN_f8IpNLgHwplsg" -}; \ No newline at end of file +}; diff --git a/src/jpl/dijit/LayerControl.js b/src/jpl/dijit/LayerControl.js index ba592c32..bef1c596 100644 --- a/src/jpl/dijit/LayerControl.js +++ b/src/jpl/dijit/LayerControl.js @@ -23,10 +23,11 @@ define([ "dijit/form/HorizontalRule", "dijit/form/HorizontalRuleLabels", "jpl/dijit/ui/AlertDialog", - "jpl/config/Config" + "jpl/config/Config", + "esri/geometry/Extent" ], function(declare, lang, on, domConstruct, domClass, domAttr, domStyle, topic, touch, xhr, array, _WidgetBase, _TemplatedMixin, template, css, Layers, LayerEvent, MapEvent, MapUtil, AnimationUtil, - HorizontalSlider, HorizontalRule, HorizontalRuleLabels, AlertDialog, Config) { + HorizontalSlider, HorizontalRule, HorizontalRuleLabels, AlertDialog, Config, Extent) { return declare([_WidgetBase, _TemplatedMixin], { templateString: template, widgetsInTemplate: false, @@ -256,14 +257,33 @@ define([ var granuleName = obj.granuleObj["Granule-Name"]; var variableName = this.variableId; var imageFilename = calculateImageFilename(granuleName, variableName); - - var relatedUrls = obj.granuleObj.umm.RelatedUrls; var objectURL for(var i=0; i < relatedUrls.length; i++){ objectURL = relatedUrls[i]['URL']; if(objectURL.includes(imageFilename)){ - return MapUtil.prototype.createMapImage(objectURL, this.translateExtent(obj.granuleObj["Granule-Extent"])); + var currentExtent = this.translateExtent(obj.granuleObj["Granule-Extent"]) + + // Calculate the new extent properties based on the offset + var newExtent = new Extent({ + xmin: currentExtent.xmin , + ymin: currentExtent.ymin , + xmax: currentExtent.xmax , + ymax: currentExtent.ymax , + spatialReference: currentExtent.spatialReference + }); + + if(obj['global_grid'] === true){ + newExtent = new Extent({ + xmin: -180 , + ymin: -90 , + xmax: 180 , + ymax: 90 , + spatialReference: currentExtent.spatialReference + }); + } + + return MapUtil.prototype.createMapImage(objectURL, newExtent); } } } diff --git a/src/jpl/dijit/LegendsAndOpacity.js b/src/jpl/dijit/LegendsAndOpacity.js index 704386e9..d3c05cf0 100644 --- a/src/jpl/dijit/LegendsAndOpacity.js +++ b/src/jpl/dijit/LegendsAndOpacity.js @@ -93,7 +93,6 @@ define([ if (this.datasets[message.datasetId]) { this.removeDataset(message); } - var laoDataset = new LegendsAndOpacityDataset({ _id: Math.random(), datasetId: message.datasetId, @@ -159,6 +158,9 @@ define([ this.open = false; }, handleVariablesFetched: function(message) { + if('global_grid' in message){ + this.datasets[message.datasetId]['global_grid'] = message['global_grid']; + } if('multi_lon_lat' in message){ var new_variables = []; for(var i = 0; i < message.multi_groups.length; i++){ @@ -193,6 +195,7 @@ define([ }, handleAddGranulePreview: function(message) { var laoDataset = this.datasets[message.granuleObj["Granule-DatasetId"]]; + message['global_grid'] = laoDataset['global_grid']; if (laoDataset) { laoDataset.addGranulePreview(message); } From 4d917b68271499bede904752ded5038c093c7f10 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Tue, 20 Feb 2024 22:48:54 +0000 Subject: [PATCH 21/32] Adding collections OPS: C2832221740-POCLOUD --- cmr/ops_associations.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cmr/ops_associations.txt b/cmr/ops_associations.txt index 2c76d7f5..637134e1 100644 --- a/cmr/ops_associations.txt +++ b/cmr/ops_associations.txt @@ -70,3 +70,4 @@ C2746966657-POCLOUD C2799465428-POCLOUD C2799465507-POCLOUD C2799465497-POCLOUD +C2832221740-POCLOUD From 6b69620284f8d8b8efd3a846a06423e8c4135cfa Mon Sep 17 00:00:00 2001 From: James Wood Date: Tue, 20 Feb 2024 14:55:40 -0800 Subject: [PATCH 22/32] update Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a12d7c1..f98d8f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added -- Added global_grid configuration check to make a global extent for images. ### Changed ### Removed ### Fixed @@ -14,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [4.17.0] ### Added +- Added global_grid configuration check to make a global extent for images. ### Changed ### Removed ### Fixed From 605241fab3f34e9b0f5eb8372de2ce0c243af12f Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Tue, 20 Feb 2024 22:56:47 +0000 Subject: [PATCH 23/32] /version v4.17.0-rc.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5cf7fa3d..3e6c69f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.3", + "version": "4.17.0-rc.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5201acb5..c5435f12 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.3", + "version": "4.17.0-rc.4", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 5df4ea44b0d5859d6e0b19fb1cc6964bab3a63ea Mon Sep 17 00:00:00 2001 From: Simon Liu <69875423+sliu008@users.noreply.github.com> Date: Tue, 20 Feb 2024 15:43:27 -0800 Subject: [PATCH 24/32] update umm updater module (#56) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a95f4a1..ae3d117b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: git push origin "${{ env.THE_VERSION }}" --force - name: Publish UMM-T with new version - uses: podaac/cmr-umm-updater@0.5.0 + uses: podaac/cmr-umm-updater@0.6.0 if: | github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release') From 75358269ed0846d5f13a2edcf988fb051d1f529f Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Tue, 20 Feb 2024 23:44:33 +0000 Subject: [PATCH 25/32] /version v4.17.1-5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3892461b..add4fdae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.1-4", + "version": "4.17.1-5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3206dbab..00e313a0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.1-4", + "version": "4.17.1-5", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 278cf852fd2f46d28e23487738ab26237b30e422 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Tue, 20 Feb 2024 23:52:48 +0000 Subject: [PATCH 26/32] /version v4.17.0-rc.5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e6c69f1..f7cd459c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.4", + "version": "4.17.0-rc.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c5435f12..b6a3a30c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.4", + "version": "4.17.0-rc.5", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 57f4e23f40cec80d81ca90001baf7f2e224ef310 Mon Sep 17 00:00:00 2001 From: James Wood Date: Wed, 28 Feb 2024 13:29:37 -0800 Subject: [PATCH 27/32] removing from hitide ui --- cmr/ops_associations.txt | 11 ----------- cmr/uat_associations.txt | 13 ------------- 2 files changed, 24 deletions(-) diff --git a/cmr/ops_associations.txt b/cmr/ops_associations.txt index 637134e1..689cc491 100644 --- a/cmr/ops_associations.txt +++ b/cmr/ops_associations.txt @@ -1,18 +1,8 @@ C1940473819-POCLOUD C1940475563-POCLOUD -C1968979997-POCLOUD -C1968979762-POCLOUD C1996881456-POCLOUD C1996881636-POCLOUD C1996881807-POCLOUD -C1968980549-POCLOUD -C1968979566-POCLOUD -C1968979550-POCLOUD -C1968980583-POCLOUD -C1968980576-POCLOUD -C1968979597-POCLOUD -C1968979561-POCLOUD -C1968980609-POCLOUD C2036880739-POCLOUD C2205618215-POCLOUD C2205618339-POCLOUD @@ -70,4 +60,3 @@ C2746966657-POCLOUD C2799465428-POCLOUD C2799465507-POCLOUD C2799465497-POCLOUD -C2832221740-POCLOUD diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt index e35ff874..240a153e 100644 --- a/cmr/uat_associations.txt +++ b/cmr/uat_associations.txt @@ -7,17 +7,7 @@ C1234071416-POCLOUD C1940473819-POCLOUD C1940475563-POCLOUD C1940466008-POCLOUD -C1238543220-POCLOUD -C1238543223-POCLOUD -C1238538240-POCLOUD C1238621102-POCLOUD -C1238538225-POCLOUD -C1238538224-POCLOUD -C1238538231-POCLOUD -C1238538230-POCLOUD -C1238538233-POCLOUD -C1238538232-POCLOUD -C1238538241-POCLOUD C1238658052-POCLOUD C1240739577-POCLOUD C1240739709-POCLOUD @@ -65,13 +55,10 @@ C1238658086-POCLOUD C1240739611-POCLOUD C1240739768-POCLOUD C1238658088-POCLOUD -C1238687282-POCLOUD C1238621176-POCLOUD C1238658049-POCLOUD C1238687546-POCLOUD -C1256445396-POCLOUD C1240817851-POCLOUD -C1238621186-POCLOUD C1240739606-POCLOUD C1238621112-POCLOUD C1259115176-POCLOUD From 2f5f7b3fd4ee7d4e3d99e0faed2e3bd3c40c3e32 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Wed, 28 Feb 2024 21:30:43 +0000 Subject: [PATCH 28/32] /version v4.17.0-rc.6 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f7cd459c..6c70f55b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.5", + "version": "4.17.0-rc.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b6a3a30c..c31233e8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.5", + "version": "4.17.0-rc.6", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 01e196495e3ecf835ad025735f7560a00bde0d60 Mon Sep 17 00:00:00 2001 From: James Wood Date: Thu, 29 Feb 2024 11:32:45 -0800 Subject: [PATCH 29/32] update release date --- src/jpl/dijit/templates/HelpDialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jpl/dijit/templates/HelpDialog.html b/src/jpl/dijit/templates/HelpDialog.html index e0fea025..15a019c4 100644 --- a/src/jpl/dijit/templates/HelpDialog.html +++ b/src/jpl/dijit/templates/HelpDialog.html @@ -127,7 +127,7 @@
version #.#
- Version 4.17.0 (1/31/2024) + Version 4.17.0 (2/29/2024)
  • Fixed Fixed collection thumbnails not loading properly for certain collections.
    • From eb4a01fe44728bb91f9d2b3d6643a86a68a34caf Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Thu, 29 Feb 2024 19:33:44 +0000 Subject: [PATCH 30/32] /version v4.17.0-rc.7 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c70f55b..6a814e9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.6", + "version": "4.17.0-rc.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c31233e8..951474f2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.6", + "version": "4.17.0-rc.7", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js", From 424eb267c424976f56772998d63ce9fd33da76fa Mon Sep 17 00:00:00 2001 From: James Wood Date: Thu, 29 Feb 2024 12:45:23 -0800 Subject: [PATCH 31/32] remove extra linefeeds --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f98d8f37..29270c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - issue-38: Removed shortName retrieval operation from variable graphql query - ## [4.16.1] ### Added ### Changed @@ -38,7 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - issue-33: Fixed collection resolution displaying multiple resolutions and scaling - ## [4.16.0] ### Added ### Changed @@ -51,7 +49,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - issue-15: Fixed color palette error in the legend when selecting datasets - ## [4.15.0] ### Added - issue-17: Add way to read config files to allow for multiple lat lon for variables images. From 0018e5affdca633a82524ff90c80b2ac06396366 Mon Sep 17 00:00:00 2001 From: hitide-ui bot Date: Thu, 29 Feb 2024 20:46:19 +0000 Subject: [PATCH 32/32] /version v4.17.0-rc.8 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6a814e9e..7f4b609e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gov.nasa.jpl.podaac/hitide-ui", - "version": "4.17.0-rc.7", + "version": "4.17.0-rc.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 951474f2..daa7a400 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@gov.nasa.jpl.podaac/hitide-ui", "title": "HiTIDE", "description": "High Level Tool for Interactive Data Extraction", - "version": "4.17.0-rc.7", + "version": "4.17.0-rc.8", "scripts": { "build": "grunt --force; npm run copy", "copy": "node scripts/copy-files.js",