fix: review

Author: Raubzeug

src/containers/Tenant/Diagnostics/Describe/Describe.tsx

@@ -5,12 +5,10 @@ import {shallowEqual} from 'react-redux';
 
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 import {Loader} from '../../../../components/Loader';
-import {
-    overviewApi,
-    selectPreparedPathOverview,
-} from '../../../../store/reducers/overview/overview';
+import {overviewApi} from '../../../../store/reducers/overview/overview';
 import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
 import type {EPathType} from '../../../../types/api/schema';
+import type {IDescribeData} from '../../../../types/store/describe';
 import {cn} from '../../../../utils/cn';
 import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
 import {isEntityWithMergedImplementation} from '../../utils/schema';
@@ -28,6 +26,8 @@ interface IDescribeProps {
     type?: EPathType;
 }
 
+const emptyObject: IDescribeData = {};
+
 const Describe = ({path, database, type}: IDescribeProps) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
@@ -44,18 +44,30 @@ const Describe = ({path, database, type}: IDescribeProps) => {
     } else if (mergedChildrenPaths) {
         paths = [path, ...mergedChildrenPaths];
     }
-    const {currentData, isFetching, error} = overviewApi.useGetOverviewQuery(
+    const {currentDescribe, currentData, isFetching, error} = overviewApi.useGetOverviewQuery(
         paths.length ? {paths, database} : skipToken,
         {
             pollingInterval: autoRefreshInterval,
+            selectFromResult: (props) => {
+                const {currentData} = props;
+                if (!currentData) {
+                    return {currentDescribe: emptyObject, ...props};
+                }
+
+                const mergedData = Object.values(currentData).flat();
+
+                const data = mergedData.reduce<IDescribeData>((acc, item) => {
+                    if (item?.Path) {
+                        acc[item.Path] = item;
+                    }
+                    return acc;
+                }, {});
+                return {currentDescribe: data, ...props};
+            },
         },
     );
     const loading = isFetching && currentData === undefined;
 
-    const data = useTypedSelector((state) => selectPreparedPathOverview(state, paths, database));
-
-    const currentDescribe = data;
-
     let preparedDescribeData: Object | undefined;
     if (currentDescribe) {
         const paths = Object.keys(currentDescribe);

src/store/reducers/overview/overview.ts

@@ -1,7 +1,3 @@
-import {createSelector} from '@reduxjs/toolkit';
-
-import type {IDescribeData} from '../../../types/store/describe';
-import type {RootState} from '../../defaultStore';
 import {api} from '../api';
 
 export const overviewApi = api.injectEndpoints({
@@ -30,31 +26,3 @@ export const overviewApi = api.injectEndpoints({
         }),
     }),
 });
-
-const createGetOverviewSelector = createSelector(
-    (paths: string[], database: string) => ({paths, database}),
-    (params) => overviewApi.endpoints.getOverview.select(params),
-);
-
-const selectPathOverview = createSelector(
-    (state: RootState) => state,
-    (_state: RootState, paths: string[], database: string) =>
-        createGetOverviewSelector(paths, database),
-    (state, selectGetOverview) => selectGetOverview(state).data,
-);
-
-export const selectPreparedPathOverview = createSelector(selectPathOverview, (rawData) => {
-    if (!rawData) {
-        return undefined;
-    }
-
-    const mergedData = Object.values(rawData).flat();
-
-    const data = mergedData.reduce<IDescribeData>((acc, item) => {
-        if (item?.Path) {
-            acc[item.Path] = item;
-        }
-        return acc;
-    }, {});
-    return data;
-});

src/store/reducers/schema/schema.ts

@@ -129,7 +129,6 @@ export const selectSchemaMergedChildrenPaths = createSelector(
 );
 
 export function useGetSchemaQuery({path, database}: {path: string; database: string}) {
-    console.log('IS HERE', path);
     const {currentData, isFetching, error, refetch, originalArgs} = schemaApi.useGetSchemaQuery({
         path,
         database,