rebasing with main, updating types, and fixing refresh accelerations

Signed-off-by: Sean Li <[email protected]>

public/components/datasources/components/manage/accelerations/acceleration_table.tsx

@@ -210,11 +210,7 @@ export const AccelerationTable = ({
           <EuiLink
             onClick={() => {
               console.log(displayName);
-              renderAccelerationDetailsFlyout({
-                index: displayName,
-                acceleration,
-                dataSourceName,
-              });
+              renderAccelerationDetailsFlyout(displayName, acceleration, dataSourceName);
             }}
           >
             {displayName}

public/components/datasources/components/manage/accelerations/flyout_modules/accelerations_schema_tab.tsx

@@ -12,6 +12,8 @@ interface AccelerationSchemaTabProps {
 }
 
 export const AccelerationSchemaTab = ({ mappings, indexInfo }: AccelerationSchemaTabProps) => {
+  console.log('mappings', mappings);
+  console.log('indexInfo', indexInfo);
   const indexName = indexInfo.data[0]?.index;
   const indexData = mappings.data[indexName]?.mappings._meta?.indexedColumns;
   const indexType = mappings.data[indexName]?.mappings._meta?.kind;

public/components/datasources/components/manage/associated_objects/associated_objects_tab.tsx

@@ -92,6 +92,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
   const onRefreshButtonClick = () => {
     if (!isCatalogCacheFetching(databasesLoadStatus, tablesLoadStatus, accelerationsLoadStatus)) {
       startLoadingDatabases(datasource.name);
+      startLoadingAccelerations(datasource.name);
       setIsRefreshing(true);
     }
   };
@@ -321,7 +322,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
                     </EuiSelectable>
                   </EuiFlexItem>
                   <EuiFlexItem>
-                    {isObjectsLoading && !isRefreshing ? (
+                    {isObjectsLoading && isFirstTimeLoading ? (
                       <AssociatedObjectsTabLoading objectType="tables" warningMessage={true} />
                     ) : (
                       <>

public/components/datasources/components/manage/associated_objects/modules/associated_objects_table.tsx

@@ -70,19 +70,15 @@ export const AssociatedObjectsTable = (props: AssociatedObjectsTableProps) => {
         <EuiLink
           onClick={() => {
             if (item.type === 'table') {
-              renderAssociatedObjectsDetailsFlyout({
-                tableDetail: item,
-                datasourceName,
-              });
+              renderAssociatedObjectsDetailsFlyout(item, datasourceName);
             } else {
               const acceleration = cachedAccelerations.find((acc) => acc.indexName === item.id);
-              console.log(acceleration);
               if (acceleration) {
-                renderAccelerationDetailsFlyout({
-                  index: getAccelerationName(acceleration, datasourceName),
+                renderAccelerationDetailsFlyout(
+                  getAccelerationName(acceleration, datasourceName),
                   acceleration,
-                  dataSourceName: datasourceName,
-                });
+                  datasourceName
+                );
               }
             }
           }}
@@ -124,11 +120,7 @@ export const AssociatedObjectsTable = (props: AssociatedObjectsTableProps) => {
           return (
             <EuiLink
               onClick={() => {
-                renderAccelerationDetailsFlyout({
-                  index: name,
-                  acceleration: accelerations[0],
-                  dataSourceName: datasourceName,
-                });
+                renderAccelerationDetailsFlyout(name, accelerations[0], datasourceName);
               }}
             >
               {name}
@@ -138,10 +130,7 @@ export const AssociatedObjectsTable = (props: AssociatedObjectsTableProps) => {
         return (
           <EuiButtonEmpty
             onClick={() => {
-              renderAssociatedObjectsDetailsFlyout({
-                tableDetail: obj,
-                datasourceName,
-              });
+              renderAssociatedObjectsDetailsFlyout(obj, datasourceName);
             }}
             size="xs"
           >

public/plugin.tsx

@@ -48,7 +48,7 @@ import {
   observabilityTracesTitle,
 } from '../common/constants/shared';
 import { QueryManager } from '../common/query_manager';
-import { CachedAcceleration } from '../common/types/data_connections';
+import { AssociatedObject, CachedAcceleration } from '../common/types/data_connections';
 import { VISUALIZATION_SAVED_OBJECT } from '../common/types/observability_saved_object_attributes';
 import {
   setOSDHttp,
@@ -60,10 +60,7 @@ import { DirectSearch } from './components/common/search/direct_search';
 import { Search } from './components/common/search/search';
 import { AccelerationDetailsFlyout } from './components/datasources/components/manage/accelerations/acceleration_details_flyout';
 import { CreateAcceleration } from './components/datasources/components/manage/accelerations/create_accelerations_flyout';
-import {
-  AssociatedObjectsDetailsFlyout,
-  AssociatedObjectsFlyoutProps,
-} from './components/datasources/components/manage/associated_objects/associated_objects_details_flyout';
+import { AssociatedObjectsDetailsFlyout } from './components/datasources/components/manage/associated_objects/associated_objects_details_flyout';
 import { convertLegacyNotebooksUrl } from './components/notebooks/components/helpers/legacy_route_helpers';
 import { convertLegacyTraceAnalyticsUrl } from './components/trace_analytics/components/common/legacy_route_helpers';
 import { registerAsssitantDependencies } from './dependencies/register_assistant';
@@ -104,21 +101,13 @@ export const [
   getRenderAccelerationDetailsFlyout,
   setRenderAccelerationDetailsFlyout,
 ] = createGetterSetter<
-  ({
-    index,
-    acceleration,
-    dataSourceName,
-  }: {
-    index: string;
-    acceleration: CachedAcceleration;
-    dataSourceName: string;
-  }) => void
+  (index: string, acceleration: CachedAcceleration, dataSourceName: string) => void
 >('renderAccelerationDetailsFlyout');
 
 export const [
   getRenderAssociatedObjectsDetailsFlyout,
   setRenderAssociatedObjectsDetailsFlyout,
-] = createGetterSetter<({ tableDetail, datasourceName }: AssociatedObjectsFlyoutProps) => void>(
+] = createGetterSetter<(tableDetail: AssociatedObject, datasourceName: string) => void>(
   'renderAssociatedObjectsDetailsFlyout'
 );
 
@@ -404,15 +393,11 @@ export class ObservabilityPlugin
     });
 
     // Use overlay service to render flyouts
-    const renderAccelerationDetailsFlyout = ({
-      index,
-      acceleration,
-      dataSourceName,
-    }: {
-      index: string;
-      acceleration: CachedAcceleration;
-      dataSourceName: string;
-    }) => {
+    const renderAccelerationDetailsFlyout = (
+      index: string,
+      acceleration: CachedAcceleration,
+      dataSourceName: string
+    ) => {
       const accelerationDetailsFlyout = core.overlays.openFlyout(
         toMountPoint(
           <AccelerationDetailsFlyout
@@ -426,10 +411,10 @@ export class ObservabilityPlugin
     };
     setRenderAccelerationDetailsFlyout(renderAccelerationDetailsFlyout);
 
-    const renderAssociatedObjectsDetailsFlyout = ({
-      tableDetail,
-      datasourceName,
-    }: AssociatedObjectsFlyoutProps) => {
+    const renderAssociatedObjectsDetailsFlyout = (
+      tableDetail: AssociatedObject,
+      datasourceName: string
+    ) => {
       const associatedObjectsDetailsFlyout = core.overlays.openFlyout(
         toMountPoint(
           <AssociatedObjectsDetailsFlyout

public/types.ts

@@ -11,7 +11,7 @@ import { ManagementOverViewPluginSetup } from '../../../src/plugins/management_o
 import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
 import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { VisualizationsSetup } from '../../../src/plugins/visualizations/public';
-import { AssociatedObject } from '../common/types/data_connections';
+import { AssociatedObject, CachedAcceleration } from '../common/types/data_connections';
 import { AssistantSetup } from './types';
 
 export interface AppPluginStartDependencies {
@@ -35,12 +35,15 @@ export interface SetupDependencies {
 export interface ObservabilitySetup {}
 
 export interface ObservabilityStart {
-  renderAccelerationDetailsFlyout: (acceleration: any) => void;
-  renderAssociatedObjectsDetailsFlyout: ({
-    tableDetail,
-  }: {
-    tableDetail: AssociatedObject;
-  }) => void;
+  renderAccelerationDetailsFlyout: (
+    index: string,
+    acceleration: CachedAcceleration,
+    datasourceName: string
+  ) => void;
+  renderAssociatedObjectsDetailsFlyout: (
+    tableDetail: AssociatedObject,
+    datasourceName: string
+  ) => void;
   renderCreateAccelerationFlyout: (selectedDatasource: string) => void;
 }