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 <[email protected]> Co-authored-by: James Wood <[email protected]>
podaac · Feb 16, 2024 · 0eea9db · 0eea9db
1 parent 11fd690
commit 0eea9db
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 828 deletions.
diff --git a/Jenkins/read_collection.py → .github/workflows/read_collection.py b/Jenkins/read_collection.py → .github/workflows/read_collection.py
diff --git a/.github/workflows/umm_t_sync.yml b/.github/workflows/umm_t_sync.yml
@@ -37,15 +37,15 @@ 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
           fi
 
           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
@@ -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
diff --git a/Jenkins/JenkinsfileUMMTSync b/Jenkins/JenkinsfileUMMTSync
diff --git a/Jenkins/build.Dockerfile b/Jenkins/build.Dockerfile
diff --git a/cmr/cmr.Dockerfile b/cmr/cmr.Dockerfile
diff --git a/docker/Dockerfile b/docker/Dockerfile
diff --git a/docker/doc b/docker/doc
diff --git a/docker/docker-start-command b/docker/docker-start-command