Merge pull request #54 from CCI-Tools/544-hp-allow_proxy_config

544 hp allow proxy config

CHANGES.md

@@ -22,6 +22,9 @@
 * Error - Removal of Resource Causes Failure Instead of Gracefully Informing User.
   [#589](https://github.com/CCI-Tools/cate/issues/589)
 
+* Allow proxy configuration in Cate Desktop
+  [#544](https://github.com/CCI-Tools/cate/issues/544)
+
 
 ## Changes in 2.0.0-dev.8 
 

src/renderer/actions.spec.ts

@@ -66,13 +66,15 @@ describe('Actions', () => {
                 {
                     dataStoresPath: '/a/b/c',
                     useWorkspaceImageryCache: false,
-                    resourceNamePattern: 'var_{index}'
+                    resourceNamePattern: 'var_{index}',
+                    proxyUrl: 'http://user:password@host:port'
                 }));
             expect(getState().session.backendConfig).to.deep.equal(
                 {
                     dataStoresPath: '/a/b/c',
                     useWorkspaceImageryCache: false,
-                    resourceNamePattern: 'var_{index}'
+                    resourceNamePattern: 'var_{index}',
+                    proxyUrl: 'http://user:password@host:port'
                 });
         });
     });

src/renderer/components/PanelContainer.tsx

@@ -11,7 +11,6 @@ import {
     // Popover
 } from "@blueprintjs/core";
 import {Splitter} from "./Splitter";
-import ReactElement = React.ReactElement;
 import {CSSProperties} from "react";
 
 export interface PanelContainerLayout {

src/renderer/components/field/Field.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import {isString, isUndefinedOrNull, isDefined, isDefinedAndNotNull} from "../../../common/types";
+import {isString, isUndefinedOrNull, isDefined, isDefinedAndNotNull} from '../../../common/types';
 
 export type FieldType<T> = T | null;
 
@@ -34,7 +34,7 @@ export function toTextValue(value: AnyFieldValue | any) {
     } else if (isString(value)) {
         return value;
     }
-    return isDefinedAndNotNull(value)? `${value}` : '';
+    return isDefinedAndNotNull(value) ? `${value}` : '';
 }
 
 export function toValue(value: any) {
@@ -53,8 +53,8 @@ export function toValue(value: any) {
  */
 export class Field<P extends IFieldProps> extends React.PureComponent<P, IFieldState> {
 
-    static readonly NOMINAL_CLASS = "pt-input";
-    static readonly ERROR_CLASS = "pt-input pt-intent-danger";
+    static readonly NOMINAL_CLASS = 'pt-input';
+    static readonly ERROR_CLASS = 'pt-input pt-intent-danger';
 
     protected _fieldValue: AnyFieldValue;
 
@@ -208,13 +208,15 @@ export class Field<P extends IFieldProps> extends React.PureComponent<P, IFieldS
     render() {
         const error = this.getError();
         // console.log("Field.render: fieldValue = ", this._fieldValue);
+        const errorClassName = Field.ERROR_CLASS + ' ' + this.props.className;
+        const nominalClassName = Field.NOMINAL_CLASS + ' ' + this.props.className;
         return (
             <input value={this.getTextValue()}
                    onChange={this.handleInputChange}
                    onBlur={this.handleBlur}
                    onKeyPress={this.handleKeyPress}
                    type="text"
-                   className={error ? Field.ERROR_CLASS : Field.NOMINAL_CLASS}
+                   className={error ? errorClassName : nominalClassName}
                    style={this.props.style}
                    size={this.props.size}
                    placeholder={this.props.placeholder}

src/renderer/containers/PreferencesDialog.tsx

@@ -97,6 +97,7 @@ class PreferencesDialog extends React.Component<IPreferencesDialogProps & Dispat
             <Tabs2 id="preferences">
                 <Tab2 id="g" title="General" panel={this.renderGeneralPanel()}/>
                 <Tab2 id="dm" title="Data Management" panel={this.renderDataManagementPanel()}/>
+                <Tab2 id="pc" title="Proxy Configuration" panel={this.renderProxyConfigurationPanel()}/>
             </Tabs2>
         );
     }
@@ -123,6 +124,14 @@ class PreferencesDialog extends React.Component<IPreferencesDialogProps & Dispat
         );
     }
 
+    private renderProxyConfigurationPanel() {
+        return (
+            <div style={{width: '100%', marginTop: '1em'}}>
+                {this.renderProxyUrlInput()}
+            </div>
+        );
+    }
+
     private renderReopenLastWorkspace() {
         return this.renderBooleanValue(
             'reopenLastWorkspace',
@@ -187,6 +196,24 @@ class PreferencesDialog extends React.Component<IPreferencesDialogProps & Dispat
         );
     }
 
+    private renderProxyUrlInput() {
+        const initialValue = this.getStateValue("proxyUrl", true);
+        const onChange = this.getChangeHandler("proxyUrl", true);
+        return (
+            <div className="pt-control-group"
+                 style={{width: '100%', marginBottom: '1em', display: 'flex', alignItems: 'center'}}>
+                <span style={{flexBasis: '100px'}}>Proxy URL:</span>
+                <TextField className="pt-input pt-fill"
+                           style={{flexGrow: 0.2, marginLeft: '20px'}}
+                           value={initialValue}
+                           onChange={onChange}
+                           placeholder={'http://user:password@host:port'}
+                           nullable={true}
+                />
+            </div>
+        );
+    }
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Components
     // Note (forman): could make this React component later

src/renderer/containers/VariablesPanel.tsx

@@ -11,7 +11,7 @@ import {Position, Colors} from "@blueprintjs/core";
 import {Cell, Column, Table, TruncatedFormat} from "@blueprintjs/table";
 import {ScrollablePanelContent} from "../components/ScrollableContent";
 import {NO_VARIABLES, NO_VARIABLES_EMPTY_RESOURCE} from "../messages";
-import {CSSProperties} from "react";
+import {CSSProperties} from 'react';
 import * as Cesium from "cesium";
 import {ToolButton} from "../components/ToolButton";
 import {isSpatialImageVariable, isSpatialVectorVariable} from "../state-util";

src/renderer/initial-state.ts

@@ -102,6 +102,7 @@ export const INITIAL_SESSION_STATE: SessionState = {
         dataStoresPath: null,
         useWorkspaceImageryCache: false,
         resourceNamePattern: 'res_{index}',
+        proxyUrl: null,
     },
 };
 

src/renderer/state.ts

@@ -691,6 +691,7 @@ export interface BackendConfigState {
     dataStoresPath: string;
     useWorkspaceImageryCache: boolean;
     resourceNamePattern: string;
+    proxyUrl: string;
 }
 
 export interface Placemark extends Feature<Point> {

src/renderer/webapi/apis/BackendConfigAPI.ts

@@ -11,6 +11,7 @@ function fromPythonConfig(configResponse: any): BackendConfigState|null {
         dataStoresPath: configResponse.data_stores_path,
         useWorkspaceImageryCache: configResponse.use_workspace_imagery_cache,
         resourceNamePattern: configResponse.default_res_pattern,
+        proxyUrl: configResponse.http_proxy
     };
 }
 
@@ -22,6 +23,7 @@ function toPythonConfig(backendConfig: BackendConfigState): any {
         data_stores_path: backendConfig.dataStoresPath,
         use_workspace_imagery_cache: backendConfig.useWorkspaceImageryCache,
         default_res_pattern: backendConfig.resourceNamePattern,
+        http_proxy: backendConfig.proxyUrl
     };
 }