ydb-embedded-ui 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## [1.5.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.4.2...v1.5.0) (2022-05-24)
+
+
+### Features
+
+* **Healthcheck:** use TreeView in issues viewer ([bcd81e5](https://github.com/ydb-platform/ydb-embedded-ui/commit/bcd81e56dc613cf3e9f31d77d930b79e070372e4))
+* **Tenant:** use NavigationTree for schemas ([f2867e1](https://github.com/ydb-platform/ydb-embedded-ui/commit/f2867e18898028ca265df46fcc8bfa4f929173f0))
+
+
+### Bug Fixes
+
+* **Healthcheck:** don't display reasonsItems in issues viewer ([f0a545f](https://github.com/ydb-platform/ydb-embedded-ui/commit/f0a545f7c70d449c121d64f8d1820e53b880a0fc))
+* **Tenant:** add ellipsis to menu items inserting queries ([09135a2](https://github.com/ydb-platform/ydb-embedded-ui/commit/09135a2777ec9183ddf71bd2a4de66c5ef422ac8))
+* **Tenant:** change messages for path copy toasts ([09adfa5](https://github.com/ydb-platform/ydb-embedded-ui/commit/09adfa52735bf706deb1ee9bf37f4bfa459b3758))
+* **Tenant:** switch to query tab for inserted query ([991f156](https://github.com/ydb-platform/ydb-embedded-ui/commit/991f156ff819c58ff79146a44b57fb400729f325))
+
+### [1.4.2](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.4.1...v1.4.2) (2022-05-23)
+
+
+### UI Updates
+
+* **QueryEditor:** replace warning for query losing with note about how query are saved ([89820ca](https://github.com/ydb-platform/ydb-embedded-ui/commit/89820ca7e2d02f880eb81d484b8947d599798d5f))
+
+
+### Bug Fixes
+
+* **QueryEditor:** confirm query deletion with enter ([d3dadbd](https://github.com/ydb-platform/ydb-embedded-ui/commit/d3dadbd0244fead5f41bd98445669c4f5ce23c43))
+* **QueryEditor:** field autofocus in query save dialog ([9225238](https://github.com/ydb-platform/ydb-embedded-ui/commit/92252384dc68c40191f7898fff9a2c1106b0b2f1))
+* **QueryEditor:** save query with enter ([5f9c450](https://github.com/ydb-platform/ydb-embedded-ui/commit/5f9c450aedc90f0e162515294a74000c006f9be7))
+
+### [1.4.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.4.0...v1.4.1) (2022-05-17)
+
+
+### UI Updates
+
+* **Tenant:** add tenant name wrapper ([8176d28](https://github.com/ydb-platform/ydb-embedded-ui/commit/8176d28a5769b2b95d667ed960ad34d7a0d9bb4c))
+
+
+### Bug Fixes
+
+* **NodesTable:** align external link icon ([a379796](https://github.com/ydb-platform/ydb-embedded-ui/commit/a379796c6b8087f25f95ce3db4be33f18da71e04))
+
 ## [1.4.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.3.0...v1.4.0) (2022-05-16)
 
 

package/dist/components/GroupTreeViewer/GroupTreeViewer.js

@@ -3,10 +3,11 @@ import PropTypes from 'prop-types';
 import cn from 'bem-cn-lite';
 import {withRouter} from 'react-router';
 
+import {TreeView} from 'ydb-ui-components';
+
 import GroupViewer from '../GroupViewer/GroupViewer';
 import PDiskViewer from '../PDiskViewer/PDiskViewer';
 import EntityStatus from '../EntityStatus/EntityStatus';
-import TreeView from '../TreeView/TreeView';
 import {stringifyVdiskId} from '../../utils';
 import routes, {createHref} from '../../routes';
 import {backend} from '../../store';
@@ -50,7 +51,7 @@ class GroupTreeViewer extends React.Component {
                 <div className={b()}>
                     <TreeView
                         key={group.GroupID}
-                        nodeLabel={label2}
+                        name={label2}
                         collapsed={collapsed}
                         onClick={onClick}
                     >

package/dist/components/GroupTreeViewer/GroupTreeViewer.scss

@@ -1,5 +1,3 @@
-@import '../../styles/react-treeview';
-
 .group-tree-viewer {
     &__row {
         display: flex;

package/dist/components/SplitPane/SplitPane.tsx

@@ -18,8 +18,8 @@ interface SplitPaneProps {
     minSize?: number[];
     triggerCollapse?: boolean;
     triggerExpand?: boolean;
-    onSplitStartDrugAdditional?: VoidFunction;
-    onSplitDrugAdditional?: VoidFunction;
+    onSplitStartDragAdditional?: VoidFunction;
+    onSplitDragAdditional?: VoidFunction;
 }
 
 const minSizeDefaultInner = [0, 100];
@@ -41,17 +41,17 @@ function SplitPane(props: SplitPaneProps) {
         localStorage.setItem(defaultSizePaneKey, sizes.join(','));
     };
     const onDragHandler = (sizes: number[]) => {
-        const {onSplitDrugAdditional} = props;
-        if (onSplitDrugAdditional) {
-            onSplitDrugAdditional();
+        const {onSplitDragAdditional} = props;
+        if (onSplitDragAdditional) {
+            onSplitDragAdditional();
         }
         setDefaultSizePane(sizes);
     };
 
     const onDragStartHandler = () => {
-        const {onSplitStartDrugAdditional} = props;
-        if (onSplitStartDrugAdditional) {
-            onSplitStartDrugAdditional();
+        const {onSplitStartDragAdditional} = props;
+        if (onSplitStartDragAdditional) {
+            onSplitStartDragAdditional();
         }
         setInnerSizes(undefined);
     };

package/dist/containers/App/App.js

@@ -25,6 +25,7 @@ class App extends React.Component {
     constructor(props) {
         super(props);
         i18n.setLang(I18N.LANGS.en);
+        I18N.setDefaultLang(I18N.LANGS.en); // for the peer dependency ydb-ui-components, should match the language above
     }
 
     componentDidMount() {

package/dist/containers/App/App.scss

@@ -117,32 +117,6 @@ body,
     border-color: var(--yc-color-text-danger);
 }
 
-.tree-view_item {
-    /* stylelint-disable-next-line declaration-no-important*/
-    cursor: default !important;
-}
-
-.tree-view_children {
-    margin-left: 25px;
-}
-
-.tree-view_arrow {
-    padding: 2px;
-
-    line-height: 0.8;
-
-    transform: rotate(90deg);
-}
-
-.tree-view_arrow-collapsed {
-    transform: rotate(0deg);
-}
-
-.tree-view_arrow:after {
-    font-size: var(--yc-text-body2-font-size);
-    content: '❯';
-}
-
 .data-table__row:hover .entity-status__clipboard-button {
     display: flex;
 }

package/dist/containers/App/NodesTable.scss

@@ -9,8 +9,6 @@
 
         margin-left: 4px;
 
-        transform: translateY(-1px);
-
         .yc-button__text {
             margin: 0 4px;
         }

package/dist/containers/Tenant/Diagnostics/Healthcheck/IssuesViewer/IssueViewer.scss

@@ -5,37 +5,14 @@
     align-items: center;
 
     height: 40px;
-    margin-left: 36px;
 
     cursor: pointer;
-    .km-tree-view__arrow-icon + & {
-        margin-left: 0;
-    }
 
     &_active {
         border-radius: 4px;
         background: var(--yc-color-base-info);
     }
 
-    &__wpapper {
-        & .km-tree-view__node-wrapper {
-            height: 40px;
-
-            & .km-tree-view__arrow-icon {
-                display: flex;
-                align-items: center;
-
-                width: 36px;
-                height: 36px;
-                margin: 0;
-            }
-        }
-
-        & .tree-view_item {
-            margin: 0;
-        }
-    }
-
     &__field {
         padding: 0 10px;
 
@@ -173,4 +150,15 @@
             }
         }
     }
+
+    .ydb-tree-view {
+        &__item {
+            height: 40px;
+        }
+
+        .tree-view_arrow {
+            width: 40px;
+            height: 40px;
+        }
+    }
 }

package/dist/containers/Tenant/Diagnostics/Healthcheck/IssuesViewer/IssuesViewer.js

@@ -7,7 +7,8 @@ import _filter from 'lodash/fp/filter';
 import _sortBy from 'lodash/fp/sortBy';
 import _uniqBy from 'lodash/fp/uniqBy';
 
-import TreeView from '../../../../../components/TreeView/TreeView';
+import {TreeView} from 'ydb-ui-components';
+
 import EntityStatus from '../../../../../components/EntityStatus/EntityStatus';
 
 import './IssueViewer.scss';
@@ -29,7 +30,7 @@ const issueBlock = cn('issue');
 
 const IssueRow = ({data, treeLevel, active, setInfoForActive, onClick}) => {
     // eslint-disable-next-line no-unused-vars
-    const {id, status, message, type, ...rest} = data;
+    const {id, status, message, type, reasonsItems, ...rest} = data;
 
     useEffect(() => {
         if (active) {
@@ -45,7 +46,7 @@ const IssueRow = ({data, treeLevel, active, setInfoForActive, onClick}) => {
             </div>
             <div
                 className={issueBlock('field', {message: true})}
-                style={{marginLeft: -treeLevel * 25 + 'px'}}
+                style={{marginLeft: -treeLevel * 24 + 'px'}}
             >
                 {message}
             </div>
@@ -85,21 +86,20 @@ const IssuesViewer = ({issues}) => {
                 return (
                     <TreeView
                         key={id}
-                        nodeLabel={
+                        name={
                             <IssueRow
                                 data={item}
                                 treeLevel={treeLevel}
                                 active={isActive}
                                 setInfoForActive={setInfoData}
-                                onClick={() => setActiveItem(id)}
                             />
                         }
-                        className={issueBlock('wpapper', {active: isActive})}
                         collapsed={
                             typeof collapsedIssues[id] === 'undefined' || collapsedIssues[id]
                         }
                         hasArrow={hasArrow}
-                        onClick={() => {
+                        onClick={() => setActiveItem(id)}
+                        onArrowClick={() => {
                             const newValue =
                                 typeof collapsedIssues[id] === 'undefined'
                                     ? false

package/dist/containers/Tenant/ObjectSummary/ObjectSummary.scss

@@ -26,8 +26,8 @@
 
     &__action-button {
         position: absolute;
-        top: 12px;
-        right: 4px;
+        top: 8px; // centered relative to the heading
+        right: 5px; // centered relative to the collapsed panel
 
         background-color: var(--yc-color-base-background);
         &_hidden {
@@ -41,32 +41,26 @@
         align-items: center;
     }
 
-    &__tree {
+    &__tree-wrapper {
         display: flex;
-        overflow: scroll;
-        flex: 0 0 auto;
         flex-direction: column;
+    }
+
+    &__tree {
+        overflow-y: scroll;
+        flex: 1 1 auto;
 
         height: 100%;
         padding: 0 12px 12px;
-
-        .tree-view_item {
-            margin: 0;
-            padding: 2px 0;
-        }
-
-        & > div > .tree-view {
-            padding-bottom: 15px;
-        }
     }
 
     &__tree-header {
         display: flex;
+        flex: 0 0 auto;
         justify-content: space-between;
         align-items: center;
 
         padding: 12px 12px 8px;
-        @include sticky-top();
     }
 
     &__tree-title {

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

@@ -7,18 +7,13 @@ import qs from 'qs';
 import _ from 'lodash';
 
 import {Button, HelpTooltip, Loader, Tabs} from '@yandex-cloud/uikit';
-//@ts-ignore
+
 import SplitPane from '../../../components/SplitPane';
-//@ts-ignore
-import SchemaNode from '../Schema/SchemaNode/SchemaNode';
-//@ts-ignore
+import {SchemaTree} from '../Schema/SchemaTree/SchemaTree';
 import Acl from '../Acl/Acl';
-//@ts-ignore
 import SchemaViewer from '../Schema/SchemaViewer/SchemaViewer';
 import CopyToClipboard from '../../../components/CopyToClipboard/CopyToClipboard';
-//@ts-ignore
 import InfoViewer from '../../../components/InfoViewer/InfoViewer';
-//@ts-ignore
 import Icon from '../../../components/Icon/Icon';
 
 import {OLAP_TABLE_TYPE, TABLE_TYPE} from '../Tenant';
@@ -26,7 +21,6 @@ import {OLAP_TABLE_TYPE, TABLE_TYPE} from '../Tenant';
 import {
     DEFAULT_IS_TENANT_COMMON_INFO_COLLAPSED,
     DEFAULT_SIZE_TENANT_SUMMARY_KEY,
-    //@ts-ignore
 } from '../../../utils/constants';
 import {
     TenantGeneralTabsIds,
@@ -41,10 +35,10 @@ import {
     paneVisibilityToggleReducerCreator,
     PaneVisibilityToggleButtons,
 } from '../utils/paneVisibilityToggleHelpers';
-//@ts-ignore
 import {setShowPreview} from '../../../store/reducers/schema';
 
 import './ObjectSummary.scss';
+
 const b = cn('object-summary');
 
 const getInitialIsSummaryCollapsed = () => {
@@ -103,7 +97,7 @@ function ObjectSummary(props: ObjectSummaryProps) {
     });
 
     const {name: tenantName, info: infoTab} = queryParams;
-    const tenantData = _.get(data[tenantName as string], 'PathDescription.Self');
+    const pathData = _.get(data[tenantName as string], 'PathDescription.Self');
     const currentSchemaData = _.get(data[currentSchemaPath], 'PathDescription.Self');
 
     const tableSchema =
@@ -195,13 +189,20 @@ function ObjectSummary(props: ObjectSummaryProps) {
 
     const renderTree = () => {
         return (
-            <div>
+            <div className={b('tree-wrapper')}>
                 <div className={b('tree-header')}>
                     <div className={b('tree-title')}>Navigation</div>
                 </div>
                 <div className={b('tree')}>
-                    {tenantData && (
-                        <SchemaNode fullPath={tenantName as string} data={tenantData} isRoot />
+                    {pathData && (
+                        <SchemaTree
+                            rootPath={tenantName as string}
+                            // for the root pathData.Name contains the same string as tenantName,
+                            // but without the leading slash
+                            rootName={pathData?.Name || tenantName}
+                            rootType={pathData.PathType}
+                            currentPath={currentSchemaPath}
+                        />
                     )}
                 </div>
             </div>
@@ -215,7 +216,7 @@ function ObjectSummary(props: ObjectSummaryProps) {
         dispatchCommonInfoVisibilityState(PaneVisibilityActionTypes.triggerExpand);
     };
 
-    const onSplitStartDrugAdditional = () => {
+    const onSplitStartDragAdditional = () => {
         dispatchCommonInfoVisibilityState(PaneVisibilityActionTypes.clear);
     };
 
@@ -278,7 +279,7 @@ function ObjectSummary(props: ObjectSummaryProps) {
                     <SplitPane
                         direction="vertical"
                         defaultSizePaneKey={DEFAULT_SIZE_TENANT_SUMMARY_KEY}
-                        onSplitStartDrugAdditional={onSplitStartDrugAdditional}
+                        onSplitStartDragAdditional={onSplitStartDragAdditional}
                         triggerCollapse={commonInfoVisibilityState.triggerCollapse}
                         triggerExpand={commonInfoVisibilityState.triggerExpand}
                         minSize={[200, 52]}

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

@@ -298,7 +298,7 @@ function QueryEditor(props) {
         dispatchResultVisibilityState(PaneVisibilityActionTypes.triggerExpand);
     };
 
-    const onSplitStartDrugAdditional = () => {
+    const onSplitStartDragAdditional = () => {
         dispatchResultVisibilityState(PaneVisibilityActionTypes.clear);
     };
 
@@ -636,7 +636,7 @@ function QueryEditor(props) {
                 triggerExpand={resultVisibilityState.triggerExpand}
                 minSize={[0, 52]}
                 collapsedSizes={[100, 0]}
-                onSplitStartDrugAdditional={onSplitStartDrugAdditional}
+                onSplitStartDragAdditional={onSplitStartDragAdditional}
             >
                 <div className={b('pane-wrapper')}>
                     <div className={b('monaco-wrapper')}>

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

@@ -1,31 +1,24 @@
-import React, {useState, useRef} from 'react';
+import React, {useState} from 'react';
 import _ from 'lodash';
 import cn from 'bem-cn-lite';
 import {useDispatch, useSelector} from 'react-redux';
-import {Dialog, DropdownMenu, Popup, TextInput, Button} from '@yandex-cloud/uikit';
+import {Dialog, DropdownMenu, TextInput, Button} from '@yandex-cloud/uikit';
 
-import Icon from '../../../../components/Icon/Icon';
 import {setQueryNameToEdit} from '../../../../store/reducers/saveQuery';
 
 import './SaveQuery.scss';
 
 const b = cn('kv-save-query');
 
-const EMBEDDED_VERSION_WARNING =
-    'Please be aware: after cookies delete your saved queries will be lost.';
-
 function SaveQuery({savedQueries, onSaveQuery, saveButtonDisabled}) {
     const singleClusterMode = useSelector((state) => state.singleClusterMode);
     const [isDialogVisible, setIsDialogVisible] = useState(false);
-    const [isEmbeddedWarningVisible, setIsEmbeddedWarningVisible] = useState(false);
     const [queryName, setQueryName] = useState('');
     const [validationError, setValidationError] = useState(null);
 
     const queryNameToEdit = useSelector((state) => state.saveQuery);
     const dispatch = useDispatch();
 
-    const warningRef = useRef();
-
     const onSaveQueryClick = () => {
         setIsDialogVisible(true);
         dispatch(setQueryNameToEdit(null));
@@ -42,13 +35,6 @@ function SaveQuery({savedQueries, onSaveQuery, saveButtonDisabled}) {
         setValidationError(validateQueryName(value));
     };
 
-    const onEmbeddedWarningOpen = () => {
-        setIsEmbeddedWarningVisible(true);
-    };
-    const onEmbeddedWarningClose = () => {
-        setIsEmbeddedWarningVisible(false);
-    };
-
     const validateQueryName = (value) => {
         if (_.some(savedQueries, (q) => q.name.toLowerCase() === value.trim().toLowerCase())) {
             return 'This name already exists';
@@ -57,9 +43,11 @@ function SaveQuery({savedQueries, onSaveQuery, saveButtonDisabled}) {
     };
 
     const onSaveClick = () => {
-        if (queryName && !validationError) {
-            onSaveQuery(queryName);
+        if (!queryName || validationError) {
+            return;
         }
+
+        onSaveQuery(queryName);
         onCloseDialog();
     };
 
@@ -70,18 +58,38 @@ function SaveQuery({savedQueries, onSaveQuery, saveButtonDisabled}) {
 
     const renderDialog = () => {
         return (
-            <Dialog open={isDialogVisible} hasCloseButton={false} size="s" onClose={onCloseDialog}>
+            <Dialog
+                open={isDialogVisible}
+                hasCloseButton={false}
+                size="s"
+                onClose={onCloseDialog}
+                onEnterKeyDown={onSaveClick}
+            >
                 <Dialog.Header caption="Save query" />
                 <Dialog.Body className={b('dialog-body')}>
-                    <span className={b('field-title', 'required')}>Query name</span>
-                    <div className={b('control-wrapper')}>
-                        <TextInput
-                            placeholder="Enter query name"
-                            text={queryName}
-                            onUpdate={onQueryNameChange}
-                            hasClear
-                        />
-                        <span className={b('error')}>{validationError}</span>
+                    {singleClusterMode && (
+                        <div className={b('dialog-row')}>
+                            The query will be saved in your browser
+                        </div>
+                    )}
+                    <div className={b('dialog-row')}>
+                        <label
+                            htmlFor="queryName"
+                            className={b('field-title', 'required')}
+                        >
+                            Query name
+                        </label>
+                        <div className={b('control-wrapper')}>
+                            <TextInput
+                                id="queryName"
+                                placeholder="Enter query name"
+                                text={queryName}
+                                onUpdate={onQueryNameChange}
+                                hasClear
+                                autoFocus
+                            />
+                            <span className={b('error')}>{validationError}</span>
+                        </div>
                     </div>
                 </Dialog.Body>
                 <Dialog.Footer
@@ -121,36 +129,10 @@ function SaveQuery({savedQueries, onSaveQuery, saveButtonDisabled}) {
         );
     };
 
-    const renderEmbeddedVersionWarning = () => {
-        return (
-            <React.Fragment>
-                <Popup
-                    className={b('embedded-popup')}
-                    anchorRef={warningRef}
-                    placement={['top']}
-                    open={isEmbeddedWarningVisible}
-                    hasArrow
-                >
-                    {EMBEDDED_VERSION_WARNING}
-                </Popup>
-                <div
-                    className={b('embedded-tooltip')}
-                    ref={warningRef}
-                    onMouseEnter={onEmbeddedWarningOpen}
-                    onMouseLeave={onEmbeddedWarningClose}
-                >
-                    <Icon name="question" height={18} width={18} viewBox="0 0 24 24" />
-                </div>
-            </React.Fragment>
-        );
-    };
-
     return (
         <React.Fragment>
             {queryNameToEdit ? renderSaveDropdownMenu() : renderSaveButton(onSaveQueryClick)}
             {isDialogVisible && renderDialog()}
-
-            {singleClusterMode && renderEmbeddedVersionWarning()}
         </React.Fragment>
     );
 }

package/dist/containers/Tenant/QueryEditor/SaveQuery/SaveQuery.scss

@@ -1,17 +1,19 @@
-@import '../../../../styles/mixins.scss';
-
 .kv-save-query {
-    &__dialog-body {
+    &__dialog-row {
         display: flex;
         align-items: flex-start;
+
+        & + & {
+            margin-top: var(--yc-text-body-line-height);
+        }
     }
     &__field-title {
         margin-right: 12px;
 
         font-weight: 500;
-        line-height: 32px;
+        line-height: 28px;
         white-space: nowrap;
-        @include body2-typography();
+
         &.required {
             &::after {
                 content: '*';

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

@@ -71,6 +71,7 @@ function SavedQueries({savedQueries, changeUserInput, onDeleteQuery}) {
                 hasCloseButton={false}
                 size="s"
                 onClose={onClickCancelDelete}
+                onEnterKeyDown={onConfirmDeleteClick}
             >
                 <Dialog.Header caption="Delete query" />
                 <Dialog.Body className={b('dialog-body')}>