fixed bug when switching scatter options with x, y, and error set bet…

…ween "Add Chart" and "Add New Trace"
Caltech-IPAC · Sep 27, 2018 · 8074fee · 8074fee
1 parent 3fde917
commit 8074fee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/firefly/js/charts/ui/ChartSelectPanel.jsx b/src/firefly/js/charts/ui/ChartSelectPanel.jsx
@@ -215,7 +215,7 @@ function ChartActionOptions(props) {
     const chartId = chartAction === CHART_ADDNEW ? undefined : chartIdProp;
 
     if (chartAction === CHART_ADDNEW || chartAction === CHART_TRACE_ADDNEW) {
-        return (<NewTracePanel {...{groupKey, tbl_id, chartId, hideDialog, showMultiTrace}}/>);
+        return (<NewTracePanel key={chartAction} {...{groupKey, tbl_id, chartId, hideDialog, showMultiTrace}}/>);
     }
     if (chartAction === CHART_TRACE_MODIFY) {
         return (

diff --git a/src/firefly/js/ui/TargetPanelWorker.js b/src/firefly/js/ui/TargetPanelWorker.js
@@ -186,7 +186,7 @@ function resolveObject(posFieldDef, resolver) {
         }
     ).catch((e) => {
         let feedback = `Could not resolve: ${objName}`;
-        if (e.name === 'AbortError') {
+        if (e && e.name === 'AbortError') {
             feedback += '. Unresponsive service.';
         } else {
             feedback += '. Unexpected error.';