ydb-embedded-ui 3.3.0 → 3.3.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [3.3.2](https://github.com/ydb-platform/ydb-embedded-ui/compare/v3.3.1...v3.3.2) (2023-01-31)
+
+
+### Bug Fixes
+
+* **QueryEditor:** collapse bottom panel if empty ([566db3b](https://github.com/ydb-platform/ydb-embedded-ui/commit/566db3b15c4393555071f058c88ad36b4073cc2d))
+* **VDisk:** use pdiskid field for link ([5ee0705](https://github.com/ydb-platform/ydb-embedded-ui/commit/5ee0705416aa31be9bee4be0776ecb8a61d3e82c))
+
+## [3.3.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v3.3.0...v3.3.1) (2023-01-31)
+
+
+### Bug Fixes
+
+* **UserSettings:** reword nodes setting and add popup ([2fda2b8](https://github.com/ydb-platform/ydb-embedded-ui/commit/2fda2b815b921a8163f80527c45f788172df4ba8))
+
 ## [3.3.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v3.2.3...v3.3.0) (2023-01-30)
 
 

package/dist/containers/Storage/VDisk/VDisk.tsx

@@ -123,7 +123,7 @@ export const VDisk = ({data = {}, poolName, nodes, compact}: VDiskProps) => {
                             routes.node,
                             {id: data.NodeId, activeTab: STRUCTURE},
                             {
-                                pdiskId: data.PDisk?.PDiskId,
+                                pdiskId: data.PDiskId ?? data.PDisk?.PDiskId,
                                 vdiskId: stringifyVdiskId(data.VDiskId),
                             },
                         )}

package/dist/containers/Tenant/QueryEditor/QueryEditor.js

@@ -91,6 +91,8 @@ const initialTenantCommonInfoState = {
 function QueryEditor(props) {
     const [resultType, setResultType] = useState(RESULT_TYPES.EXECUTE);
 
+    const [isResultLoaded, setIsResultLoaded] = useState(false);
+
     const [resultVisibilityState, dispatchResultVisibilityState] = useReducer(
         paneVisibilityToggleReducerCreator(DEFAULT_IS_QUERY_RESULT_COLLAPSED),
         initialTenantCommonInfoState,
@@ -117,11 +119,12 @@ function QueryEditor(props) {
     }, []);
 
     useEffect(() => {
-        const {showPreview} = props;
-        if (showPreview && resultVisibilityState.collapsed) {
+        if (props.showPreview || isResultLoaded) {
             dispatchResultVisibilityState(PaneVisibilityActionTypes.triggerExpand);
+        } else {
+            dispatchResultVisibilityState(PaneVisibilityActionTypes.triggerCollapse);
         }
-    }, [props.showPreview, resultVisibilityState.collapsed]);
+    }, [props.showPreview, isResultLoaded]);
 
     useEffect(() => {
         const {
@@ -254,6 +257,7 @@ function QueryEditor(props) {
 
         setResultType(RESULT_TYPES.EXECUTE);
         sendQuery({query: input, database: path, action: runAction});
+        setIsResultLoaded(true);
         setShowPreview(false);
 
         const {queries, currentIndex} = history;
@@ -272,6 +276,7 @@ function QueryEditor(props) {
         } = props;
         setResultType(RESULT_TYPES.EXPLAIN);
         getExplainQuery({query: input, database: path});
+        setIsResultLoaded(true);
         setShowPreview(false);
         dispatchResultVisibilityState(PaneVisibilityActionTypes.triggerExpand);
     };

package/dist/containers/UserSettings/UserSettings.scss

@@ -0,0 +1,9 @@
+.ydb-user-settings {
+    &__item-with-popup {
+        max-width: 180px;
+    }
+
+    &__popup {
+        max-width: 370px;
+    }
+}

package/dist/containers/UserSettings/UserSettings.tsx

@@ -1,6 +1,8 @@
+import {ReactNode} from 'react';
 import {connect} from 'react-redux';
+import cn from 'bem-cn-lite';
 
-import {RadioButton, Switch} from '@gravity-ui/uikit';
+import {RadioButton, Switch, HelpPopover} from '@gravity-ui/uikit';
 import {Settings} from '@gravity-ui/navigation';
 
 import favoriteFilledIcon from '../../assets/icons/star.svg';
@@ -14,6 +16,10 @@ import {
 
 import {setSettingValue} from '../../store/reducers/settings';
 
+import './UserSettings.scss';
+
+const b = cn('ydb-user-settings');
+
 enum Theme {
     light = 'light',
     dark = 'dark',
@@ -33,6 +39,19 @@ function UserSettings(props: any) {
         props.setSettingValue(USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY, String(value));
     };
 
+    const renderBreakNodesSettingsItem = (title: ReactNode) => {
+        return (
+            <div className={b('item-with-popup')}>
+                {title}
+                <HelpPopover
+                    content="Use /viewer/json/nodes endpoint for Nodes Tab in diagnostics. It returns incorrect data on older versions"
+                    contentClassName={b('popup')}
+                    hasArrow={true}
+                />
+            </div>
+        );
+    };
+
     return (
         <Settings>
             <Settings.Page
@@ -58,7 +77,10 @@ function UserSettings(props: any) {
                             onUpdate={_onInvertedDisksChangeHandler}
                         />
                     </Settings.Item>
-                    <Settings.Item title="Use /viewer/json/nodes for Nodes Tab in diagnostics">
+                    <Settings.Item
+                        title="Break the Nodes tab in Diagnostics"
+                        renderTitleComponent={renderBreakNodesSettingsItem}
+                    >
                         <Switch
                             checked={props.useNodesEndpointInDiagnostics}
                             onUpdate={_onNodesEndpointChangeHandler}

package/package.json

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