From 4d283c4081871a3f5103194975f4d8124e60da2d Mon Sep 17 00:00:00 2001 From: Jimmy Date: Wed, 12 Jun 2024 09:17:40 -0700 Subject: [PATCH] Feature/swodlr UI sci orbit message (#112) * /version v1.0.0-rc.1 * /version v1.0.0-rc.2 * Pull in recent changes to 1.0.0 * /version v1.0.0-rc.3 * Fix umm-t record * /version v1.0.0-rc.4 * Fix umm-t record * /version v1.0.0-rc.5 * Fix umm-t record * /version v1.0.0-rc.6 * /version v1.0.0-rc.7 * issue/manual-granule-input-hotfix: fixed how ranged of scenes are processed (#86) Co-authored-by: jbyrne * Issues/swodlr UI 72 essential UI bug fixes (#87) * issues/swodlr-ui-72: fix cps url params bug * issues/swodlr-ui-72 * issues/swodlr-ui-75: fixed a couple bugs * issues/swodlr-ui-72: fixed map movement, adjust options, data page limit, etc * issues/swodlr-ui-72: changed spatial search beginning date in range * issues/swodlr-ui-72-essential-fixes: cleaned up comments --------- Co-authored-by: jbyrne * /version v1.0.0-rc.8 * feature/demo-uwg-june2024: fix tutorial popup * feature/demo-uwg-june2024: fix my data page loading bug * feature/demo-uwg-june2024: fix my data page no data navigation * feature/swodlr-ui-107: grey out some product customization options * feature/swodlr-ui-107: added info alert about disabled parameter options * feature/swodlr-ui-107: added feature not available tooltip * feature/swodlr-ui-107: change feature not available alert message * feature/swodlr-ui-sci-orbiit-message: added message for only sci orbits * feature/swodlr-ui-sci-orbit-message: update cycle to 1-399 --------- Co-authored-by: frankinspace Co-authored-by: Frank Greguska Co-authored-by: Jonathan M Smolenski Co-authored-by: jonathansmolenski Co-authored-by: jbyrne --- src/components/sidebar/GranulesTable.tsx | 7 +++++-- src/constants/rasterParameterConstants.ts | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/sidebar/GranulesTable.tsx b/src/components/sidebar/GranulesTable.tsx index cdf13bf..aa33d3b 100644 --- a/src/components/sidebar/GranulesTable.tsx +++ b/src/components/sidebar/GranulesTable.tsx @@ -6,7 +6,7 @@ import { granuleAlertMessageConstant, granuleSelectionLabels, productCustomizati afterCPSL, afterCPSR, spatialSearchCollectionConceptId} from '../../constants/rasterParameterConstants'; -import { Button, Col, Form, OverlayTrigger, Row, Tooltip, Spinner } from 'react-bootstrap'; +import { Button, Col, Form, OverlayTrigger, Row, Tooltip, Spinner, Alert } 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, clearGranuleTableAlerts, setWaitingForSpatialSearch } from './actions/productSlice'; @@ -740,7 +740,7 @@ const GranuleTable = (props: GranuleTableProps) => { setScene(event.target.value)}/> - Valid Values: + Valid Values: {renderInfoIcon('validCPSValues')} {`${inputBounds.cycle.min} - ${inputBounds.cycle.max}`} {`${inputBounds.pass.min} - ${inputBounds.pass.max}`} {`${inputBounds.scene.min} - ${inputBounds.scene.max}`} @@ -755,6 +755,9 @@ const GranuleTable = (props: GranuleTableProps) => { {tableType === 'granuleSelection' ? ( <> To add multiple scenes at once, enter two numbers into the scene input field separated by a hyphen (e.g. 1-10) + + Only scientific orbit cycle, pass, scene values are supported at this time. + {waitingForScenesToBeAdded || waitingForSpatialSearch || waitingForFootprintSearch ? diff --git a/src/constants/rasterParameterConstants.ts b/src/constants/rasterParameterConstants.ts index 408fe36..79b40d9 100644 --- a/src/constants/rasterParameterConstants.ts +++ b/src/constants/rasterParameterConstants.ts @@ -108,7 +108,8 @@ export const parameterHelp: ParameterHelp = { pass: `Predefined sections of the orbit between the maximum and minimum latitudes. SWOT has 584 passes in one cycle, split into ascending and descending passes`, scene: `Predefined 128 x 128 km squares of the SWOT observations.`, status: `The processing status of your custom product. The status types are as follows: NEW, UNAVAILABLE, GENERATING, ERROR, READY, AVAILABLE`, - granuleTableLimit: `There is a limit of ${granuleTableLimit} scenes allowed to be added to the scene table at a time. This is to ensure our scene processing pipeline can handle the demand of all of SWODLR's users.` + granuleTableLimit: `There is a limit of ${granuleTableLimit} scenes allowed to be added to the scene table at a time. This is to ensure our scene processing pipeline can handle the demand of all of SWODLR's users.`, + validCPSValues: `There are two types of orbits, calibration and scientific. Calibration orbits have a 400-578 cycle range and science orbits have a 0-399 cycle range. Cycles in the calibration orbit range are not currently supported at this time but will be in the future.`, } export interface InputBounds { @@ -118,10 +119,12 @@ export interface InputBounds { } } +// cycle for calibration orbit is 400-578 +// TODO: change cycle max back to 578 when calibration orbit is implemented export const inputBounds: inputValuesDictionary = { cycle: { - min: 0, - max: 578 + min: 1, + max: 399 }, pass: { min: 1,