Skip to content

Commit 0f8063a

Browse files
loitlyloitly
authored
Merge pull request #481 from Caltech-IPAC/IRSA-924_cleanup_new_image_select
IRSA-924: fix issues found in new image search
2 parents 6a3e1d8 + 5e28c67 commit 0f8063a

File tree

8 files changed

+170
-75
lines changed

8 files changed

+170
-75
lines changed

‎src/firefly/html/firefly-dev.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
window.firefly = {
1414
app: {
1515
template: 'FireflyViewer',
16-
views: 'tables',
1716
options : {
1817
MenuItemKeys: {maskOverlay:true},
1918
}

‎src/firefly/java/edu/caltech/ipac/firefly/server/visualize/imagesources/ExternalMasterDataSource.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ static private List<ImageMasterDataEntry> sdss() {
3535

3636

3737
ImageMasterDataEntry u= sdssTemplate();
38-
u.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
39-
u.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
38+
u.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.2910");
39+
u.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.2910 micron");
4040
u.set(ImageMasterDataEntry.PARAMS.TITLE,"u");
4141
u.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is SDSS u");
4242
u.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"sdss-u");
@@ -50,8 +50,8 @@ static private List<ImageMasterDataEntry> sdss() {
5050

5151

5252
ImageMasterDataEntry g= sdssTemplate();
53-
g.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
54-
g.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
53+
g.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.4810");
54+
g.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.4810 micron");
5555
g.set(ImageMasterDataEntry.PARAMS.TITLE,"g");
5656
g.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is SDSS g");
5757
g.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"sdss-g");
@@ -64,8 +64,8 @@ static private List<ImageMasterDataEntry> sdss() {
6464
g.setPlotRequestParams(params);
6565

6666
ImageMasterDataEntry r= sdssTemplate();
67-
r.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
68-
r.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
67+
r.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.6230");
68+
r.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.6230 micron");
6969
r.set(ImageMasterDataEntry.PARAMS.TITLE,"r");
7070
r.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is SDSS r");
7171
r.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"sdss-r");
@@ -78,8 +78,8 @@ static private List<ImageMasterDataEntry> sdss() {
7878
r.setPlotRequestParams(params);
7979

8080
ImageMasterDataEntry i= sdssTemplate();
81-
i.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
82-
i.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
81+
i.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.7640");
82+
i.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.7640 micron");
8383
i.set(ImageMasterDataEntry.PARAMS.TITLE,"i");
8484
i.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is SDSS i");
8585
i.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"sdss-i");
@@ -92,8 +92,8 @@ static private List<ImageMasterDataEntry> sdss() {
9292
i.setPlotRequestParams(params);
9393

9494
ImageMasterDataEntry z= sdssTemplate();
95-
z.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
96-
z.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
95+
z.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.9060");
96+
z.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.9060 micron");
9797
z.set(ImageMasterDataEntry.PARAMS.TITLE,"z");
9898
z.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is SDSS z");
9999
z.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"sdss-z");
@@ -192,8 +192,8 @@ static private List<ImageMasterDataEntry> dss() {
192192

193193

194194
ImageMasterDataEntry red = dssTemplate();
195-
red.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
196-
red.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
195+
red.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.65");
196+
red.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.65 micron");
197197
red.set(ImageMasterDataEntry.PARAMS.TITLE,"POSS2/UKSTU Red");
198198
red.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is DSS poss2ukstu_red");
199199
red.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"dss-poss2ukstu_red");
@@ -207,8 +207,8 @@ static private List<ImageMasterDataEntry> dss() {
207207
red.setPlotRequestParams(params);
208208

209209
ImageMasterDataEntry ir = dssTemplate();
210-
ir.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
211-
ir.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
210+
ir.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.85");
211+
ir.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.85 micron");
212212
ir.set(ImageMasterDataEntry.PARAMS.TITLE,"POSS2/UKSTU Infrared");
213213
ir.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is DSS poss2ukstu_ir");
214214
ir.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"dss-poss2ukstu_ir");
@@ -221,8 +221,8 @@ static private List<ImageMasterDataEntry> dss() {
221221
ir.setPlotRequestParams(params);
222222

223223
ImageMasterDataEntry blue = dssTemplate();
224-
blue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
225-
blue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
224+
blue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.41");
225+
blue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.41 micron");
226226
blue.set(ImageMasterDataEntry.PARAMS.TITLE,"POSS2/UKSTU Blue");
227227
blue.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is DSS poss2ukstu_blue");
228228
blue.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"dss-poss2ukstu_blue");
@@ -235,8 +235,8 @@ static private List<ImageMasterDataEntry> dss() {
235235
blue.setPlotRequestParams(params);
236236

237237
ImageMasterDataEntry pred = dssTemplate();
238-
pred.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
239-
pred.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
238+
pred.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.65");
239+
pred.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.65 micron");
240240
pred.set(ImageMasterDataEntry.PARAMS.TITLE,"POSS1 Red");
241241
pred.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is DSS poss1_red");
242242
pred.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"dss-poss1_red");
@@ -249,8 +249,8 @@ static private List<ImageMasterDataEntry> dss() {
249249
pred.setPlotRequestParams(params);
250250

251251
ImageMasterDataEntry pblue = dssTemplate();
252-
pblue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
253-
pblue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0 micron");
252+
pblue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0.48");
253+
pblue.set(ImageMasterDataEntry.PARAMS.WAVELENGTH_DESC,"0.48 micron");
254254
pblue.set(ImageMasterDataEntry.PARAMS.TITLE,"POSS1 Blue");
255255
pblue.set(ImageMasterDataEntry.PARAMS.TOOL_TIP,"This is DSS poss1_blue");
256256
pblue.set(ImageMasterDataEntry.PARAMS.IMAGE_ID,"dss-poss1_blue");
@@ -274,7 +274,7 @@ static private List<ImageMasterDataEntry> dss() {
274274
params.put("SurveyKey", "quickv");
275275
params.put("title", "DSS quickv");
276276
params.put("drawingSubgroupID", "dss");
277-
quick.setPlotRequestParams(params);
277+
//quick.setPlotRequestParams(params);
278278

279279
ImageMasterDataEntry phase2 = dssTemplate();
280280
phase2.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
@@ -289,7 +289,7 @@ static private List<ImageMasterDataEntry> dss() {
289289
params.put("SurveyKey", "phase2_gsc2");
290290
params.put("title", "DSS phase2_gsc2");
291291
params.put("drawingSubgroupID", "dss");
292-
phase2.setPlotRequestParams(params);
292+
//phase2.setPlotRequestParams(params);
293293

294294
ImageMasterDataEntry phase1 = dssTemplate();
295295
phase1.set(ImageMasterDataEntry.PARAMS.WAVELENGTH, "0");
@@ -304,7 +304,7 @@ static private List<ImageMasterDataEntry> dss() {
304304
params.put("SurveyKey", "phase2_gsc1");
305305
params.put("title", "DSS phase2_gsc1");
306306
params.put("drawingSubgroupID", "dss");
307-
phase1.setPlotRequestParams(params);
307+
//phase1.setPlotRequestParams(params);
308308

309309

310310
List<ImageMasterDataEntry> retval= new ArrayList<>();
@@ -313,9 +313,9 @@ static private List<ImageMasterDataEntry> dss() {
313313
retval.add(blue);
314314
retval.add(pred);
315315
retval.add(pblue);
316-
retval.add(quick);
317-
retval.add(phase2);
318-
retval.add(phase1);
316+
// retval.add(quick);
317+
// retval.add(phase2);
318+
// retval.add(phase1);
319319
return retval;
320320

321321
}
@@ -326,9 +326,9 @@ static private ImageMasterDataEntry sdssTemplate() {
326326
ImageMasterDataEntry e= new ImageMasterDataEntry();
327327

328328
e.set(ImageMasterDataEntry.PARAMS.PROJECT,"SDSS");
329-
e.set(ImageMasterDataEntry.PARAMS.MISSION_ID,"sdss");
329+
e.set(ImageMasterDataEntry.PARAMS.MISSION_ID,"SDSS");
330330
e.set(ImageMasterDataEntry.PARAMS.SUB_PROJECT,"");
331-
e.set(ImageMasterDataEntry.PARAMS.HELP_URL,"http://irsa.ipac.caltech.edu/stuff");
331+
e.set(ImageMasterDataEntry.PARAMS.HELP_URL,"http://irsa.ipac.caltech.edu");
332332
e.set(ImageMasterDataEntry.PARAMS.PROJECT_TYPE_KEY,"galactic");
333333
e.set(ImageMasterDataEntry.PARAMS.PROJECT_TYPE_DESC,"Galactic");
334334
e.set(ImageMasterDataEntry.PARAMS.MIN_RANGE_DEG,"0.016");
@@ -339,9 +339,9 @@ static private ImageMasterDataEntry sdssTemplate() {
339339
static private ImageMasterDataEntry msxTemplate() {
340340
ImageMasterDataEntry e= new ImageMasterDataEntry();
341341
e.set(ImageMasterDataEntry.PARAMS.PROJECT,"MSX");
342-
e.set(ImageMasterDataEntry.PARAMS.MISSION_ID,"msx");
342+
e.set(ImageMasterDataEntry.PARAMS.MISSION_ID,"MSX");
343343
e.set(ImageMasterDataEntry.PARAMS.SUB_PROJECT,"");
344-
e.set(ImageMasterDataEntry.PARAMS.HELP_URL,"http://irsa.ipac.caltech.edu/stuff");
344+
e.set(ImageMasterDataEntry.PARAMS.HELP_URL,"http://irsa.ipac.caltech.edu");
345345
e.set(ImageMasterDataEntry.PARAMS.PROJECT_TYPE_KEY,"galactic");
346346
e.set(ImageMasterDataEntry.PARAMS.PROJECT_TYPE_DESC,"Galactic");
347347
e.set(ImageMasterDataEntry.PARAMS.MIN_RANGE_DEG,"0.01");
@@ -354,9 +354,9 @@ static private ImageMasterDataEntry msxTemplate() {
354354
static private ImageMasterDataEntry dssTemplate() {
355355
ImageMasterDataEntry e= new ImageMasterDataEntry();
356356
e.set(ImageMasterDataEntry.PARAMS.PROJECT,"DSS");
357-
e.set(ImageMasterDataEntry.PARAMS.MISSION_ID,"dss");
357+
e.set(ImageMasterDataEntry.PARAMS.MISSION_ID,"DSS");
358358
e.set(ImageMasterDataEntry.PARAMS.SUB_PROJECT,"");
359-
e.set(ImageMasterDataEntry.PARAMS.HELP_URL,"http://irsa.ipac.caltech.edu/stuff");
359+
e.set(ImageMasterDataEntry.PARAMS.HELP_URL,"http://irsa.ipac.caltech.edu");
360360
e.set(ImageMasterDataEntry.PARAMS.PROJECT_TYPE_KEY,"galactic");
361361
e.set(ImageMasterDataEntry.PARAMS.PROJECT_TYPE_DESC,"Galactic");
362362
e.set(ImageMasterDataEntry.PARAMS.MIN_RANGE_DEG,"0.016");

‎src/firefly/js/ui/CheckboxGroupInputField.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function getProps(params, fireValueChange) {
5555

5656
var {value,options}= params;
5757
value= convertValue(value,options);
58-
58+
5959
return Object.assign({}, params,
6060
{ value,
6161
onChange: (ev) => handleOnChange(ev,params, fireValueChange)
@@ -79,7 +79,6 @@ function handleOnChange(ev, params, fireValueChange) {
7979
else {
8080
if (idx > -1) curValueArr.splice(idx, 1); // remove val from the array
8181
}
82-
8382
var {valid,message} = params.validator(curValueArr.toString());
8483

8584
fireValueChange({ value: curValueArr.toString(), message, valid });

‎src/firefly/js/ui/FormPanel.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function createSuccessHandler(action, params={}, title, onSubmit) {
5454

5555
export const FormPanel = function (props) {
5656
var {children, onSubmit, onCancel, onError, groupKey, action, params, title,
57-
submitText='Search', help_id, changeMasking} = props;
57+
submitText='Search', help_id, changeMasking, includeUnmounted=false} = props;
5858

5959
const style = {
6060
backgroundColor: 'white',
@@ -74,6 +74,7 @@ export const FormPanel = function (props) {
7474
<div style={{flexGrow: 0, display: 'inline-flex', justifyContent: 'space-between', width: '100%', alignItems: 'flex-end', padding:'2px 0px 3px'}}>
7575
<div>
7676
<CompleteButton style={{display: 'inline-block', marginRight: 10}}
77+
includeUnmounted={includeUnmounted}
7778
groupKey={groupKey}
7879
onSuccess={createSuccessHandler(action, params, title, onSubmit)}
7980
onFail={onError || handleFailfure}
@@ -102,7 +103,8 @@ FormPanel.propTypes = {
102103
action: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
103104
params: PropTypes.object,
104105
help_id: PropTypes.string,
105-
changeMasking: PropTypes.func
106+
changeMasking: PropTypes.func,
107+
includeUnmounted: PropTypes.bool
106108
};
107109

108110
function handleChartAdd(request) {

‎src/firefly/js/ui/ImageSelect.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@
8080
}
8181

8282
.DataProductList__item--header {
83-
margin-left: 5px;
84-
font-size: large;
85-
font-weight: bold;
86-
color: #005da4;
83+
display: inline-block;
84+
white-space: nowrap;
85+
overflow: hidden;
86+
text-overflow: ellipsis;
87+
margin: -5px;
8788
}
8889

8990
.DataProductList__item--details {
@@ -102,4 +103,7 @@
102103
white-space: nowrap;
103104
text-align: right;
104105
margin: 2px 2px 0 0;
106+
overflow: hidden;
107+
text-overflow: ellipsis;
108+
max-width: 100px;
105109
}

0 commit comments

Comments
 (0)