From 98037f2f3e5d0f34def672bbcc209bd8f947bcc5 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Tue, 30 Jan 2024 12:00:37 +0530
Subject: [PATCH] Add the UI components and hide from the config

---
 .../repository/resources/conf/default.json    |  3 ++
 .../src/repository/resources/conf/infer.json  | 40 +++----------------
 modules/p2-profile-gen/pom.xml                | 15 +++++--
 pom.xml                                       |  2 +-
 4 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/modules/distribution/src/repository/resources/conf/default.json b/modules/distribution/src/repository/resources/conf/default.json
index 1ab18044e00..d06ef0362e5 100644
--- a/modules/distribution/src/repository/resources/conf/default.json
+++ b/modules/distribution/src/repository/resources/conf/default.json
@@ -24,6 +24,9 @@
     "userstores_mgt_menu",
     "service_providers_menu",
     "identity_providers_menu",
+    "identity_verification_providers_menu",
+    "identity_emailtemplate_menu",
+    "scope_menu",
     "identity_admin_advisory_banner_menu",
     "server-roles-mgt_menu",
     "logging_config_menu"
diff --git a/modules/distribution/src/repository/resources/conf/infer.json b/modules/distribution/src/repository/resources/conf/infer.json
index 02921b0da81..81a8d82138f 100644
--- a/modules/distribution/src/repository/resources/conf/infer.json
+++ b/modules/distribution/src/repository/resources/conf/infer.json
@@ -32,8 +32,8 @@
         "tenantDomain", "t"]
     }
   },
-  "legacy_ui.enable": {
-    "resident_idp": {
+  "resident_idp.enable": {
+    "true": {
       "server.hide_menu_items": [
         "claim_mgt_menu",
         "remote_fetch_providers_menu",
@@ -46,39 +46,9 @@
         "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",
-        "user_mgt_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",
-        "user_mgt_menu",
-        "userstores_mgt_menu",
-        "identity_providers_add",
-        "identity_providers_list",
+        "identity_verification_providers_menu",
+        "identity_emailtemplate_menu",
+        "scope_menu",
         "identity_admin_advisory_banner_menu",
         "server-roles-mgt_menu",
         "logging_config_menu"
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index a3f9156d0f7..036236cd529 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -165,7 +165,7 @@
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.event.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.mgt.server.feature:${carbon.identity.framework.version}
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.mgt.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.template.mgt.feature:${carbon.identity.framework.version}
@@ -177,7 +177,7 @@
                                     org.wso2.carbon.identity.event.handler.accountlock:org.wso2.carbon.identity.handler.event.account.lock.feature:${identity.event.handler.account.lock.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity.event.handler.notification:org.wso2.carbon.email.mgt.server.feature:${identity.event.handler.notification.version}
+                                    org.wso2.carbon.identity.event.handler.notification:org.wso2.carbon.email.mgt.feature:${identity.event.handler.notification.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.event.handler.notification:org.wso2.carbon.event.handler.notification.server.feature:${identity.event.handler.notification.version}
@@ -504,6 +504,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.extension.identity.verification:org.wso2.carbon.extension.identity.verification.provider.feature:${identity.verification.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.extension.identity.verification:org.wso2.carbon.extension.identity.verification.ui.feature:${identity.verification.version}
+                                </featureArtifactDef>
                                 <!-- input validation related features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.input.validation.mgt.server.feature:${carbon.identity.framework.version}
@@ -654,11 +657,11 @@
                                     <version>${identity.event.handler.account.lock.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.mgt.server.feature.group</id>
+                                    <id>org.wso2.carbon.identity.mgt.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.email.mgt.server.feature.group</id>
+                                    <id>org.wso2.carbon.email.mgt.feature.group</id>
                                     <version>${identity.event.handler.notification.version}</version>
                                 </feature>
                                 <feature>
@@ -1130,6 +1133,10 @@
                                     <id>org.wso2.carbon.extension.identity.verification.mgt.feature.group</id>
                                     <version>${identity.verification.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.extension.identity.verification.ui.feature.group</id>
+                                    <version>${identity.verification.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.extension.identity.oauth2.token.exchange.feature.group</id>
                                     <version>${identity.oauth2.token.exchange.grant.version}</version>
diff --git a/pom.xml b/pom.xml
index 43ded9093c5..78276cd83dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2252,7 +2252,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>7.0.7</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.0.10</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 8.0.0)</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->