{}
diff --git a/clients/admin-ui/src/features/datastore-connections/ConnectionTypeLogo.tsx b/clients/admin-ui/src/features/datastore-connections/ConnectionTypeLogo.tsx
index fc51a7ae17..86b15a4645 100644
--- a/clients/admin-ui/src/features/datastore-connections/ConnectionTypeLogo.tsx
+++ b/clients/admin-ui/src/features/datastore-connections/ConnectionTypeLogo.tsx
@@ -12,12 +12,19 @@ import {
CONNECTOR_LOGOS_PATH,
FALLBACK_CONNECTOR_LOGOS_PATH,
} from "./constants";
-import { isConnectionSystemTypeMap, isDatastoreConnection } from "./types";
type ConnectionTypeLogoProps = {
data: string | ConnectionConfigurationResponse | ConnectionSystemTypeMap;
};
+const isDatastoreConnection = (
+ obj: any,
+): obj is ConnectionConfigurationResponse =>
+ (obj as ConnectionConfigurationResponse).connection_type !== undefined;
+
+const isConnectionSystemTypeMap = (obj: any): obj is ConnectionSystemTypeMap =>
+ (obj as ConnectionSystemTypeMap).encoded_icon !== undefined;
+
const ConnectionTypeLogo = ({
data,
...props
diff --git a/clients/admin-ui/src/features/datastore-connections/types.ts b/clients/admin-ui/src/features/datastore-connections/types.d.ts
similarity index 91%
rename from clients/admin-ui/src/features/datastore-connections/types.ts
rename to clients/admin-ui/src/features/datastore-connections/types.d.ts
index e4a171038f..7d1e20d841 100644
--- a/clients/admin-ui/src/features/datastore-connections/types.ts
+++ b/clients/admin-ui/src/features/datastore-connections/types.d.ts
@@ -1,6 +1,5 @@
import {
ConnectionConfigurationResponse,
- ConnectionSystemTypeMap,
ConnectionType,
DatasetConfigCtlDataset,
SystemType,
@@ -128,16 +127,6 @@ export type DatastoreConnectionResponse = {
];
};
-export const isDatastoreConnection = (
- obj: any,
-): obj is ConnectionConfigurationResponse =>
- (obj as ConnectionConfigurationResponse).connection_type !== undefined;
-
-export const isConnectionSystemTypeMap = (
- obj: any,
-): obj is ConnectionSystemTypeMap =>
- (obj as ConnectionSystemTypeMap).encoded_icon !== undefined;
-
export type DatastoreConnectionParams = {
search: string;
connection_type?: string[];
diff --git a/clients/admin-ui/src/pages/data-discovery/action-center/[monitorId]/index.tsx b/clients/admin-ui/src/pages/data-discovery/action-center/[monitorId]/index.tsx
index 6f07a74600..5f96ddfa1a 100644
--- a/clients/admin-ui/src/pages/data-discovery/action-center/[monitorId]/index.tsx
+++ b/clients/admin-ui/src/pages/data-discovery/action-center/[monitorId]/index.tsx
@@ -1,5 +1,27 @@
-const MonitorResultSystems = () => {
- return Monitor Result Systems FPO
;
+import { NextPage } from "next";
+import { useRouter } from "next/router";
+
+import FixedLayout from "~/features/common/FixedLayout";
+import { ACTION_CENTER_ROUTE } from "~/features/common/nav/v2/routes";
+import PageHeader from "~/features/common/PageHeader";
+import { DiscoveredSystemAggregateTable } from "~/features/data-discovery-and-detection/action-center/tables/DiscoveredSystemAggregateTable";
+
+const MonitorResultSystems: NextPage = () => {
+ const router = useRouter();
+ const monitorId = decodeURIComponent(router.query.monitorId as string);
+
+ return (
+
+
+
+
+ );
};
export default MonitorResultSystems;
diff --git a/clients/admin-ui/src/pages/data-discovery/action-center/index.tsx b/clients/admin-ui/src/pages/data-discovery/action-center/index.tsx
index 6edb23321c..598a357f4d 100644
--- a/clients/admin-ui/src/pages/data-discovery/action-center/index.tsx
+++ b/clients/admin-ui/src/pages/data-discovery/action-center/index.tsx
@@ -15,11 +15,11 @@ import {
PaginationBar,
useServerSidePagination,
} from "~/features/common/table/v2";
-import { useGetMonitorSummaryQuery } from "~/features/data-discovery-and-detection/action-center/actionCenter.slice";
-import { DisabledMonitorPage } from "~/features/data-discovery-and-detection/action-center/DisabledMonitorPage";
-import { EmptyMonitorResult } from "~/features/data-discovery-and-detection/action-center/EmptyMonitorResult";
+import { useGetAggregateMonitorResultsQuery } from "~/features/data-discovery-and-detection/action-center/action-center.slice";
+import { DisabledMonitorsPage } from "~/features/data-discovery-and-detection/action-center/DisabledMonitorsPage";
+import { EmptyMonitorsResult } from "~/features/data-discovery-and-detection/action-center/EmptyMonitorsResult";
import { MonitorResult } from "~/features/data-discovery-and-detection/action-center/MonitorResult";
-import { MonitorSummary } from "~/features/data-discovery-and-detection/action-center/types";
+import { MonitorAggregatedResults } from "~/features/data-discovery-and-detection/action-center/types";
import { SearchInput } from "~/features/data-discovery-and-detection/SearchInput";
import { useGetConfigurationSettingsQuery } from "~/features/privacy-requests";
@@ -51,14 +51,15 @@ const ActionCenterPage = () => {
resetPageIndexToDefault();
}, [searchQuery, resetPageIndexToDefault]);
- const { data, isError, isLoading, isFetching } = useGetMonitorSummaryQuery(
- {
- pageIndex,
- pageSize,
- search: searchQuery,
- },
- { skip: isConfigLoading || !webMonitorEnabled },
- );
+ const { data, isError, isLoading, isFetching } =
+ useGetAggregateMonitorResultsQuery(
+ {
+ page: pageIndex,
+ size: pageSize,
+ search: searchQuery,
+ },
+ { skip: isConfigLoading || !webMonitorEnabled },
+ );
useEffect(() => {
if (isError && !!toast && webMonitorEnabled) {
@@ -123,7 +124,7 @@ const ActionCenterPage = () => {
);
if (!webMonitorEnabled) {
- return ;
+ return ;
}
return (
@@ -141,16 +142,20 @@ const ActionCenterPage = () => {
loading={isLoading}
dataSource={results || loadingResults}
locale={{
- emptyText: ,
+ emptyText: ,
+ }}
+ renderItem={(summary: MonitorAggregatedResults) => {
+ return (
+ !!summary && (
+
+ )
+ );
}}
- renderItem={(summary: MonitorSummary) => (
-
- )}
/>
{!!results && !!data?.total && data.total > pageSize && (
diff --git a/clients/admin-ui/src/types/common/PaginationQueryParams.ts b/clients/admin-ui/src/types/common/PaginationQueryParams.ts
index bfdeda1475..0600daee7f 100644
--- a/clients/admin-ui/src/types/common/PaginationQueryParams.ts
+++ b/clients/admin-ui/src/types/common/PaginationQueryParams.ts
@@ -2,3 +2,11 @@ export interface PaginationQueryParams {
page: number;
size: number;
}
+
+export interface PaginatedResponse {
+ items: T[];
+ page: number;
+ size: number;
+ total: number;
+ pages: number;
+}