From 0de6403be4b858b246e2898e0ed2ec10cc64d147 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 17 Nov 2020 18:23:38 +0300 Subject: [PATCH] Problems: fix empty query editor, #988 --- src/panel-triggers/migrations.ts | 12 ++++++++++++ src/panel-triggers/triggers_panel_ctrl.ts | 1 + 2 files changed, 13 insertions(+) diff --git a/src/panel-triggers/migrations.ts b/src/panel-triggers/migrations.ts index 770c249..054919a 100644 --- a/src/panel-triggers/migrations.ts +++ b/src/panel-triggers/migrations.ts @@ -24,6 +24,10 @@ export function getDefaultTargetOptions() { } export function migratePanelSchema(panel) { + if (isDefaultPanel(panel)) { + return panel; + } + if (isEmptyPanel(panel)) { delete panel.targets; return panel; @@ -160,6 +164,14 @@ function isEmptyTargets(targets) { return !targets || (_.isArray(targets) && (targets.length === 0 || targets.length === 1 && _.isEmpty(targets[0]))); } +function isDefaultPanel(panel) { + return panel.targets && panel.targets.length === 1 && isDefaultTarget(panel.targets[0]); +} + +function isDefaultTarget(target) { + return !target.group?.filter && !target.host?.filter && !target.application?.filter && !target.trigger?.filter && !target.queryType; +} + function isEmptyTarget(target) { return !target || !(target.group && target.host && target.application && target.trigger); } diff --git a/src/panel-triggers/triggers_panel_ctrl.ts b/src/panel-triggers/triggers_panel_ctrl.ts index c96a264..2e57fcc 100644 --- a/src/panel-triggers/triggers_panel_ctrl.ts +++ b/src/panel-triggers/triggers_panel_ctrl.ts @@ -39,6 +39,7 @@ const DEFAULT_TIME_FORMAT = "DD MMM YYYY HH:mm:ss"; export const PANEL_DEFAULTS = { schemaVersion: CURRENT_SCHEMA_VERSION, + targets: [{}], // Fields hostField: true, hostTechNameField: false,