fix build issue

Signed-off-by: hemahg <[email protected]>
streamshub · Oct 1, 2024 · 67b0a1e · 67b0a1e
1 parent 07586a2
commit 67b0a1e
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 55 deletions.
diff --git a/...p/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/consumer-groups/page.tsx b/...p/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/consumer-groups/page.tsx
@@ -1,3 +1,10 @@
-import { TopicHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
+import {
+  TopicHeader,
+  TopicHeaderProps,
+} from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 
-export default TopicHeader;
+export default function TopicHeaderNoRefresh(
+  props: Omit<TopicHeaderProps, "showRefresh">,
+) {
+  return <TopicHeader {...props} showRefresh={false} />;
+}
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/rebalances/RebalanceTable.stories.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/rebalances/RebalanceTable.stories.tsx
@@ -13,6 +13,9 @@ export const RebalanceList: Story = {
     rebalanceList: [
       {
         id: "geffs",
+        meta: {
+          allowedActions: ["approve", "refresh"],
+        },
         attributes: {
           name: "kafak-rebalance-test1",
           status: "Ready",
@@ -23,6 +26,9 @@ export const RebalanceList: Story = {
       },
       {
         id: "zwrfts",
+        meta: {
+          allowedActions: ["refresh"],
+        },
         attributes: {
           name: "kafak-rebalance-test2",
           status: "Stopped",
@@ -32,6 +38,9 @@ export const RebalanceList: Story = {
       },
       {
         id: "zwerts",
+        meta: {
+          allowedActions: ["approve"],
+        },
         attributes: {
           name: "kafak-rebalance-test3",
           status: "New",
@@ -41,6 +50,9 @@ export const RebalanceList: Story = {
       },
       {
         id: "zw6gscd6w",
+        meta: {
+          allowedActions: ["approve", "refresh"],
+        },
         attributes: {
           name: "kafak-rebalance-test4",
           status: "PendingProposal",
@@ -57,6 +69,9 @@ export const RebalanceList: Story = {
       },
       {
         id: "zserts",
+        meta: {
+          allowedActions: [],
+        },
         attributes: {
           name: "kafak-rebalance-test6",
           status: "ReconciliationPaused",
@@ -65,6 +80,9 @@ export const RebalanceList: Story = {
       },
       {
         id: "asqwests",
+        meta: {
+          allowedActions: ["approve", "refresh"],
+        },
         attributes: {
           name: "kafak-rebalance-test7",
           status: "NotReady",
@@ -73,6 +91,9 @@ export const RebalanceList: Story = {
       },
       {
         id: "asqwests",
+        meta: {
+          allowedActions: [],
+        },
         attributes: {
           name: "kafak-rebalance-test7",
           status: "Rebalancing",

diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/rebalances/RebalanceTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/rebalances/RebalanceTable.tsx
@@ -188,27 +188,24 @@ export function RebalanceTable({
         }
       }}
       renderActions={({ row, ActionsColumn }) => (
-        console.log(row.meta?.allowedActions),
-        (
-          <ActionsColumn
-            items={[
-              {
-                title: t("approve"),
-                onClick: () => onApprove(row),
-                isDisabled: row.meta.allowedActions.includes("approve"),
-              },
-              {
-                title: t("refresh"),
-                onClick: () => {},
-              },
-              {
-                title: t("stop"),
-                onClick: () => onStop(row),
-                isDisabled: !row.meta.allowedActions.includes("approve"),
-              },
-            ]}
-          />
-        )
+        <ActionsColumn
+          items={[
+            {
+              title: t("approve"),
+              onClick: () => onApprove(row),
+              isDisabled: row.meta?.allowedActions.includes("approve"),
+            },
+            {
+              title: t("refresh"),
+              onClick: () => {},
+            },
+            {
+              title: t("stop"),
+              onClick: () => onStop(row),
+              isDisabled: !row.meta?.allowedActions.includes("approve"),
+            },
+          ]}
+        />
       )}
       getExpandedRow={({ row }) => {
         return (

diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/rebalances/[rebalanceId]/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/rebalances/[rebalanceId]/page.tsx
@@ -46,37 +46,41 @@ async function ConnectedOptimizationProposal({
 }) {
   const rebalanceDetails = await getRebalanceDetails(kafkaId, rebalanceId);
 
-  const { optimizationResult, sessionId } = rebalanceDetails.attributes;
+  if (rebalanceDetails && typeof rebalanceDetails !== "boolean") {
+    const { optimizationResult, sessionId } = rebalanceDetails.attributes;
 
-  return (
-    <OptimizationProposal
-      numIntraBrokerReplicaMovements={
-        optimizationResult.numIntraBrokerReplicaMovements
-      }
-      numReplicaMovements={optimizationResult.numReplicaMovements}
-      onDemandBalancednessScoreAfter={
-        optimizationResult.onDemandBalancednessScoreAfter
-      }
-      intraBrokerDataToMoveMB={optimizationResult.intraBrokerDataToMoveMB}
-      monitoredPartitionsPercentage={
-        optimizationResult.monitoredPartitionsPercentage
-      }
-      excludedBrokersForReplicaMove={
-        optimizationResult.excludedBrokersForReplicaMove
-      }
-      excludedBrokersForLeadership={
-        optimizationResult.excludedBrokersForLeadership
-      }
-      onDemandBalancednessScoreBefore={
-        optimizationResult.onDemandBalancednessScoreBefore
-      }
-      recentWindows={optimizationResult.recentWindows}
-      dataToMoveMB={optimizationResult.dataToMoveMB}
-      excludedTopics={optimizationResult.excludedTopics}
-      numLeaderMovements={optimizationResult.numLeaderMovements}
-      isModalOpen={true}
-      sessionId={sessionId}
-      baseurl={`/kafka/${kafkaId}/nodes/rebalances`}
-    />
-  );
+    return (
+      <OptimizationProposal
+        numIntraBrokerReplicaMovements={
+          optimizationResult.numIntraBrokerReplicaMovements
+        }
+        numReplicaMovements={optimizationResult.numReplicaMovements}
+        onDemandBalancednessScoreAfter={
+          optimizationResult.onDemandBalancednessScoreAfter
+        }
+        intraBrokerDataToMoveMB={optimizationResult.intraBrokerDataToMoveMB}
+        monitoredPartitionsPercentage={
+          optimizationResult.monitoredPartitionsPercentage
+        }
+        excludedBrokersForReplicaMove={
+          optimizationResult.excludedBrokersForReplicaMove
+        }
+        excludedBrokersForLeadership={
+          optimizationResult.excludedBrokersForLeadership
+        }
+        onDemandBalancednessScoreBefore={
+          optimizationResult.onDemandBalancednessScoreBefore
+        }
+        recentWindows={optimizationResult.recentWindows}
+        dataToMoveMB={optimizationResult.dataToMoveMB}
+        excludedTopics={optimizationResult.excludedTopics}
+        numLeaderMovements={optimizationResult.numLeaderMovements}
+        isModalOpen={true}
+        sessionId={sessionId}
+        baseurl={`/kafka/${kafkaId}/nodes/rebalances`}
+      />
+    );
+  } else {
+    return <div>No rebalance details available.</div>;
+  }
 }