[v10.0.x] AppChromeService: Fixes update to breadcrumb parent URL (#71418)

AppChromeService: Fixes update to breadcrumb parent URL (#71410)

AppChromeService: Fixes update to parent url
(cherry picked from commit dc71d36958)
This commit is contained in:
Torkel Ödegaard
2023-07-12 13:38:04 +02:00
committed by GitHub
parent 08def85380
commit 1f13067103
34 changed files with 40 additions and 35 deletions
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
/**
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
limit: number;
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
/**
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends common.SingleStatBaseOptions {
displayMode: common.BarGaugeDisplayMode;
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum VizDisplayMode {
Candles = 'candles',
@@ -11,7 +11,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum HorizontalConstraint {
Center = 'center',
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface MetricStat {
/**
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
folderId?: number;
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
selectedSeries: number;
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export type UpdateConfig = {
render: boolean,
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends common.SingleStatBaseOptions {
showThresholdLabels: boolean;
@@ -11,7 +11,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
basemap: ui.MapLayerOptions;
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export type PhlareQueryType = ('metrics' | 'profile' | 'both');
@@ -11,7 +11,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
/**
* Controls the color mode of the heatmap
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
/**
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
dedupStrategy: common.LogsDedupStrategy;
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum QueryEditorMode {
Builder = 'builder',
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
/**
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface ArcOption {
/**
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export type ParcaQueryType = ('metrics' | 'profile' | 'both');
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
/**
* Select the pie chart display style.
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum QueryEditorMode {
Builder = 'builder',
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends common.SingleStatBaseOptions {
colorMode: common.BigValueColorMode;
@@ -11,7 +11,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
/**
@@ -11,7 +11,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
/**
@@ -11,7 +11,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options {
/**
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface TempoQuery extends common.DataQuery {
filters: Array<TraceqlFilter>;
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum TestDataQueryType {
Annotations = 'annotations',
@@ -9,7 +9,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum TextMode {
Code = 'code',
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export interface Options extends common.OptionsWithTimezones {
legend: common.VizLegendOptions;
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
/**
* Identical to timeseries... except it does not have timezone settings
@@ -11,7 +11,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "10.0.2";
export const pluginVersion = "10.0.3";
export enum SeriesMapping {
Auto = 'auto',
@@ -161,7 +161,7 @@ export class AppChromeService {
/**
* Checks if text, url and active child url are the same
**/
function navItemsAreTheSame(a: NavModelItem | undefined, b: NavModelItem | undefined) {
function navItemsAreTheSame(a: NavModelItem | undefined, b: NavModelItem | undefined): boolean {
if (a === b) {
return true;
}
@@ -169,5 +169,10 @@ function navItemsAreTheSame(a: NavModelItem | undefined, b: NavModelItem | undef
const aActiveChild = a?.children?.find((child) => child.active);
const bActiveChild = b?.children?.find((child) => child.active);
return a?.text === b?.text && a?.url === b?.url && aActiveChild?.url === bActiveChild?.url;
return (
a?.text === b?.text &&
a?.url === b?.url &&
aActiveChild?.url === bActiveChild?.url &&
navItemsAreTheSame(a?.parentItem, b?.parentItem)
);
}