Merge pull request #139 from CCI-Tools/forman-xxx-veri_flags_2

forman · web-flow · commit 0f978ff98112 · 2020-12-16T17:46:25.000+01:00
Verification Flags II
diff --git a/.gitignore b/.gitignore
@@ -13,10 +13,7 @@
 
 # misc
 .DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
+.env.*
 
 npm-debug.log*
 yarn-debug.log*
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,13 +3,18 @@
 #### In current
 
 * The DATA SOURCES panel has been updated:
-  - Fixed deferred effect of checkbox "Show identifiers"
-  - Added checkbox "All data sources" that will display all ODP datasets
+  - Fixed deferred effect of checkbox "Show identifiers".
+  - Added checkbox "All data sources" that will display all ODP datasets.
   - Added warn icon to those datasets that cannot be opened from store.
     Such data sources disable the "Open" button and display a popup 
     instead. The popup informs the user how to manually download and open 
-    the datasets. 
-* Using term "sandboxed file system" instead of "user root" in about box 
+    the datasets.
+  - The data Open Dialog no longer displays 
+    + the region constraint, if a dataset has no spatial coordinates;
+    + the cached option, if a dataset cannot be cached.
+  - Displaying a data source's data type, if given, in its list item.
+  - Fixed crash on double-clicking a list item with no selection.
+* Using term "sandboxed file system" instead of "user root" in about box.
 
 #### From previous
 
diff --git a/src/renderer/containers/DataAccessComponent.tsx b/src/renderer/containers/DataAccessComponent.tsx
@@ -37,6 +37,8 @@ export interface IDataAccessComponentProps {
     dataSource: DataSourceState | null;
     isLocalDataSource: boolean;
     temporalCoverage: TimeRangeValue | null;
+    canMap: boolean;
+    canCache: boolean;
 }
 
 
@@ -47,6 +49,7 @@ export interface IDataAccessComponentProps {
  */
 export class DataAccessComponent extends React.Component<IDataAccessComponentProps, null> {
     static readonly VAR_NAMES_INPUT = {name: 'varNames', dataType: 'string', description: null, nullable: true};
+    static readonly SUB_PANEL_STYLE = {marginTop: '1em'};
     static readonly OPTION_CHECK_STYLE = {marginTop: '1em'};
     static readonly OPTION_DIV_STYLE = {marginLeft: '2em'};
 
@@ -144,116 +147,97 @@ export class DataAccessComponent extends React.Component<IDataAccessComponentPro
 
         const res = DataAccessComponent.dataSourceToResource(this.props.dataSource);
 
-        let headerText;
-        let cacheDataSourceCheck;
-        let cacheDataSourcePanel;
-        // let openDatasetResourceNamePanel = (
-        //     <div style={DataAccessComponent.OPTION_DIV_STYLE}>
-        //         <Label>
-        //             Unique name for the new dataset resource
-        //             <span className="bp3-text-muted"> (required)</span>
-        //             <input className="bp3-input"
-        //                    style={{width: '100%'}}
-        //                    type="text"
-        //                    value={options.openDatasetResourceName}
-        //                    onChange={this.onOpenDatasetResourceNameChange}/>
-        //         </Label>
-        //     </div>
-        // );
-        if (isLocalDataSource) {
-            headerText = (<LongIdLabel label='File data source:' longId={this.props.dataSource.title}/>);
-        } else {
-            headerText = (<LongIdLabel label='Remote data source:' longId={this.props.dataSource.title}/>);
-            cacheDataSourceCheck = (
-                <Tooltip
-                    content="If unchecked, remote data will be accessed using an available protocol, e.g. OPeNDAP.">
+        return (
+            <div>
+                {isLocalDataSource
+                 ? (<LongIdLabel label='File data source:' longId={this.props.dataSource.title}/>)
+                 : (<LongIdLabel label='Remote data source:' longId={this.props.dataSource.title}/>)
+                }
+
+                <div style={DataAccessComponent.SUB_PANEL_STYLE}>
                     <Checkbox
-                        style={DataAccessComponent.OPTION_CHECK_STYLE}
-                        checked={isMakeLocalSelected}
-                        label="Cache data source (allocates space on disk)"
-                        onChange={this.onMakeLocalSelectedChange}
+                        disabled={!temporalCoverage}
+                        checked={hasTimeConstraint}
+                        label="Time constraint"
+                        onChange={this.onHasTimeConstraintChange}
                     />
-                </Tooltip>
-            );
-            cacheDataSourcePanel = (
-                <Collapse isOpen={isMakeLocalSelected}>
-                    <div style={DataAccessComponent.OPTION_DIV_STYLE}>
-                        <Label>
-                            Unique identifier for the new local data source
-                            <span className="bp3-text-muted"> (optional)</span>
-                            <InputGroup
-                                style={{width: '100%'}}
-                                type="text"
-                                value={options.cachedDataSourceId}
-                                onChange={this.onMakeLocalDataSourceIdChange}
+                    <Collapse isOpen={hasTimeConstraint}>
+                        <div style={DataAccessComponent.OPTION_DIV_STYLE}>
+                            <DateRangeField
+                                nullable={true}
+                                min={minDate}
+                                max={maxDate}
+                                value={dateRange}
+                                onChange={this.onDateRangeChange}
                             />
-                        </Label>
-                    </div>
-                </Collapse>
-            );
-            /*
-             openDatasetResourceNamePanel = (
-             <Collapse isOpen={isOpenDatasetSelected}>
-             {openDatasetResourceNamePanel}
-             </Collapse>
-             );
-             */
-        }
-
-        return (
-            <div>
-                {headerText}
-
-                <Checkbox
-                    style={DataAccessComponent.OPTION_CHECK_STYLE}
-                    disabled={!temporalCoverage}
-                    checked={hasTimeConstraint}
-                    label="Time constraint"
-                    onChange={this.onHasTimeConstraintChange}
-                />
-                <Collapse isOpen={hasTimeConstraint}>
-                    <div style={DataAccessComponent.OPTION_DIV_STYLE}>
-                        <DateRangeField
-                            nullable={true}
-                            min={minDate}
-                            max={maxDate}
-                            value={dateRange}
-                            onChange={this.onDateRangeChange}
+                            {temporalCoverageText}
+                        </div>
+                    </Collapse>
+                </div>
+
+                {this.props.canMap && (
+                    <div style={DataAccessComponent.SUB_PANEL_STYLE}>
+                        <Checkbox
+                            checked={hasRegionConstraint}
+                            label="Region constraint"
+                            onChange={this.onHasRegionConstraintChange}
                         />
-                        {temporalCoverageText}
+                        <Collapse isOpen={hasRegionConstraint}>
+                            <div style={DataAccessComponent.OPTION_DIV_STYLE}>
+                                <Region
+                                    value={region}
+                                    disabled={!hasRegionConstraint}
+                                    onChange={this.onRegionChange}
+                                />
+                            </div>
+                        </Collapse>
                     </div>
-                </Collapse>
-
-                <Checkbox style={DataAccessComponent.OPTION_CHECK_STYLE}
-                          checked={hasRegionConstraint}
-                          label="Region constraint"
-                          onChange={this.onHasRegionConstraintChange}/>
-                <Collapse isOpen={hasRegionConstraint}>
-                    <div style={DataAccessComponent.OPTION_DIV_STYLE}>
-                        <Region value={region}
-                                disabled={!hasRegionConstraint}
-                                onChange={this.onRegionChange}/>
-                    </div>
-                </Collapse>
-
-                <Checkbox style={DataAccessComponent.OPTION_CHECK_STYLE}
-                          checked={hasVariablesConstraint}
-                          label="Variables constraint"
-                          onChange={this.onHasVariablesConstraintChange}/>
-                <Collapse isOpen={hasVariablesConstraint}>
-                    <div style={DataAccessComponent.OPTION_DIV_STYLE}>
-                        <VarNameValueEditor input={DataAccessComponent.VAR_NAMES_INPUT}
-                                            value={options.variableNames}
-                                            onChange={this.onVariableNamesChange}
-                                            resource={res}
-                                            multi={true}/>
-                    </div>
-                </Collapse>
+                )}
 
-                {cacheDataSourceCheck}
-                {cacheDataSourcePanel}
+                <div style={DataAccessComponent.SUB_PANEL_STYLE}>
+                    <Checkbox
+                        checked={hasVariablesConstraint}
+                        label="Variables constraint"
+                        onChange={this.onHasVariablesConstraintChange}
+                    />
+                    <Collapse isOpen={hasVariablesConstraint}>
+                        <div style={DataAccessComponent.OPTION_DIV_STYLE}>
+                            <VarNameValueEditor input={DataAccessComponent.VAR_NAMES_INPUT}
+                                                value={options.variableNames}
+                                                onChange={this.onVariableNamesChange}
+                                                resource={res}
+                                                multi={true}/>
+                        </div>
+                    </Collapse>
+                </div>
+
+                {this.props.canCache && (
+                    <div style={DataAccessComponent.SUB_PANEL_STYLE}>
+                        <Tooltip content={"If unchecked, remote data will be accessed " +
+                                          "using an available protocol, e.g. OPeNDAP."}>
+                            <Checkbox
+                                checked={isMakeLocalSelected}
+                                label="Cache data source (allocates space on disk)"
+                                onChange={this.onMakeLocalSelectedChange}
+                            />
+                        </Tooltip>
+                        <Collapse isOpen={isMakeLocalSelected}>
+                            <div style={DataAccessComponent.OPTION_DIV_STYLE}>
+                                <Label>
+                                    Unique identifier for the new local data source
+                                    <span className="bp3-text-muted"> (optional)</span>
+                                    <InputGroup
+                                        style={{width: '100%'}}
+                                        type="text"
+                                        value={options.cachedDataSourceId}
+                                        onChange={this.onMakeLocalDataSourceIdChange}
+                                    />
+                                </Label>
+                            </div>
+                        </Collapse>
+                    </div>
+                )}
                 {/*{openDatasetResourceNamePanel}*/}
-
             </div>
         );
     }
diff --git a/src/renderer/containers/DataSourcesPanel.tsx b/src/renderer/containers/DataSourcesPanel.tsx
@@ -241,7 +241,7 @@ class DataSourcesPanel extends React.Component<IDataSourcesPanelProps & IDataSou
                                                   : null}
                             setSelectedDataSourceId={this.props.setSelectedDataSourceId}
                             showDataSourceIDs={this.props.showDataSourceIDs}
-                            doubleClickAction={this.handleShowOpenDatasetDialog}
+                            doubleClickAction={canOpen ? this.handleShowOpenDatasetDialog : undefined}
                         />)
                      : this.renderNoDataSourcesMessage()
                     }
@@ -260,6 +260,7 @@ class DataSourcesPanel extends React.Component<IDataSourcesPanelProps & IDataSou
     }
 
     private handleShowOpenDatasetDialog() {
+        const canOpen = this.props.selectedDataSource;
         this.maybeLoadTemporalCoverage();
         this.props.showDialog('openDatasetDialog');
     }
diff --git a/src/renderer/containers/OpenDatasetDialog.tsx b/src/renderer/containers/OpenDatasetDialog.tsx
@@ -16,6 +16,8 @@ interface IOpenDatasetDialogProps {
     dataStore: DataStoreState | null;
     dataSource: DataSourceState | null;
     temporalCoverage: TimeRangeValue | null;
+    canMap: boolean;
+    canCache: boolean;
     options: IDataAccessComponentOptions;
 }
 
@@ -30,6 +32,8 @@ function mapStateToProps(state: State): IOpenDatasetDialogProps {
         dataStore: selectors.selectedDataStoreSelector(state),
         dataSource: selectors.selectedDataSourceSelector(state),
         temporalCoverage: selectors.selectedDataSourceTemporalCoverageSelector(state),
+        canMap: selectors.canMapDataSourceSelector(state),
+        canCache: selectors.canCacheDataSourceSelector(state),
         options: (dialogState as any).options as IDataAccessComponentOptions,
     };
 }
@@ -52,10 +56,12 @@ class OpenDatasetDialog extends React.Component<IOpenDatasetDialogProps & Dispat
     }
 
     static mapPropsToState(nextProps: IOpenDatasetDialogProps): IOpenDatasetDialogState {
-        let options = nextProps.options
+        let options: IDataAccessComponentOptions = nextProps.options
                       || DataAccessComponent.defaultOptions(isLocalDataStore(nextProps.dataStore),
                                                             nextProps.temporalCoverage);
+        const isCacheDataSourceSelected = nextProps.canCache && options.isCacheDataSourceSelected;
         options = DataAccessComponent.ensureDateRangeIsValidated(options, nextProps.temporalCoverage);
+        options = {...options, isCacheDataSourceSelected}
         return {options};
     }
 
@@ -68,7 +74,8 @@ class OpenDatasetDialog extends React.Component<IOpenDatasetDialogProps & Dispat
     }
 
     private onConfirm() {
-        const options = this.state.options;
+        const isCacheDataSourceSelected = this.props.canCache && this.state.options.isCacheDataSourceSelected;
+        const options: IDataAccessComponentOptions = {...this.state.options, isCacheDataSourceSelected};
         // Clear cachedDataSourceId, so on next props, we can create a new default from selected data source
         // clear cachedDataSourceTitle, hasVariablesConstraint, variableNames, too
         // keep time and geo constraint
@@ -87,7 +94,7 @@ class OpenDatasetDialog extends React.Component<IOpenDatasetDialogProps & Dispat
         this.props.dispatch(actions.openDataset(
             this.props.dataSource.id,
             DataAccessComponent.optionsToOperationArguments(this.state.options),
-            this.isRemoteDataStore && this.state.options.isCacheDataSourceSelected
+            this.isRemoteDataStore && isCacheDataSourceSelected
         ) as any);
         // Save modified state
         this.setState(dialogState);
@@ -140,7 +147,10 @@ class OpenDatasetDialog extends React.Component<IOpenDatasetDialogProps & Dispat
                 onChange={this.onOptionsChange}
                 dataSource={this.props.dataSource}
                 isLocalDataSource={this.isLocalDataStore}
-                temporalCoverage={this.props.temporalCoverage}/>
+                temporalCoverage={this.props.temporalCoverage}
+                canCache={this.props.canCache}
+                canMap={this.props.canMap}
+            />
         );
     }
 
diff --git a/src/renderer/selectors.ts b/src/renderer/selectors.ts
@@ -2,7 +2,13 @@ import { createSelector, Selector } from 'reselect';
 import * as Cesium from 'cesium';
 
 import { requireElectron } from './electron';
-import { canOpenDataSource, DEFAULT_BASE_MAP, DEFAULT_BASE_MAP_ID } from './state-util';
+import {
+    canCacheDataSource,
+    canMapDataSource,
+    canOpenDataSource,
+    DEFAULT_BASE_MAP,
+    DEFAULT_BASE_MAP_ID
+} from './state-util';
 import {
     BaseMapState,
     ColorMapCategoryState,
@@ -443,6 +449,20 @@ export const selectedDataSourceTemporalCoverageSelector = createSelector<State,
     }
 );
 
+export const canCacheDataSourceSelector = createSelector<State, boolean, DataSourceState | null>(
+    selectedDataSourceSelector,
+    (selectedDataSource: DataSourceState | null): boolean => {
+        return selectedDataSource ? canCacheDataSource(selectedDataSource) : false;
+    }
+);
+
+export const canMapDataSourceSelector = createSelector<State, boolean, DataSourceState | null>(
+    selectedDataSourceSelector,
+    (selectedDataSource: DataSourceState | null): boolean => {
+        return selectedDataSource ? canMapDataSource(selectedDataSource) : false;
+    }
+);
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Workspace, resource, step, and variable selectors
 
diff --git a/src/renderer/state-util.ts b/src/renderer/state-util.ts
@@ -109,6 +109,10 @@ export function canCacheDataSource(dataSource: DataSourceState) {
     return _checkDataSource(dataSource, 'cache');
 }
 
+export function canMapDataSource(dataSource: DataSourceState) {
+    return _checkDataSource(dataSource, 'map');
+}
+
 function _checkDataSource(dataSource: DataSourceState, ...flags: DataSourceVerificationFlags[]): boolean {
     if (Array.isArray(dataSource.verificationFlags)) {
         // dataSource.verificationFlags have been introduced for ESA CCI datasets only

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ class DataSourcesPanel extends React.Component<IDataSourcesPanelProps & IDataSou`
`241`	`241`	`: null}`
`242`	`242`	`setSelectedDataSourceId={this.props.setSelectedDataSourceId}`
`243`	`243`	`showDataSourceIDs={this.props.showDataSourceIDs}`
`244`		`- doubleClickAction={this.handleShowOpenDatasetDialog}`
	`244`	`+ doubleClickAction={canOpen ? this.handleShowOpenDatasetDialog : undefined}`
`245`	`245`	`/>)`
`246`	`246`	`: this.renderNoDataSourcesMessage()`
`247`	`247`	`}`
`@@ -260,6 +260,7 @@ class DataSourcesPanel extends React.Component<IDataSourcesPanelProps & IDataSou`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`private handleShowOpenDatasetDialog() {`
	`263`	`+ const canOpen = this.props.selectedDataSource;`
`263`	`264`	`this.maybeLoadTemporalCoverage();`
`264`	`265`	`this.props.showDialog('openDatasetDialog');`
`265`	`266`	`}`