fix merge

Author: k-fish

static/app/components/events/ourlogs/ourlogsSection.tsx

@@ -13,13 +13,13 @@ import {trackAnalytics} from 'sentry/utils/analytics';
 import {LogsAnalyticsPageSource} from 'sentry/utils/analytics/logsAnalyticsEvent';
 import useOrganization from 'sentry/utils/useOrganization';
 import {TableBody} from 'sentry/views/explore/components/table';
+import {useLogsPageData} from 'sentry/views/explore/contexts/logs/logsPageData';
 import {
   LogsPageParamsProvider,
   useLogsSearch,
 } from 'sentry/views/explore/contexts/logs/logsPageParams';
 import {TraceItemAttributeProvider} from 'sentry/views/explore/contexts/traceItemAttributeContext';
-import {LogRowContent} from 'sentry/views/explore/logs/logsTableRow';
-import {useExploreLogsTable} from 'sentry/views/explore/logs/useLogsQuery';
+import {LogRowContent} from 'sentry/views/explore/logs/tables/logsTableRow';
 import {TraceItemDataset} from 'sentry/views/explore/types';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
@@ -56,7 +56,7 @@ function OurlogsSectionContent({
 }) {
   const organization = useOrganization();
   const feature = organization.features.includes('ourlogs-enabled');
-  const tableData = useExploreLogsTable({enabled: feature, limit: 10});
+  const tableData = useLogsPageData().logsQueryResult;
   const logsSearch = useLogsSearch();
   const abbreviatedTableData = (tableData.data ?? []).slice(0, 5);
   const {openDrawer} = useDrawer();
@@ -102,7 +102,10 @@ function OurlogsSectionContent({
     // We may change this in the future if we have a trace-group or we generate trace sids for these issue types.
     return null;
   }
-  if (!tableData || (tableData.data?.length === 0 && logsSearch.isEmpty())) {
+  if (
+    !tableData ||
+    (tableData.data && tableData.data.length === 0 && logsSearch.isEmpty())
+  ) {
     // Like breadcrumbs, we don't show the logs section if there are no logs.
     return null;
   }
@@ -127,7 +130,7 @@ function OurlogsSectionContent({
             ))}
           </TableBody>
         </SmallTable>
-        {tableData.data?.length > 5 ? (
+        {tableData.data && tableData.data.length > 5 ? (
           <div>
             <Button
               icon={<IconChevron direction="right" />}