Fix LDAP service update error
When a service is enabled, it must be disabled prior
to changing the service type, e.g change from OpenLDAP
to ActiveDirectory.
- Add check to determine if a service is already enabled
- Make two calls if service is already enabled. First to
disable existing service. Second to enable updated
service
- Remove toast message for ssl check and replace with
error message which also keeps submit button disabled
if the regex pattern is not met
Tested:
- Edge
- Safari
- Firefox
- Chrome
- IE 11
Signed-off-by: Derick Montague <derick.montague@ibm.com>
Change-Id: I195eeb7d1cd3621681c18f4dd9aa4414eb079c09
diff --git a/app/access-control/styles/ldap.scss b/app/access-control/styles/ldap.scss
index 3a5d930..a2698e7 100644
--- a/app/access-control/styles/ldap.scss
+++ b/app/access-control/styles/ldap.scss
@@ -29,15 +29,23 @@
.ldap__ssl-column {
padding-left: 1.5em;
+
.control__label {
text-transform: none;
font-weight: 400;
font-size: 16px;
color: $primary-dark;
}
+
.control__indicator {
top: 5px;
}
+
+ // using !important due to being a state and need to have higer specificity
+ &.disabled *,
+ .disabled {
+ color: $base-02--02 !important;
+ }
}
.ldap__configuration-buttons {
@@ -70,16 +78,22 @@
}
.ldap__certificate-info {
- padding-top: 0.5em;
- small {
- font-size: 14px;
- }
- p {
- color: $base-02--02;
+ margin-top: 0.5em;
+
+ dt {
text-transform: uppercase;
+ color: $base-02--02;
font-weight: 700;
- font-size: 0.75em;
- margin-bottom: 0;
+ font-size: 12px;
+ }
+
+ dd {
+ font-size: 14px;
+ margin-top: 0.25em;
+ }
+
+ .disabled {
+ color: $base-02--02;
}
}