Make Insight login work with websocket URLs #66

dominikl · 2019-08-21T11:05:31Z

With this PR:

A URL can be entered as hostname
Port can be empty (default is set in the java gateway) (depends on Support websocket URLs omero-gateway-java#21 )

Test

Connect to IDR next via websocket URLwss://[OMERO SERVER]/omero-ws (this again depends on ome/omero-blitz#66 ) . Connect to another server using usual hostname and port.

Note

There's actually one caveat: This PR slightly changes the appearance of the server list dialog: There are no separate fields any longer for hostname and port. If a port other than default port is used, one has to add it with a : after the hostname. Will probably need updating various help and training docs /cc @pwalczysko .

snoopycrimecop · 2019-08-22T01:05:28Z

Conflicting PR. Removed from build OMERO-insight-push#138. See the console output for more details.
Possible conflicts:

PR Imagej script #53 jburel 'Imagej script'
- src/main/java/org/openmicroscopy/shoola/env/data/DataServicesFactory.java

~~--conflicts~~ Conflict resolved in build OMERO-insight-push#59. See the console output for more details.

mtbc · 2019-09-02T07:55:14Z

src/main/java/org/openmicroscopy/shoola/util/ui/login/ScreenLogin.java

@@ -546,7 +546,7 @@ private void initialize(String userName, String hostName)
 					serverName = i.next();
 					if (k == n) {
 						value = servers.get(serverName);
-						if (value != null) {
+						if (value != null && value.length() > 0) {


CommonsLangUtils.isNotBlank can be handy for this kind of thing.

Not sure, thought we want to gradually get rid off external apache/google dependencies?

Where the JDK now offers an equivalent method, sure. For our heavyweight full-application JARs I wasn't aware of a broader push but I may have missed something? I'd have thought they were worth it for readability and reusing others' work but happy to go in the other direction if that's what's been decided. Certainly not a blocker for this PR anyway.

mtbc · 2019-09-02T08:49:54Z

Initial functional testing looking promising. Can't see any data on IDR next but also can't via 4064 so maybe expected.

manics · 2019-09-02T10:44:14Z

Works fine to me too, for idr had to play around with selecting/unselecting users/groups to view the data.

I couldn't find the insight logs (OS X, the menu option doesn't load anything). I wanted to check the error message was informative when using an incorrect URL, but that's unrelated to this PR.

dominikl · 2019-09-02T11:56:17Z

That's a good point. The omeroinsight.log file is usually in ~/omero/log. Opening the directory from the menu option in Insight works for me.

dominikl · 2019-09-02T13:46:34Z

Sorry, there's actually way more to it. The server editor / dialog still has the two cells (one for hostname and one for the port); unbelievable complex to remove that.

mtbc · 2019-09-02T13:49:19Z

I suppose it would be too optimistic to let the port number imply the protocol?

dominikl · 2019-09-02T13:55:46Z

The problem is just the UI, this server list/editor is a monster (re complexity) :-/

- A URL can now be entered as hostname - Port can now be empty (default is set in the java gateway)

dominikl · 2019-09-04T14:59:28Z

This PR got much bigger than I intended initially, now also:

Rewrites the ServerEditor: Using simple JList instead of complicated table
Removes the group stuff from ScreenLogin dialog ( https://github.com/ome/omero-insight/pull/66/files#diff-7eacc67f747c3a2db767bc67d29ba011L201 ). Couldn't find anything where this would be used.
Removes the unneccassary LoginCredentials class (and the various conversions between this class and UserCredentials)

manics · 2019-09-05T15:43:01Z

Configuration:

Quit, then reload Insight. The configuration is messed up:

edit: just realised from the description...this PR is probably missing from the merge-ci build

manics · 2019-09-05T16:03:34Z

@dominikl Can you remove the exclude comment from #66 (comment)

dominikl · 2019-09-06T07:48:09Z

Argh, sorry, yes forgot about the exclude in the comment above; removed now.

manics · 2019-09-09T12:46:35Z

The new functionality works well. I've got a UI issue on OS X 10.13.6 openjdk version "1.8.0_212": When + is clicked the Add new server dialogue is behind the Servers dialog:

jburel · 2019-09-20T14:41:58Z

This certainly allows to have the same server name with different port.
This is major change in the UI configuration.
Doc needs to be updated. The message could be added to "new server dialog"
cc @pwalczysko

pwalczysko · 2019-09-20T14:49:10Z

Yes, but the addition of the port manually is adding a burden on each and every insight user - no user now will be able to ignore the port, it will never be prepopulated, do I get it right ? Thus, the user will have to know it is "colon 4064"
I am not sure that this is a wise move

dominikl · 2019-09-20T15:00:58Z

No, if it's the default port (which probably is the case for the vast majority of the users) you don't have to enter a port, ie demo.openmicroscopy.org will do. Oh, but that reminds me about the case people entering https://demo.openmicroscopy.org, that's probably gonna mess things up now.

jburel · 2019-09-23T08:27:09Z

src/main/java/org/openmicroscopy/shoola/util/ui/login/ServerEditor.java

@@ -214,12 +204,20 @@ public void actionPerformed(ActionEvent e)
 		removeButton.setEnabled(!this.servers.isEmpty());
 		addButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				String add = JOptionPane.showInputDialog(ServerEditor.this, "", "Add new server",
+				String add = JOptionPane.showInputDialog(ServerEditor.this,
+						"Enter hostname or IP address (:port as needed)\n(e.g. test.openmicroscopy.org or 192.168.0.1:1234",


the port example should be indicated when the hostname is changed. It will probably be missed when the IP is used

pwalczysko · 2019-09-23T11:56:58Z

See above - some servers have ports listed, some not. This is probably because I had the list of servers "from old insight" and all these have ports explicitly listed. But, when I entered a new server (nightshade) I have not listed the port with a colon. But, the port number was not automatically added either. This could be explained in the dialog above, where it just says "Enter a new server or use existing one" - not very informatinve actually.

pwalczysko · 2019-09-23T11:58:30Z

This should actually say "Connecting to" - at the moment when I am dealing with the dialog here, I am not connected yet.

pwalczysko · 2019-09-23T12:40:39Z

Discussed with @dominikl - the solution might be to put the info in the first dialog,

There is space for it and maybe it can be formatted as well.
I would imagine 3 separate lines with 3 examples, introduced by
Server address can be entered as:

my.server.name (default case)
my.server.name:port (for non-default ports)
124.133.0.343:1245 (if you have an IP address)
websocket-example (connecting via websocket)

pwalczysko · 2019-09-25T10:22:52Z

That is much better, couple of further suggestions:

remove the e.g. , maybe replacing it by making the header to read Server address examples
swap the italicising of the brackets with the addresses (i.e. italicise the address examples, leave the explanations non-italics) -> see how that looks like please though
make either quite a few spaces between the server address and the explanation, or, even better, make it so that the explanations are indented in the same way for all 4 examples

dominikl · 2019-10-23T10:21:26Z

Had to fix some more issues, hence some more tests needs to be taken:

Apart from testing with an already existing list of servers, also delete (or temporary rename) your existing Insight preferences (rm -rf ~/.java/.userPrefs/org/openmicroscopy), then test again. Make sure you're connecting by default to 'localhost' (and there is exactly one entry in the serverlist 'localhost').
Delete preferences again. Open the container.xml and enter a different default server.
Check that this (and only this) server shows up as default server on the login dialog.
Delete preferences again. Open the container.xml and set the configurable flag to false. Check that the specified server shows up as default, and that the 'Server Editor' button is disabled.

That's additionally to the previous tests of the actual PR, which are:

Test connection to websocket URL: wss://pub-omero.openmicroscopy.org/omero-ws
Test connection to normal hostname/port.

Note:
On OSX to access Insight's preferences use "Go to folder" /Users/[YOU]/Library/Preferences and delete or tmp rename the file org.openmicroscopy.shoola.plist.

- Handle case that no config doesn't exists yet - Take default values from container.xml - Handle case that config is set to not editable

src/main/java/org/openmicroscopy/shoola/util/ui/login/ScreenLoginDialog.java

pwalczysko · 2019-10-25T10:56:30Z

All works as expected here. Also tested import using websocket into the pub-omero server, went fine.

Ready to merge FMPOV

jburel · 2019-12-17T08:46:27Z

Breaking UI change so this needs to go in for 5.6

jburel · 2019-12-17T08:50:25Z

@pwalczysko The import guide will need to be adjusted to indicate how to change the port.

jburel · 2019-12-17T09:41:05Z

ome/omero-guide-upload#1

mtbc reviewed Sep 2, 2019

View reviewed changes

dominikl added 3 commits September 4, 2019 15:26

Make Insight login work with websocket URLs

48ecbc0

- A URL can now be entered as hostname - Port can now be empty (default is set in the java gateway)

Rewrite ServerEditor

82ec2dc

Fix ServerEditor and delete unneccessary LoginCredentials class

bd798f6

dominikl force-pushed the wss branch from 34f9816 to bd798f6 Compare September 4, 2019 14:26

dominikl added 2 commits September 4, 2019 15:43

Remove the groups stuff from ScreenLogin

7ef6cd0

Avoid duplicate entries; avoid NPE

6f0498e

manics mentioned this pull request Sep 5, 2019

Support wss external websocket connections to demo ome/prod-playbooks#204

Merged

Fix: Add/Edit server dialog pops up in background

5678aa2

dominikl mentioned this pull request Sep 19, 2019

Login error dialog in background #80

Closed

Make "new server" dialog clearer, check for accidental http(s)

2715956

jburel reviewed Sep 23, 2019

View reviewed changes

Further ServerEditor UI improvements

6297058

Another small tweak to the ServerEditor UI

6c2f17d

dominikl mentioned this pull request Oct 22, 2019

Support websocket URLs ome/omero-gateway-java#21

Merged

Fixed some more issues:

9420c92

- Handle case that no config doesn't exists yet - Take default values from container.xml - Handle case that config is set to not editable

dominikl force-pushed the wss branch from 53eb9b6 to 9420c92 Compare October 24, 2019 09:59

Fixed pot. issue in OMEROinfo and removed unn. println

20666eb

mtbc reviewed Oct 24, 2019

View reviewed changes

src/main/java/org/openmicroscopy/shoola/util/ui/login/ScreenLoginDialog.java Outdated Show resolved Hide resolved

Remove unneccessary imports and comments

3a1a7ec

jburel merged commit bbffef4 into ome:master Dec 17, 2019

pwalczysko mentioned this pull request Dec 18, 2019

Change screenshot, explain about server address inputs ome/omero-guide-upload#3

Merged

dominikl mentioned this pull request Jun 3, 2020

Provide error message if unsupported protocol was used #113

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make Insight login work with websocket URLs #66

Make Insight login work with websocket URLs #66

dominikl commented Aug 21, 2019 •

edited

Loading

snoopycrimecop commented Aug 22, 2019 •

edited

Loading

mtbc Sep 2, 2019

dominikl Sep 2, 2019

mtbc Sep 2, 2019

mtbc commented Sep 2, 2019 •

edited

Loading

manics commented Sep 2, 2019

dominikl commented Sep 2, 2019

dominikl commented Sep 2, 2019 •

edited

Loading

mtbc commented Sep 2, 2019

dominikl commented Sep 2, 2019

dominikl commented Sep 4, 2019

manics commented Sep 5, 2019 •

edited

Loading

manics commented Sep 5, 2019 •

edited

Loading

dominikl commented Sep 6, 2019

manics commented Sep 9, 2019

jburel commented Sep 20, 2019

pwalczysko commented Sep 20, 2019

dominikl commented Sep 20, 2019

jburel Sep 23, 2019

pwalczysko commented Sep 23, 2019

pwalczysko commented Sep 23, 2019

pwalczysko commented Sep 23, 2019

pwalczysko commented Sep 25, 2019

dominikl commented Oct 23, 2019 •

edited

Loading

pwalczysko commented Oct 25, 2019

jburel commented Dec 17, 2019

jburel commented Dec 17, 2019

jburel commented Dec 17, 2019

Make Insight login work with websocket URLs #66

Make Insight login work with websocket URLs #66

Conversation

dominikl commented Aug 21, 2019 • edited Loading

Test

Note

snoopycrimecop commented Aug 22, 2019 • edited Loading

mtbc Sep 2, 2019

Choose a reason for hiding this comment

dominikl Sep 2, 2019

Choose a reason for hiding this comment

mtbc Sep 2, 2019

Choose a reason for hiding this comment

mtbc commented Sep 2, 2019 • edited Loading

manics commented Sep 2, 2019

dominikl commented Sep 2, 2019

dominikl commented Sep 2, 2019 • edited Loading

mtbc commented Sep 2, 2019

dominikl commented Sep 2, 2019

dominikl commented Sep 4, 2019

manics commented Sep 5, 2019 • edited Loading

manics commented Sep 5, 2019 • edited Loading

dominikl commented Sep 6, 2019

manics commented Sep 9, 2019

jburel commented Sep 20, 2019

pwalczysko commented Sep 20, 2019

dominikl commented Sep 20, 2019

jburel Sep 23, 2019

Choose a reason for hiding this comment

pwalczysko commented Sep 23, 2019

pwalczysko commented Sep 23, 2019

pwalczysko commented Sep 23, 2019

pwalczysko commented Sep 25, 2019

dominikl commented Oct 23, 2019 • edited Loading

pwalczysko commented Oct 25, 2019

jburel commented Dec 17, 2019

jburel commented Dec 17, 2019

jburel commented Dec 17, 2019

dominikl commented Aug 21, 2019 •

edited

Loading

snoopycrimecop commented Aug 22, 2019 •

edited

Loading

mtbc commented Sep 2, 2019 •

edited

Loading

dominikl commented Sep 2, 2019 •

edited

Loading

manics commented Sep 5, 2019 •

edited

Loading

manics commented Sep 5, 2019 •

edited

Loading

dominikl commented Oct 23, 2019 •

edited

Loading