ydb-embedded-ui 4.19.0 → 4.19.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [4.19.2](https://github.com/ydb-platform/ydb-embedded-ui/compare/v4.19.1...v4.19.2) (2023-10-12)
+
+
+### Bug Fixes
+
+* add default data formatter to ProgressViewer ([#552](https://github.com/ydb-platform/ydb-embedded-ui/issues/552)) ([ac372a4](https://github.com/ydb-platform/ydb-embedded-ui/commit/ac372a415e67e7126518d9c5a8d04594b82cf485))
+* **Tenant:** fix tree not fully collapsed bug ([#551](https://github.com/ydb-platform/ydb-embedded-ui/issues/551)) ([8469307](https://github.com/ydb-platform/ydb-embedded-ui/commit/8469307b67d463ed2aafd17b2c0319ea40c1f8d5))
+
+## [4.19.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v4.19.0...v4.19.1) (2023-10-11)
+
+
+### Bug Fixes
+
+* add storage value to tb formatter ([#547](https://github.com/ydb-platform/ydb-embedded-ui/issues/547)) ([f1e4377](https://github.com/ydb-platform/ydb-embedded-ui/commit/f1e4377443be493a7072aca33a62b51e381f6841))
+
 ## [4.19.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v4.18.0...v4.19.0) (2023-10-11)
 
 

package/dist/components/ProgressViewer/ProgressViewer.tsx

@@ -1,6 +1,8 @@
 import cn from 'bem-cn-lite';
 
 import type {ValueOf} from '../../types/common';
+import {isNumeric} from '../../utils/utils';
+import {formatNumber, roundToPrecision} from '../../utils/dataFormatters/dataFormatters';
 
 import './ProgressViewer.scss';
 
@@ -18,6 +20,14 @@ export const PROGRESS_VIEWER_SIZE_IDS = {
 
 type ProgressViewerSize = ValueOf<typeof PROGRESS_VIEWER_SIZE_IDS>;
 
+const formatValue = (value?: number) => {
+    return formatNumber(roundToPrecision(Number(value), 2));
+};
+
+const defaultFormatValues = (value?: number, total?: number) => {
+    return [formatValue(value), formatValue(total)];
+};
+
 /*
 
 Props description:
@@ -47,7 +57,7 @@ interface ProgressViewerProps {
 export function ProgressViewer({
     value,
     capacity,
-    formatValues,
+    formatValues = defaultFormatValues,
     percents,
     className,
     size = PROGRESS_VIEWER_SIZE_IDS.xs,
@@ -58,15 +68,15 @@ export function ProgressViewer({
 }: ProgressViewerProps) {
     let fillWidth = Math.round((parseFloat(String(value)) / parseFloat(String(capacity))) * 100);
     fillWidth = fillWidth > 100 ? 100 : fillWidth;
-    let valueText: number | string | undefined = Math.round(Number(value)),
+    let valueText: number | string | undefined = value,
         capacityText: number | string | undefined = capacity,
         divider = '/';
-    if (formatValues) {
-        [valueText, capacityText] = formatValues(Number(value), Number(capacity));
-    } else if (percents) {
+    if (percents) {
         valueText = fillWidth + '%';
         capacityText = '';
         divider = '';
+    } else if (formatValues) {
+        [valueText, capacityText] = formatValues(Number(value), Number(capacity));
     }
 
     let bg = inverseColorize ? 'scarlet' : 'apple';
@@ -85,14 +95,14 @@ export function ProgressViewer({
     const text = fillWidth > 60 ? 'contrast0' : 'contrast70';
 
     const renderContent = () => {
-        if (capacityText) {
+        if (isNumeric(capacity)) {
             return `${valueText} ${divider} ${capacityText}`;
         }
 
         return valueText;
     };
 
-    if (!isNaN(Number(value))) {
+    if (isNumeric(value)) {
         return (
             <div className={b({size}, className)}>
                 <div className={b('line', {bg})} style={lineStyle}></div>

package/dist/containers/Tenant/ObjectSummary/ObjectSummary.tsx

@@ -58,14 +58,14 @@ import './ObjectSummary.scss';
 
 const b = cn('object-summary');
 
-const getInitialIsSummaryCollapsed = () => {
-    return Boolean(localStorage.getItem(DEFAULT_IS_TENANT_COMMON_INFO_COLLAPSED));
-};
+const getTenantCommonInfoState = () => {
+    const collapsed = Boolean(localStorage.getItem(DEFAULT_IS_TENANT_COMMON_INFO_COLLAPSED));
 
-const initialTenantCommonInfoState = {
-    triggerExpand: false,
-    triggerCollapse: false,
-    collapsed: getInitialIsSummaryCollapsed(),
+    return {
+        triggerExpand: false,
+        triggerCollapse: false,
+        collapsed,
+    };
 };
 
 function prepareOlapTableSchema(tableSchema: TColumnTableDescription = {}) {
@@ -109,7 +109,8 @@ export function ObjectSummary({
     const dispatch = useDispatch();
     const [commonInfoVisibilityState, dispatchCommonInfoVisibilityState] = useReducer(
         paneVisibilityToggleReducerCreator(DEFAULT_IS_TENANT_COMMON_INFO_COLLAPSED),
-        initialTenantCommonInfoState,
+        undefined,
+        getTenantCommonInfoState,
     );
     const {
         data,

package/dist/containers/Tenant/Tenant.tsx

@@ -27,14 +27,14 @@ import './Tenant.scss';
 
 const b = cn('tenant-page');
 
-const getInitialIsSummaryCollapsed = () => {
-    return Boolean(localStorage.getItem(DEFAULT_IS_TENANT_SUMMARY_COLLAPSED));
-};
+const getTenantSummaryState = () => {
+    const collapsed = Boolean(localStorage.getItem(DEFAULT_IS_TENANT_SUMMARY_COLLAPSED));
 
-const initialTenantSummaryState = {
-    triggerExpand: false,
-    triggerCollapse: false,
-    collapsed: getInitialIsSummaryCollapsed(),
+    return {
+        triggerExpand: false,
+        triggerCollapse: false,
+        collapsed,
+    };
 };
 
 interface TenantProps {
@@ -45,7 +45,8 @@ interface TenantProps {
 function Tenant(props: TenantProps) {
     const [summaryVisibilityState, dispatchSummaryVisibilityAction] = useReducer(
         paneVisibilityToggleReducerCreator(DEFAULT_IS_TENANT_SUMMARY_COLLAPSED),
-        initialTenantSummaryState,
+        undefined,
+        getTenantSummaryState,
     );
 
     const {currentSchemaPath, currentSchema: currentItem = {}} = useSelector(

package/dist/utils/dataFormatters/dataFormatters.ts

@@ -86,6 +86,10 @@ export const formatStorageValuesToGb = (value?: number, total?: number) => {
     return formatStorageValues(value, total, 'gb');
 };
 
+export const formatStorageValuesToTb = (value?: number, total?: number) => {
+    return formatStorageValues(value, total, 'tb');
+};
+
 export const formatNumber = (number?: unknown) => {
     if (!isNumeric(number)) {
         return '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "4.19.0",
+  "version": "4.19.2",
   "files": [
     "dist"
   ],