Skip to content

Update includedeaccessioned to GetFileById#766

Merged
ofahimIQSS merged 5 commits intodevelopfrom
764-update-includedeaccessioned-to-getfile
Jul 17, 2025
Merged

Update includedeaccessioned to GetFileById#766
ofahimIQSS merged 5 commits intodevelopfrom
764-update-includedeaccessioned-to-getfile

Conversation

@ChengShi-1
Copy link
Contributor

@ChengShi-1 ChengShi-1 commented Jul 3, 2025

What this PR does / why we need it:

Related to IQSS/dataverse-client-javascript#322

In order to correctly get the file which is deaccessioned, we need include the includeDeaccessioned, so even though the dataset is deaccessioned, by applying includeDeaccessioned = true to the GETFile endpoint, the owner could get right response to access the deaccessioned file.

  • add includeDeaccessioned to getById and getCitationById, the parameter is affected by EditPermission so I change the order of the promises, and get permission first.
  • File version tab, deaccessioned version links only access to who canEditDataset

Which issue(s) this PR closes:

Special notes for your reviewer:

Suggestions on how to test this:

It's better to wait #741 to be merged to this PR and then test

  • As a superuser,

  • create dataset with a file and published dataset

  • deaccessioned dataset

  • click to the file table's file, in dataset page, so navigate to file page

  • see if the file page of deaccessioned version is ok, also should be shown with deaccessioned format
    image

  • Log out (As a guest user

  • go the deaccessioned dataset(superuser created), the file deaccessioned version should not be shown(404 page expected

  • If there are other versions not deaccessioned, guest users should be accessed to other released/ non-deaccessioned versions, but the file > version tab should not attach links to deaccessioned version

@ChengShi-1 ChengShi-1 added Size: 3 A percentage of a sprint. 2.1 hours. Original size: 3 labels Jul 3, 2025
@ChengShi-1 ChengShi-1 linked an issue Jul 3, 2025 that may be closed by this pull request
@ChengShi-1 ChengShi-1 moved this to Ready for Review ⏩ in IQSS Dataverse Project Jul 3, 2025
@github-actions github-actions bot added FY26 Sprint 1 FY26 Sprint 1 (2025-07-02 - 2025-07-16) GREI Re-arch GREI re-architecture-related SPA.Q3.2025 SPA: File Page labels Jul 3, 2025
@ChengShi-1 ChengShi-1 marked this pull request as ready for review July 3, 2025 22:57
@coveralls
Copy link

coveralls commented Jul 3, 2025

Coverage Status

coverage: 97.527% (-0.5%) from 98.062%
when pulling 32916dd on 764-update-includedeaccessioned-to-getfile
into e7769b4 on develop.

g-saracca
g-saracca previously approved these changes Jul 11, 2025
Copy link
Contributor

@g-saracca g-saracca left a comment

Choose a reason for hiding this comment

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

LGTM

@github-project-automation github-project-automation bot moved this from Ready for Review ⏩ to Ready for QA ⏩ in IQSS Dataverse Project Jul 11, 2025
@ofahimIQSS ofahimIQSS self-assigned this Jul 16, 2025
@ofahimIQSS ofahimIQSS moved this from Ready for QA ⏩ to QA ✅ in IQSS Dataverse Project Jul 16, 2025
@ofahimIQSS
Copy link
Contributor

Hey! this one has branch conflicts - can i get an update please :)

@ChengShi-1 ChengShi-1 dismissed g-saracca’s stale review July 16, 2025 18:57

The merge-base changed after approval.

@g-saracca
Copy link
Contributor

@ChengShi-1 I think you didn't solve merge conflicts correctly, I see lot of unrelated changes and things removed we shouldn't remove.

@ChengShi-1
Copy link
Contributor Author

@g-saracca Yes, I need revert and merge again. solving

@ChengShi-1 ChengShi-1 force-pushed the 764-update-includedeaccessioned-to-getfile branch from 80b386c to 948164f Compare July 16, 2025 19:23
@ChengShi-1
Copy link
Contributor Author

ChengShi-1 commented Jul 16, 2025

@g-saracca Reset the branch and merge again, should be ok now. Thanks!

(I falsely merged branch with discarding all changes from dev....sorry for that

@g-saracca
Copy link
Contributor

@g-saracca Reset the branch and merge again, should be ok now. Thanks!

(I falsely merged branch with discarding all changes from dev....sorry for that

That's ok, no need to be sorry 👍🏼 , waiting for tests to pass and will approve 🙂

@github-project-automation github-project-automation bot moved this from QA ✅ to Ready for QA ⏩ in IQSS Dataverse Project Jul 16, 2025
@g-saracca
Copy link
Contributor

@ofahimIQSS all good now 👍🏼

@scolapasta scolapasta moved this from Ready for QA ⏩ to QA ✅ in IQSS Dataverse Project Jul 17, 2025
@ofahimIQSS
Copy link
Contributor

tested in local - no issues found. Merging!

@ofahimIQSS ofahimIQSS merged commit e5600a3 into develop Jul 17, 2025
14 checks passed
@ofahimIQSS ofahimIQSS deleted the 764-update-includedeaccessioned-to-getfile branch July 17, 2025 18:42
@github-project-automation github-project-automation bot moved this from QA ✅ to Merged 🚀 in IQSS Dataverse Project Jul 17, 2025
@ofahimIQSS ofahimIQSS removed their assignment Jul 17, 2025
@pdurbin pdurbin moved this from Merged 🚀 to Done 🧹 in IQSS Dataverse Project Jul 22, 2025
@cmbz cmbz added the FY26 Sprint 4 FY26 Sprint 4 (2025-08-13 - 2025-08-27) label Aug 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

FY26 Sprint 1 FY26 Sprint 1 (2025-07-02 - 2025-07-16) FY26 Sprint 4 FY26 Sprint 4 (2025-08-13 - 2025-08-27) GREI Re-arch GREI re-architecture-related Original size: 3 Size: 3 A percentage of a sprint. 2.1 hours. SPA: File Page SPA.Q3.2025

Projects

Status: Done 🧹

Development

Successfully merging this pull request may close these issues.

Update includeDeaccessioned to GetFile()

5 participants