Skip to content

Initial work an adapting AbstractLims and integration with SSO - Part 1 #1492

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

Merged
merged 5 commits into from
Nov 26, 2024

Conversation

marcus-oscarsson
Copy link
Member

@marcus-oscarsson marcus-oscarsson commented Nov 8, 2024

This is the mxcubeweb part of the AbstractLims PR on mxcubecore: mxcube/mxcubecore#1079.

As with PR #1079 on mxcubecore this work will need to be continued with some further cleanup. As with the work on mxcubecore this is really a larger set of commits many also done by @antolinos and some by myself. There have been some cleanup after testing but apart from that this is code have been tested together with #1079.

This PR introduces:

  • The use of AbstractLims
  • New session selection interface
  • Single sign on via OpenIDConnect

Testing
ISPyBMockupClient (lims.xml in demo environment) can be used to test both user type and proposal type login by setting the loginType attribute.

<object class="ISPyBClientMockup">
  <object hwrid="/lims_rest" role="lims_rest"/>
  <ws_root>
    https://your.lims.org
  </ws_root>
  <base_result_url>
    https://your.limsresults.org
  </base_result_url>
  <ws_username></ws_username>
  <ws_password></ws_password>
  <loginType>user</loginType>                <!-- set to user or proposal -->
  <object role="session" href="/session"/>
</object>

UI updates
proposal_selection_2
Listing currently available sessions, and the possibility to explicitly reschedule and/or move a session from one beamline to another

sample_list
Possibility to select from which LIMS to retrieve sample information from, data is uploaded to both DRAC and ISPyB

res["selectedProposalID"] = HWR.beamline.session.proposal_id
else:
raise Exception("Not logged in")
logging.getLogger("MX3.HWR").warning("Logged out")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this warning needed? Could be an info instead. Seems to be logged twice too.

Copy link
Member Author

Choose a reason for hiding this comment

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

You are right, it should be an info :)

@marcus-oscarsson marcus-oscarsson force-pushed the mo-lims branch 2 times, most recently from 73e4a67 to 77d2f2a Compare November 26, 2024 12:40
@marcus-oscarsson marcus-oscarsson merged commit 775cfb9 into develop Nov 26, 2024
19 checks passed
@marcus-oscarsson marcus-oscarsson deleted the mo-lims branch November 26, 2024 13:02
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.

3 participants