Skip to content

Commit dd356b6

Browse files
authored
LDAP Page improvements (#2708)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent c1d39a9 commit dd356b6

File tree

13 files changed

+855
-145
lines changed

13 files changed

+855
-145
lines changed

portal-ui/src/common/SecureComponent/permissions.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ export const IAM_PAGES = {
157157
USER_SA_ACCOUNT_ADD: "/identity/users/new-user-sa/:userName",
158158

159159
/* IDP */
160-
IDP_LDAP_CONFIGURATIONS: "/identity/idp/ldap/configurations",
161-
IDP_LDAP_CONFIGURATIONS_VIEW: "/identity/idp/ldap/configurations/:idpName",
162-
IDP_LDAP_CONFIGURATIONS_ADD: "/identity/idp/ldap/configurations/add-idp",
160+
IDP_LDAP_CONFIGURATIONS: "/identity/ldap/configuration",
163161

164162
IDP_OPENID_CONFIGURATIONS: "/identity/idp/openid/configurations",
165163
IDP_OPENID_CONFIGURATIONS_VIEW:
@@ -451,14 +449,6 @@ export const IAM_PAGES_PERMISSIONS = {
451449
IAM_SCOPES.ADMIN_ALL_ACTIONS,
452450
IAM_SCOPES.ADMIN_CONFIG_UPDATE,
453451
],
454-
[IAM_PAGES.IDP_LDAP_CONFIGURATIONS_ADD]: [
455-
IAM_SCOPES.ADMIN_ALL_ACTIONS,
456-
IAM_SCOPES.ADMIN_CONFIG_UPDATE,
457-
],
458-
[IAM_PAGES.IDP_LDAP_CONFIGURATIONS_VIEW]: [
459-
IAM_SCOPES.ADMIN_ALL_ACTIONS,
460-
IAM_SCOPES.ADMIN_CONFIG_UPDATE,
461-
],
462452
[IAM_PAGES.IDP_OPENID_CONFIGURATIONS]: [
463453
IAM_SCOPES.ADMIN_ALL_ACTIONS,
464454
IAM_SCOPES.ADMIN_CONFIG_UPDATE,

portal-ui/src/screens/Console/Console.tsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,14 @@ const AccountCreate = React.lazy(
113113

114114
const Users = React.lazy(() => import("./Users/Users"));
115115
const Groups = React.lazy(() => import("./Groups/Groups"));
116-
const IDPLDAPConfigurations = React.lazy(
117-
() => import("./IDP/IDPLDAPConfigurations")
118-
);
119116
const IDPOpenIDConfigurations = React.lazy(
120117
() => import("./IDP/IDPOpenIDConfigurations")
121118
);
122-
const AddIDPLDAPConfiguration = React.lazy(
123-
() => import("./IDP/AddIDPLDAPConfiguration")
124-
);
125119
const AddIDPOpenIDConfiguration = React.lazy(
126120
() => import("./IDP/AddIDPOpenIDConfiguration")
127121
);
128122
const IDPLDAPConfigurationDetails = React.lazy(
129-
() => import("./IDP/IDPLDAPConfigurationDetails")
123+
() => import("./IDP/LDAP/IDPLDAPConfigurationDetails")
130124
);
131125
const IDPOpenIDConfigurationDetails = React.lazy(
132126
() => import("./IDP/IDPOpenIDConfigurationDetails")
@@ -344,25 +338,17 @@ const Console = ({ classes }: IConsoleProps) => {
344338
path: IAM_PAGES.POLICIES,
345339
},
346340
{
347-
component: IDPLDAPConfigurations,
341+
component: IDPLDAPConfigurationDetails,
348342
path: IAM_PAGES.IDP_LDAP_CONFIGURATIONS,
349343
},
350344
{
351345
component: IDPOpenIDConfigurations,
352346
path: IAM_PAGES.IDP_OPENID_CONFIGURATIONS,
353347
},
354-
{
355-
component: AddIDPLDAPConfiguration,
356-
path: IAM_PAGES.IDP_LDAP_CONFIGURATIONS_ADD,
357-
},
358348
{
359349
component: AddIDPOpenIDConfiguration,
360350
path: IAM_PAGES.IDP_OPENID_CONFIGURATIONS_ADD,
361351
},
362-
{
363-
component: IDPLDAPConfigurationDetails,
364-
path: IAM_PAGES.IDP_LDAP_CONFIGURATIONS_VIEW,
365-
},
366352
{
367353
component: IDPOpenIDConfigurationDetails,
368354
path: IAM_PAGES.IDP_OPENID_CONFIGURATIONS_VIEW,

portal-ui/src/screens/Console/EventDestinations/ConfTargetGeneric.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,16 @@ const ConfTargetGeneric = ({
163163
elements={holderItem ? holderItem.value : ""}
164164
label={field.label}
165165
name={field.name}
166-
onChange={(value: string) => {
167-
setValueElement(field.name, value, item);
166+
onChange={(value: string | string[]) => {
167+
let valCh = "";
168+
169+
if (Array.isArray(value)) {
170+
valCh = value.join(",");
171+
} else {
172+
valCh = value;
173+
}
174+
175+
setValueElement(field.name, valCh, item);
168176
}}
169177
tooltip={field.tooltip}
170178
commonPlaceholder={field.placeholder}

portal-ui/src/screens/Console/IDP/AddIDPConfigurationHelpbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ const AddIDPConfigurationHelpBox = ({
8080
<div>{helpText}</div>
8181
</Box>
8282
<Box sx={{ fontSize: "14px", marginBottom: "15px" }}>
83-
{contents.map((content) => (
84-
<Fragment>
83+
{contents.map((content, index) => (
84+
<Fragment key={`feature-item-${index}`}>
8585
{content.icon && (
8686
<Box sx={{ paddingBottom: "20px" }}>
8787
<FeatureItem

portal-ui/src/screens/Console/IDP/AddIDPLDAPConfiguration.tsx

Lines changed: 0 additions & 47 deletions
This file was deleted.

portal-ui/src/screens/Console/IDP/IDPConfigurationDetails.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ const IDPConfigurationDetails = ({
168168
setLoading(false);
169169
});
170170
};
171+
171172
if (loading) {
172173
loadRecord();
173174
}

portal-ui/src/screens/Console/IDP/IDPLDAPConfigurationDetails.tsx

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)