Merge pull request wso2#5478 from JayaShakthi97/fix-19297

[bug-fix] Fix User Attributes tab visible logic in connection
JayaShakthi97 · Feb 12, 2024 · 1ed8922 · 1ed8922
2 parents 20c3b98 + 76b3ccb
commit 1ed8922
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/gorgeous-kids-build.md b/.changeset/gorgeous-kids-build.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/console": patch
+---
+
+Fix User Attributes tab visible logic in connection edit view
diff --git a/apps/console/src/features/connections/components/edit/connection-edit.tsx b/apps/console/src/features/connections/components/edit/connection-edit.tsx
@@ -443,7 +443,7 @@ export const EditConnection: FunctionComponent<EditConnectionPropsInterface> = (
          * models folder for types. identity-provider.ts
          */
         const attributesForSamlEnabled: boolean = isSaml &&
-        identityProviderConfig.editIdentityProvider.attributesSettings;
+            identityProviderConfig.editIdentityProvider.attributesSettings;
 
         /**
          * If the protocol is OIDC and if the Custom Claim Mapping feature is enabled
@@ -452,9 +452,10 @@ export const EditConnection: FunctionComponent<EditConnectionPropsInterface> = (
         const isAttributesEnabledForOIDC: boolean = isOidc && UIConfig?.isCustomClaimMappingEnabled;
 
         // Evaluate whether to Show/Hide `Attributes`.
-        if ((attributesForSamlEnabled || shouldShowTab(type, ConnectionTabTypes.USER_ATTRIBUTES))
-            && (IdentityProviderManagementConstants.IDP_TEMPLATE_IDS.OIDC === type && isAttributesEnabledForOIDC)
-            && !isOrganizationEnterpriseAuthenticator) {
+        if (shouldShowTab(type, ConnectionTabTypes.USER_ATTRIBUTES)
+            && !isOrganizationEnterpriseAuthenticator
+            && (type !== IdentityProviderManagementConstants.IDP_TEMPLATE_IDS.OIDC || isAttributesEnabledForOIDC)
+            && (type !== IdentityProviderManagementConstants.IDP_TEMPLATE_IDS.SAML || attributesForSamlEnabled)) {
             panes.push({
                 "data-tabid": ConnectionManagementConstants.ATTRIBUTES_TAB_ID,
                 menuItem: "Attributes",