ydb-embedded-ui 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+### [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)
 
 

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')}>

package/package.json

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