GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-02 06:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into release/v0.42.0

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/container/ExplorerOptions/ExplorerOptions.styles.scss
View File

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

4
frontend/src/container/LogsExplorerViews/index.tsx
View File

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

6
frontend/src/pages/TracesExplorer/index.tsx
View File

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