diff --git a/src/hooks/useExpressionsProcessor.ts b/src/hooks/useExpressionsProcessor.ts index 693c5a99..786184f7 100644 --- a/src/hooks/useExpressionsProcessor.ts +++ b/src/hooks/useExpressionsProcessor.ts @@ -109,7 +109,7 @@ export function useExpressionsSourceProcessor( const keys = Object.keys(resp.data); for (let i = 0; i < config.metrics.length; i++) { const type = config.metricTypes[i]; - const c: any = (config.metricConfig && config.metricConfig[i]) || {}; + const c: MetricConfigOpt = (config.metricConfig && config.metricConfig[i]) || {}; const results = (resp.data[keys[i]] && resp.data[keys[i]].results) || []; const name = config.metrics[i]; @@ -219,7 +219,7 @@ export async function useExpressionsQueryPodsMetrics( const metricTypesArr: string[] = []; const data = pods.map((d: any, idx: number) => { for (let index = 0; index < config.expressions.length; index++) { - const c: any = (config.metricConfig && config.metricConfig[index]) || {}; + const c: MetricConfigOpt = (config.metricConfig && config.metricConfig[index]) || {}; const k = "expression" + idx + index; const sub = "subexpression" + idx + index; const results = (resp.data[k] && resp.data[k].results) || []; diff --git a/src/types/app.d.ts b/src/types/app.d.ts index e22444fd..4cf123ce 100644 --- a/src/types/app.d.ts +++ b/src/types/app.d.ts @@ -42,8 +42,7 @@ export type EventParams = { dataIndex: number; data: unknown; dataType: string; - value: number | Array; + value: number | any[]; color: string; event: any; - dataIndex: number; }; diff --git a/src/types/dashboard.d.ts b/src/types/dashboard.d.ts index 636db486..f93f4b26 100644 --- a/src/types/dashboard.d.ts +++ b/src/types/dashboard.d.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +import { DurationTime } from "./app"; export type DashboardItem = { id?: string; entity: string; @@ -75,8 +75,8 @@ export type MetricConfigOpt = { unit?: string; label?: string; calculation?: string; - labelsIndex: string; - sortOrder: string; + labelsIndex?: string; + sortOrder?: string; topN?: number; index?: number; }; diff --git a/src/views/dashboard/configuration/widget/metric/Standard.vue b/src/views/dashboard/configuration/widget/metric/Standard.vue index 8ba76a6a..9e4f69a6 100644 --- a/src/views/dashboard/configuration/widget/metric/Standard.vue +++ b/src/views/dashboard/configuration/widget/metric/Standard.vue @@ -57,7 +57,7 @@ limitations under the License. --> placeholder="auto" @change=" updateConfig(index, { - labelsIndex: encodeURIComponent(currentMetric.labelsIndex), + labelsIndex: encodeURIComponent(currentMetric.labelsIndex || ''), }) " />