Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-4158 Fix CMR query to include aggregated days, fix layer disabled when there's data from aggregated days.

Victor Gonzalez Leon7c68d2c098f6
diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.js
index bd725a2c4..982ad03c8 100644
--- a/web/js/containers/sidebar/layer-row.js
+++ b/web/js/containers/sidebar/layer-row.js
@@ -170,7 +170,11 @@ function LayerRow (props) {
// All DDV layer notices are dismissable + Reflectance (Nadir BRDF-Adjusted) + DSWx-HLS
const isLayerNotificationDismissable = layer.type === 'titiler' || layer.title === 'Reflectance (Nadir BRDF-Adjusted)' || layer.subtitle === 'DSWx-HLS';
+ // Days before the selected date that the map has aggregated
+ const lookbackDays = layer.dayRange || (dayCount > 1 ? dayCount - 1 : 0);
+
useEffect(() => {
+ let cancelled = false;
const asyncFunc = async () => {
if (layer.enableCMRDataFinder && isVisible) {
const conceptID = layer?.conceptIds?.[0]?.value || layer?.collectionConceptID;
@@ -190,7 +194,7 @@ function LayerRow (props) {
const olderUrl = buildGranulesUrl(cmrBaseUrl, {
conceptId: conceptID,
bbox: extent.join(','),
- temporal: `P0Y0M0DT0H0M/${zeroedDate}`,
+ temporal: `P0Y0M${lookbackDays}DT0H0M/${zeroedDate}`,
sortKey: '-start_date',
pageSize: 1,
});
@@ -202,11 +206,13 @@ function LayerRow (props) {
pageSize: 1,
});
const requests = [cmrFetch(olderUrl), cmrFetch(newerUrl)];
+ if (cancelled) return;
const responses = await Promise.allSettled(requests);
const [olderRes, newerRes] = responses.filter(({ status }) => status === 'fulfilled').map(({ value }) => value);
if (!olderRes?.ok || !newerRes?.ok) return;
const jsonRequests = [olderRes.json(), newerRes.json()];
const jsonResponses = await Promise.allSettled(jsonRequests);
+ if (cancelled) return;
const [olderGranules, newerGranules] = jsonResponses.filter(({ status }) => status === 'fulfilled').map(({ value }) => value);
const olderEntries = olderGranules?.feed?.entry || [];
const newerEntries = newerGranules?.feed?.entry || [];
@@ -231,7 +237,8 @@ function LayerRow (props) {
}
};
asyncFunc();
- }, [map.extent, zot, selectedDate, isVisible]);
+ return () => { cancelled = true; };
+ }, [map.extent, zot, selectedDate, isVisible, lookbackDays]);
// hook that checks if the ddv layer zoom alert should be enabled or disabled
useEffect(() => {
diff --git a/web/js/containers/sidebar/layer-row.test.js b/web/js/containers/sidebar/layer-row.test.js
index 81398bcc7..0a2e0dab5 100644
--- a/web/js/containers/sidebar/layer-row.test.js
+++ b/web/js/containers/sidebar/layer-row.test.js
@@ -1333,6 +1333,29 @@ describe('Async CMR effect', () => {
await waitFor(() => expect(cmrFetch).toHaveBeenCalled());
expect(queryByTestId('alert-granule-alert')).not.toBeInTheDocument();
});
+
+ it('widens the older CMR query to cover for aggregated day ranges', async () => {
+ const { buildGranulesUrl } = jest.requireMock('../../util/cmr');
+ renderComponent({ layer: cmrLayer, isVisible: true, dayCount: 5 });
+ await waitFor(() => expect(buildGranulesUrl).toHaveBeenCalled());
+ expect(buildGranulesUrl.mock.calls[0][1].temporal).toMatch(/^P0Y0M4DT0H0M\//);
+ });
+
+ it('re-runs the CMR check and clears the granule alert when dayCount grows into data', async () => {
+ const { cmrFetch } = jest.requireMock('../../util/cmr');
+ const props = {layer: cmrLayer, isVisible: true, zot: null, dayCount: 1};
+ const {findByTestId, queryByTestId, rerender} = renderComponent(props);
+ await findByTestId('alert-granule-alert');
+
+ cmrFetch.mockResolvedValue({
+ ok: true,
+ json: jest.fn().mockResolvedValue({feed: {entry: [{id: 'G1'}]}}),
+ });
+ const callsBefore = cmrFetch.mock.calls.length;
+ rerender(<LayerRow {...defaultProps} {...props} dayCount={5} />);
+ await waitFor(() => expect(cmrFetch.mock.calls.length).toBeGreaterThan(callsBefore));
+ await waitFor(() => expect(queryByTestId('alert-granule-alert')).not.toBeInTheDocument());
+ });
});
// ─── Additional mapStateToProps branches ──────────────────────────────────────