- {granuleTableAlerts.map((alertObject, index) => (
+ {granuleTableAlerts.filter(item => item.tableType === tableType).map((alertObject, index) => (
{alertObject.message}
diff --git a/src/components/sidebar/GranulesTable.tsx b/src/components/sidebar/GranulesTable.tsx
index 4bb8342..3e42b76 100644
--- a/src/components/sidebar/GranulesTable.tsx
+++ b/src/components/sidebar/GranulesTable.tsx
@@ -6,7 +6,7 @@ import { granuleAlertMessageConstant, granuleSelectionLabels, productCustomizati
import { Button, Col, Form, OverlayTrigger, Row, Tooltip, Spinner } from 'react-bootstrap';
import { InfoCircle, Plus, Trash } from 'react-bootstrap-icons';
import { AdjustType, AdjustValueDecoder, GranuleForTable, GranuleTableProps, InputType, SaveType, SpatialSearchResult, TableTypes, alertMessageInput, allProductParameters, handleSaveResult, validScene } from '../../types/constantTypes';
-import { addProduct, setSelectedGranules, setGranuleFocus, addGranuleTableAlerts, editProduct, addSpatialSearchResults, setWaitingForFootprintSearch, clearGranuleTableAlerts } from './actions/productSlice';
+import { addProduct, setSelectedGranules, setGranuleFocus, addGranuleTableAlerts, editProduct, addSpatialSearchResults, clearGranuleTableAlerts, setWaitingForSpatialSearch } from './actions/productSlice';
import { setShowDeleteProductModalTrue } from './actions/modalSlice';
import DeleteGranulesModal from './DeleteGranulesModal';
import { graphQLClient } from '../../user/userData';
@@ -23,9 +23,10 @@ const GranuleTable = (props: GranuleTableProps) => {
const generateProductParameters = useAppSelector((state) => state.product.generateProductParameters)
const showUTMAdvancedOptions = useAppSelector((state) => state.product.showUTMAdvancedOptions)
const waitingForSpatialSearch = useAppSelector((state) => state.product.waitingForSpatialSearch)
- const waitingForFootprintSearch = useAppSelector((state) => state.product.waitingForFootprintSearch)
const spatialSearchStartDate = useAppSelector((state) => state.product.spatialSearchStartDate)
const spatialSearchEndDate = useAppSelector((state) => state.product.spatialSearchEndDate)
+ const startTutorial = useAppSelector((state) => state.app.startTutorial)
+ const userHasCorrectEdlPermissions = useAppSelector((state) => state.app.userHasCorrectEdlPermissions)
const dispatch = useAppDispatch()
@@ -37,7 +38,6 @@ const GranuleTable = (props: GranuleTableProps) => {
// set the default url state parameters
useEffect(() => {
- dispatch(clearGranuleTableAlerts())
// if any cycle scene and pass parameters in url, add them to table
const cyclePassSceneParameters = searchParams.get('cyclePassScene')
if (cyclePassSceneParameters) {
@@ -47,33 +47,93 @@ const GranuleTable = (props: GranuleTableProps) => {
handleSave('urlParameter', sceneParamArray.length, index, splitSceneParams[0], splitSceneParams[1], splitSceneParams[2])
})
}
- }, [tableType === 'granuleSelection' ? null : addedProducts])
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [tableType === 'granuleSelection' ? null : addedProducts, startTutorial ? searchParams : null])
+ const validateSceneAvailability = async (cycleToUse: number, passToUse: number, sceneToUse: number[], cpsList?: {cycle: string, pass: string, scene: string}[]): Promise => {
+ try {
+ // build graphql availableScene query with all cycle/pass/scene combos requested
+ let queryAliasString = ``
+ // if there is a list of cycle pass and scenes go through them (spatial search) and if not, use first 3 function params (manual search)
+ if (cpsList) {
+ for(const specificCPS of cpsList) {
+ const {cycle, pass, scene} = specificCPS
+ const comboId = `${cycle}_${pass}_${scene}`
+ queryAliasString += ` s_${comboId}: availableScene(cycle: ${cycle}, pass: ${pass}, scene: ${scene}) `
+ }
+ } else {
+ for(const specificScene of sceneToUse) {
+ const comboId = `${cycleToUse}_${passToUse}_${specificScene}`
+ queryAliasString += ` s_${comboId}: availableScene(cycle: ${cycleToUse}, pass: ${passToUse}, scene: ${specificScene}) `
+ }
+ }
+ const queryAliasObject = `{${queryAliasString}}`
+ const res: {availableScene: boolean} = await graphQLClient.request(queryAliasObject).then(response => {
+ const responseToReturn = Object.fromEntries(Object.entries(response as {availableScene: boolean}).map(responseObj => [responseObj[0].replace('s_', ''), responseObj[1]]))
+ return responseToReturn as {availableScene: boolean}
+ })
+ return res
+
+ } catch (err) {
+ console.log (err)
+ return {}
+ }
+ }
+
+ // Spatial search use effect
useEffect(() => {
dispatch(clearGranuleTableAlerts())
if (spatialSearchResults.length > 0) {
let scenesFoundArray: string[] = []
let addedScenes: string[] = []
+
const fetchData = async () => {
- for(let i=0; i {
- if(result.savedScenes) {
- addedScenes.push(...(result.savedScenes).map(productObject => productObject.granuleId))
+ if (spatialSearchResults.length < 1000) {
+ // check validity before saving
+ const validationResult = await validateSceneAvailability(0,0,[0],spatialSearchResults).then(result => Object.entries(result).filter(resultEntry => resultEntry[1]).map(valuePair => {
+ const cpsSplit = valuePair[0].split('_')
+ return {cycle: cpsSplit[0], pass: cpsSplit[1], scene: cpsSplit[2]}
+ }))
+
+ if (validationResult.length > 0) {
+ for(let i=0; i result === 'found something').length) >= granuleTableLimit) {
+ // don't let more than 10 be added
+ scenesFoundArray.push('hit granule limit')
+ } else {
+ await handleSave('spatialSearch', validationResult.length, i, validationResult[i].cycle, validationResult[i].pass, validationResult[i].scene).then(result => {
+ if(result.savedScenes) {
+ addedScenes.push(...(result.savedScenes).map(productObject => productObject.granuleId))
+ }
+ scenesFoundArray.push(result.result)
+ })
+ }
+
}
- scenesFoundArray.push(result.result)
- })
+ if(addedScenes.length > 0) {
+ // add parameters
+ addSearchParamToCurrentUrlState({'cyclePassScene': addedScenes.join('-')})
+ }
+ } else {
+ scenesFoundArray.push('noScenesFound')
+ }
+ } else {
+ // If too many spatial search results, the search doesn't work because there too many granules and a limit was reached.
+ // In this scenario, make an alert that indicates that the search area was too large.
+ // TODO: remove this alert when there is a fix implemented for cmr spatial search limit.
+ // The valid granules are sometimes not a part of the first 1000 results which is the bug here.
+ scenesFoundArray.push('spatialSearchAreaTooLarge')
}
- // add parameters
- addSearchParamToCurrentUrlState({'cyclePassScene': addedScenes.join('-')})
+ dispatch(setWaitingForSpatialSearch(false))
return scenesFoundArray
}
// call the function
fetchData()
.then((noScenesFoundResults) => {
- if(noScenesFoundResults.includes('noScenesFound') && !noScenesFoundResults.includes('found something')){
- setSaveGranulesAlert('noScenesFound')
- }
+ if(noScenesFoundResults.includes('noScenesFound') && !noScenesFoundResults.includes('found something')) setSaveGranulesAlert('noScenesFound')
+ if(noScenesFoundResults.includes('hit granule limit')) setSaveGranulesAlert('granuleLimit')
+ if(noScenesFoundResults.includes('spatialSearchAreaTooLarge')) setSaveGranulesAlert('spatialSearchAreaTooLarge')
})
// make sure to catch any error
.catch(console.error);
@@ -81,6 +141,7 @@ const GranuleTable = (props: GranuleTableProps) => {
// clear spatial results out of redux after use
if(spatialSearchResults.length !== 0) dispatch(addSpatialSearchResults([] as SpatialSearchResult[]))
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [spatialSearchResults])
const addSearchParamToCurrentUrlState = (newPairsObject: object, remove?: string) => {
@@ -136,26 +197,7 @@ const GranuleTable = (props: GranuleTableProps) => {
const [scene, setScene] = useState('');
const allAddedGranules = addedProducts.map(parameterObject => parameterObject.granuleId)
const [waitingForScenesToBeAdded, setWaitingForScenesToBeAdded] = useState(false)
-
-const validateSceneAvailability = async (cycleToUse: number, passToUse: number, sceneToUse: number[]): Promise => {
- try {
- // build graphql availableScene query with all cycle/pass/scene combos requested
- let queryAliasString = ``
- for(const specificScene of sceneToUse) {
- const comboId = `${cycleToUse}_${passToUse}_${specificScene}`
- queryAliasString += ` s_${comboId}: availableScene(cycle: ${cycleToUse}, pass: ${passToUse}, scene: ${specificScene}) `
- }
- const queryAliasObject = `{${queryAliasString}}`
- const res: {availableScene: boolean} = await graphQLClient.request(queryAliasObject, {cycle: cycleToUse, pass: passToUse, scene: sceneToUse[0]}).then(response => {
- const responseToReturn = Object.fromEntries(Object.entries(response as {availableScene: boolean}).map(responseObj => [responseObj[0].replace('s_', ''), responseObj[1]]))
- return responseToReturn as {availableScene: boolean}
- })
- return res
- } catch (err) {
- console.log (err)
- return {}
- }
-}
+ const [waitingForFootprintSearch, setWaitingForFootprintSearch] = useState(false)
const getScenesArray = (sceneString: string): string[] => {
const scenesArray = []
@@ -172,7 +214,7 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
return scenesArray
}
- const setSaveGranulesAlert = (alert: alertMessageInput) => {
+ const setSaveGranulesAlert = (alert: alertMessageInput, additionalParameters?: any[]) => {
const {message, variant} = granuleAlertMessageConstant[alert]
dispatch(addGranuleTableAlerts({type: alert, message, variant, tableType: 'granuleSelection' }))
}
@@ -242,7 +284,7 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
if (authToken === null) {
throw new Error('Failed to get authentication token');
}
- dispatch(setWaitingForFootprintSearch(true))
+ setWaitingForFootprintSearch(true)
// convert the tileId in the cps string to a sceneId (divide by 2)
const granuleIdTileToSceneArray = granuleId.split('_')
let sceneString = String(parseInt(granuleIdTileToSceneArray[2])/2).padStart(3, '0');
@@ -274,10 +316,10 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
return [[], true]
}
})
- dispatch(setWaitingForFootprintSearch(false))
+ setWaitingForFootprintSearch(false)
return footprintResult
} catch (err) {
- dispatch(setWaitingForFootprintSearch(false))
+ setWaitingForFootprintSearch(false)
console.log (err)
if (err instanceof Error) {
return err
@@ -316,14 +358,13 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
if (!validPass) setSaveGranulesAlert('invalidPass')
if (!validScene) setSaveGranulesAlert('invalidScene')
return {result: 'first step'}
- } else if (addedProducts.length >= granuleTableLimit) {
- setSaveGranulesAlert('granuleLimit')
- return {result: 'second-step'}
- } else {
+ }
+ else {
const granulesToAdd: allProductParameters[] = []
let someGranulesAlreadyAdded = false
let cyclePassSceneSearchParams = searchParams.get('cyclePassScene') ? String(searchParams.get('cyclePassScene')) : ''
const sceneArray = getScenesArray(sceneToUse)
+ let validScenesThatCouldNotBeAdded: string[] = []
// check scenes availability
const validationResult = await validateSceneAvailability(parseInt(cycleToUse), parseInt(passToUse), sceneArray.map(sceneId => parseInt(sceneId))).then(scenesAvailable => {
// return response
@@ -337,31 +378,36 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
})
// TODO: make alert more verbose if some granules are added and others are not when adding more than one with scene hyphen
sceneArray.filter(sceneNumber => scenesAvailable[`${cycleToUse}_${passToUse}_${sceneNumber}`]).forEach(async sceneId => {
- // check if granule exists with that scene, cycle, and pass
- const comboAlreadyAdded = alreadyAddedCyclePassScene(cycleToUse, passToUse, sceneId)
- const cyclePassSceneInBounds = checkInBounds('cycle', cycleToUse) && checkInBounds('pass', passToUse) && checkInBounds('scene', sceneId)
- if (cyclePassSceneInBounds && !comboAlreadyAdded) {
- // get the granuleId from it and pass it to the parameters
- const parameters: allProductParameters = {
- granuleId: `${cycleToUse}_${passToUse}_${sceneId}`,
- name: '',
- cycle: cycleToUse,
- pass: passToUse,
- scene: sceneId,
- outputGranuleExtentFlag: parameterOptionValues.outputGranuleExtentFlag.default as number,
- outputSamplingGridType: parameterOptionValues.outputSamplingGridType.default as string,
- rasterResolution: parameterOptionValues.rasterResolutionUTM.default as number,
- utmZoneAdjust: parameterOptionValues.utmZoneAdjust.default as string,
- mgrsBandAdjust: parameterOptionValues.mgrsBandAdjust.default as string,
- footprint: sampleFootprint
- }
- // add cycle/pass/scene to url parameters
- if (!searchParamSceneComboAlreadyInUrl(cyclePassSceneSearchParams, cycleToUse, passToUse, sceneId)) {
- cyclePassSceneSearchParams += `${cyclePassSceneSearchParams.length === 0 ? '' : '-'}${cycleToUse}_${passToUse}_${sceneId}`
+ if ((granulesToAdd.length + addedProducts.length) >= granuleTableLimit) {
+ validScenesThatCouldNotBeAdded.push(sceneId)
+ setSaveGranulesAlert('granuleLimit')
+ } else {
+ // check if granule exists with that scene, cycle, and pass
+ const comboAlreadyAdded = alreadyAddedCyclePassScene(cycleToUse, passToUse, sceneId)
+ const cyclePassSceneInBounds = checkInBounds('cycle', cycleToUse) && checkInBounds('pass', passToUse) && checkInBounds('scene', sceneId)
+ if (cyclePassSceneInBounds && !comboAlreadyAdded) {
+ // get the granuleId from it and pass it to the parameters
+ const parameters: allProductParameters = {
+ granuleId: `${cycleToUse}_${passToUse}_${sceneId}`,
+ name: '',
+ cycle: cycleToUse,
+ pass: passToUse,
+ scene: sceneId,
+ outputGranuleExtentFlag: parameterOptionValues.outputGranuleExtentFlag.default as number,
+ outputSamplingGridType: parameterOptionValues.outputSamplingGridType.default as string,
+ rasterResolution: parameterOptionValues.rasterResolutionUTM.default as number,
+ utmZoneAdjust: parameterOptionValues.utmZoneAdjust.default as string,
+ mgrsBandAdjust: parameterOptionValues.mgrsBandAdjust.default as string,
+ footprint: sampleFootprint
+ }
+ // add cycle/pass/scene to url parameters
+ if (!searchParamSceneComboAlreadyInUrl(cyclePassSceneSearchParams, cycleToUse, passToUse, sceneId)) {
+ cyclePassSceneSearchParams += `${cyclePassSceneSearchParams.length === 0 ? '' : '-'}${cycleToUse}_${passToUse}_${sceneId}`
+ }
+ granulesToAdd.push(parameters)
+ } else if (comboAlreadyAdded) {
+ someGranulesAlreadyAdded = true
}
- granulesToAdd.push(parameters)
- } else if (comboAlreadyAdded) {
- someGranulesAlreadyAdded = true
}
})
if (saveType !== 'spatialSearch' && saveType !== 'urlParameter') {
@@ -394,8 +440,12 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
// don't run time range check if granule was manually entered
if (saveType === 'manual' || saveType === 'urlParameter') {
addSearchParamToCurrentUrlState({'cyclePassScene': cyclePassSceneSearchParams})
- if (saveType !== 'urlParameter') {
- setSaveGranulesAlert('success')
+ if (saveType !== 'urlParameter' || startTutorial) {
+ if (validScenesThatCouldNotBeAdded.length > 0) {
+ setSaveGranulesAlert('someSuccess')
+ } else {
+ setSaveGranulesAlert('success')
+ }
}
dispatch(addProduct(productsWithFootprints))
} else {
@@ -668,7 +718,9 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,
- | setCycle(event.target.value)}/> |
+ {
+ setCycle(event.target.value)
+ }}/> |
setPass(event.target.value)}/> |
setScene(event.target.value)}/> |
@@ -685,20 +737,23 @@ const validateSceneAvailability = async (cycleToUse: number, passToUse: number,