Merge pull request wso2#19143 from ThaminduR/console-feature-removal

Add role mgt ui component and remove userstore ui
hwupathum · Jan 24, 2024 · bf4c44a · bf4c44a
2 parents 0ee2d47 + 9aa7cd2
commit bf4c44a
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/modules/distribution/src/repository/resources/conf/default.json b/modules/distribution/src/repository/resources/conf/default.json
@@ -20,7 +20,8 @@
     "identity_security_questions_menu",
     "metrics_menu",
     "shutdown_restart_menu",
-    "user_mgt_menu_add",
+    "userstores_mgt_menu",
+    "service_providers_menu",
     "identity_providers_menu",
     "identity_admin_advisory_banner_menu",
     "server-roles-mgt_menu",
@@ -56,6 +57,5 @@
   "user_store.properties.UsernameJavaScriptRegEx": "^[^\\s*?%]{3,50}$",
 
   "default_management_ui.path": "console",
-  "legacy_authz_runtime.enable": false,
-  "resident_identity_provider.enable": "false"
+  "legacy_authz_runtime.enable": false
 }
diff --git a/modules/distribution/src/repository/resources/conf/infer.json b/modules/distribution/src/repository/resources/conf/infer.json
@@ -32,16 +32,48 @@
         "tenantDomain", "t"]
     }
   },
-  "resident_identity_provider.enable": {
-    "true": {
+  "legacy_ui.enable": {
+    "resident_idp": {
       "server.hide_menu_items": [
         "claim_mgt_menu",
         "remote_fetch_providers_menu",
         "identity_mgt_emailtemplate_menu",
         "identity_security_questions_menu",
         "metrics_menu",
         "shutdown_restart_menu",
-        "user_mgt_menu_add",
+        "userstores_mgt_menu",
+        "service_providers_menu",
+        "identity_providers_add",
+        "identity_providers_list",
+        "identity_admin_advisory_banner_menu",
+        "server-roles-mgt_menu",
+        "logging_config_menu"
+      ]
+    },
+    "service_provider": {
+      "server.hide_menu_items": [
+        "claim_mgt_menu",
+        "remote_fetch_providers_menu",
+        "identity_mgt_emailtemplate_menu",
+        "identity_security_questions_menu",
+        "metrics_menu",
+        "shutdown_restart_menu",
+        "userstores_mgt_menu",
+        "identity_providers_menu",
+        "identity_admin_advisory_banner_menu",
+        "server-roles-mgt_menu",
+        "logging_config_menu"
+      ]
+    },
+    "all": {
+      "server.hide_menu_items": [
+        "claim_mgt_menu",
+        "remote_fetch_providers_menu",
+        "identity_mgt_emailtemplate_menu",
+        "identity_security_questions_menu",
+        "metrics_menu",
+        "shutdown_restart_menu",
+        "userstores_mgt_menu",
         "identity_providers_add",
         "identity_providers_list",
         "identity_admin_advisory_banner_menu",

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
@@ -210,7 +210,7 @@
                                     org.wso2.carbon.identity.saml.common:org.wso2.carbon.identity.saml.common.util.feature:${saml.common.util.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.framework.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.functions.library.mgt.feature:${carbon.identity.framework.version}
@@ -313,7 +313,10 @@
                                 </featureArtifactDef>
                                 <!-- Features related to Cloud Identity -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity.framework:org.wso2.carbon.user.mgt.feature:${carbon.identity.framework.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.user.mgt.server.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.role.mgt.ui.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}
@@ -691,7 +694,7 @@
                                     <version>${saml.common.util.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
+                                    <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
@@ -783,7 +786,11 @@
                                     <version>${carbon.registry.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.user.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.role.mgt.ui.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>