DM-7784-7963: refactor code.

Author: loitly

src/firefly/js/templates/lightcurve/LcManager.js

@@ -30,10 +30,23 @@ export const DEF_IMAGE_CNT= 5;
 export const MAX_IMAGE_CNT= 7;
 const plotIdRoot= 'LC_FRAME-';
 
+
+var webplotRequestCreator;
+/**
+ * A function to create a WebPlotRequest from the given parameters
+ * @callback WebplotRequestCreator
+ * @param {TableModel} tableModel
+ * @param {number} hlrow
+ * @param {number} cutoutSize
+ */
+
 /**
- *  This event manager is custom made for light curve viewer.
+ * This event manager is custom made for light curve viewer.
+ * @param {Object} params
+ * @props {WebplotRequestCreator} params.webplotRequestCreator
  */
-export function* lcManager() {
+export function* lcManager(params={}) {
+    webplotRequestCreator = params.WebplotRequestCreator || getWebPlotRequestViaUrl;
 
     while (true) {
         const action = yield take([
@@ -87,7 +100,7 @@ function handleTableLoad(layoutInfo, action) {
     if (isImageEnabledTable(tbl_id)) {
         layoutInfo = updateSet(layoutInfo, 'showImages', true);
         layoutInfo = updateSet(layoutInfo, 'images.activeTableId', tbl_id);
-        exec(setupImages, tbl_id);
+        setupImages(tbl_id);
     }
     return layoutInfo;
 }
@@ -98,15 +111,15 @@ function handleTableActive(layoutInfo, action) {
     const {tbl_id} = action.payload;
     if (isImageEnabledTable(tbl_id)) {
         layoutInfo = updateSet(layoutInfo, 'images.activeTableId', tbl_id);
-        exec(setupImages, tbl_id);
+        setupImages(tbl_id);
     }
     return layoutInfo;
 }
 
 function handleTableHighlight(layoutInfo, action) {
     const {tbl_id} = action.payload;
     if (isImageEnabledTable(tbl_id)) {
-        exec(setupImages, tbl_id);
+        setupImages(tbl_id);
     }
 }
 
@@ -117,7 +130,7 @@ function isImageEnabledTable(tbl_id) {
 function handleChangeMultiViewLayout(layoutInfo, action) {
     const activeTableId = get(layoutInfo, 'images.activeTableId');
     const tbl= getTblById(activeTableId);
-    if (get(tbl, 'totalRows',0)>0) exec(setupImages, activeTableId);
+    if (get(tbl, 'totalRows',0)>0) setupImages(activeTableId);
     return layoutInfo;
 }
 
@@ -157,7 +170,7 @@ function getWebPlotRequest(tableModel, hlrow) {
 
 }
 
-function getWebPlotRequestViaUrl(tableModel, hlrow) {
+function getWebPlotRequestViaUrl(tableModel, hlrow, cutoutSize) {
     const ra = getCellValue(tableModel, hlrow, 'ra');
     const dec = getCellValue(tableModel, hlrow, 'dec');
     const frameId = getCellValue(tableModel, hlrow, 'frame_id');
@@ -167,21 +180,18 @@ function getWebPlotRequestViaUrl(tableModel, hlrow) {
     const scangrp = res[2];
     const frame_num = res[3];
 
-    let {cutoutSize} = FieldGroupUtils.getGroupFields(grpkey);
-    const cutoutsize = cutoutSize.value;
-
     /*the following should be from reading in the url column returned from LC search
      we are constructing the url for wise as the LC table does
      not have the url colume yet
      It is only for WISE, using default cutout size 0.3 deg
     const url = `http://irsa.ipac.caltech.edu/ibe/data/wise/merge/merge_p1bm_frm/${scangrp}/${scan_id}/${frame_num}/${scan_id}${frame_num}-w1-int-1b.fits`;
     */
     const serverinfo = 'http://irsa.ipac.caltech.edu/ibe/data/wise/merge/merge_p1bm_frm/';
-    const centerandsize = `?center=${ra},${dec}&size=${cutoutsize}&gzip=false`;
+    const centerandsize = cutoutSize ? `?center=${ra},${dec}&size=${cutoutSize}&gzip=false` : '';
     const url = `${serverinfo}${scangrp}/${scan_id}/${frame_num}/${scan_id}${frame_num}-w1-int-1b.fits${centerandsize}`;
     const plot_desc = `WISE-${frameId}`;
     const reqParams = WebPlotRequest.makeURLPlotRequest(url, plot_desc);
-    reqParams.setTitle('WISE-'+ frameId + ' size: '+ cutoutsize +'(deg)');
+    reqParams.setTitle('WISE-'+ frameId + (cutoutSize ? ` size: ${cutoutSize}(deg)` : ''));
     reqParams.setTitleOptions(TitleOptions.NONE);
     reqParams.setGroupLocked(true);
     reqParams.setPlotGroupId('LightCurveGroup');
@@ -193,37 +203,42 @@ function getWebPlotRequestViaUrl(tableModel, hlrow) {
 }
 
 export function setupImages(tbl_id) {
-    const viewer=  getViewer(getMultiViewRoot(),IMG_VIEWER_ID);
-    const count= get(viewer, 'layoutDetail.count',DEF_IMAGE_CNT);
-    const tableModel = getTblById(tbl_id);
-    if (!tableModel || isNil(tableModel.highlightedRow)) return;
-    var vr= visRoot();
-    const newPlotIdAry= makePlotIds(tableModel.highlightedRow, tableModel.totalRows,count);
-    const maxPlotIdAry= makePlotIds(tableModel.highlightedRow, tableModel.totalRows,MAX_IMAGE_CNT);
-
-
-    newPlotIdAry.forEach( (plotId) => {
-        if (!getPlotViewById(vr,plotId)) {
-            const rowNum= Number(plotId.substring(plotIdRoot.length));
-            const webPlotReq = getWebPlotRequestViaUrl(tableModel,rowNum);
-            dispatchPlotImage({plotId, wpRequest:webPlotReq,
-                                       setNewPlotAsActive:false,
-                                       holdWcsMatch:true,
-                                       pvOptions: { userCanDeletePlots: false}});
-        }
-    });
-
-
-    dispatchReplaceViewerItems(IMG_VIEWER_ID, newPlotIdAry);
-    dispatchChangeActivePlotView(plotIdRoot+tableModel.highlightedRow);
-
-    vr= visRoot();
-
-    vr.plotViewAry
-        .filter( (pv) => pv.plotId.startsWith(plotIdRoot))
-        .filter( (pv) => pv.plotId!==vr.mpwWcsPrimId)
-        .filter( (pv) => !maxPlotIdAry.includes(pv.plotId))
-        .forEach( (pv) => dispatchDeletePlotView({plotId:pv.plotId, holdWcsMatch:true}));
+    try {
+        const viewer=  getViewer(getMultiViewRoot(),IMG_VIEWER_ID);
+        const count= get(viewer, 'layoutDetail.count',DEF_IMAGE_CNT);
+        const tableModel = getTblById(tbl_id);
+        if (!tableModel || isNil(tableModel.highlightedRow)) return;
+        var vr= visRoot();
+        const newPlotIdAry= makePlotIds(tableModel.highlightedRow, tableModel.totalRows,count);
+        const maxPlotIdAry= makePlotIds(tableModel.highlightedRow, tableModel.totalRows,MAX_IMAGE_CNT);
+
+        const cutoutSize = get(FieldGroupUtils.getGroupFields(grpkey), ['cutoutSize', 'value'], null);
+
+        newPlotIdAry.forEach( (plotId) => {
+            if (!getPlotViewById(vr,plotId)) {
+                const rowNum= Number(plotId.substring(plotIdRoot.length));
+                const webPlotReq = webplotRequestCreator(tableModel,rowNum, cutoutSize);
+                dispatchPlotImage({plotId, wpRequest:webPlotReq,
+                                           setNewPlotAsActive:false,
+                                           holdWcsMatch:true,
+                                           pvOptions: { userCanDeletePlots: false}});
+            }
+        });
+
+
+        dispatchReplaceViewerItems(IMG_VIEWER_ID, newPlotIdAry);
+        dispatchChangeActivePlotView(plotIdRoot+tableModel.highlightedRow);
+
+        vr= visRoot();
+
+        vr.plotViewAry
+            .filter( (pv) => pv.plotId.startsWith(plotIdRoot))
+            .filter( (pv) => pv.plotId!==vr.mpwWcsPrimId)
+            .filter( (pv) => !maxPlotIdAry.includes(pv.plotId))
+            .forEach( (pv) => dispatchDeletePlotView({plotId:pv.plotId, holdWcsMatch:true}));
+    } catch (E){
+        console.log(E.toString());
+    }
 }
 
 
@@ -242,16 +257,3 @@ function makePlotIds(highlightedRow, totalRows, totalPlots)  {
 }
 
 
-/**
- * A simple wrapper to catch the exception then log it to console
- * @param {function} f function to execute
- * @param {*} args function's arguments.
- */
-function exec(f, args) {
-    try {
-        f(args);
-    } catch (E){
-        console.log(E.toString());
-    }
-
-}