Address review comment by Alex

minio · Apr 14, 2022 · 7a57582 · 7a57582
1 parent a220d3f
commit 7a57582
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/...ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/BucketEntityStatus.tsx b/...ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/BucketEntityStatus.tsx
@@ -17,7 +17,7 @@
 import React from "react";
 import { StatsResponseType } from "../SiteReplicationStatus";
 import LookupStatusTable from "./LookupStatusTable";
-import { EntityNotFound, syncStatus } from "./Utils";
+import { EntityNotFound, isEntityNotFound, syncStatus } from "./Utils";
 
 type BucketEntityStatusProps = Partial<StatsResponseType> & {
   lookupValue?: string;
@@ -42,10 +42,7 @@ const BucketEntityStatus = ({
 
   const siteKeys = Object.keys(sites);
 
-  const notFound = siteKeys.find((sk) => {
-    // @ts-ignore
-    return !bucketSites[sk]?.HasBucket;
-  });
+  const notFound = isEntityNotFound(sites, bucketSites, "HasBucket");
   const resultMatrix: any = [];
   if (notFound) {
     return <EntityNotFound entityType={"Bucket"} entityValue={lookupValue} />;
@@ -124,7 +121,7 @@ const BucketEntityStatus = ({
     <LookupStatusTable
       matrixData={resultMatrix}
       entityName={lookupValue}
-      entityType={"Policy"}
+      entityType={"Bucket"}
     />
   );
 };

diff --git a/...-ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/GroupEntityStatus.tsx b/...-ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/GroupEntityStatus.tsx
@@ -17,7 +17,7 @@
 import React from "react";
 import { StatsResponseType } from "../SiteReplicationStatus";
 import LookupStatusTable from "./LookupStatusTable";
-import { EntityNotFound, syncStatus } from "./Utils";
+import { EntityNotFound, isEntityNotFound, syncStatus } from "./Utils";
 
 type GroupEntityStatusProps = Partial<StatsResponseType> & {
   lookupValue?: string;
@@ -34,11 +34,7 @@ const UserEntityStatus = ({
   if (!lookupValue) return null;
 
   const siteKeys = Object.keys(sites);
-
-  const notFound = siteKeys.find((sk) => {
-    // @ts-ignore
-    return !groupSites[sk]?.HasGroup;
-  });
+  const notFound = isEntityNotFound(sites, groupSites, "HasGroup");
   const resultMatrix: any = [];
   if (notFound) {
     return <EntityNotFound entityType={"Group"} entityValue={lookupValue} />;

diff --git a/...ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/PolicyEntityStatus.tsx b/...ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/PolicyEntityStatus.tsx
@@ -17,7 +17,7 @@
 import React from "react";
 import { StatsResponseType } from "../SiteReplicationStatus";
 import LookupStatusTable from "./LookupStatusTable";
-import { EntityNotFound, syncStatus } from "./Utils";
+import { EntityNotFound, isEntityNotFound, syncStatus } from "./Utils";
 
 type PolicyEntityStatusProps = Partial<StatsResponseType> & {
   lookupValue?: string;
@@ -34,11 +34,7 @@ const PolicyEntityStatus = ({
   if (!lookupValue) return null;
 
   const siteKeys = Object.keys(sites);
-
-  const notFound = siteKeys.find((sk) => {
-    // @ts-ignore
-    return !policySites[sk]?.HasPolicy;
-  });
+  const notFound = isEntityNotFound(sites, policySites, "HasPolicy");
   const resultMatrix: any = [];
   if (notFound) {
     return <EntityNotFound entityType={"Policy"} entityValue={lookupValue} />;

diff --git a/...l-ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/UserEntityStatus.tsx b/...l-ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/UserEntityStatus.tsx
@@ -17,7 +17,7 @@
 import React from "react";
 import { StatsResponseType } from "../SiteReplicationStatus";
 import LookupStatusTable from "./LookupStatusTable";
-import { EntityNotFound, syncStatus } from "./Utils";
+import { EntityNotFound, isEntityNotFound, syncStatus } from "./Utils";
 
 type PolicyEntityStatusProps = Partial<StatsResponseType> & {
   lookupValue?: string;
@@ -35,10 +35,8 @@ const UserEntityStatus = ({
 
   const siteKeys = Object.keys(sites);
 
-  const notFound = siteKeys.find((sk) => {
-    // @ts-ignore
-    return !userSites[sk]?.HasUser;
-  });
+  const notFound = isEntityNotFound(sites, userSites, "HasUser");
+
   const resultMatrix: any = [];
   if (notFound) {
     return <EntityNotFound entityType={"User"} entityValue={lookupValue} />;

diff --git a/portal-ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/Utils.tsx b/portal-ui/src/screens/Console/Configurations/SiteReplication/LookupStatus/Utils.tsx
@@ -1,5 +1,6 @@
 import { Box } from "@mui/material";
 import React from "react";
+import { StatsResponseType } from "../SiteReplicationStatus";
 
 export function syncStatus(mismatch: boolean, set: boolean): string | boolean {
   if (!set) {
@@ -8,6 +9,20 @@ export function syncStatus(mismatch: boolean, set: boolean): string | boolean {
   return !mismatch;
 }
 
+export function isEntityNotFound(
+  sites: Partial<StatsResponseType>,
+  lookupList: Partial<StatsResponseType>,
+  lookupKey: string
+) {
+  const siteKeys: string[] = Object.keys(sites);
+  return siteKeys.find((sk: string) => {
+    // there is no way to find the type of this ! as it is an entry in the structure itself.
+    // @ts-ignore
+    const result: Record<string, any> = lookupList[sk] || {};
+    return !result[lookupKey];
+  });
+}
+
 export const EntityNotFound = ({
   entityType,
   entityValue,

diff --git a/portal-ui/src/screens/Console/Configurations/SiteReplication/SiteReplicationStatus.tsx b/portal-ui/src/screens/Console/Configurations/SiteReplication/SiteReplicationStatus.tsx
@@ -43,7 +43,7 @@ export type StatsResponseType = {
   userStats?: Record<string, any>;
   maxPolicies?: number;
   policyStats?: Record<string, any>;
-  sites?: any;
+  sites?: Record<string, any>;
 };
 
 const SREntityStatus = ({