-
Notifications
You must be signed in to change notification settings - Fork 29
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
Catanie refactor to remove the duplicate pages for anonymous users #823
Catanie refactor to remove the duplicate pages for anonymous users #823
Conversation
Modified the header to be the same for logged in and anonymous pages. Changed a bit the style of the header to be fixed and not change based on the vh and change the main div to follow resize correctly. Enable again the returnUrl in the login to redirect to the returnUrl instead of always datasets/. If you are already logged in it will figure as such in the header. Also if you open the login page while logged in you get redirected to datasets. Updated all the styles removing the reference to the login-header.
Changed the logoutNavigate test as the anonymous site is accessed going to "/anonymous/" on logout and not "".
Removed all the "anonymous" only page and functionality and change the default pages to show functionalities based on the login status. Removed the use of the searchPublicDataEnabled flag as it become needed to see public data while logged in. Updated some minor functions to work better with the changes.
…to SciCatProject-develop
@marcoleorato thank you so much for taking care of this. |
@nitrosx Friday was a bit late so I'm going to fix it today. I'm waiting to push the changes as I'm also going to add a few unit test to fix the coverage. |
@marcoleorato what is the best way to test all the changes that you implemented? |
The best way to test would probably to compare the pages with the current develop branch. While logged in with the page at the same route and logged out with the page at the /anonymous/* url. There are also a few changes to the style that are different from develop, so maybe it could be useful to also have Henrik as reviewer since he was working on the style in the last months. |
@marcoleorato: I agree with you. I will ask @henrikjohansson712 to take a look and I will make sure to set aside sometime to test this week. |
@marcoleorato could you have a look at the merge conflicts ? After fixing the merge conflicts: is anything preventing us from merging ? I think this change should enter as soon as possible. Any objections from the colleagues ? |
@stephan271 I have updated the PR branch with the latest changes from develop, now it should be possible to merge without issues if everything else is OK |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @marcoleorato, Thank for the work.
src/app/datasets/dataset-table-actions/dataset-table-actions.component.ts
Show resolved
Hide resolved
A small update regarding this, I am going to make a PR for the backend to remove the anonymousquery from that too. |
Thanks for taking over the catamel side of it ! |
… fix on the dataset details
I fixed the small issue I found for the login, also added the change for the issue #836 adding ingestor to the list of functional accounts. There is also, now, another PR in catamel for the backend part for the removal of anonymousquery. |
Description
The aim of the PR is to remove all the duplicate functions created specifically for an anonymous users and adapt the already existing one to account for both an anonymous user or a logged in user.
Motivation
Several part of the catanie code have been duplicated making the site more difficult to maintain as many changes needed to be applied in 2 different pages. There were also some situation in which this was not done leaving, very small, issue that only appeared if you were logged out.
Also the "double" site allow for situations in which a user is logged in but does not realize it since he accessed the anonymous part of the website without knowing.
This also solve issue #807 better than just changing the routing.
Fixes & Changes:
The flag "searchPublicDataEnabled" is now unused as it's now needed to see public datasets while logged in.
Removed all the anonymous pages and functions.
Modified the layout, header, datasets and datasets details to show the correct elements if an user is not logged in.
Full change list
Tests included/Docs Updated?