Add UI in settings to change ID Server #3300

dbkr · 2019-08-09T17:12:05Z

Just changes the current ID server being used

To come in subsequent PRs:

Store this in account data
Check for terms or support the proper UI for accepting terms when setting
Support disconnecting

Part 1 of element-hq/element-web#10094
Requires matrix-org/matrix-js-sdk#1013

Just changes the current ID server being used To come in subsequent PRs: * Store this in account data * Check for terms or support the proper UI for accepting terms when setting * Support disconnecting Part 1 of element-hq/element-web#10094 Requires matrix-org/matrix-js-sdk#1013

src/components/views/elements/Field.js

dbkr · 2019-08-12T12:00:39Z

Tests do actually pass when rich isn't breaking the build agents

dbkr · 2019-08-12T13:18:33Z

oops, don't merge this yet. Keen observers can play Spot The Deliberate Mistake for a bit.

Pretty important that we don't send that to the new IS...

dbkr · 2019-08-12T13:56:20Z

ok, better

jryans

Thanks, this is coming together nicely!

Will there be a future part focused on suggesting 3PIDs should be unbound first: element-hq/element-web#10094 (comment)?

res/css/views/settings/_SetIdServer.scss

src/components/views/settings/SetIdServer.js

src/components/views/elements/Field.js

jryans · 2019-08-12T15:28:08Z

src/components/views/elements/Field.js

@@ -135,6 +138,7 @@ export default class Field extends React.PureComponent {

    render() {
        const { element, prefix, onValidate, children, ...inputProps } = this.props;
+        delete inputProps.tooltip; // needs to be removed from props but we don't need it here


delete forces the JIT to deoptimise the object, but probably doesn't matter for this case...

interesting - I started with a nop !tooltip although it sort of seems awful.

turt2live · 2019-08-12T20:07:17Z

res/css/views/settings/_SetIdServer.scss

+*/
+
+.mx_SetIdServer .mx_Field_input {
+    width: 300px;


I'm not sure 300px is right... The input is supposed to be aligned with the other inputs on the page (except add email/phone, which are wrong).

The common CSS for this is (see .mx_GeneralUserSettingsTab_languageInput):

margin-right: 100px; // Align with the other fields on the page

mm - we may have to make all the other fields smaller then, otherwise I don't think we'll have room for the tooltip.

done - does this look reasonable?

The tooltip will overextend itself because it's the wrong shape anyways.

I'm not entirely sure the mixin is equivalent either. It looks like the math has gone a bit sideways.

Empirically it looks correct to me:

The inputs are supposed to be ~10px from the left edge of the avatar, and clamped there:

The inputs are of variable width whereas the "column" the avatar sits in is not.

also the section texts, labelled toggles, and that random revoke button all need to line up...

edit: I guess it's largely out of scope for this PR at this point, and I can fight the layout if you'd prefer.

mm - ok, that's not the design as it appears in the privacy bit though - there the all the fields in all the sections are the same length and are 31px from the profile picture.

it looks like it's using an older version of the settings design. An even still, your screenshot is not 31px :(

Oh I see :/ And no, I don't think the tooltip would have fitted with just 31px.

src/components/views/settings/SetIdServer.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>

and make that width narrower so we can fit a tooltip in the left hand side (they were a little too wide anyway for the kind of data being entered, even on a narrow window).

as per bug in comment

dbkr · 2019-08-13T17:01:49Z

sigh, more problems with this:

The 3pids and discovery sections need to appear/disappear when you set/clear an ID server
The discovery section thinks there are no emails added when the 3pids section . thinks there are

jryans · 2019-08-13T17:07:34Z

The discovery section thinks there are no emails added when the 3pids section . thinks there are

I spun this out to a separate issue a few days back: element-hq/element-web#10519

dbkr · 2019-08-13T17:53:31Z

aha, in that case I fixed the other bug so just potential design issues now.

jryans

This seems reasonable to me, assuming some future PR will handle suggesting 3PIDs should be unbound first: element-hq/element-web#10094 (comment).

dbkr added 2 commits August 9, 2019 18:07

lint

4075cdd

turt2live reviewed Aug 9, 2019

View reviewed changes

src/components/views/elements/Field.js Outdated Show resolved Hide resolved

dbkr added 4 commits August 12, 2019 11:50

nicer way to appease linter

417d9b6

rerun i18n

1067457

add the rest of the files

bf9caa7

Actually appease linter

06905bc

dbkr requested a review from a team August 12, 2019 12:00

dbkr added 3 commits August 12, 2019 13:11

shorten url by default

bc66545

Don't clear field on failure

10b1962

add comment

bc088e4

dbkr removed the request for review from a team August 12, 2019 13:17

Remove the access token for the old IS

f358b61

Pretty important that we don't send that to the new IS...

dbkr mentioned this pull request Aug 12, 2019

Disconnect from IS Button #3305

Merged

c+p fail

4d33438

dbkr requested a review from a team August 12, 2019 13:56

jryans requested review from jryans and removed request for a team August 12, 2019 15:00

jryans suggested changes Aug 12, 2019

View reviewed changes

turt2live reviewed Aug 12, 2019

View reviewed changes

src/components/views/settings/SetIdServer.js Outdated Show resolved Hide resolved

turt2live reviewed Aug 12, 2019

View reviewed changes

src/components/views/settings/SetIdServer.js Outdated Show resolved Hide resolved

turt2live mentioned this pull request Aug 12, 2019

Support changing your integration manager in the UI #3308

Merged

dbkr and others added 4 commits August 13, 2019 10:46

Correct license header

c732ae3

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>

write Identity Server out in full to be less confusing

934b711

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>

other general grammar

c36c3a9

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>

s/tooltip/tooltipContent/

860a9db

dbkr added 6 commits August 13, 2019 11:05

link to doc issue

7afaba3

Make mixin for fields in settings that need to be the same width

e07c22a

and make that width narrower so we can fit a tooltip in the left hand side (they were a little too wide anyway for the kind of data being entered, even on a narrow window).

Merge remote-tracking branch 'origin/develop' into dbkr/change_is

e5f913b

make it work again

02504b9

selector ordering

050766e

Hack to ignore @define-mixin

7a92465

as per bug in comment

dbkr requested a review from jryans August 13, 2019 14:54

dbkr added 4 commits August 13, 2019 16:20

use accessiblebutton

31fd36e

Use fetch instead of browser-request

2539da0

unused import

596ff93

prefill id server box with default if there isn't one

c80c8dc

dbkr added 2 commits August 13, 2019 18:40

Update 3pids section visibility when id server set / unset

7c35107

rerun i18n

f883495

jryans approved these changes Aug 13, 2019

View reviewed changes

dbkr merged commit e2c5dc6 into develop Aug 14, 2019

This was referenced Aug 14, 2019

Settings page fields are all out of alignment / settings page is wonky element-hq/element-web#10554

Closed

Store identity server in Account Data and support choosing identity server integration in User Settings element-hq/element-web#10094

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add UI in settings to change ID Server #3300

Add UI in settings to change ID Server #3300

dbkr commented Aug 9, 2019 •

edited

Loading

dbkr commented Aug 12, 2019

dbkr commented Aug 12, 2019

dbkr commented Aug 12, 2019

jryans left a comment

jryans Aug 12, 2019

dbkr Aug 13, 2019

turt2live Aug 12, 2019

dbkr Aug 13, 2019

dbkr Aug 13, 2019

turt2live Aug 13, 2019

dbkr Aug 13, 2019

turt2live Aug 13, 2019

turt2live Aug 13, 2019 •

edited

Loading

dbkr Aug 13, 2019

turt2live Aug 13, 2019

dbkr Aug 14, 2019

dbkr commented Aug 13, 2019

jryans commented Aug 13, 2019 •

edited

Loading

dbkr commented Aug 13, 2019

jryans left a comment

Add UI in settings to change ID Server #3300

Add UI in settings to change ID Server #3300

Conversation

dbkr commented Aug 9, 2019 • edited Loading

dbkr commented Aug 12, 2019

dbkr commented Aug 12, 2019

dbkr commented Aug 12, 2019

jryans left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

turt2live Aug 13, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dbkr commented Aug 13, 2019

jryans commented Aug 13, 2019 • edited Loading

dbkr commented Aug 13, 2019

jryans left a comment

Choose a reason for hiding this comment

dbkr commented Aug 9, 2019 •

edited

Loading

turt2live Aug 13, 2019 •

edited

Loading

jryans commented Aug 13, 2019 •

edited

Loading