Merge branch 'main' of github.com:redhat-developer/app-services-sdk-j…

…s into main
redhat-developer · Jun 30, 2021 · 0006e84 · 0006e84
2 parents bf710aa + c38e4a8
commit 0006e84
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/.openapi/srs-fleet-manager.json b/.openapi/srs-fleet-manager.json
@@ -495,6 +495,10 @@
               "registryDeploymentId": {
                 "description": "Identifier of a multi-tenant deployment, where this Service Registry instance resides.",
                 "type": "integer"
+              },
+              "owner": {
+                "description": "Registry instance owner",
+                "type": "string"
               }
             },
             "example": {
@@ -505,7 +509,8 @@
                 "status": "PROVISIONING",
                 "lastUpdated": "2021-05-04T12:34:56Z"
               },
-              "registryDeploymentId": 1
+              "registryDeploymentId": 1,
+              "owner": "ownername"
             }
           }
         ]

diff --git a/packages/api-mock/src/handlers/kafka-admin.js b/packages/api-mock/src/handlers/kafka-admin.js
@@ -5,6 +5,13 @@ module.exports = {
   getConsumerGroups: async (c, req, res) => {
     let consumerGroupList = consumerGroups;
     let count = consumerGroups !== undefined ? consumerGroups.length : 0;
+
+    let order = req.query.order || 'asc';
+    let orderKey = req.query.orderKey;
+
+    if(orderKey=='name') {
+      order === 'asc' ? consumerGroups.sort(compareGroupId) : consumerGroups.sort((a, b) => compareGroupId(b, a));
+    }
 
     const filteredConsumerGroups = () => {
       let regexp = new RegExp(`${req.query['group-id-filter'].trim()}`,`i`);
@@ -14,7 +21,7 @@ module.exports = {
       consumerGroupList = filteredConsumerGroups();
       count = consumerGroupList.length;
     }
-
+    
     const filterConsumerGroups = (topicName) => {
       return consumerGroupList.filter((consumerGroup) => {
         return consumerGroup.consumers.some(
@@ -269,6 +276,12 @@ function compareName(a, b) {
   return 0;
 }
 
+function compareGroupId(a, b) {
+  if (a.groupId < b.groupId) return -1;
+  if (a.groupId > b.groupId) return 1;
+  return 0;
+}
+
 function comparePartitions(a, b) {
   if (a.partitions.length < b.partitions.length) return -1;
   if (a.partitions.length > b.partitions.length) return 1;

diff --git a/packages/registry-management-sdk/src/generated/model/root-type-for-registry.ts b/packages/registry-management-sdk/src/generated/model/root-type-for-registry.ts
@@ -51,6 +51,12 @@ export interface RootTypeForRegistry {
      * @memberof RootTypeForRegistry
      */
     registryDeploymentId?: number;
+    /**
+     * Registry instance owner
+     * @type {string}
+     * @memberof RootTypeForRegistry
+     */
+    owner?: string;
 }