removing graph from small size and others tweaks (#2472)

Co-authored-by: Felipe da Conceicao Guimaraes <felipeda@microsoft.com>
microsoft · Mar 27, 2024 · 43adc94 · 43adc94
1 parent 2aedd26
commit 43adc94
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -23,6 +23,7 @@
           "url": "${netGraphUrl}",
           "height": "${chartHeight}",
           "width": "${chartWidth}",
+          "$when": "${$host.widgetSize != \"small\"}",
           "horizontalAlignment": "center"
         },
         {