Merge pull request #178 from Caltech-IPAC/dm-7610-resolve

robyww · web-flow · commit 70f282055884 · 2016-09-13T16:31:57.000-07:00
DM-7610: Target panel resolve selection now working
diff --git a/src/firefly/js/ui/CatalogSearchMethodType.jsx b/src/firefly/js/ui/CatalogSearchMethodType.jsx
@@ -219,18 +219,7 @@ function renderTargetPanel(groupKey, searchType) {
     const visible = searchType === SpatialMethod.Cone.value || searchType === SpatialMethod.Box.value || searchType === SpatialMethod.Elliptical.value;
     return (
         visible && <div className='intarget'>
-            <TargetPanel labelWidth={100} groupKey={groupKey}>
-                <ListBoxInputField
-                    fieldKey='targettry'
-                    options={[{label: 'Try NED then Simbad', value: 'NED'},
-                                   {label: 'Try Simbad then NED', value: 'simbad'}
-                              ]}
-                    multiple={false}
-                    label=''
-                    labelWidth={3}
-                    wrapperStyle={{display: 'inline-block'}}
-                />
-            </TargetPanel>
+            <TargetPanel labelWidth={100} groupKey={groupKey}/>
         </div>
     );
 
diff --git a/src/firefly/js/ui/TargetFeedback.jsx b/src/firefly/js/ui/TargetFeedback.jsx
@@ -8,9 +8,10 @@ var TargetFeedback = React.createClass(
 
   render() {
       var topDivStyle= {
-          paddingTop: '5px',
+          paddingTop: 5,
           position: 'relative',
-          height : '50px'
+          height : 50,
+          textAlign : 'center'
       };
       var exDivStyle= {
           display : 'inline-block'
diff --git a/src/firefly/js/ui/TargetPanel.jsx b/src/firefly/js/ui/TargetPanel.jsx
@@ -8,11 +8,17 @@ import {parseTarget, getFeedback, formatPosForTextField} from './TargetPanelWork
 import TargetFeedback from './TargetFeedback.jsx';
 import {InputFieldView} from './InputFieldView.jsx';
 import {fieldGroupConnector} from './FieldGroupConnector.jsx';
+import {ListBoxInputFieldView} from './ListBoxInputField.jsx';
 import FieldGroupUtils, {getFieldGroupState} from '../fieldGroup/FieldGroupUtils.js';
 import {dispatchActiveTarget, getActiveTarget} from '../core/AppDataCntlr.js';
 import {isValidPoint, parseWorldPt} from '../visualize/Point.js';
 
 
+const TARGET= 'targetSource';
+const RESOLVER= 'resolverSource';
+
+const nedThenSimbad= 'nedthensimbad';
+const simbadThenNed= 'simbadthenned';
 
 class TargetPanelView extends Component {
 
@@ -22,12 +28,12 @@ class TargetPanelView extends Component {
     }
 
     render() {
-        const {showHelp, feedback, valid, message, onChange, value, labelWidth, children}= this.props;
+        const {showHelp, feedback, valid, message, onChange, value, labelWidth, children, resolver}= this.props;
         var positionField = (<InputFieldView
                                 valid={valid}
                                 visible= {true}
                                 message={message}
-                                onChange={onChange}
+                                onChange={(ev) => onChange(ev.target.value, TARGET)}
                                 label='Name or Position:'
                                 value={value}
                                 tooltip='Enter a target'
@@ -37,7 +43,20 @@ class TargetPanelView extends Component {
 
         return (
             <div>
-                {positionField}
+                <div style= {{display: 'flex'}}>
+                    {positionField}
+                    <ListBoxInputFieldView
+                        options={[{label: 'Try NED then Simbad', value: nedThenSimbad},
+                               {label: 'Try Simbad then NED', value: simbadThenNed}
+                              ]}
+                        value={resolver}
+                        onChange={(ev) => onChange(ev.target.value, RESOLVER)}
+                        multiple={false}
+                        label=''
+                        labelWidth={3}
+                        wrapperStyle={{}}
+                    />
+                </div>
                 <TargetFeedback showHelp={showHelp} feedback={feedback}/>
             </div>
         );
@@ -49,6 +68,7 @@ TargetPanelView.propTypes = {
     valid   : PropTypes.bool.isRequired,
     showHelp   : PropTypes.bool.isRequired,
     feedback: PropTypes.string.isRequired,
+    resolver: PropTypes.string.isRequired,
     message: PropTypes.string.isRequired,
     onChange: PropTypes.func.isRequired,
     value : PropTypes.string.isRequired,
@@ -74,6 +94,7 @@ function getProps(params, fireValueChange) {
 
     var feedback= params.feedback|| '';
     var value= params.displayValue;
+    var resolver= params.resolver || nedThenSimbad;
     var showHelp= get(params,'showHelp', true);
     const wpStr= params.value;
     const wp= parseWorldPt(wpStr);
@@ -87,11 +108,12 @@ function getProps(params, fireValueChange) {
     return Object.assign({}, params,
         {
             visible: true,
-            onChange: (ev) => handleOnChange(ev,params, fireValueChange),
+            onChange: (value,source) => handleOnChange(value,source,params, fireValueChange),
             label: 'Name or Position:',
             tooltip: 'Enter a target',
             value,
             feedback,
+            resolver,
             showHelp,
             onUnmountCB: didUnmount
         });
@@ -100,21 +122,36 @@ function getProps(params, fireValueChange) {
 
 
 
-function handleOnChange(ev, params, fireValueChange) {
-    var displayValue= ev.target.value;
+function handleOnChange(value, source, params, fireValueChange) {
+    console.log({value,source});
     var {parseResults={}}= params;
 
+    var displayValue;
+    var resolver;
+
+    if (source===TARGET) {
+        resolver= params.resolver || nedThenSimbad;
+        displayValue= value;
+    }
+    else if (source===RESOLVER) {
+        resolver= value;
+        displayValue= params.displayValue || '';
+    }
+    else {
+        console.error('should never be here');
+    }
 
-    parseResults= parseTarget(displayValue, parseResults);
+    parseResults= parseTarget(displayValue, parseResults, resolver);
     var {resolvePromise}= parseResults;
 
     const targetResolve= (asyncParseResults) => {
-        return asyncParseResults ? makePayloadAndUpdateActive(displayValue, asyncParseResults) : null;
+        return asyncParseResults ? makePayloadAndUpdateActive(displayValue, asyncParseResults, null, resolver) : null;
     };
 
     resolvePromise= resolvePromise ? resolvePromise.then(targetResolve) : null;
 
-    fireValueChange(makePayloadAndUpdateActive(displayValue,parseResults, resolvePromise));
+    fireValueChange(makePayloadAndUpdateActive(displayValue,parseResults, resolvePromise, resolver));
+
 }
 
 /**
@@ -125,11 +162,11 @@ function handleOnChange(ev, params, fireValueChange) {
  * @param resolvePromise
  * @return {{message: string, displayValue: *, wpt: (*|null), value: null, valid: *, showHelp: (*|boolean), feedback: (string|*|string), parseResults: *}}
  */
-function makePayloadAndUpdateActive(displayValue, parseResults, resolvePromise) {
+function makePayloadAndUpdateActive(displayValue, parseResults, resolvePromise, resolver) {
     const {wpt}= parseResults;
     const wpStr= parseResults && wpt ? wpt.toString() : null;
 
-    return {
+    const payload= {
         message : 'Could not resolve object: Enter valid object',
         displayValue,
         wpt,
@@ -139,6 +176,8 @@ function makePayloadAndUpdateActive(displayValue, parseResults, resolvePromise)
         feedback : parseResults.feedback,
         parseResults
     };
+    if (resolver) payload.resolver= resolver;
+    return payload;
 }
 
 const connectorDefaultProps = {
diff --git a/src/firefly/js/ui/TargetPanelWorker.js b/src/firefly/js/ui/TargetPanelWorker.js
@@ -22,7 +22,7 @@ export {formatPosForTextField} from '../data/form/PositionFieldDef.js';
 //     showHelp, boolean
 //     return parse results
 
-var makeResolverPromise= function(objName) {
+var makeResolverPromise= function(objName, resolver) {
     var ignoreSearchResults= null;
     var aborted= false;
 
@@ -38,7 +38,7 @@ var makeResolverPromise= function(objName) {
                     reject();
                 }
                 else {
-                    var {p, rejectFunc}= makeSearchPromise(objName);
+                    var {p, rejectFunc}= makeSearchPromise(objName, resolver);
                     ignoreSearchResults= rejectFunc;
                     resolve(p);
                 }
@@ -53,9 +53,9 @@ var makeResolverPromise= function(objName) {
 
 
 
-function makeSearchPromise(objName) {
+function makeSearchPromise(objName, resolver= 'nedthensimbad') {
     var rejectFunc= null;
-    var url= `sticky/CmdSrv?objName=${objName}&resolver=nedthensimbad&cmd=CmdResolveName`;
+    var url= `sticky/CmdSrv?objName=${objName}&resolver=${resolver}&cmd=CmdResolveName`;
     var searchPromise= new Promise(
         function(resolve, reject) {
             fetchUrl(url).then( (response) => {
@@ -75,7 +75,7 @@ function makeSearchPromise(objName) {
 
 
 
-export var parseTarget= function(inStr, lastResults) {
+export var parseTarget= function(inStr, lastResults, resolver) {
     var wpt= null;
     var valid= false;
     var targetInput= inStr;
@@ -103,7 +103,7 @@ export var parseTarget= function(inStr, lastResults) {
                 if (posFieldDef.getObjectName()) {
                     showHelp= false;
                     feedback= `<i>Resolving:</i>  ${posFieldDef.getObjectName()}`;
-                    resolveData= resolveObject(posFieldDef);
+                    resolveData= resolveObject(posFieldDef, resolver);
                 }
                 else {
                     showHelp= true;
@@ -127,7 +127,7 @@ export function getFeedback(wpt) {
     return posFieldDef.formatTargetForHelp(wpt);
 }
 
-var resolveObject = function(posFieldDef) {
+var resolveObject = function(posFieldDef, resolver) {
     var objName= posFieldDef.getObjectName();
     if (!objName) {
         return {
@@ -137,7 +137,7 @@ var resolveObject = function(posFieldDef) {
         };
     }
 
-    var {p,aborter}= makeResolverPromise(objName);
+    var {p,aborter}= makeResolverPromise(objName, resolver);
     p= p.then( (results) =>
         {
             if (results) {
diff --git a/src/firefly/js/ui/VoSearchPanel.jsx b/src/firefly/js/ui/VoSearchPanel.jsx
@@ -64,22 +64,7 @@ export class VoSearchPanel extends React.Component {
 function targetPanelArea() {
     return (
         <div >
-            <TargetPanel groupKey={gkey} labelWidth={100}>
-                <ListBoxInputField
-                    fieldKey='targettry'
-                    initialState={{
-                                  fieldKey:'targettry',
-                                  label : '',
-                                  labelWidth: 0
-                              }}
-                    label={''}
-                    options={[
-                            {label: 'Try NED then Simbad', value: 'NED'},
-                            {label: 'Try Simbad then NED', value: 'simbad'}
-                         ]}
-                    multiple={false}
-                />
-            </TargetPanel>
+            <TargetPanel groupKey={gkey} labelWidth={100}/>
         </div>
     );
 }
diff --git a/src/firefly/js/visualize/ui/ImageSelectPanel.jsx b/src/firefly/js/visualize/ui/ImageSelectPanel.jsx
@@ -513,14 +513,6 @@ function TargetPanelSetView({plotMode, displayEntry}) {
              return (
                  <div className={'intarget'}>
                      <TargetPanel groupKey={panelKey}/>
-                     <ListBoxInputField
-                         fieldKey={keyMap['targettry']}
-                         options={[{label: 'Try NED then Simbad', value: 'NED'},
-                                   {label: 'Try Simbad then NED', value: 'simbad'}
-                              ]}
-                         multiple={false}
-                         labelWidth={3}
-                     />
                  </div>
              );
          }
