-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
initial ui for organizations #29643
initial ui for organizations #29643
Conversation
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.
@edewit I tried this out and everything looks great except I can't add identity providers. The dropdown is not working.
Not sure if you expect it to work yet?
The identity provider dropdown works for me after typing something to run a search. But I think we are not yet filtering out the identity providers already linked to an organization, are we? The comments I have are:
@edewit Other than that, LGTM. Thanks for it! |
I also found some issues in the backend we need to fix when managing brokers:
|
UI failure might be related to #29691 |
Hi @pedroigor @edewit @ssilvert I was trying to reply to the comments that Pedro left:
I agree with filtering out the IDPs that are already linked to the current org. I'd like not to show the IDPs in the dropdown list that are already linked to the org.
We can add a "None" option and make it selected by default as the screenshot shows below. We have the same UI in the current console. WDYT? |
I quoted @pedroigor 's comments below, and have a question about the IDP table.
Do we need to indicate if the IDPs are linked to organizations in the IDPs table as shown below? |
No I'm not filtering out the IDPs that have already been linked, I'm now using the "normal" idp endpoint, I'll have to see if there is a search parameter that I can use to give me only unlinked once.
Right I'll use "None" like Kun suggested as that indicates more the intent of leaving it blank.
Yes this is something that react does in development mode to check if we don't break the "Rules of React". In production it will only call the endpoints once
Right hence addind the None opion
|
We can do that if you check for the |
Changed it so now shows the initial 20 |
@edewit The latest changes, LGTM. There are some changes we need in the backend to allow unset a domain and we are preparing a follow-up for it. |
Should also fix #29759. |
@@ -1672,7 +1673,9 @@ private static void updateOrganizationBroker(RealmModel realm, IdentityProviderR | |||
|
|||
String domain = representation.getConfig().get(OrganizationModel.ORGANIZATION_DOMAIN_ATTRIBUTE); | |||
|
|||
if (domain != null && org.getDomains().map(OrganizationDomainModel::getName).noneMatch(domain::equals)) { | |||
if (StringUtil.isBlank(domain)) { |
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.
Changed this to make sure empty strings remove the domain from the broker config.
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.
Thank you @edewit for the PR.
I've found few comments:
- I've noticed you can put multiple domains with same value when creating/updating an org
... only single domain is present inOrganizationRepresentation
in the request. When the page is refreshed it shows correctly only one domain.
EDIT: not reproducible any more, probably some issue on my end
- If you update the domain from e.g. orga.com
to orgb.com
and press save it's not propagated to the backend and when page is refreshed there is again orga.com
.
createOrganization=Create organization | ||
domain=Domain | ||
organizationDomainHelp=What is a domain |
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.
I suppose this help text is temporary, right?
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.
Yes, I didn't have text to explain this field yet
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.
@edewit Pedro has provided a help text for the Domain. FYI:
"Sets one or more domains to an organization so that users are mapped to an organization whenever their email domains match one of the domains herein set forth."
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Closes keycloak#29759 Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
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.
Approving based on review from @pedroigor
It's missing cypress tests, but I'm putting this out here to collect some feedback
Closes #29759