Merge remote-tracking branch 'origin/master' into feature/postgres-16

Evolveum · Sep 25, 2023 · 169620b · 169620b
2 parents 13b1f1d + 3851e1e
commit 169620b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/config/sql/native/postgres-upgrade.sql b/config/sql/native/postgres-upgrade.sql
@@ -427,6 +427,12 @@ CREATE TRIGGER m_role_analysis_session_oid_delete_tr AFTER DELETE ON m_role_anal
     FOR EACH ROW EXECUTE FUNCTION delete_object_oid();
 $aa$);
 
+-- Display Name for Connector Type
+
+call apply_change(24, $aa$
+    ALTER TABLE m_connector ADD  displayNameOrig TEXT;
+    ALTER TABLE m_connector ADD displayNameNorm TEXT;
+$aa$);
 
 ---
 -- WRITE CHANGES ABOVE ^^

diff --git a/config/sql/native/postgres.sql b/config/sql/native/postgres.sql
@@ -1308,6 +1308,8 @@ CREATE TABLE m_connector (
     connectorHostRefTargetOid UUID,
     connectorHostRefTargetType ObjectType,
     connectorHostRefRelationId INTEGER REFERENCES m_uri(id),
+    displayNameOrig TEXT,
+    displayNameNorm TEXT,
     targetSystemTypes INTEGER[],
     available BOOLEAN
 )
@@ -2218,4 +2220,4 @@ END $$;
 -- This is important to avoid applying any change more than once.
 -- Also update SqaleUtils.CURRENT_SCHEMA_CHANGE_NUMBER
 -- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
-call apply_change(23, $$ SELECT 1 $$, true);
+call apply_change(24, $$ SELECT 1 $$, true);
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java
@@ -38,7 +38,7 @@ protected void onInitialize() {
     private void initLayout() {
         List<Badge> badgeList = getModelObject()
                 .stream()
-                .map(op -> new Badge(createBadgeClass(op), null, createLabelText(op), null))
+                .map(op -> new Badge(createBadgeClass(op), null, createLabelText(op), createTooltip(op)))
                 .toList();
         add(new BadgeListPanel(
                 ID_OPERATION,

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
@@ -38,7 +38,7 @@ public class SqaleUtils {
      */
     public static final String SCHEMA_AUDIT_CHANGE_NUMBER = "schemaAuditChangeNumber";
 
-    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 23;
+    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 24;
 
     public static final int CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER = 8;
 

diff --git a/...epo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/MConnector.java b/...epo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/MConnector.java
@@ -25,4 +25,7 @@ public class MConnector extends MObject {
     public Integer connectorHostRefRelationId;
     public Integer[] targetSystemTypes;
     public Boolean available;
+
+    public String displayNameOrig;
+    public String displayNameNorm;
 }
diff --git a/...epo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/QConnector.java b/...epo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/QConnector.java
@@ -44,6 +44,11 @@ public class QConnector extends QAssignmentHolder<MConnector> {
     public static final ColumnMetadata AVAILABLE =
             ColumnMetadata.named("available").ofType(Types.BOOLEAN);
 
+    public static final ColumnMetadata DISPLAY_NAME_ORIG =
+            ColumnMetadata.named("displayNameOrig").ofType(Types.VARCHAR);
+    public static final ColumnMetadata DISPLAY_NAME_NORM =
+            ColumnMetadata.named("displayNameNorm").ofType(Types.VARCHAR);
+
     public final StringPath connectorBundle = createString("connectorBundle", CONNECTOR_BUNDLE);
     public final StringPath connectorType = createString("connectorType", CONNECTOR_TYPE);
     public final StringPath connectorVersion = createString("connectorVersion", CONNECTOR_VERSION);
@@ -59,6 +64,9 @@ public class QConnector extends QAssignmentHolder<MConnector> {
             createArray("targetSystemTypes", Integer[].class, TARGET_SYSTEM_TYPES);
     public final BooleanPath available = createBoolean("available", AVAILABLE);
 
+    public final StringPath displayNameNorm = createString("displayNameNorm", DISPLAY_NAME_NORM);
+    public final StringPath displayNameOrig = createString("displayNameOrig", DISPLAY_NAME_ORIG);
+
     public QConnector(String variable) {
         this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME);
     }

diff --git a/...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/QConnectorMapping.java b/...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/QConnectorMapping.java
@@ -54,6 +54,8 @@ private QConnectorMapping(@NotNull SqaleRepoContext repositoryContext) {
 
         addItemMapping(F_TARGET_SYSTEM_TYPE, multiUriMapper(q -> q.targetSystemTypes));
         addItemMapping(F_AVAILABLE, booleanMapper(q -> q.available));
+        addItemMapping(F_DISPLAY_NAME,
+                polyStringMapper(q -> q.displayNameOrig, q -> q.displayNameNorm));
     }
 
     @Override
@@ -83,7 +85,8 @@ public MConnector newRowObject() {
 
         row.targetSystemTypes = processCacheableUris(schemaObject.getTargetSystemType());
         row.available = schemaObject.isAvailable();
-
+        setPolyString(schemaObject.getDisplayName(),
+                o -> row.displayNameOrig = o, n -> row.displayNameNorm = n);
         return row;
     }
 }