Skip to content

Commit f7bb1e6

Browse files
committed
fixes and feedback implementation
1 parent 7039fad commit f7bb1e6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/firefly/js/ui/UploadTableSelector.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,11 @@ export function UploadTableSelectorPosCol(props) {
374374

375375
export function CenterColumns({lonCol,latCol, sx, cols, lonKey, latKey, openKey,
376376
doQuoteNonAlphanumeric, headerTitle='Position Columns:',
377-
headerPostTitle = '', posDefaultOpenMsg='', setPosDefaultOpenMsg, slotProps}) {
377+
headerPostTitle = '', posDefaultOpenMsg='', setPosDefaultOpenMsg, tableName, slotProps}) {
378378
const columnFields = positionColumnFields(
379-
{fieldKey: lonKey, doQuoteNonAlphanumeric, colTblId: 'posCol', onSearchBtnClicked: () => filterMappedColFldTbl(cols, 'posCol', 'pos.eq.ra,pos.galactic.lon,pos.ecliptic.lon')},
380-
{fieldKey: latKey, doQuoteNonAlphanumeric, colTblId: 'posCol', onSearchBtnClicked: () => filterMappedColFldTbl(cols, 'posCol', 'pos.eq.dec,pos.galactic.lat,pos.ecliptic.lat')}
381-
);
379+
{fieldKey: lonKey, doQuoteNonAlphanumeric, colTblId: 'posCol'+tableName, onSearchBtnClicked: () => filterMappedColFldTbl(cols, 'posCol'+tableName, 'pos.eq.ra,pos.eq;meta.main')},
380+
{fieldKey: latKey, doQuoteNonAlphanumeric, colTblId: 'posCol'+tableName, onSearchBtnClicked: () => filterMappedColFldTbl(cols, 'posCol'+tableName, 'pos.eq.dec,pos.eq;meta.main')}
381+
); //colTblId: posCol+tableName is to give the col select popups for each table a unique tblId, otherwise it may lead to bugs with different tables sharing the same tblId
382382

383383
const customSlotProps = defaultsDeep({openPreMessage: {level: 'body-sm'}}, slotProps, selectorPosColSlotProps.columnMappingPanel.slotProps);
384384

src/firefly/js/ui/tap/SpatialSearch.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React, {useContext, useEffect, useState} from 'react';
44
import {ColsShape, getColValidator} from '../../charts/ui/ColumnOrExpression.jsx';
55
import {getAppOptions} from '../../core/AppDataCntlr.js';
66
import {ServerParams} from '../../data/ServerParams.js';
7-
import {getCellValue, getColumn, getColumnIdx} from '../../tables/TableUtil';
7+
import {getColumnIdx} from '../../tables/TableUtil';
88
import {findCenterColumnsByColumnsModel} from '../../voAnalyzer/ColumnsModelInfo.js';
99
import {findTableCenterColumns} from '../../voAnalyzer/TableAnalysis.js';
1010
import {posCol, UCDCoord} from '../../voAnalyzer/VoConst.js';
@@ -291,7 +291,7 @@ export function SpatialSearch({sx, cols, serviceUrl, serviceLabel, serviceId, co
291291
headerTitle:posHeaderTitle, openKey:posOpenKey,
292292
doQuoteNonAlphanumeric:false,
293293
headerPostTitle:'(from the selected table on the right)',
294-
posDefaultOpenMsg, cols, lonKey:CenterLonColumns, latKey:CenterLatColumns, setPosDefaultOpenMsg}} />}
294+
posDefaultOpenMsg, cols, lonKey:CenterLonColumns, latKey:CenterLatColumns, setPosDefaultOpenMsg, tableName}} />}
295295
</ForceFieldGroupValid>
296296
</Stack>
297297
<DebugObsCore {...{constraintResult}}/>

0 commit comments

Comments
 (0)