Skip to content

FIREFLY-1635: bug fix for CADC prepare download#1683

Merged
kpuriIpac merged 1 commit intodevfrom
FIREFLY-1635-prepare-download-bug
Dec 19, 2024
Merged

FIREFLY-1635: bug fix for CADC prepare download#1683
kpuriIpac merged 1 commit intodevfrom
FIREFLY-1635-prepare-download-bug

Conversation

@kpuriIpac
Copy link
Contributor

Ticket: FIREFLY-1635

  • there's a regression bug in ttFeatureWatchers.js, in some cases the request object does not have a source entry, but will have a serviceUrl entry instead (from TAP).
  • this fix uses that value when source is undefined, fixing the Prepare Download not working for CADC bug

Testing:
Firefly: https://fireflydev.ipac.caltech.edu/firefly-1635-prepare-download-bug/firefly
DCE: https://firefly-1635-prepare-download-bug.irsakudev.ipac.caltech.edu/irsaviewer/dce

  • do a CADC search and select one or more rows, click on Prepare Download to make sure it works
    • the search i do is: select IVOA from the CADC tables, and search for 'm81', 10 rows.
  • do a DCE search and repeat the same step (click on Prepare Download having selected one or more rows).
    • i searched the MSX collection, click on a point (or, use this: 2h44m14.43s +57d57m24.8s Equ J2000) and search

@kpuriIpac kpuriIpac added the bug label Dec 17, 2024
@kpuriIpac kpuriIpac added this to the 2025.1 milestone Dec 17, 2024
@kpuriIpac kpuriIpac requested review from lrebull and robyww December 17, 2024 03:40
@kpuriIpac kpuriIpac self-assigned this Dec 17, 2024
function updateSearchRequest( tbl_id='', dlParams='', sRequest=null) {
const hostname= new URL(sRequest.source)?.hostname;

const hostname= new URL(sRequest.source ? sRequest.source : sRequest.serviceUrl)?.hostname;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually I can just simply this to sRequest.source ?? sRequest.serviceUrl. I'll add that in tomorrow, but let me know if it looks good & if testing it works for both CADC / DCE @robyww.

@lrebull
Copy link
Contributor

lrebull commented Dec 17, 2024

doesn't work for me; see attached movie. screenshot is the error i get (which is before downloading attempt). tbl file with target list also attached.

Screenshot 2024-12-16 at 7 51 25 PM

bpmg.tbl.txt

video1110386765.mp4

Copy link
Contributor

@robyww robyww left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@kpuriIpac kpuriIpac force-pushed the FIREFLY-1635-prepare-download-bug branch from 704e01a to 6798c7c Compare December 19, 2024 19:17
@kpuriIpac kpuriIpac merged commit 36f4e65 into dev Dec 19, 2024
@kpuriIpac kpuriIpac deleted the FIREFLY-1635-prepare-download-bug branch December 19, 2024 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants