EDSC-3773: Some adjustments to the EDSC-3773 merge

static/src/js/actions/__tests__/focusedCollection.test.js

@@ -206,7 +206,7 @@ describe('getFocusedCollection', () => {
                     'org.ceos.wgiss.cwic.granules.prod': {}
                   },
                   tools: {
-                    items: null
+                    items: []
                   }
                 }
               }
@@ -286,7 +286,7 @@ describe('getFocusedCollection', () => {
                     'org.ceos.wgiss.cwic.granules.prod': {}
                   },
                   tools: {
-                    items: null
+                    items: []
                   }
                 }
               }
@@ -370,7 +370,7 @@ describe('getFocusedCollection', () => {
                   }
                 },
                 tools: {
-                  items: null
+                  items: []
                 }
               }
             }
@@ -524,7 +524,7 @@ describe('getFocusedCollection', () => {
                 }
               ],
               tools: {
-                items: null
+                items: []
               }
             }
           }

static/src/js/actions/__tests__/project.test.js

@@ -287,24 +287,24 @@ describe('getProjectCollections', () => {
                 }]
               },
               services: {
-                items: null
+                items: []
               },
               dataQualitySummaries:
               {
-                items: null
+                items: []
               }
             },
             {
               conceptId: 'collectionId2',
               tools: {
-                items: null
+                items: []
               },
               services: {
-                items: null
+                items: []
               },
               dataQualitySummaries:
               {
-                items: null
+                items: []
               }
             }]
           }
@@ -350,7 +350,8 @@ describe('getProjectCollections', () => {
 
     const storeActions = store.getActions()
 
-    expect(storeActions.length).toEqual(4)
+    expect(storeActions.length).toEqual(6)
+
     expect(storeActions[0]).toEqual({
       type: ADD_ACCESS_METHODS,
       payload: {
@@ -360,6 +361,14 @@ describe('getProjectCollections', () => {
     })
 
     expect(storeActions[1]).toEqual({
+      type: SET_DATA_QUALITY_SUMMARIES,
+      payload: {
+        catalogItemId: 'collectionId1',
+        dataQualitySummaries: []
+      }
+    })
+
+    expect(storeActions[2]).toEqual({
       type: UPDATE_COLLECTION_METADATA,
       payload: [
         expect.objectContaining({
@@ -371,15 +380,23 @@ describe('getProjectCollections', () => {
       ]
     })
 
-    expect(storeActions[2]).toEqual({
+    expect(storeActions[3]).toEqual({
       type: ADD_ACCESS_METHODS,
       payload: {
         collectionId: 'collectionId2',
         methods: {}
       }
     })
 
-    expect(storeActions[3]).toEqual({
+    expect(storeActions[4]).toEqual({
+      type: SET_DATA_QUALITY_SUMMARIES,
+      payload: {
+        catalogItemId: 'collectionId2',
+        dataQualitySummaries: []
+      }
+    })
+
+    expect(storeActions[5]).toEqual({
       type: UPDATE_COLLECTION_METADATA,
       payload: [
         expect.objectContaining({
@@ -609,24 +626,24 @@ describe('getProjectCollections', () => {
                 }]
               },
               services: {
-                items: null
+                items: []
               },
               dataQualitySummaries:
               {
-                items: null
+                items: []
               }
             },
             {
               conceptId: 'collectionId2',
               tools: {
-                items: null
+                items: []
               },
               services: {
-                items: null
+                items: []
               },
               dataQualitySummaries:
               {
-                items: null
+                items: []
               }
             }]
           }
@@ -674,7 +691,8 @@ describe('getProjectCollections', () => {
 
     const storeActions = store.getActions()
 
-    expect(storeActions.length).toEqual(5)
+    expect(storeActions.length).toEqual(7)
+
     expect(storeActions[0]).toEqual({
       type: ADD_ERROR,
       payload: expect.objectContaining({
@@ -693,6 +711,14 @@ describe('getProjectCollections', () => {
     })
 
     expect(storeActions[2]).toEqual({
+      type: SET_DATA_QUALITY_SUMMARIES,
+      payload: {
+        catalogItemId: 'collectionId1',
+        dataQualitySummaries: []
+      }
+    })
+
+    expect(storeActions[3]).toEqual({
       type: UPDATE_COLLECTION_METADATA,
       payload: [
         expect.objectContaining({
@@ -704,15 +730,23 @@ describe('getProjectCollections', () => {
       ]
     })
 
-    expect(storeActions[3]).toEqual({
+    expect(storeActions[4]).toEqual({
       type: ADD_ACCESS_METHODS,
       payload: {
         collectionId: 'collectionId2',
         methods: {}
       }
     })
 
-    expect(storeActions[4]).toEqual({
+    expect(storeActions[5]).toEqual({
+      type: SET_DATA_QUALITY_SUMMARIES,
+      payload: {
+        catalogItemId: 'collectionId2',
+        dataQualitySummaries: []
+      }
+    })
+
+    expect(storeActions[6]).toEqual({
       type: UPDATE_COLLECTION_METADATA,
       payload: [
         expect.objectContaining({
@@ -750,26 +784,26 @@ describe('getProjectCollections', () => {
                 ],
                 dataQualitySummaries:
                 {
-                  items: null
+                  items: []
                 },
                 tools: {
-                  items: null
+                  items: []
                 },
                 services: {
-                  items: null
+                  items: []
                 }
               },
               {
                 conceptId: 'collectionId2',
                 tools: {
-                  items: null
+                  items: []
                 },
                 dataQualitySummaries:
                 {
-                  items: null
+                  items: []
                 },
                 services: {
-                  items: null
+                  items: []
                 }
               }]
             }
@@ -815,7 +849,7 @@ describe('getProjectCollections', () => {
 
       const storeActions = store.getActions()
 
-      expect(storeActions.length).toEqual(4)
+      expect(storeActions.length).toEqual(6)
 
       expect(storeActions[0]).toEqual({
         type: ADD_ACCESS_METHODS,
@@ -826,6 +860,14 @@ describe('getProjectCollections', () => {
       })
 
       expect(storeActions[1]).toEqual({
+        type: SET_DATA_QUALITY_SUMMARIES,
+        payload: {
+          catalogItemId: 'collectionId1',
+          dataQualitySummaries: []
+        }
+      })
+
+      expect(storeActions[2]).toEqual({
         type: UPDATE_COLLECTION_METADATA,
         payload: [
           expect.objectContaining({
@@ -837,15 +879,23 @@ describe('getProjectCollections', () => {
         ]
       })
 
-      expect(storeActions[2]).toEqual({
+      expect(storeActions[3]).toEqual({
         type: ADD_ACCESS_METHODS,
         payload: {
           collectionId: 'collectionId2',
           methods: {}
         }
       })
 
-      expect(storeActions[3]).toEqual({
+      expect(storeActions[4]).toEqual({
+        type: 'SET_DATA_QUALITY_SUMMARIES',
+        payload: {
+          catalogItemId: 'collectionId2',
+          dataQualitySummaries: []
+        }
+      })
+
+      expect(storeActions[5]).toEqual({
         type: UPDATE_COLLECTION_METADATA,
         payload: [
           expect.objectContaining({

static/src/js/components/Map/__tests__/mocks.js

@@ -812,7 +812,7 @@ export const updateProps = {
     isOpenSearch: false,
     services: {
       count: 0,
-      items: null
+      items: []
     },
     shortName: 'MOD13Q1',
     tags: {
@@ -983,7 +983,7 @@ export const updateProps = {
     title: 'MODIS/Terra Vegetation Indices 16-Day L3 Global 250m SIN Grid V006',
     variables: {
       count: 0,
-      items: null
+      items: []
     },
     versionId: '006',
     gibsLayers: 'Geographic',

static/src/js/constants/accessMethodTypes.js

@@ -0,0 +1,5 @@
+export const ECHO_ORDERS = 'echoOrders'
+export const ESI = 'esi'
+export const OPENDAP = 'opendap'
+export const HARMONY = 'harmony'
+export const SWODLR = 'swodlr'