From 43adc94dc3119e7b86df2f6571878aadb6dad438 Mon Sep 17 00:00:00 2001 From: Felipe G Date: Wed, 27 Mar 2024 11:07:37 -0700 Subject: [PATCH] removing graph from small size and others tweaks (#2472) Co-authored-by: Felipe da Conceicao Guimaraes --- .../Templates/SystemCPUUsageTemplate.json | 45 +++++++++++-------- .../Templates/SystemGPUUsageTemplate.json | 1 + .../Templates/SystemMemoryTemplate.json | 7 ++- .../Templates/SystemNetworkUsageTemplate.json | 1 + 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/extensions/CoreWidgetProvider/Widgets/Templates/SystemCPUUsageTemplate.json b/extensions/CoreWidgetProvider/Widgets/Templates/SystemCPUUsageTemplate.json index 1ce0b347f5..7a1c40a4f5 100644 --- a/extensions/CoreWidgetProvider/Widgets/Templates/SystemCPUUsageTemplate.json +++ b/extensions/CoreWidgetProvider/Widgets/Templates/SystemCPUUsageTemplate.json @@ -23,6 +23,7 @@ "url": "${cpuGraphUrl}", "height": "${chartHeight}", "width": "${chartWidth}", + "$when": "${$host.widgetSize != \"small\"}", "horizontalAlignment": "center" }, { @@ -64,25 +65,31 @@ ] }, { - "type": "TextBlock", - "isSubtle": true, - "text": "%CPUUsage_Widget_Template/Processes%", - "wrap": true - }, - { - "type": "TextBlock", - "size": "medium", - "text": "${cpuProc1}" - }, - { - "type": "TextBlock", - "size": "medium", - "text": "${cpuProc2}" - }, - { - "type": "TextBlock", - "size": "medium", - "text": "${cpuProc3}" + "type": "Container", + "$when": "${$host.widgetSize != \"small\"}", + "items": [ + { + "type": "TextBlock", + "isSubtle": true, + "text": "%CPUUsage_Widget_Template/Processes%", + "wrap": true + }, + { + "type": "TextBlock", + "size": "medium", + "text": "${cpuProc1}" + }, + { + "type": "TextBlock", + "size": "medium", + "text": "${cpuProc2}" + }, + { + "type": "TextBlock", + "size": "medium", + "text": "${cpuProc3}" + } + ] } ] } diff --git a/extensions/CoreWidgetProvider/Widgets/Templates/SystemGPUUsageTemplate.json b/extensions/CoreWidgetProvider/Widgets/Templates/SystemGPUUsageTemplate.json index 3578a91109..791e2881ad 100644 --- a/extensions/CoreWidgetProvider/Widgets/Templates/SystemGPUUsageTemplate.json +++ b/extensions/CoreWidgetProvider/Widgets/Templates/SystemGPUUsageTemplate.json @@ -23,6 +23,7 @@ "url": "${gpuGraphUrl}", "height": "${chartHeight}", "width": "${chartWidth}", + "$when": "${$host.widgetSize != \"small\"}", "horizontalAlignment": "center" }, { diff --git a/extensions/CoreWidgetProvider/Widgets/Templates/SystemMemoryTemplate.json b/extensions/CoreWidgetProvider/Widgets/Templates/SystemMemoryTemplate.json index eaf2ce046c..188da82fdc 100644 --- a/extensions/CoreWidgetProvider/Widgets/Templates/SystemMemoryTemplate.json +++ b/extensions/CoreWidgetProvider/Widgets/Templates/SystemMemoryTemplate.json @@ -23,6 +23,7 @@ "url": "${memGraphUrl}", "height": "${chartHeight}", "width": "${chartWidth}", + "$when": "${$host.widgetSize != \"small\"}", "horizontalAlignment": "center" }, { @@ -40,7 +41,7 @@ { "text": "${usedMem}", "type": "TextBlock", - "size": "large", + "size": "${if($host.widgetSize == \"small\", \"medium\", \"large\")}", "weight": "bolder" } ] @@ -58,7 +59,7 @@ { "text": "${allMem}", "type": "TextBlock", - "size": "large", + "size": "${if($host.widgetSize == \"small\", \"medium\", \"large\")}", "weight": "bolder", "horizontalAlignment": "right" } @@ -107,6 +108,7 @@ }, { "type": "ColumnSet", + "$when": "${$host.widgetSize == \"large\"}", "columns": [ { "type": "Column", @@ -146,6 +148,7 @@ }, { "type": "ColumnSet", + "$when": "${$host.widgetSize != \"small\"}", "columns": [ { "type": "Column", diff --git a/extensions/CoreWidgetProvider/Widgets/Templates/SystemNetworkUsageTemplate.json b/extensions/CoreWidgetProvider/Widgets/Templates/SystemNetworkUsageTemplate.json index 08925dcf1e..83b02a4cbc 100644 --- a/extensions/CoreWidgetProvider/Widgets/Templates/SystemNetworkUsageTemplate.json +++ b/extensions/CoreWidgetProvider/Widgets/Templates/SystemNetworkUsageTemplate.json @@ -23,6 +23,7 @@ "url": "${netGraphUrl}", "height": "${chartHeight}", "width": "${chartWidth}", + "$when": "${$host.widgetSize != \"small\"}", "horizontalAlignment": "center" }, {