Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion project-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -550,4 +550,5 @@ reqs
mutatable
DSUID
newrecords
logsdrilldowndefaultlabels
logsdrilldowndefaultlabels
logstable
5 changes: 3 additions & 2 deletions src/Components/ServiceScene/LogOptionsScene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { narrowLogsSortOrder } from '../../services/narrowing';
import { LogsPanelHeaderActions } from '../Table/LogsHeaderActions';
import { LogOptionsButtonsScene } from './LogOptionsButtonsScene';
import { LogsListScene } from './LogsListScene';
import { LogsPanelScene } from './LogsPanelScene';
import { logsControlsSupported } from 'services/panel';
import { LogsVisualizationType, setLogOption } from 'services/store';

Expand Down Expand Up @@ -61,7 +60,9 @@ export class LogOptionsScene extends SceneObjectBase<LogOptionsState> {
};

getLogsPanelScene = () => {
return sceneGraph.getAncestor(this, LogsPanelScene);
//@todo fix
return this.parent as any;
// return sceneGraph.getAncestor(this, LogsPanelScene);
};
}

Expand Down
6 changes: 5 additions & 1 deletion src/Components/ServiceScene/LogsListScene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import { LineLimitScene } from './LineLimitScene';
import { ErrorType } from './LogsPanelError';
import { LogsPanelScene } from './LogsPanelScene';
import { LogsTablePanelScene } from './LogsTablePanelScene';
import { LogsTableScene } from './LogsTableScene';
import { LogsVolumePanel, logsVolumePanelKey } from './LogsVolume/LogsVolumePanel';
import { ServiceScene } from './ServiceScene';
Expand Down Expand Up @@ -302,7 +303,7 @@
}

handleLogsError(data: PanelData) {
const error = data.errors?.length ? data.errors[0] : data.error;

Check warning on line 306 in src/Components/ServiceScene/LogsListScene.tsx

View workflow job for this annotation

GitHub Actions / CI / CD / CI / Test and build plugin

`error` is deprecated. use errors instead -- will be removed in Grafana 10+
const errorResponse = error?.message;
if (errorResponse) {
logger.error(new Error('Logs Panel error'), {
Expand Down Expand Up @@ -471,6 +472,7 @@
const { error, errorType, canClearFilters } = this.state;

this.logsPanelScene = new LogsPanelScene({ error, errorType, canClearFilters });
const logsTablePanelNG = getFeatureFlag('logsTablePanelNG');

const children =
this.state.visualizationType === 'logs'
Expand Down Expand Up @@ -525,7 +527,9 @@
],
}),
new SceneFlexItem({
body: new LogsTableScene({ error, canClearFilters }),
body: logsTablePanelNG
? new LogsTablePanelScene({ error, canClearFilters })
: new LogsTableScene({ error, canClearFilters }),
height: 'calc(100vh - 220px)',
}),
];
Expand Down
Loading
Loading