From f8599494ee44be3a6c1d7d3a19da4fa4843e753f Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Tue, 30 Jul 2024 15:55:13 +0200
Subject: [PATCH 1/6] Adding hide empty groups option in topic groups

---
 client/src/components/SearchBar/SearchBar.jsx |  52 +++++-
 .../Topic/Topic/TopicGroups/TopicGroups.jsx   | 163 +++++++++++-------
 client/src/utils/endpoints.jsx                |   4 +-
 .../org/akhq/controllers/TopicController.java |  10 +-
 .../repositories/ConsumerGroupRepository.java |  26 ++-
 .../akhq/repositories/TopicRepository.java    |   5 +
 6 files changed, 178 insertions(+), 82 deletions(-)

diff --git a/client/src/components/SearchBar/SearchBar.jsx b/client/src/components/SearchBar/SearchBar.jsx
index fd910a98f..4c140fd10 100644
--- a/client/src/components/SearchBar/SearchBar.jsx
+++ b/client/src/components/SearchBar/SearchBar.jsx
@@ -12,7 +12,8 @@ class SearchBar extends Form {
     showTopicListView: PropTypes.bool,
     showSearch: PropTypes.bool,
     showFilters: PropTypes.string,
-    showKeepSearch: PropTypes.bool
+    showKeepSearch: PropTypes.bool,
+    showConsumerGroupsListView: PropTypes.bool
   };
   state = {
     formData: {},
@@ -34,7 +35,16 @@ class SearchBar extends Form {
         _id: SETTINGS_VALUES.TOPIC.TOPIC_DEFAULT_VIEW.HIDE_STREAM,
         name: 'Hide stream topics'
       }
-    ]
+    ],
+    consumerGroupsListViewOptions: [
+      {
+        _id: "ALL",
+        name: "Show empty consumer groups"
+      },
+      {
+        _id: "HIDE_EMPTY",
+        name: "Hide empty consumer groups"
+      }]
   };
 
   schema = {};
@@ -44,19 +54,20 @@ class SearchBar extends Form {
   }
 
   componentDidUpdate(prevProps) {
-    const { search, topicListView, keepSearch } = this.props;
+    const { search, topicListView, keepSearch, consumerGroupsListView } = this.props;
 
     if (
       search !== prevProps.search ||
       topicListView !== prevProps.topicListView ||
-      keepSearch !== prevProps.keepSearch
+      keepSearch !== prevProps.keepSearch ||
+        consumerGroupsListView !== prevProps.consumerGroupsListView
     ) {
       this.setupProps();
     }
   }
 
   setupProps() {
-    const { showSearch, showTopicListView, showKeepSearch } = this.props;
+    const { showSearch, showTopicListView, showKeepSearch, showConsumerGroupsListView } = this.props;
     const { formData } = this.state;
     if (showSearch) {
       const { search } = this.props;
@@ -72,6 +83,11 @@ class SearchBar extends Form {
       formData['keepSearch'] = this.props.keepSearch;
       this.schema['keepSearch'] = Joi.boolean();
     }
+    if (showConsumerGroupsListView) {
+      const { consumerGroupsListView } = this.props;
+      formData['consumerGroupsListView'] = consumerGroupsListView;
+      this.schema['consumerGroupsListView'] = Joi.string().required();
+    }
     return formData;
   }
 
@@ -88,14 +104,15 @@ class SearchBar extends Form {
   }
 
   doSubmit = () => {
-    const { pagination, search, topicListView, keepSearch } = this.state.formData;
+    const { pagination, search, topicListView, keepSearch, consumerGroupsListView } = this.state.formData;
     const data = {
       pagination: pagination,
       searchData: {
         search: search,
         topicListView: topicListView
       },
-      keepSearch: keepSearch
+      keepSearch: keepSearch,
+      consumerGroupsListView: consumerGroupsListView
     };
     this.props.doSubmit(data);
   };
@@ -109,8 +126,9 @@ class SearchBar extends Form {
   }
 
   render() {
-    const { showSearch, showTopicListView, showKeepSearch } = this.props;
-    const { topicListViewOptions, showFilters, formData } = this.state;
+    const { showSearch, showTopicListView, showKeepSearch, showConsumerGroupsListView } = this.props;
+    const { topicListViewOptions, consumerGroupsListViewOptions,
+      showFilters, formData } = this.state;
 
     return (
       <React.Fragment>
@@ -155,6 +173,22 @@ class SearchBar extends Form {
                 'select-wrapper',
                 false
               )}
+            {showConsumerGroupsListView && (
+                this.renderSelect(
+                    'consumerGroupsListView',
+                    '',
+                    consumerGroupsListViewOptions,
+                    ({ currentTarget: input }) => {
+                      let { formData } = this.state;
+                      formData.consumerGroupsListView = input.value;
+                      this.setState();
+                      this.props.onConsumerGroupsListViewChange(input.value);
+                    },
+                    '',
+                    'select-wrapper',
+                    false
+                )
+            )}
             <button className="btn btn-primary" type="submit">
               <FontAwesomeIcon icon={faSearch} />
               <span className="d-lg-none"> Search</span>
diff --git a/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx b/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
index 9af7fc099..2294dff56 100644
--- a/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
+++ b/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
@@ -5,6 +5,7 @@ import constants from '../../../../utils/constants';
 import Root from '../../../../components/Root';
 import { Link } from 'react-router-dom';
 import { withRouter } from '../../../../utils/withRouter.jsx';
+import SearchBar from "../../../../components/SearchBar/index.jsx";
 
 class TopicGroups extends Root {
   state = {
@@ -13,7 +14,8 @@ class TopicGroups extends Root {
     showDeleteModal: false,
     selectedCluster: this.props.clusterId,
     deleteMessage: '',
-    loading: true
+    loading: true,
+    consumerGroupsListView: 'HIDE_EMPTY'
   };
 
   componentDidMount() {
@@ -21,9 +23,10 @@ class TopicGroups extends Root {
   }
 
   async getConsumerGroup() {
-    const { selectedCluster, topicId } = this.state;
+    const { selectedCluster, topicId, consumerGroupsListView} = this.state;
+    this.setState({ loading: true });
 
-    let data = await this.getApi(uriTopicsGroups(selectedCluster, topicId));
+    let data = await this.getApi(uriTopicsGroups(selectedCluster, topicId, consumerGroupsListView));
     if (data && data.data) {
       this.handleGroups(data.data);
     } else {
@@ -31,6 +34,20 @@ class TopicGroups extends Root {
     }
   }
 
+
+  handleSearch = () => {
+    // Cancel previous requests if there are some to prevent UI issues
+    this.cancelAxiosRequests();
+    this.renewCancelToken();
+
+    this.getConsumerGroup();
+
+    this.props.router.navigate({
+      pathname: `/ui/${this.state.selectedCluster}/topic/${this.state.topicId}/groups`,
+      search: `consumerGroupsListView=${this.state.consumerGroupsListView}`
+    });
+  }
+
   handleGroups(consumerGroups) {
     let tableConsumerGroups =
       consumerGroups.map(consumerGroup => {
@@ -70,7 +87,7 @@ class TopicGroups extends Root {
       return (
         <Link
           to={`/ui/${this.state.selectedCluster}/topic/${topic}`}
-          key="lagTopic.topicId"
+          key={`lagTopic.${topic}`}
           className="btn btn-dark btn-sm mb-1 me-1"
           onClick={noPropagation}
         >
@@ -82,68 +99,82 @@ class TopicGroups extends Root {
   }
 
   render() {
-    const { selectedCluster, loading } = this.state;
+    const { selectedCluster, loading, consumerGroupsListView } = this.state;
 
     return (
-      <div>
-        <Table
-          loading={loading}
-          columns={[
-            {
-              id: 'id',
-              accessor: 'id',
-              colName: 'Id',
-              sortable: true
-            },
-            {
-              id: 'state',
-              accessor: 'state',
-              colName: 'State',
-              cell: obj => {
-                return this.handleState(obj.state);
-              }
-            },
-            {
-              id: 'coordinator',
-              accessor: 'coordinator',
-              colName: 'Coordinator',
-              cell: obj => {
-                return this.handleCoordinator(obj.coordinator);
-              }
-            },
-            {
-              id: 'members',
-              accessor: 'members',
-              colName: 'Members',
-              sortable: true
-            },
-            {
-              id: 'topics',
-              accessor: 'topics',
-              colName: 'Topics',
-              cell: obj => {
-                if (obj.topics) {
-                  return this.handleTopics(obj.topics);
-                }
-              }
-            }
-          ]}
-          data={this.state.consumerGroups}
-          updateData={data => {
-            this.setState({ consumerGroups: data });
-          }}
-          onDetails={id => {
-            this.props.router.navigate(
-              {
-                pathname: `/ui/${selectedCluster}/group/${id}`
-              },
-              { replace: true }
-            );
-          }}
-          actions={[constants.TABLE_DETAILS]}
-        />
-      </div>
-    );
+        <div>
+          <nav className="navbar navbar-expand-lg navbar-light bg-light me-auto khq-data-filter khq-sticky khq-nav">
+            <SearchBar
+                showSearch={false}
+                showPagination={true}
+                showTopicListView={false}
+                showConsumerGroupsListView={true}
+                consumerGroupsListView={consumerGroupsListView}
+                onConsumerGroupsListViewChange={value => {
+                  this.setState({consumerGroupsListView: value});
+                }}
+                doSubmit={this.handleSearch}
+            />
+          </nav>
+            <Table
+                loading={loading}
+                columns={[
+                  {
+                    id: 'id',
+                    accessor: 'id',
+                    colName: 'Id',
+                    sortable: true
+                  },
+                  {
+                    id: 'state',
+                    accessor: 'state',
+                    colName: 'State',
+                    cell: obj => {
+                      return this.handleState(obj.state);
+                    }
+                  },
+                  {
+                    id: 'coordinator',
+                    accessor: 'coordinator',
+                    colName: 'Coordinator',
+                    cell: obj => {
+                      return this.handleCoordinator(obj.coordinator);
+                    }
+                  },
+                  {
+                    id: 'members',
+                    accessor: 'members',
+                    colName: 'Members',
+                    sortable: true
+                  },
+                  {
+                    id: 'topics',
+                    accessor: 'topics',
+                    colName: 'Topics',
+                    cell: obj => {
+                      if (obj.topics) {
+                        return this.handleTopics(obj.topics);
+                      }
+                    }
+                  }
+                ]}
+                data={this.state.consumerGroups}
+                updateData={data => {
+                  this.setState({consumerGroups: data});
+                }}
+                onDetails={id => {
+                  this.props.router.navigate(
+                      {
+                        pathname: `/ui/${selectedCluster}/group/${id}`
+                      },
+                      {replace: true}
+                  );
+                }}
+                actions={[constants.TABLE_DETAILS]}
+            />
+        </div>
+  );
   }
-}
-export default withRouter(TopicGroups);
+  }
+
+  export default withRouter(TopicGroups);
diff --git a/client/src/utils/endpoints.jsx b/client/src/utils/endpoints.jsx
index 54bcb5cb8..d4de53c8d 100644
--- a/client/src/utils/endpoints.jsx
+++ b/client/src/utils/endpoints.jsx
@@ -94,8 +94,8 @@ export const uriTopicsPartitions = (clusterId, topicId) => {
   return `${apiUrl}/${clusterId}/topic/${topicId}/partitions`;
 };
 
-export const uriTopicsGroups = (clusterId, topicId) => {
-  return `${apiUrl}/${clusterId}/topic/${topicId}/groups`;
+export const uriTopicsGroups = (clusterId, topicId, consumerGroupsListView) => {
+  return `${apiUrl}/${clusterId}/topic/${topicId}/groups?consumerGroupsListView=${consumerGroupsListView}`;
 };
 export const uriTopicsLogs = (clusterId, topicId) => {
   return `${apiUrl}/${clusterId}/topic/${topicId}/logs`;
diff --git a/src/main/java/org/akhq/controllers/TopicController.java b/src/main/java/org/akhq/controllers/TopicController.java
index dd6a88db2..28c67ada7 100644
--- a/src/main/java/org/akhq/controllers/TopicController.java
+++ b/src/main/java/org/akhq/controllers/TopicController.java
@@ -275,11 +275,15 @@ public List<Partition> partitions(String cluster, String topicName) throws Execu
     @AKHQSecured(resource = Role.Resource.CONSUMER_GROUP, action = Role.Action.READ)
     @Get("api/{cluster}/topic/{topicName}/groups")
     @Operation(tags = {"topic"}, summary = "List all consumer groups from a topic")
-    public List<ConsumerGroup> groups(String cluster, String topicName) throws ExecutionException, InterruptedException {
+    public List<ConsumerGroup> groups(String cluster, String topicName,
+                                      Optional<TopicRepository.TopicConsumerGroupsListView> consumerGroupsListView)
+        throws ExecutionException, InterruptedException {
         checkIfClusterAndResourceAllowed(cluster, topicName);
 
-        return this.consumerGroupRepository.findByTopic(cluster, topicName,
-            buildUserBasedResourceFilters(cluster));
+        return (consumerGroupsListView.isEmpty()
+            || TopicRepository.TopicConsumerGroupsListView.HIDE_EMPTY.equals(consumerGroupsListView.get()))
+            ? this.consumerGroupRepository.findActiveByTopic(cluster, topicName, buildUserBasedResourceFilters(cluster))
+            : this.consumerGroupRepository.findByTopic(cluster, topicName, buildUserBasedResourceFilters(cluster));
     }
 
     @AKHQSecured(resource = Role.Resource.TOPIC, action = Role.Action.READ_CONFIG)
diff --git a/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java b/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
index 190f06ee7..da9f313fc 100644
--- a/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
+++ b/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
@@ -1,8 +1,6 @@
 package org.akhq.repositories;
 
 import io.micronaut.context.ApplicationContext;
-import io.micronaut.security.authentication.Authentication;
-import io.micronaut.security.utils.SecurityService;
 import org.akhq.models.ConsumerGroup;
 import org.akhq.models.Partition;
 import org.akhq.models.audit.ConsumerGroupAuditEvent;
@@ -103,6 +101,30 @@ public List<ConsumerGroup> findByName(String clusterId, List<String> groups, Lis
             .collect(Collectors.toList());
     }
 
+    public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException {
+        List<String> groupName = this.all(clusterId, Optional.empty(), filters);
+
+        List<String> filteredConsumerGroups = groupName.stream()
+            .filter(t -> isMatchRegex(filters, t))
+            .collect(Collectors.toList());
+
+        List<String> consumerGroups =
+            kafkaWrapper.describeConsumerGroups(clusterId, filteredConsumerGroups)
+                .values().stream()
+                .filter(description ->
+                    description.members()
+                        .stream()
+                        .flatMap(member -> member.assignment().topicPartitions().stream().map(TopicPartition::topic))
+                        .distinct()
+                        .anyMatch(t -> Objects.equals(t, topic))
+                )
+                .map(ConsumerGroupDescription::groupId)
+                .toList();
+
+
+        return this.findByName(clusterId, consumerGroups, filters);
+    }
+
     public List<ConsumerGroup> findByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException {
         List<String> groupName = this.all(clusterId, Optional.empty(), filters);
         List<ConsumerGroup> list = this.findByName(clusterId, groupName, filters);
diff --git a/src/main/java/org/akhq/repositories/TopicRepository.java b/src/main/java/org/akhq/repositories/TopicRepository.java
index 264eb8f68..5bbb11c83 100644
--- a/src/main/java/org/akhq/repositories/TopicRepository.java
+++ b/src/main/java/org/akhq/repositories/TopicRepository.java
@@ -48,6 +48,11 @@ public enum TopicListView {
         HIDE_STREAM,
     }
 
+    public enum TopicConsumerGroupsListView {
+        ALL,
+        HIDE_EMPTY
+    }
+
     public PagedList<Topic> list(String clusterId, Pagination pagination, TopicListView view, Optional<String> search, List<String> filters) throws ExecutionException, InterruptedException {
         List<String> all = all(clusterId, view, search, filters);
 

From 98f5ed94ee8dc0fbb312052b9d076defd10a1390 Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Thu, 1 Aug 2024 09:54:18 +0200
Subject: [PATCH 2/6] Adding Groups Default View in settings page Refactoring
 and comments

---
 application.example.yml                       |  2 +
 client/src/components/SearchBar/SearchBar.jsx | 40 +++++------
 client/src/containers/Settings/Settings.jsx   | 33 +++++++--
 .../Topic/Topic/TopicGroups/TopicGroups.jsx   | 36 +++++++---
 client/src/utils/constants.jsx                |  4 ++
 client/src/utils/endpoints.jsx                |  4 +-
 .../java/org/akhq/configs/Connection.java     |  3 +-
 .../java/org/akhq/configs/UiOptionsTopic.java |  1 +
 .../org/akhq/controllers/TopicController.java |  6 +-
 .../repositories/ConsumerGroupRepository.java | 70 ++++++++++++++-----
 .../akhq/repositories/TopicRepository.java    |  4 +-
 11 files changed, 141 insertions(+), 62 deletions(-)

diff --git a/application.example.yml b/application.example.yml
index 6e3104829..b064f6989 100644
--- a/application.example.yml
+++ b/application.example.yml
@@ -109,6 +109,7 @@ akhq:
           skip-consumer-groups: false # Skip loading consumer group information when showing topics. Overrides default
           skip-last-record: true  # Skip loading last record date information when showing topics.  Overrides default
           show-all-consumer-groups: true # Expand list of consumer groups instead of showing one. Overrides default.
+          groups-default-view: ALL  # default consumer groups list view (ALL, HIDE_EMPTY). Overrides default
         topic-data:
           sort: NEWEST # default sort order (OLDEST, NEWEST) (default: OLDEST).  Overrides default
           date-time-format: ISO # format of message timestamps (RELATIVE, ISO) (default: RELATIVE)
@@ -181,6 +182,7 @@ akhq:
       skip-consumer-groups: false # Skip loading consumer group information when showing topics. Overrides default
       skip-last-record: true  # Skip loading last record date information when showing topics.  Overrides default
       show-all-consumer-groups: true # Expand list of consumer groups instead of showing one. Overrides default.
+      consumer-groups-default-view: ALL  # default consumer groups list view (ALL, HIDE_EMPTY). Overrides default
     topic-data:
       sort: NEWEST # default sort order (OLDEST, NEWEST) (default: OLDEST).  Overrides default
 
diff --git a/client/src/components/SearchBar/SearchBar.jsx b/client/src/components/SearchBar/SearchBar.jsx
index 4c140fd10..94c90c89a 100644
--- a/client/src/components/SearchBar/SearchBar.jsx
+++ b/client/src/components/SearchBar/SearchBar.jsx
@@ -13,7 +13,7 @@ class SearchBar extends Form {
     showSearch: PropTypes.bool,
     showFilters: PropTypes.string,
     showKeepSearch: PropTypes.bool,
-    showConsumerGroupsListView: PropTypes.bool
+    showGroupsListView: PropTypes.bool
   };
   state = {
     formData: {},
@@ -36,13 +36,13 @@ class SearchBar extends Form {
         name: 'Hide stream topics'
       }
     ],
-    consumerGroupsListViewOptions: [
+    groupsListViewOptions: [
       {
-        _id: "ALL",
+        _id: SETTINGS_VALUES.TOPIC.CONSUMER_GROUP_DEFAULT_VIEW.ALL,
         name: "Show empty consumer groups"
       },
       {
-        _id: "HIDE_EMPTY",
+        _id: SETTINGS_VALUES.TOPIC.CONSUMER_GROUP_DEFAULT_VIEW.HIDE_EMPTY,
         name: "Hide empty consumer groups"
       }]
   };
@@ -54,20 +54,20 @@ class SearchBar extends Form {
   }
 
   componentDidUpdate(prevProps) {
-    const { search, topicListView, keepSearch, consumerGroupsListView } = this.props;
+    const { search, topicListView, keepSearch, groupsListView } = this.props;
 
     if (
       search !== prevProps.search ||
       topicListView !== prevProps.topicListView ||
       keepSearch !== prevProps.keepSearch ||
-        consumerGroupsListView !== prevProps.consumerGroupsListView
+        groupsListView !== prevProps.groupsListView
     ) {
       this.setupProps();
     }
   }
 
   setupProps() {
-    const { showSearch, showTopicListView, showKeepSearch, showConsumerGroupsListView } = this.props;
+    const { showSearch, showTopicListView, showKeepSearch, showGroupsListView } = this.props;
     const { formData } = this.state;
     if (showSearch) {
       const { search } = this.props;
@@ -83,10 +83,10 @@ class SearchBar extends Form {
       formData['keepSearch'] = this.props.keepSearch;
       this.schema['keepSearch'] = Joi.boolean();
     }
-    if (showConsumerGroupsListView) {
-      const { consumerGroupsListView } = this.props;
-      formData['consumerGroupsListView'] = consumerGroupsListView;
-      this.schema['consumerGroupsListView'] = Joi.string().required();
+    if (showGroupsListView) {
+      const { groupsListView } = this.props;
+      formData['groupsListView'] = groupsListView;
+      this.schema['groupsListView'] = Joi.string().required();
     }
     return formData;
   }
@@ -104,7 +104,7 @@ class SearchBar extends Form {
   }
 
   doSubmit = () => {
-    const { pagination, search, topicListView, keepSearch, consumerGroupsListView } = this.state.formData;
+    const { pagination, search, topicListView, keepSearch, groupsListView } = this.state.formData;
     const data = {
       pagination: pagination,
       searchData: {
@@ -112,7 +112,7 @@ class SearchBar extends Form {
         topicListView: topicListView
       },
       keepSearch: keepSearch,
-      consumerGroupsListView: consumerGroupsListView
+      groupsListView: groupsListView
     };
     this.props.doSubmit(data);
   };
@@ -126,8 +126,8 @@ class SearchBar extends Form {
   }
 
   render() {
-    const { showSearch, showTopicListView, showKeepSearch, showConsumerGroupsListView } = this.props;
-    const { topicListViewOptions, consumerGroupsListViewOptions,
+    const { showSearch, showTopicListView, showKeepSearch, showGroupsListView } = this.props;
+    const { topicListViewOptions, groupsListViewOptions,
       showFilters, formData } = this.state;
 
     return (
@@ -173,16 +173,16 @@ class SearchBar extends Form {
                 'select-wrapper',
                 false
               )}
-            {showConsumerGroupsListView && (
+            {showGroupsListView && (
                 this.renderSelect(
-                    'consumerGroupsListView',
+                    'groupsListView',
                     '',
-                    consumerGroupsListViewOptions,
+                    groupsListViewOptions,
                     ({ currentTarget: input }) => {
                       let { formData } = this.state;
-                      formData.consumerGroupsListView = input.value;
+                      formData.groupsListView = input.value;
                       this.setState();
-                      this.props.onConsumerGroupsListViewChange(input.value);
+                      this.props.ongroupsListViewChange(input.value);
                     },
                     '',
                     'select-wrapper',
diff --git a/client/src/containers/Settings/Settings.jsx b/client/src/containers/Settings/Settings.jsx
index dde853128..8585fc86c 100644
--- a/client/src/containers/Settings/Settings.jsx
+++ b/client/src/containers/Settings/Settings.jsx
@@ -17,7 +17,8 @@ class Settings extends Form {
       topicDataDateTimeFormat: '',
       skipConsumerGroups: false,
       skipLastRecord: false,
-      showAllConsumerGroups: true
+      showAllConsumerGroups: true,
+      groupsDefaultView: '',
     },
     errors: {}
   };
@@ -33,6 +34,10 @@ class Settings extends Form {
   topicDataDateTimeFormat = Object.entries(SETTINGS_VALUES.TOPIC_DATA.DATE_TIME_FORMAT).map(
     ([value]) => ({ _id: value, name: value })
   );
+  groupsDefaultView = Object.entries(SETTINGS_VALUES.TOPIC.CONSUMER_GROUP_DEFAULT_VIEW).map(([value]) => ({
+    _id: value,
+    name: value
+  }));
 
   schema = {
     topicDefaultView: Joi.string().optional(),
@@ -40,7 +45,8 @@ class Settings extends Form {
     topicDataDateTimeFormat: Joi.string().required(),
     skipConsumerGroups: Joi.boolean().optional(),
     skipLastRecord: Joi.boolean().optional(),
-    showAllConsumerGroups: Joi.boolean().optional()
+    showAllConsumerGroups: Joi.boolean().optional(),
+    groupsDefaultView: Joi.string().optional(),
   };
 
   componentDidMount() {
@@ -72,7 +78,11 @@ class Settings extends Form {
             showAllConsumerGroups:
               this.state.uiOptions && this.state.uiOptions.topic
                 ? this.state.uiOptions.topic.showAllConsumerGroups
-                : false
+                : false,
+            groupsDefaultView:
+              this.state.uiOptions && this.state.uiOptions.topic
+                ? this.state.uiOptions.topic.groupsDefaultView
+                : '',
           }
         });
       });
@@ -102,7 +112,8 @@ class Settings extends Form {
         defaultView: formData.topicDefaultView,
         skipConsumerGroups: formData.skipConsumerGroups,
         skipLastRecord: formData.skipLastRecord,
-        showAllConsumerGroups: formData.showAllConsumerGroups
+        showAllConsumerGroups: formData.showAllConsumerGroups,
+        groupsDefaultView: formData.groupsDefaultView,
       },
       topicData: {
         sort: formData.topicDataSort,
@@ -178,6 +189,20 @@ class Settings extends Form {
                 />
               </span>
             </div>
+            {this.renderSelect(
+                'groupsDefaultView',
+                'Consumer Groups Default View',
+                this.groupsDefaultView,
+                ({ currentTarget: input }) => {
+                  const { formData } = this.state;
+                  formData.groupsDefaultView = input.value;
+                  this.setState({ formData });
+                },
+                'col-sm-10',
+                'select-wrapper settings-wrapper',
+                true,
+                { className: 'form-control' }
+            )}
           </fieldset>
 
           <fieldset id="topicData" key="topicData">
diff --git a/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx b/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
index 2294dff56..818c12b98 100644
--- a/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
+++ b/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import Table from '../../../../components/Table';
 import { uriTopicsGroups } from '../../../../utils/endpoints';
-import constants from '../../../../utils/constants';
+import constants, {SETTINGS_VALUES} from '../../../../utils/constants';
 import Root from '../../../../components/Root';
 import { Link } from 'react-router-dom';
 import { withRouter } from '../../../../utils/withRouter.jsx';
 import SearchBar from "../../../../components/SearchBar/index.jsx";
+import {getClusterUIOptions} from "../../../../utils/functions.jsx";
 
 class TopicGroups extends Root {
   state = {
@@ -15,18 +16,31 @@ class TopicGroups extends Root {
     selectedCluster: this.props.clusterId,
     deleteMessage: '',
     loading: true,
-    consumerGroupsListView: 'HIDE_EMPTY'
+    groupsListView: 'ALL',
   };
 
   componentDidMount() {
-    this.getConsumerGroup();
+    this._initializeVars(() => this.getConsumerGroup());
+  }
+
+  async _initializeVars(callBackFunction) {
+    const { clusterId } = this.props.params;
+    const uiOptions = await getClusterUIOptions(clusterId);
+    const query = new URLSearchParams(this.props.location.search);
+
+    this.setState({groupsListView: query.get('groupsListView')
+        ? query.get('groupsListView')
+        : uiOptions && uiOptions.topic && uiOptions.topic.groupsDefaultView
+            ? uiOptions.topic.groupsDefaultView
+            : SETTINGS_VALUES.TOPIC.CONSUMER_GROUP_DEFAULT_VIEW.ALL
+    }, callBackFunction);
   }
 
   async getConsumerGroup() {
-    const { selectedCluster, topicId, consumerGroupsListView} = this.state;
+    const { selectedCluster, topicId, groupsListView} = this.state;
     this.setState({ loading: true });
 
-    let data = await this.getApi(uriTopicsGroups(selectedCluster, topicId, consumerGroupsListView));
+    let data = await this.getApi(uriTopicsGroups(selectedCluster, topicId, groupsListView));
     if (data && data.data) {
       this.handleGroups(data.data);
     } else {
@@ -44,7 +58,7 @@ class TopicGroups extends Root {
 
     this.props.router.navigate({
       pathname: `/ui/${this.state.selectedCluster}/topic/${this.state.topicId}/groups`,
-      search: `consumerGroupsListView=${this.state.consumerGroupsListView}`
+      search: `groupsListView=${this.state.groupsListView}`
     });
   }
 
@@ -99,7 +113,7 @@ class TopicGroups extends Root {
   }
 
   render() {
-    const { selectedCluster, loading, consumerGroupsListView } = this.state;
+    const { selectedCluster, loading, groupsListView } = this.state;
 
     return (
         <div>
@@ -108,10 +122,10 @@ class TopicGroups extends Root {
                 showSearch={false}
                 showPagination={true}
                 showTopicListView={false}
-                showConsumerGroupsListView={true}
-                consumerGroupsListView={consumerGroupsListView}
-                onConsumerGroupsListViewChange={value => {
-                  this.setState({consumerGroupsListView: value});
+                showGroupsListView={true}
+                groupsListView={groupsListView}
+                ongroupsListViewChange={value => {
+                  this.setState({groupsListView: value});
                 }}
                 doSubmit={this.handleSearch}
             />
diff --git a/client/src/utils/constants.jsx b/client/src/utils/constants.jsx
index 39923b48b..f2380ce52 100644
--- a/client/src/utils/constants.jsx
+++ b/client/src/utils/constants.jsx
@@ -48,6 +48,10 @@ export const SETTINGS_VALUES = {
       HIDE_INTERNAL: 'HIDE_INTERNAL',
       HIDE_INTERNAL_STREAM: 'HIDE_INTERNAL_STREAM',
       HIDE_STREAM: 'HIDE_STREAM'
+    },
+    CONSUMER_GROUP_DEFAULT_VIEW: {
+      ALL: 'ALL',
+      HIDE_EMPTY: 'HIDE_EMPTY'
     }
   },
   TOPIC_DATA: {
diff --git a/client/src/utils/endpoints.jsx b/client/src/utils/endpoints.jsx
index d4de53c8d..1f76bd732 100644
--- a/client/src/utils/endpoints.jsx
+++ b/client/src/utils/endpoints.jsx
@@ -94,8 +94,8 @@ export const uriTopicsPartitions = (clusterId, topicId) => {
   return `${apiUrl}/${clusterId}/topic/${topicId}/partitions`;
 };
 
-export const uriTopicsGroups = (clusterId, topicId, consumerGroupsListView) => {
-  return `${apiUrl}/${clusterId}/topic/${topicId}/groups?consumerGroupsListView=${consumerGroupsListView}`;
+export const uriTopicsGroups = (clusterId, topicId, groupsListView) => {
+  return `${apiUrl}/${clusterId}/topic/${topicId}/groups?groupsListView=${groupsListView}`;
 };
 export const uriTopicsLogs = (clusterId, topicId) => {
   return `${apiUrl}/${clusterId}/topic/${topicId}/logs`;
diff --git a/src/main/java/org/akhq/configs/Connection.java b/src/main/java/org/akhq/configs/Connection.java
index cf6109bc0..c9897056c 100644
--- a/src/main/java/org/akhq/configs/Connection.java
+++ b/src/main/java/org/akhq/configs/Connection.java
@@ -77,7 +77,8 @@ public UiOptions mergeOptions(UIOptions defaultOptions) {
             StringUtils.isNotEmpty(this.uiOptions.topic.getDefaultView()) ? this.uiOptions.topic.getDefaultView() : defaultOptions.getTopic().getDefaultView(),
             (this.uiOptions.topic.getSkipConsumerGroups() != null) ? this.uiOptions.topic.getSkipConsumerGroups() : defaultOptions.getTopic().getSkipConsumerGroups(),
             (this.uiOptions.topic.getSkipLastRecord() != null) ? this.uiOptions.topic.getSkipLastRecord() : defaultOptions.getTopic().getSkipLastRecord(),
-            (this.uiOptions.topic.getShowAllConsumerGroups() != null) ? this.uiOptions.topic.getShowAllConsumerGroups() : defaultOptions.getTopic().getShowAllConsumerGroups()
+            (this.uiOptions.topic.getShowAllConsumerGroups() != null) ? this.uiOptions.topic.getShowAllConsumerGroups() : defaultOptions.getTopic().getShowAllConsumerGroups(),
+            StringUtils.isNotEmpty(this.uiOptions.topic.getGroupsDefaultView()) ? this.uiOptions.topic.getGroupsDefaultView() : defaultOptions.getTopic().getGroupsDefaultView()
         );
 
         options.topicData = new UiOptionsTopicData(
diff --git a/src/main/java/org/akhq/configs/UiOptionsTopic.java b/src/main/java/org/akhq/configs/UiOptionsTopic.java
index e6e75c194..661e14a07 100644
--- a/src/main/java/org/akhq/configs/UiOptionsTopic.java
+++ b/src/main/java/org/akhq/configs/UiOptionsTopic.java
@@ -12,4 +12,5 @@ public class UiOptionsTopic {
     private Boolean skipConsumerGroups;
     private Boolean skipLastRecord;
     private Boolean showAllConsumerGroups;
+    private String groupsDefaultView;
 }
diff --git a/src/main/java/org/akhq/controllers/TopicController.java b/src/main/java/org/akhq/controllers/TopicController.java
index 28c67ada7..646759e9b 100644
--- a/src/main/java/org/akhq/controllers/TopicController.java
+++ b/src/main/java/org/akhq/controllers/TopicController.java
@@ -276,12 +276,12 @@ public List<Partition> partitions(String cluster, String topicName) throws Execu
     @Get("api/{cluster}/topic/{topicName}/groups")
     @Operation(tags = {"topic"}, summary = "List all consumer groups from a topic")
     public List<ConsumerGroup> groups(String cluster, String topicName,
-                                      Optional<TopicRepository.TopicConsumerGroupsListView> consumerGroupsListView)
+                                      Optional<TopicRepository.TopicGroupsListView> groupsListView)
         throws ExecutionException, InterruptedException {
         checkIfClusterAndResourceAllowed(cluster, topicName);
 
-        return (consumerGroupsListView.isEmpty()
-            || TopicRepository.TopicConsumerGroupsListView.HIDE_EMPTY.equals(consumerGroupsListView.get()))
+        return (groupsListView.isEmpty()
+            || TopicRepository.TopicGroupsListView.HIDE_EMPTY.equals(groupsListView.get()))
             ? this.consumerGroupRepository.findActiveByTopic(cluster, topicName, buildUserBasedResourceFilters(cluster))
             : this.consumerGroupRepository.findByTopic(cluster, topicName, buildUserBasedResourceFilters(cluster));
     }
diff --git a/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java b/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
index da9f313fc..e05ccde84 100644
--- a/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
+++ b/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
@@ -64,12 +64,29 @@ public ConsumerGroup findByName(String clusterId, String name, List<String> filt
         return consumerGroup.orElseThrow(() -> new NoSuchElementException("Consumer Group '" + name + "' doesn't exist"));
     }
 
+    /**
+     * Find all the consumer groups matching the list of names
+     * Execution time can be long if the list of groups is big. This method does several calls to the Kafka cluster
+     * (describeConsumerGroups, listConsumerGroupOffsets, describeTopics) to build ConsumerGroup with:
+     * - consumer groups description containing the active members
+     * - consumer groups offsets (allowing to retrieve the topics for empty consumer groups)
+     * - topics partition offsets (allowing to compute the lag)
+     *
+     * @param clusterId cluster id
+     * @param groups list of consumer group names
+     * @param filters security filters applied to the user
+     * @return list of consumer groups
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
     public List<ConsumerGroup> findByName(String clusterId, List<String> groups, List<String> filters) throws ExecutionException, InterruptedException {
         List<String> filteredConsumerGroups = groups.stream()
             .filter(t -> isMatchRegex(filters, t))
             .collect(Collectors.toList());
+        // Get the consumer group description of all the consumer groups the user has access to
         Map<String, ConsumerGroupDescription> consumerDescriptions = kafkaWrapper.describeConsumerGroups(clusterId, filteredConsumerGroups);
 
+        // Get the consumer group offsets to get also the topics on which the groups are affected
         Map<String, Map<TopicPartition, OffsetAndMetadata>> groupGroupsOffsets = consumerDescriptions.keySet().stream()
             .map(group -> {
                 try {
@@ -80,14 +97,18 @@ public List<ConsumerGroup> findByName(String clusterId, List<String> groups, Lis
             })
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
+        // Extract the topics list
         List<String> topics = groupGroupsOffsets.values().stream()
             .map(Map::keySet)
             .flatMap(Set::stream)
             .map(TopicPartition::topic)
             .distinct()
             .collect(Collectors.toList());
+
+        // Get the topics offsets to be able to extract later the offsets of empty consumer groups
         Map<String, List<Partition.Offsets>> topicTopicsOffsets = kafkaWrapper.describeTopicsOffsets(clusterId, topics);
 
+        // Build the consumer groups with all the information collected before
         return consumerDescriptions.values().stream()
             .map(consumerGroupDescription -> new ConsumerGroup(
                 consumerGroupDescription,
@@ -101,15 +122,23 @@ public List<ConsumerGroup> findByName(String clusterId, List<String> groups, Lis
             .collect(Collectors.toList());
     }
 
-    public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException {
-        List<String> groupName = this.all(clusterId, Optional.empty(), filters);
-
-        List<String> filteredConsumerGroups = groupName.stream()
-            .filter(t -> isMatchRegex(filters, t))
-            .collect(Collectors.toList());
-
+    /**
+     * Find all the active consumer groups for a topic
+     * Use the ConsumerGroupDescription to find the active topics from the consumer group description members.
+     *
+     * @param clusterId cluster id
+     * @param topic topic name
+     * @param filters security filters applied to the user
+     * @return list of consumer groups
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
+    public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException{
+        List<String> groupsName = this.all(clusterId, Optional.empty(), filters);
+
+        // Keep only the consumer groups that have the topic in their active topics
         List<String> consumerGroups =
-            kafkaWrapper.describeConsumerGroups(clusterId, filteredConsumerGroups)
+            kafkaWrapper.describeConsumerGroups(clusterId, groupsName)
                 .values().stream()
                 .filter(description ->
                     description.members()
@@ -125,20 +154,25 @@ public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, Lis
         return this.findByName(clusterId, consumerGroups, filters);
     }
 
+    /**
+     * Find all the consumer groups for a topic, empty or not.
+     * Warning: this method loops over all the consumer groups in the cluster because it searches for the empty consumer groups too.
+     * Consider using findActiveByTopic if searching for the active consumer groups is enough because. The execution time will be faster
+     *
+     * @param clusterId cluster id
+     * @param topic topic name
+     * @param filters security filters applied to the user
+     * @return list of consumer groups
+     * @throws ExecutionException
+     * @throws InterruptedException
+     */
     public List<ConsumerGroup> findByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException {
         List<String> groupName = this.all(clusterId, Optional.empty(), filters);
         List<ConsumerGroup> list = this.findByName(clusterId, groupName, filters);
 
-        return list
-            .stream()
-            .filter(consumerGroups ->
-                consumerGroups.getActiveTopics()
-                    .stream()
-                    .anyMatch(s -> Objects.equals(s, topic)) ||
-                    consumerGroups.getTopics()
-                        .stream()
-                        .anyMatch(s -> Objects.equals(s, topic))
-            )
+        return list.stream()
+            .filter(consumerGroup -> consumerGroup.getTopics().stream()
+                .anyMatch(s -> Objects.equals(s, topic)))
             .collect(Collectors.toList());
     }
 
diff --git a/src/main/java/org/akhq/repositories/TopicRepository.java b/src/main/java/org/akhq/repositories/TopicRepository.java
index 5bbb11c83..300be7b63 100644
--- a/src/main/java/org/akhq/repositories/TopicRepository.java
+++ b/src/main/java/org/akhq/repositories/TopicRepository.java
@@ -3,8 +3,6 @@
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.annotation.Value;
 import io.micronaut.retry.annotation.Retryable;
-import io.micronaut.security.authentication.Authentication;
-import io.micronaut.security.utils.SecurityService;
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.clients.admin.TopicListing;
 import org.akhq.models.Partition;
@@ -48,7 +46,7 @@ public enum TopicListView {
         HIDE_STREAM,
     }
 
-    public enum TopicConsumerGroupsListView {
+    public enum TopicGroupsListView {
         ALL,
         HIDE_EMPTY
     }

From ed394140f2bd57f0b049ec01a004e590818dc4e3 Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Thu, 1 Aug 2024 10:01:09 +0200
Subject: [PATCH 3/6] Update doc

---
 application.example.yml         | 2 +-
 docs/docs/configuration/akhq.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application.example.yml b/application.example.yml
index b064f6989..226335449 100644
--- a/application.example.yml
+++ b/application.example.yml
@@ -182,7 +182,7 @@ akhq:
       skip-consumer-groups: false # Skip loading consumer group information when showing topics. Overrides default
       skip-last-record: true  # Skip loading last record date information when showing topics.  Overrides default
       show-all-consumer-groups: true # Expand list of consumer groups instead of showing one. Overrides default.
-      consumer-groups-default-view: ALL  # default consumer groups list view (ALL, HIDE_EMPTY). Overrides default
+      groups-default-view: ALL  # default consumer groups list view (ALL, HIDE_EMPTY). Overrides default
     topic-data:
       sort: NEWEST # default sort order (OLDEST, NEWEST) (default: OLDEST).  Overrides default
 
diff --git a/docs/docs/configuration/akhq.md b/docs/docs/configuration/akhq.md
index c7cfd9215..3799ea176 100644
--- a/docs/docs/configuration/akhq.md
+++ b/docs/docs/configuration/akhq.md
@@ -30,6 +30,7 @@ These parameters are the default values used in the topic creation page.
 * `akhq.ui-options.topic.skip-consumer-groups` hide consumer groups columns on topic list
 * `akhq.ui-options.topic.skip-last-record` hide the last records on topic list
 * `akhq.ui-options.topic.show-all-consumer-groups` expand lists of consumer groups on topic list
+* `akhq.ui-options.topic.groups-default-view` is the default consumer groups list view on topic screen/consumer groups tab (ALL, HIDE_EMPTY) (default: ALL). HIDE_EMPTY increases performance, especially on cluster with a lot of consumer groups
 
 ### Topic Data
 * `akhq.ui-options.topic-data.sort`: default sort order (OLDEST, NEWEST) (default: OLDEST)

From 5a25cb8dc636fd660424b9f10887df1839dfd2b3 Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Thu, 1 Aug 2024 10:05:29 +0200
Subject: [PATCH 4/6] Lint

---
 client/src/components/SearchBar/SearchBar.jsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/client/src/components/SearchBar/SearchBar.jsx b/client/src/components/SearchBar/SearchBar.jsx
index 94c90c89a..08c2d5c75 100644
--- a/client/src/components/SearchBar/SearchBar.jsx
+++ b/client/src/components/SearchBar/SearchBar.jsx
@@ -56,12 +56,8 @@ class SearchBar extends Form {
   componentDidUpdate(prevProps) {
     const { search, topicListView, keepSearch, groupsListView } = this.props;
 
-    if (
-      search !== prevProps.search ||
-      topicListView !== prevProps.topicListView ||
-      keepSearch !== prevProps.keepSearch ||
-        groupsListView !== prevProps.groupsListView
-    ) {
+    if (search !== prevProps.search || topicListView !== prevProps.topicListView
+        || keepSearch !== prevProps.keepSearch || groupsListView !== prevProps.groupsListView) {
       this.setupProps();
     }
   }
@@ -127,8 +123,7 @@ class SearchBar extends Form {
 
   render() {
     const { showSearch, showTopicListView, showKeepSearch, showGroupsListView } = this.props;
-    const { topicListViewOptions, groupsListViewOptions,
-      showFilters, formData } = this.state;
+    const { topicListViewOptions, groupsListViewOptions, showFilters, formData } = this.state;
 
     return (
       <React.Fragment>

From ed8d91ceda4031fd3e3fc2525d1fa8dff8c68bf6 Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Tue, 6 Aug 2024 11:31:42 +0200
Subject: [PATCH 5/6] Using groups default view on topics list

---
 .../containers/Topic/TopicList/TopicList.jsx  |   8 +-
 client/src/utils/endpoints.jsx                |   4 +-
 .../org/akhq/controllers/GroupController.java |  25 ++--
 .../org/akhq/controllers/TopicController.java |   3 +-
 .../repositories/ConsumerGroupRepository.java | 132 +++++++++---------
 5 files changed, 87 insertions(+), 85 deletions(-)

diff --git a/client/src/containers/Topic/TopicList/TopicList.jsx b/client/src/containers/Topic/TopicList/TopicList.jsx
index f26cdad29..76605780a 100644
--- a/client/src/containers/Topic/TopicList/TopicList.jsx
+++ b/client/src/containers/Topic/TopicList/TopicList.jsx
@@ -11,7 +11,7 @@ import {
   uriTopicLastRecord,
   uriTopics
 } from '../../../utils/endpoints';
-import constants from '../../../utils/constants';
+import constants, {SETTINGS_VALUES} from '../../../utils/constants';
 import { calculateTopicOffsetLag, showBytes } from '../../../utils/converters';
 import { toast } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
@@ -288,7 +288,11 @@ class TopicList extends Root {
     const topicsName = topics.map(topic => topic.name).join(',');
 
     if (!uiOptionsTopic.skipConsumerGroups) {
-      this.getApi(uriConsumerGroupByTopics(selectedCluster, encodeURIComponent(topicsName))).then(
+      const groupsListView = uiOptions && uiOptions.topic && uiOptions.topic.groupsDefaultView
+          ? uiOptions.topic.groupsDefaultView
+          : SETTINGS_VALUES.TOPIC.CONSUMER_GROUP_DEFAULT_VIEW.ALL
+
+      this.getApi(uriConsumerGroupByTopics(selectedCluster, encodeURIComponent(topicsName), groupsListView)).then(
         value => {
           topics.forEach(topic => {
             tableTopics[topic.name].groupComponent =
diff --git a/client/src/utils/endpoints.jsx b/client/src/utils/endpoints.jsx
index 1f76bd732..9dbb39665 100644
--- a/client/src/utils/endpoints.jsx
+++ b/client/src/utils/endpoints.jsx
@@ -312,8 +312,8 @@ export const uriConsumerGroupAcls = (clusterId, groupId) => {
   return `${apiUrl}/${clusterId}/group/${encodeURIComponent(groupId)}/acls`;
 };
 
-export const uriConsumerGroupByTopics = (clusterId, topicList) => {
-  return `${apiUrl}/${clusterId}/group/topics?topics=${topicList}`;
+export const uriConsumerGroupByTopics = (clusterId, topicList, groupsListView) => {
+  return `${apiUrl}/${clusterId}/group/topics?topics=${topicList}?groupsListView=${groupsListView}`;
 };
 
 export const uriAclsByPrincipal = (clusterId, principalEncoded, resourceType = 'ANY') => {
diff --git a/src/main/java/org/akhq/controllers/GroupController.java b/src/main/java/org/akhq/controllers/GroupController.java
index 6d1a6aabf..7e9df30ac 100644
--- a/src/main/java/org/akhq/controllers/GroupController.java
+++ b/src/main/java/org/akhq/controllers/GroupController.java
@@ -18,6 +18,7 @@
 import org.akhq.repositories.AccessControlListRepository;
 import org.akhq.repositories.ConsumerGroupRepository;
 import org.akhq.repositories.RecordRepository;
+import org.akhq.repositories.TopicRepository;
 import org.akhq.security.annotation.AKHQSecured;
 import org.akhq.utils.Pagination;
 import org.akhq.utils.ResultPagedList;
@@ -93,18 +94,18 @@ public List<AccessControl> acls(String cluster, String groupName) throws Executi
 
     @Get("topics")
     @Operation(tags = {"consumer group"}, summary = "Retrieve consumer group for list of topics")
-    public List filterByTopics(String cluster, Optional<List<String>> topics) {
-
-        return topics.map(
-                topicsName -> {
-                    try {
-                        return this.consumerGroupRepository.findByTopics(cluster, topicsName,
-                            buildUserBasedResourceFilters(cluster));
-                    } catch (ExecutionException | InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-        ).orElse(Collections.EMPTY_LIST);
+    public List<ConsumerGroup> filterByTopics(String cluster, Optional<List<String>> topics,
+                               Optional<TopicRepository.TopicGroupsListView> groupsListView) {
+        return topics.map(topicsName -> {
+            if (groupsListView.isPresent()
+                && TopicRepository.TopicGroupsListView.HIDE_EMPTY.equals(groupsListView.get())) {
+                return this.consumerGroupRepository.findActiveByTopics(cluster, topicsName,
+                    buildUserBasedResourceFilters(cluster));
+            } else {
+                    return this.consumerGroupRepository.findByTopics(cluster, topicsName,
+                        buildUserBasedResourceFilters(cluster));
+            }
+        }).orElse(Collections.emptyList());
     }
 
     @AKHQSecured(resource = Role.Resource.CONSUMER_GROUP, action = Role.Action.UPDATE_OFFSET)
diff --git a/src/main/java/org/akhq/controllers/TopicController.java b/src/main/java/org/akhq/controllers/TopicController.java
index 646759e9b..35ac0d7ac 100644
--- a/src/main/java/org/akhq/controllers/TopicController.java
+++ b/src/main/java/org/akhq/controllers/TopicController.java
@@ -280,8 +280,7 @@ public List<ConsumerGroup> groups(String cluster, String topicName,
         throws ExecutionException, InterruptedException {
         checkIfClusterAndResourceAllowed(cluster, topicName);
 
-        return (groupsListView.isEmpty()
-            || TopicRepository.TopicGroupsListView.HIDE_EMPTY.equals(groupsListView.get()))
+        return groupsListView.isPresent() && TopicRepository.TopicGroupsListView.HIDE_EMPTY.equals(groupsListView.get())
             ? this.consumerGroupRepository.findActiveByTopic(cluster, topicName, buildUserBasedResourceFilters(cluster))
             : this.consumerGroupRepository.findByTopic(cluster, topicName, buildUserBasedResourceFilters(cluster));
     }
diff --git a/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java b/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
index e05ccde84..4768c1e03 100644
--- a/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
+++ b/src/main/java/org/akhq/repositories/ConsumerGroupRepository.java
@@ -42,18 +42,16 @@ public PagedList<ConsumerGroup> list(String clusterId, Pagination pagination, Op
         return PagedList.of(all(clusterId, search, filters), pagination, groupsList -> this.findByName(clusterId, groupsList, filters));
     }
 
-    public List<String> all(String clusterId, Optional<String> search, List<String> filters) throws ExecutionException, InterruptedException {
-        ArrayList<String> list = new ArrayList<>();
-
-        for (ConsumerGroupListing item : kafkaWrapper.listConsumerGroups(clusterId)) {
-            if (isSearchMatch(search, item.groupId()) && isMatchRegex(filters, item.groupId())) {
-                list.add(item.groupId());
-            }
+    public List<String> all(String clusterId, Optional<String> search, List<String> filters) {
+        try {
+            return kafkaWrapper.listConsumerGroups(clusterId).stream()
+                .map(ConsumerGroupListing::groupId)
+                .filter(groupId -> isSearchMatch(search, groupId) && isMatchRegex(filters, groupId))
+                .sorted(String::compareToIgnoreCase)
+                .collect(Collectors.toList());
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
         }
-
-        list.sort(Comparator.comparing(String::toLowerCase));
-
-        return list;
     }
 
     public ConsumerGroup findByName(String clusterId, String name, List<String> filters) throws ExecutionException, InterruptedException {
@@ -76,84 +74,89 @@ public ConsumerGroup findByName(String clusterId, String name, List<String> filt
      * @param groups list of consumer group names
      * @param filters security filters applied to the user
      * @return list of consumer groups
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
-    public List<ConsumerGroup> findByName(String clusterId, List<String> groups, List<String> filters) throws ExecutionException, InterruptedException {
+    public List<ConsumerGroup> findByName(String clusterId, List<String> groups, List<String> filters) {
         List<String> filteredConsumerGroups = groups.stream()
             .filter(t -> isMatchRegex(filters, t))
             .collect(Collectors.toList());
-        // Get the consumer group description of all the consumer groups the user has access to
-        Map<String, ConsumerGroupDescription> consumerDescriptions = kafkaWrapper.describeConsumerGroups(clusterId, filteredConsumerGroups);
-
-        // Get the consumer group offsets to get also the topics on which the groups are affected
-        Map<String, Map<TopicPartition, OffsetAndMetadata>> groupGroupsOffsets = consumerDescriptions.keySet().stream()
-            .map(group -> {
-                try {
-                    return new AbstractMap.SimpleEntry<>(group, kafkaWrapper.consumerGroupsOffsets(clusterId, group));
-                } catch (ExecutionException e) {
-                    throw new RuntimeException(e);
-                }
-            })
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        // Extract the topics list
-        List<String> topics = groupGroupsOffsets.values().stream()
-            .map(Map::keySet)
-            .flatMap(Set::stream)
-            .map(TopicPartition::topic)
-            .distinct()
-            .collect(Collectors.toList());
 
-        // Get the topics offsets to be able to extract later the offsets of empty consumer groups
-        Map<String, List<Partition.Offsets>> topicTopicsOffsets = kafkaWrapper.describeTopicsOffsets(clusterId, topics);
-
-        // Build the consumer groups with all the information collected before
-        return consumerDescriptions.values().stream()
-            .map(consumerGroupDescription -> new ConsumerGroup(
-                consumerGroupDescription,
-                groupGroupsOffsets.get(consumerGroupDescription.groupId()),
-                groupGroupsOffsets.get(consumerGroupDescription.groupId()).keySet().stream()
-                    .map(TopicPartition::topic)
-                    .distinct()
-                    .collect(Collectors.toMap(Function.identity(), topicTopicsOffsets::get))
-            ))
-            .sorted(Comparator.comparing(ConsumerGroup::getId))
-            .collect(Collectors.toList());
+        try {
+            // Get the consumer group description of all the consumer groups the user has access to
+            Map<String, ConsumerGroupDescription> consumerDescriptions = kafkaWrapper.describeConsumerGroups(clusterId, filteredConsumerGroups);
+
+            // Get the consumer group offsets to get also the topics on which the groups are affected
+            Map<String, Map<TopicPartition, OffsetAndMetadata>> groupGroupsOffsets = consumerDescriptions.keySet().stream()
+                .map(group -> {
+                    try {
+                        return new AbstractMap.SimpleEntry<>(group, kafkaWrapper.consumerGroupsOffsets(clusterId, group));
+                    } catch (ExecutionException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+            // Extract the topics list
+            List<String> topics = groupGroupsOffsets.values().stream()
+                .map(Map::keySet)
+                .flatMap(Set::stream)
+                .map(TopicPartition::topic)
+                .distinct()
+                .collect(Collectors.toList());
+
+            // Get the topics offsets to be able to extract later the offsets of empty consumer groups
+            Map<String, List<Partition.Offsets>> topicTopicsOffsets = kafkaWrapper.describeTopicsOffsets(clusterId, topics);
+
+            // Build the consumer groups with all the information collected before
+            return consumerDescriptions.values().stream()
+                .map(consumerGroupDescription -> new ConsumerGroup(
+                    consumerGroupDescription,
+                    groupGroupsOffsets.get(consumerGroupDescription.groupId()),
+                    groupGroupsOffsets.get(consumerGroupDescription.groupId()).keySet().stream()
+                        .map(TopicPartition::topic)
+                        .distinct()
+                        .collect(Collectors.toMap(Function.identity(), topicTopicsOffsets::get))
+                ))
+                .sorted(Comparator.comparing(ConsumerGroup::getId))
+                .collect(Collectors.toList());
+        } catch (ExecutionException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
-     * Find all the active consumer groups for a topic
+     * Find all the active consumer groups for a list of topics
      * Use the ConsumerGroupDescription to find the active topics from the consumer group description members.
      *
      * @param clusterId cluster id
-     * @param topic topic name
+     * @param topics topics name
      * @param filters security filters applied to the user
      * @return list of consumer groups
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
-    public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException{
+    public List<ConsumerGroup> findActiveByTopics(String clusterId, List<String> topics, List<String> filters) {
         List<String> groupsName = this.all(clusterId, Optional.empty(), filters);
 
-        // Keep only the consumer groups that have the topic in their active topics
+        // Keep only the consumer groups that have the topic(s) in their active topics
         List<String> consumerGroups =
             kafkaWrapper.describeConsumerGroups(clusterId, groupsName)
                 .values().stream()
                 .filter(description ->
                     description.members()
                         .stream()
-                        .flatMap(member -> member.assignment().topicPartitions().stream().map(TopicPartition::topic))
+                        .flatMap(member -> member.assignment().topicPartitions()
+                            .stream().map(TopicPartition::topic))
                         .distinct()
-                        .anyMatch(t -> Objects.equals(t, topic))
+                        .anyMatch(topics::contains)
                 )
                 .map(ConsumerGroupDescription::groupId)
                 .toList();
 
-
         return this.findByName(clusterId, consumerGroups, filters);
     }
 
+    public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, List<String> filters) {
+        return findActiveByTopics(clusterId, List.of(topic), filters);
+    }
+
     /**
      * Find all the consumer groups for a topic, empty or not.
      * Warning: this method loops over all the consumer groups in the cluster because it searches for the empty consumer groups too.
@@ -163,8 +166,6 @@ public List<ConsumerGroup> findActiveByTopic(String clusterId, String topic, Lis
      * @param topic topic name
      * @param filters security filters applied to the user
      * @return list of consumer groups
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     public List<ConsumerGroup> findByTopic(String clusterId, String topic, List<String> filters) throws ExecutionException, InterruptedException {
         List<String> groupName = this.all(clusterId, Optional.empty(), filters);
@@ -176,21 +177,18 @@ public List<ConsumerGroup> findByTopic(String clusterId, String topic, List<Stri
             .collect(Collectors.toList());
     }
 
-    public List<ConsumerGroup> findByTopics(String clusterId, List<String> topics, List<String> filters) throws ExecutionException, InterruptedException {
+    public List<ConsumerGroup> findByTopics(String clusterId, List<String> topics, List<String> filters) {
 
         List<String> groupName = this.all(clusterId, Optional.empty(), filters);
         List<ConsumerGroup> list = this.findByName(clusterId, groupName, filters);
         return list
             .stream()
             .filter(consumerGroups ->
-                consumerGroups.getActiveTopics()
-                    .stream()
-                    .anyMatch(s -> topics.contains(s)) ||
                     consumerGroups.getTopics()
                         .stream()
-                        .anyMatch(s -> topics.contains(s))
+                        .anyMatch(topics::contains)
             )
-            .collect(Collectors.toList());
+            .toList();
     }
 
     public void updateOffsets(String clusterId, String name, Map<org.akhq.models.TopicPartition, Long> offset) {

From c59840f68ff9424406376149fb45e37004b69f1f Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Tue, 6 Aug 2024 11:41:52 +0200
Subject: [PATCH 6/6] Using groups default view on topics list

---
 .../akhq/modules/AbstractKafkaWrapper.java    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/akhq/modules/AbstractKafkaWrapper.java b/src/main/java/org/akhq/modules/AbstractKafkaWrapper.java
index 2af8453af..be2ddcfd9 100644
--- a/src/main/java/org/akhq/modules/AbstractKafkaWrapper.java
+++ b/src/main/java/org/akhq/modules/AbstractKafkaWrapper.java
@@ -217,20 +217,25 @@ public Collection<ConsumerGroupListing> listConsumerGroups(String clusterId) thr
 
     private Map<String, Map<String, ConsumerGroupDescription>> describeConsumerGroups = new HashMap<>();
 
-    public Map<String, ConsumerGroupDescription> describeConsumerGroups(String clusterId, List<String> groups) throws ExecutionException {
+    public Map<String, ConsumerGroupDescription> describeConsumerGroups(String clusterId, List<String> groups) {
         describeConsumerGroups.computeIfAbsent(clusterId, s -> new HashMap<>());
 
         List<String> list = new ArrayList<>(groups);
         list.removeIf(value -> this.describeConsumerGroups.get(clusterId).containsKey(value));
 
-        if (list.size() > 0) {
-            Map<String, ConsumerGroupDescription> description = Logger.call(
-                kafkaModule.getAdminClient(clusterId)
-                    .describeConsumerGroups(groups)
-                    .all(),
-                "Describe ConsumerGroups {}",
-                groups
-            );
+        if (!list.isEmpty()) {
+            Map<String, ConsumerGroupDescription> description = null;
+            try {
+                description = Logger.call(
+                    kafkaModule.getAdminClient(clusterId)
+                        .describeConsumerGroups(groups)
+                        .all(),
+                    "Describe ConsumerGroups {}",
+                    groups
+                );
+            } catch (ExecutionException e) {
+                throw new RuntimeException(e);
+            }
 
             this.describeConsumerGroups.get(clusterId).putAll(description);
         }