Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/use isis data publications #1464 #1514

Merged
merged 55 commits into from
Jun 9, 2023

Conversation

jounaidr
Copy link
Contributor

@jounaidr jounaidr commented Feb 10, 2023

Description

This PR migrates Study landing/table/card views to use new ICAT 5 DataPublication endpoints. The new page hierarchy can be viewed using /browseDataPublications/instrument, and navigating through to see the new landing/table/card views. Note that for the linked investigation, the parent DOI was removed as it seemed to now be always a duplicate.

To finish PR

Currently all the features are implemented, however some e2e tests are failing. These are mostly to do with investigation doi links, as to fix another test and for consistency the doi's were taken from the investigations datacollection property rather than the previous studyInvestigations. An attempt at fixing this can seen here, however i'm unsure if this will actually work.

Testing instructions

Check that each dataPublication page in the hierarchy loads as expected.

Agile board tracking

closes #1464

Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
… api

Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
…estigation missing

Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
- add datapublication labels
- users now working

Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
- fix instrumentId check for datapublications landing page
- implement page routing for all new components
- temporarily disable sort in table as query isn't working

Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>

# Conflicts:
#	packages/datagateway-dataview/src/views/card/isis/isisStudiesCardView.component.test.tsx
#	packages/datagateway-dataview/src/views/card/isis/isisStudiesCardView.component.tsx
#	packages/datagateway-dataview/src/views/landing/isis/isisStudyLanding.component.test.tsx
#	packages/datagateway-dataview/src/views/table/isis/isisStudiesTable.component.test.tsx
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
@codecov
Copy link

codecov bot commented Apr 11, 2023

Codecov Report

Patch coverage: 96.19% and project coverage change: -0.07 ⚠️

Comparison is base (4c375c0) 96.33% compared to head (c4e9632) 96.26%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1514      +/-   ##
===========================================
- Coverage    96.33%   96.26%   -0.07%     
===========================================
  Files          161      161              
  Lines         6934     6860      -74     
  Branches      2146     2126      -20     
===========================================
- Hits          6680     6604      -76     
- Misses         233      236       +3     
+ Partials        21       20       -1     
Flag Coverage Δ
common 95.53% <92.85%> (-0.10%) ⬇️
dataview 96.85% <96.79%> (-0.12%) ⬇️
download 96.73% <ø> (ø)
search 96.50% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
packages/datagateway-common/src/api/index.tsx 96.68% <ø> (ø)
...ages/datagateway-common/src/api/investigations.tsx 100.00% <ø> (ø)
packages/datagateway-common/src/app.types.tsx 100.00% <ø> (ø)
...n/src/table/cellRenderers/cellContentRenderers.tsx 92.30% <ø> (-1.25%) ⬇️
...dataview/src/views/citationFormatter.component.tsx 98.27% <ø> (ø)
.../datagateway-dataview/src/page/idCheckFunctions.ts 92.20% <66.66%> (ø)
...anels/isis/investigationDetailsPanel.component.tsx 97.46% <71.42%> (-2.54%) ⬇️
...card/isis/isisInvestigationsCardView.component.tsx 95.38% <77.77%> (-3.06%) ⬇️
...table/isis/isisDataPublicationsTable.component.tsx 92.59% <92.59%> (ø)
...es/datagateway-common/src/api/dataPublications.tsx 100.00% <100.00%> (ø)
... and 14 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

jounaidr and others added 14 commits April 12, 2023 13:36
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Signed-off-by: jounaidr <jounaidruhomaun@googlemail.com>
Also added some TODOs we need to decide on later
needed different route intercepts for new id check function
@louise-davies louise-davies force-pushed the feature/use-isis-data-publications-#1464 branch from b422b1a to c4e9632 Compare May 23, 2023 13:16
@louise-davies louise-davies marked this pull request as ready for review May 23, 2023 13:16
Copy link
Contributor

@joshuadkitenge joshuadkitenge left a comment

Choose a reason for hiding this comment

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

LGTM

@louise-davies louise-davies merged commit 3bf6259 into develop Jun 9, 2023
9 checks passed
@louise-davies louise-davies deleted the feature/use-isis-data-publications-#1464 branch June 9, 2023 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use DataPublications instead of Studies in ISIS landing pages
3 participants