fix: update controlhub and dashboard disk unit

beclab · Aug 6, 2024 · 09d16c4 · 09d16c4
1 parent 5842a4a
commit 09d16c4
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 35 deletions.
diff --git a/apps/adminConsole/package.json b/apps/adminConsole/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/admin_console",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Control Hub",
   "productName": "Control Hub",
   "private": true,

diff --git a/apps/adminConsole/src/utils/monitoring.ts b/apps/adminConsole/src/utils/monitoring.ts
@@ -135,8 +135,8 @@ const UnitTypes = {
 		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	disk: {
-		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],
-		units: ['TB', 'GB', 'MB', 'KB', 'Bytes']
+		conditions: [1024 ** 4, 1024 ** 3, 1024 ** 2, 1024, 0],
+		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	throughput: {
 		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],

diff --git a/apps/adminConsole/yarn.lock b/apps/adminConsole/yarn.lock
@@ -269,11 +269,21 @@
   resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz"
   integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
+
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
 "@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz"
@@ -307,9 +317,11 @@
     js-tokens "^4.0.0"
 
 "@babel/parser@^7.23.5":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.0.tgz#9fdc9237504d797b6e7b8f66e78ea7f570d256ad"
-  integrity sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
+  integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
+  dependencies:
+    "@babel/types" "^7.25.2"
 
 "@babel/parser@^7.23.9", "@babel/parser@^7.24.0":
   version "7.24.0"
@@ -1067,6 +1079,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
+  integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
 "@bytetrade/ui@^0.1.12":
   version "0.1.12"
   resolved "https://registry.npmjs.org/@bytetrade/ui/-/ui-0.1.12.tgz"
@@ -1094,24 +1115,24 @@
   integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==
 
 "@floating-ui/core@^1.6.0":
-  version "1.6.5"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.5.tgz#102335cac0d22035b04d70ca5ff092d2d1a26f2b"
-  integrity sha512-8GrTWmoFhm5BsMZOTHeGD2/0FLKLQQHvO/ZmQga4tKempYRLz8aqJGqXVuQgisnMObq2YZ2SgkwctN1LOOxcqA==
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.6.tgz#f6edf703c8acb73e3802cf558c88ddb7cddc4f67"
+  integrity sha512-Vkvsw6EcpMHjvZZdMkSY+djMGFbt7CRssW99Ne8tar2WLnZ/l3dbxeTShbLQj+/s35h+Qb4cmnob+EzwtjrXGQ==
   dependencies:
-    "@floating-ui/utils" "^0.2.5"
+    "@floating-ui/utils" "^0.2.6"
 
 "@floating-ui/dom@^1.0.1":
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.8.tgz#45e20532b6d8a061b356a4fb336022cf2609754d"
-  integrity sha512-kx62rP19VZ767Q653wsP1XZCGIirkE09E0QUGNYTM/ttbbQHqcGPdSfWFxUyyNLc/W6aoJRBajOSXhP6GXjC0Q==
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.9.tgz#7240f4fea0ff929a9d642f7572331d33dd2ee809"
+  integrity sha512-zB1PcI350t4tkm3rvUhSRKa9sT7vH5CrAbQxW+VaPYJXKAO0gsg4CTueL+6Ajp7XzAQC8CW4Jj1Wgqc0sB6oUQ==
   dependencies:
     "@floating-ui/core" "^1.6.0"
-    "@floating-ui/utils" "^0.2.5"
+    "@floating-ui/utils" "^0.2.6"
 
-"@floating-ui/utils@^0.2.5":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.5.tgz#105c37d9d9620ce69b7f692a20c821bf1ad2cbf9"
-  integrity sha512-sTcG+QZ6fdEUObICavU+aB3Mp8HY4n14wYHdxK4fXjPmv3PXZZeY5RaguJmGyeH/CJQhX3fqKUtS4qc1LoHwhQ==
+"@floating-ui/utils@^0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.6.tgz#1898a31c7e17a50384147a02a4e6264b1b1a0291"
+  integrity sha512-0KI3zGxIUs1KDR/pjQPdJH4Z8nGBm0yJ5WRoRfdw1Kzeh45jkIfA0rmD0kBF6fKHH+xaH7g8y4jIXyAV5MGK3g==
 
 "@intlify/[email protected]":
   version "9.10.1"
@@ -2517,9 +2538,9 @@ [email protected]:
     fsevents "~2.3.2"
 
 chroma-js@^2.1.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.4.2.tgz#dffc214ed0c11fa8eefca2c36651d8e57cbfb2b0"
-  integrity sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.6.0.tgz#578743dd359698a75067a19fa5571dec54d0b70b"
+  integrity sha512-BLHvCB9s8Z1EV4ethr6xnkl/P2YRFOGqfgvuMG/MyCbZPrTA+NeiByY6XvgF0zP4/2deU2CXnWyMa3zu1LqQ3A==
 
 chrome-trace-event@^1.0.2:
   version "1.0.3"
@@ -5338,9 +5359,9 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^8.4.14:
-  version "8.4.40"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
-  integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
+  version "8.4.41"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
+  integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.1"
@@ -5411,9 +5432,9 @@ [email protected]:
     side-channel "^1.0.4"
 
 qs@^6.5.2:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.3.tgz#e43ce03c8521b9c7fd7f1f13e514e5ca37727754"
-  integrity sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
   dependencies:
     side-channel "^1.0.6"
 

diff --git a/apps/common/src/utils/monitoring.ts b/apps/common/src/utils/monitoring.ts
@@ -135,8 +135,8 @@ const UnitTypes = {
 		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	disk: {
-		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],
-		units: ['TB', 'GB', 'MB', 'KB', 'Bytes']
+		conditions: [1024 ** 4, 1024 ** 3, 1024 ** 2, 1024, 0],
+		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	throughput: {
 		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],

diff --git a/apps/monitoring/package.json b/apps/monitoring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/monitoring",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Dashboard",
   "productName": "Dashboard",
   "private": true,

diff --git a/apps/monitoring/src/i18n/en-US/index.ts b/apps/monitoring/src/i18n/en-US/index.ts
@@ -10,7 +10,7 @@ const options = {
 	USAGE_RANKING: 'Usage Ranking',
 	MORE: 'More',
 	MORE_DETAILS: 'More Details',
-	PHYSICAL_RESOURCE_MONTORING: 'Physical Resource Montoring',
+	PHYSICAL_RESOURCE_MONTORING: 'Physical Resource Monitoring',
 	TOP_COUNT_CPU_USAGE_APPS: 'Top {count} CPU Usage Apps',
 	TOP_COUNT_MEMORY_USAGE_APPS: 'Top {count} Memory Usage Apps',
 	VIEWS_COUNT_VIEW: 'Views in {count} hours',

diff --git a/apps/monitoring/src/utils/monitoring.ts b/apps/monitoring/src/utils/monitoring.ts
@@ -135,8 +135,8 @@ const UnitTypes = {
 		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	disk: {
-		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],
-		units: ['TB', 'GB', 'MB', 'KB', 'Bytes']
+		conditions: [1024 ** 4, 1024 ** 3, 1024 ** 2, 1024, 0],
+		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	throughput: {
 		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],

diff --git a/apps/nodes/src/utils/monitoring.ts b/apps/nodes/src/utils/monitoring.ts
@@ -135,8 +135,8 @@ const UnitTypes = {
 		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	disk: {
-		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],
-		units: ['TB', 'GB', 'MB', 'KB', 'Bytes']
+		conditions: [1024 ** 4, 1024 ** 3, 1024 ** 2, 1024, 0],
+		units: ['Ti', 'Gi', 'Mi', 'Ki', 'Bytes']
 	},
 	throughput: {
 		conditions: [1000 ** 4, 1000 ** 3, 1000 ** 2, 1000, 0],