Implementing MID-9016 - support in GUI, DB support needs to be added

Evolveum · Aug 25, 2023 · a40475f · a40475f
1 parent 1979397
commit a40475f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java b/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
@@ -54,8 +54,7 @@ public class SearchBoxConfigurationBuilder {
                 ItemPath.create(ObjectType.F_NAME))
         );
         FIXED_SEARCH_ITEMS.put(UserType.class, Arrays.asList(
-                ItemPath.create(UserType.F_GIVEN_NAME),
-                ItemPath.create(UserType.F_FAMILY_NAME)
+                ItemPath.create(UserType.F_FULL_NAME)
         ));
         FIXED_SEARCH_ITEMS.put(AbstractRoleType.class, Arrays.asList(
                 ItemPath.create(RoleType.F_DISPLAY_NAME)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -2307,11 +2307,16 @@
                                     Typically used as correlation identifier and for
                                     auditing purposes. Should be immutable, but the
                                     specific properties and usage are deployment-specific.
+
+                                    DEPRECATED, use personalNumber instead.
                                 </p>
                             </xsd:documentation>
                             <xsd:appinfo>
                                 <a:displayName>UserType.employeeNumber</a:displayName>
                                 <a:displayOrder>400</a:displayOrder>
+                                <a:deprecated/>
+                                <a:deprecatedSince>4.8</a:deprecatedSince>
+                                <a:plannedRemoval>5.0</a:plannedRemoval>
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
@@ -2374,6 +2379,25 @@
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
+
+                    <xsd:element name="personalNumber" type="xsd:string" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                <p>
+                                    Unique, business-oriented identifier of the user.
+                                    Typically used as correlation identifier and for
+                                    auditing purposes. Should be immutable, but the
+                                    specific properties and usage are deployment-specific.
+                                </p>
+                            </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:displayName>UserType.employeeNumber</a:displayName>
+                                <a:displayOrder>400</a:displayOrder>
+                                <a:since>4.8</a:since>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+
                 </xsd:sequence>
             </xsd:extension>
         </xsd:complexContent>

diff --git a/...odel-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java b/...odel-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java
@@ -68,8 +68,7 @@ public class DefaultColumnUtils {
                         new ColumnWrapper(ItemPath.create(ResourceType.F_CONNECTOR_REF, ConnectorType.F_CONNECTOR_VERSION), "ConnectorType.connectorVersion")))
                 .put(UserType.class, Arrays.asList(
                         new ColumnWrapper(UserType.F_NAME, true),
-                        new ColumnWrapper(UserType.F_GIVEN_NAME, true),
-                        new ColumnWrapper(UserType.F_FAMILY_NAME, true),
+                        new ColumnWrapper(UserType.F_PERSONAL_NUMBER, true),
                         new ColumnWrapper(UserType.F_FULL_NAME, true),
                         new ColumnWrapper(UserType.F_EMAIL_ADDRESS),
                         new ColumnWrapper(UserType.F_LINK_REF, "FocusType.accounts", DisplayValueType.NUMBER)))