From 57b76e7e64271144feae51b6c6f0dadd0dad2129 Mon Sep 17 00:00:00 2001
From: 10xtechie <koder.kay@gmail.com>
Date: Tue, 21 Jun 2022 18:57:17 +0000
Subject: [PATCH 1/2] issue #1115 adding  Pattern Type to ACLs Panel
 Information

---
 .../Acl/AclDetail/AclClusters/AclClusters.jsx    | 16 ++++++++++++----
 .../Acl/AclDetail/AclGroups/AclGroups.jsx        |  8 ++++++++
 .../Acl/AclDetail/AclTopics/AclTopics.jsx        |  8 ++++++++
 .../AclTransactionalIds/AclTransactionalIds.jsx  | 16 ++++++++++++----
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/client/src/containers/Acl/AclDetail/AclClusters/AclClusters.jsx b/client/src/containers/Acl/AclDetail/AclClusters/AclClusters.jsx
index 2babcb4b2..e04e9f685 100644
--- a/client/src/containers/Acl/AclDetail/AclClusters/AclClusters.jsx
+++ b/client/src/containers/Acl/AclDetail/AclClusters/AclClusters.jsx
@@ -30,7 +30,8 @@ class AclClusters extends Root {
   handleAcls = data => {
     const tableData = data.acls.map(acl => {
       return {
-        topic: acl.resource.name,
+        cluster: acl.resource.name,
+        patterntype: acl.resource.patternType,
         host: acl.host,
         permission: acl.operation
       };
@@ -56,9 +57,16 @@ class AclClusters extends Root {
         history={this.props.history}
         columns={[
           {
-            id: 'topic',
-            accessor: 'topic',
-            colName: 'Topic',
+            id: 'cluster',
+            accessor: 'cluster',
+            colName: 'Cluster',
+            type: 'text',
+            sortable: true
+          },
+          {
+            id: 'pattern-type',
+            accessor: 'patterntype',
+            colName: 'Pattern Type',
             type: 'text',
             sortable: true
           },
diff --git a/client/src/containers/Acl/AclDetail/AclGroups/AclGroups.jsx b/client/src/containers/Acl/AclDetail/AclGroups/AclGroups.jsx
index b04b80187..bb20e34fb 100644
--- a/client/src/containers/Acl/AclDetail/AclGroups/AclGroups.jsx
+++ b/client/src/containers/Acl/AclDetail/AclGroups/AclGroups.jsx
@@ -31,6 +31,7 @@ class AclGroups extends Root {
     const tableData = data.acls.map(acl => {
       return {
         group: acl.resource.name,
+        patterntype: acl.resource.patternType,
         host: acl.host,
         permission: acl.operation
       };
@@ -62,6 +63,13 @@ class AclGroups extends Root {
             type: 'text',
             sortable: true
           },
+          {
+            id: 'pattern-type',
+            accessor: 'patterntype',
+            colName: 'Pattern Type',
+            type: 'text',
+            sortable: true
+          },
           {
             id: 'host',
             accessor: 'host',
diff --git a/client/src/containers/Acl/AclDetail/AclTopics/AclTopics.jsx b/client/src/containers/Acl/AclDetail/AclTopics/AclTopics.jsx
index 816fea894..6abbee8ab 100644
--- a/client/src/containers/Acl/AclDetail/AclTopics/AclTopics.jsx
+++ b/client/src/containers/Acl/AclDetail/AclTopics/AclTopics.jsx
@@ -31,6 +31,7 @@ class AclTopics extends Root {
     const tableData = data.acls.map(acl => {
       return {
         topic: acl.resource.name,
+        patterntype: acl.resource.patternType,
         host: acl.host,
         permission: acl.operation
       };
@@ -62,6 +63,13 @@ class AclTopics extends Root {
             type: 'text',
             sortable: true
           },
+          {
+            id: 'pattern-type',
+            accessor: 'patterntype',
+            colName: 'Pattern Type',
+            type: 'text',
+            sortable: true
+          },
           {
             id: 'host',
             accessor: 'host',
diff --git a/client/src/containers/Acl/AclDetail/AclTransactionalIds/AclTransactionalIds.jsx b/client/src/containers/Acl/AclDetail/AclTransactionalIds/AclTransactionalIds.jsx
index cf0d63dbe..a8a1d0026 100644
--- a/client/src/containers/Acl/AclDetail/AclTransactionalIds/AclTransactionalIds.jsx
+++ b/client/src/containers/Acl/AclDetail/AclTransactionalIds/AclTransactionalIds.jsx
@@ -30,7 +30,8 @@ class AclTransactionalIds extends Root {
   handleAcls = data => {
     const tableData = data.acls.map(acl => {
       return {
-        topic: acl.resource.name,
+        transactionalId: acl.resource.name,
+        patterntype: acl.resource.patternType,
         host: acl.host,
         permission: acl.operation
       };
@@ -56,9 +57,16 @@ class AclTransactionalIds extends Root {
         history={this.props.history}
         columns={[
           {
-            id: 'topic',
-            accessor: 'topic',
-            colName: 'Topic',
+            id: 'transactionalId',
+            accessor: 'transactionalId',
+            colName: 'Transactional Id',
+            type: 'text',
+            sortable: true
+          },
+          {
+            id: 'pattern-type',
+            accessor: 'patterntype',
+            colName: 'Pattern Type',
             type: 'text',
             sortable: true
           },

From 9c582c594fdbf985609dd8e7aafc9e72b54b05fe Mon Sep 17 00:00:00 2001
From: Jens Heinitz <jheinitz@mmwarburg.com>
Date: Mon, 12 Sep 2022 15:37:21 +0200
Subject: [PATCH 2/2] change base image to focal

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5cb622fab..9c955f088 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM eclipse-temurin:11-jre-focal
 
 # install curl
 RUN apt-get update && \