Skip to content

Feature #33472710#5

Merged
TomDijkema merged 11 commits intomainfrom
feature-#33472710
Sep 26, 2022
Merged

Feature #33472710#5
TomDijkema merged 11 commits intomainfrom
feature-#33472710

Conversation

@TomDijkema
Copy link
Copy Markdown
Contributor

Pull request to maintain a (kinda) stable version of the UCAS system (changes could be made based upon changes in the API).
Goal of this stable version is to get rid of the big commits and go back to the form of the small commits about specific parts.

TomDijkema and others added 4 commits June 7, 2022 15:00
Commit adds basic login functionality with the Keycloak library.

Adds:
- Keycloak package
- Seperate Keycloak section (files)
- Login functionality from header
Commit adds all or most of the requested functionality for the basic image of the Unified Curation and Annotation System.

Adds:
- Improved login functionality with Keycloak / token integration for full integration

- Specimen page: details / media gallery / mids bar / version tabs

- Annotation and Curation page:
- Specimen bar with name, specimen type and the option to switch to annotate or curate mode
- MIDS details block that contains all indications for improving the digital specimen based upon the MIDS documentation
- MIDS meter (non-functional yet)
- Annotation section with all the properties of a digital specimen those can be annotated
- Annotation modal which allows the user to see, add, edit and remove annotations (the latter three only if the user is logged in)
- A JSON filter layer for detailing the property information with a: display name, mids level, annotatable boolean and possible rules (for arrays, dates, images, etc.)

- Dockerfile
- Kubernetes files
- NGINX configuration

Updates:
- The general code concept of the project (REACT)
- Styling of existing pages

Removes:
- The old method of processing the digital specimen (and using its properties)
- Old media gallery
Commit to end this branch of huge commits and go back to the more simplistic form of small commits.
This commit contains a somewhat stable version of the UCAS system, based upon the changes made to the API.

Adds:
- Specimen version reckoning
- Improved filter layer
- Improved styling

Modifies:
- API interactions based upon changes in the API
- Media being loaded after the main specimen data
- Alters homepage a bit, but has to be improved
- Improved Header and Footer

Removes:
-
Adds:
- Support for the new endpoints of sandbox.dissco.tech/annotations
- Basic navigation in header

Modifies:
- Styling for home, search pages
- Fix scrolling mechanism when clicking on MIDS property on Annotation page
Commit fixes the version switching between specimens. Using the dropdown, users can now instantaneously switch between versions
Commit is the first step for moving the Annotation Page Components to the main Specimen Page because these functionalities will now be executed from the same page. This first step moves the visual components, updates the modal and secures the scroll functionality for mids.

Modifies:
- Moves Components and functionality from the Annotation Page to the Specimen Page
Adds:
- New way of handling annotations in the view. Annotations will now be handled by their respective attribute and thus shall only be shown when a modal of specific attribute is opened.
- Attributes know show a pencil icon on the overview page when annotations are present.

Modifies:
- Homepage styling: add new banner based upon five images. Work has to be continued on the dynamic parts when API is ready.

Removes:
- Old banner (still present in code but not used)
Commit fixes Media Slider bug not showing all images. Issue was due to some formats not being accepted, as well as some images that were hidden due to incorrect styling.
First commit for fixing SonarCloud issues.
Second commit for fixing SonarCloud issues
@sonarqubecloud
Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
1.1% 1.1% Duplication

Copy link
Copy Markdown
Contributor

@samleeflang samleeflang left a comment

Choose a reason for hiding this comment

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

Tom echt netjes! Veel werk verzet en het ziet er al veel beter uit dan eerst. De code is goed leesbaar doordat de files klein zijn en de functionaliteit per file beperkt is. Complimenten. Het enige wat misschien beter kan is de hoeveelheid CSS. Misschien kunnen we bekijken of we generieke componenten kunnen maken of dat we componenten uit frameworks kunnen gebruiken.

Comment thread src/api/annotate/PatchAnnotation.js
Comment thread .dockerignore
Comment thread src/index.js
Comment thread src/templates/annotate/annotate.css
Comment thread src/templates/footer/footer.css
Comment thread src/templates/specimen/body/annotate/AnnotateSection.js
Comment thread src/templates/specimen/body/annotate/AnnotateSection.js
Comment thread src/templates/specimen/body/annotate/annotationTypes/Correcting.js
Comment thread src/templates/specimen/body/specimenMedia/SpecimenMedia.js
Comment thread src/templates/specimen/body/annotate/AnnotateModal.js
Copy link
Copy Markdown
Contributor

@samleeflang samleeflang left a comment

Choose a reason for hiding this comment

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

Comment looked at and things that needed to be done ar done. Some things will go into next PR or the backlog

@TomDijkema TomDijkema merged commit 0a1e203 into main Sep 26, 2022
@TomDijkema TomDijkema deleted the feature-#33472710 branch September 26, 2022 14:46
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.

2 participants