Merge branch 'main' into release/v0.42.0

This commit is contained in:
Prashant Shahi 2024-03-27 23:17:30 +05:45
commit a1dd170641
3 changed files with 6 additions and 6 deletions

View File

@ -40,7 +40,7 @@
.explorer-options {
position: fixed;
bottom: 16px;
bottom: 24px;
left: calc(50% + 240px);
padding: 10px 12px;
transform: translate(calc(-50% - 120px), 0);

View File

@ -15,7 +15,7 @@ import {
} from 'constants/queryBuilder';
import { DEFAULT_PER_PAGE_VALUE } from 'container/Controls/config';
import Download from 'container/DownloadV2/DownloadV2';
import ExplorerOptions from 'container/ExplorerOptions/ExplorerOptions';
import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
import GoToTop from 'container/GoToTop';
import LogsExplorerChart from 'container/LogsExplorerChart';
import LogsExplorerList from 'container/LogsExplorerList';
@ -659,7 +659,7 @@ function LogsExplorerViews({
<GoToTop />
<ExplorerOptions
<ExplorerOptionWrapper
disabled={!stagedQuery}
query={exportDefaultQuery}
isLoading={isUpdateDashboardLoading}

View File

@ -5,7 +5,7 @@ import axios from 'axios';
import ExplorerCard from 'components/ExplorerCard/ExplorerCard';
import { AVAILABLE_EXPORT_PANEL_TYPES } from 'constants/panelTypes';
import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
import ExplorerOptions from 'container/ExplorerOptions/ExplorerOptions';
import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
import ExportPanel from 'container/ExportPanel';
import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
@ -208,12 +208,12 @@ function TracesExplorer(): JSX.Element {
onChange={handleExplorerTabChange}
/>
</Container>
<ExplorerOptions
<ExplorerOptionWrapper
disabled={!stagedQuery}
query={exportDefaultQuery}
isLoading={isLoading}
onExport={handleExport}
sourcepage={DataSource.TRACES}
onExport={handleExport}
/>
</>
</ErrorBoundary>