Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EDSC-3881: Create portal for CASEI #1699

Merged
merged 4 commits into from
Dec 15, 2023
Merged

EDSC-3881: Create portal for CASEI #1699

merged 4 commits into from
Dec 15, 2023

Conversation

rushgeo
Copy link
Contributor

@rushgeo rushgeo commented Dec 5, 2023

Overview

What is the feature?

Add a portal to EDSC for CASEI, the Catalog of Archived Suborbital Earth Science Investigations.

What is the Solution?

A new portal was created using a query for the 107 projects/campaigns currently available from CASEI.

Note that if new projects are added to CASEI, we will need to update this portal config.

We have an old unused portal called Suborbital that looks like it was intended to be use used for CASEI. I tested it, but its query returned fewer collections (669).

Testing

  • Click Browse Portals
  • Ensure there is an option for CASEI, then click it to enter the portal
  • There should be around 1,768 matching collections

Attachments

CASEI added to the list of portals:

image

After entering portal:

image

Checklist

  • I have added automated tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

Copy link

codecov bot commented Dec 5, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6464b9d) 91.94% compared to head (fb5838c) 91.94%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1699   +/-   ##
=======================================
  Coverage   91.94%   91.94%           
=======================================
  Files         725      725           
  Lines       19353    19353           
  Branches     4561     4561           
=======================================
  Hits        17795    17795           
  Misses       1422     1422           
  Partials      136      136           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

"parentConfig": "edsc",
"portalBrowser": true,
"query": {
"project": "ABoVE&project=SnowEx&project=Delta-X&project=S-MODE&project=IMPACTS&project=SASSIE&project=CPEX-CV&project=ACCLIP&project=CALIPSO-NVF&project=DCOTSS&project=ACTIVATE&project=MOOSE&project=CPEX-AW&project=TRACER-AQ&project=OMG&project=EXPORTS&project=CAMP2&project=FIREX-AQ&project=LISTOS&project=ACT-America&project=SCOAPE&project=Aeolus&project=ORACLES&project=HyspIRI&project=OWLETS&project=ATom&project=NAAMES&project=ICE-POP&project=SPURS&project=ACEPOL&project=EPOCH&project=ASCENDS&project=CPEX&project=LMOS&project=CORAL&project=CARAFE&project=GOES-R&project=POSIDON&project=KORUS-AQ&project=KORUS-OC&project=OLYMPEX&project=AfriSAR&project=RADEX&project=CARVE&project=VIRGAS&project=AirMOSS&project=COMEX&project=Polar&project=ATTREX&project=CalWater&project=HS3&project=ARISE&project=DISCOVER-AQ&project=SABOR&project=IPHEx&project=SEAC4&project=MIZOPEX&project=IFloodS&project=HyMeX&project=PODEX&project=DC3&project=BROMEX&project=GCPEx&project=DEVOTE&project=COAST&project=ECO-3&project=ICESCAPE&project=MC3&project=MACPEX&project=LPVEx&project=GRIP&project=CASIE&project=AMISA&project=ARCTAS&project=TC4&project=CLASIC07&project=C3&project=NAMMA&project=CC-VEx&project=INTEX-NA&project=CR-AVE&project=TCSP&project=BigFoot&project=ACES&project=CRYSTAL-FACE&project=CAMEX&project=PAC2001&project=CLAMS&project=TRACE&project=SAFARI&project=ARESE&project=PEM&project=TEFLUN&project=FIRE&project=POLARIS&project=PROVE&project=BOREAS&project=TARFOX&project=ASHOE&project=SPADE&project=AASE&project=OTTER&project=ABLE&project=CITE&project=FIFE&project=AAOE&project=SNF"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an absolute maintenance nightmare. Tags feel much more useful than a list of projects. But if we absolutely must do a list of projects then the config file needs to be an actual list of projects, not a very long string of url parameters.

"parentConfig": "edsc",
"portalBrowser": true,
"query": {
"project": "ABoVE&project=SnowEx&project=Delta-X&project=S-MODE&project=IMPACTS&project=SASSIE&project=CPEX-CV&project=ACCLIP&project=CALIPSO-NVF&project=DCOTSS&project=ACTIVATE&project=MOOSE&project=CPEX-AW&project=TRACER-AQ&project=OMG&project=EXPORTS&project=CAMP2&project=FIREX-AQ&project=LISTOS&project=ACT-America&project=SCOAPE&project=Aeolus&project=ORACLES&project=HyspIRI&project=OWLETS&project=ATom&project=NAAMES&project=ICE-POP&project=SPURS&project=ACEPOL&project=EPOCH&project=ASCENDS&project=CPEX&project=LMOS&project=CORAL&project=CARAFE&project=GOES-R&project=POSIDON&project=KORUS-AQ&project=KORUS-OC&project=OLYMPEX&project=AfriSAR&project=RADEX&project=CARVE&project=VIRGAS&project=AirMOSS&project=COMEX&project=Polar&project=ATTREX&project=CalWater&project=HS3&project=ARISE&project=DISCOVER-AQ&project=SABOR&project=IPHEx&project=SEAC4&project=MIZOPEX&project=IFloodS&project=HyMeX&project=PODEX&project=DC3&project=BROMEX&project=GCPEx&project=DEVOTE&project=COAST&project=ECO-3&project=ICESCAPE&project=MC3&project=MACPEX&project=LPVEx&project=GRIP&project=CASIE&project=AMISA&project=ARCTAS&project=TC4&project=CLASIC07&project=C3&project=NAMMA&project=CC-VEx&project=INTEX-NA&project=CR-AVE&project=TCSP&project=BigFoot&project=ACES&project=CRYSTAL-FACE&project=CAMEX&project=PAC2001&project=CLAMS&project=TRACE&project=SAFARI&project=ARESE&project=PEM&project=TEFLUN&project=FIRE&project=POLARIS&project=PROVE&project=BOREAS&project=TARFOX&project=ASHOE&project=SPADE&project=AASE&project=OTTER&project=ABLE&project=CITE&project=FIFE&project=AAOE&project=SNF"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check if you can do this in the config

Suggested change
"project": "ABoVE&project=SnowEx&project=Delta-X&project=S-MODE&project=IMPACTS&project=SASSIE&project=CPEX-CV&project=ACCLIP&project=CALIPSO-NVF&project=DCOTSS&project=ACTIVATE&project=MOOSE&project=CPEX-AW&project=TRACER-AQ&project=OMG&project=EXPORTS&project=CAMP2&project=FIREX-AQ&project=LISTOS&project=ACT-America&project=SCOAPE&project=Aeolus&project=ORACLES&project=HyspIRI&project=OWLETS&project=ATom&project=NAAMES&project=ICE-POP&project=SPURS&project=ACEPOL&project=EPOCH&project=ASCENDS&project=CPEX&project=LMOS&project=CORAL&project=CARAFE&project=GOES-R&project=POSIDON&project=KORUS-AQ&project=KORUS-OC&project=OLYMPEX&project=AfriSAR&project=RADEX&project=CARVE&project=VIRGAS&project=AirMOSS&project=COMEX&project=Polar&project=ATTREX&project=CalWater&project=HS3&project=ARISE&project=DISCOVER-AQ&project=SABOR&project=IPHEx&project=SEAC4&project=MIZOPEX&project=IFloodS&project=HyMeX&project=PODEX&project=DC3&project=BROMEX&project=GCPEx&project=DEVOTE&project=COAST&project=ECO-3&project=ICESCAPE&project=MC3&project=MACPEX&project=LPVEx&project=GRIP&project=CASIE&project=AMISA&project=ARCTAS&project=TC4&project=CLASIC07&project=C3&project=NAMMA&project=CC-VEx&project=INTEX-NA&project=CR-AVE&project=TCSP&project=BigFoot&project=ACES&project=CRYSTAL-FACE&project=CAMEX&project=PAC2001&project=CLAMS&project=TRACE&project=SAFARI&project=ARESE&project=PEM&project=TEFLUN&project=FIRE&project=POLARIS&project=PROVE&project=BOREAS&project=TARFOX&project=ASHOE&project=SPADE&project=AASE&project=OTTER&project=ABLE&project=CITE&project=FIFE&project=AAOE&project=SNF"
"project": "ABoVE",
"project":"SnowEx"

...

unless we customize some logic from the docs it didn't seem like CMR could parse project=['proj1', 'proj2] etc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, EDSC just keeps the last line if there are multiple lines of "project" keys.
An array would be a nice compromise and might be worth altering parsing logic for.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't this using tags?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll discuss with the product owner next week whether a tags-based workflow would be better for the data owners and users.

In the meantime, the latest commit changes the project list to a string array in portals/casei/config.json, and adds project to the array of keys in sharedConstants/nonIndexedCmrKeys.js. That allows it to be stringified correctly by sharedUtils/prepKeysForCmr.js.

@rushgeo rushgeo marked this pull request as ready for review December 12, 2023 15:38
@eudoroolivares2016
Copy link
Contributor

After discussing the context was that we don't expect these projects to change. This is a stop-gap measure until the UMM-C changes (or perhaps other determined CMR changes) can be made to accommodate casei field data at which point likely other measures (such as a new facet) may be used to filter the collections

@@ -104,6 +104,7 @@ describe('CollectionRequest#nonIndexedKeys', () => {
'point',
'polygon',
'processing_level_id_h',
'project',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QQ: Did project_h not work as the query param to process? Instead of adding project?

@Bccorb Bccorb self-requested a review December 14, 2023 19:17
Copy link
Contributor

@eudoroolivares2016 eudoroolivares2016 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets fix the project facet or determine if we think that warrants holding this off

Copy link
Contributor

@eudoroolivares2016 eudoroolivares2016 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We discussed that facet issue it is something existing so that should not stop this from completing

Doesn't work.
The way the "condition" and "or" keys are stringified are incompatible
with CMR. The stringified array indices for projects are also
unneccessary.
@rushgeo rushgeo merged commit d5403eb into main Dec 15, 2023
9 checks passed
@rushgeo rushgeo deleted the EDSC-3881 branch December 15, 2023 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants