ydb-embedded-ui 1.3.0 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # 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)
+
+
+### 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)
+
+
+### Features
+
+* **Tenant:** save initial tab preference ([7195d0f](https://github.com/ydb-platform/ydb-embedded-ui/commit/7195d0f7f5754c461555211515f80ea96464ca15))
+
+
+### UI Updtaes
+
+* **NodesTable:** don't reserve space for icons next to node fqdn ([8fcf1b3](https://github.com/ydb-platform/ydb-embedded-ui/commit/8fcf1b3269dee7ada83d7c5abcf44ad004191851))
+
+
+### Bug Fixes
+
+* **Tenant:** mapDispatchToProps types ([7dcaf56](https://github.com/ydb-platform/ydb-embedded-ui/commit/7dcaf561ec0c361d52d789b2ea3b1aba75339d83))
+
 ## [1.3.0](https://www.github.com/ydb-platform/ydb-embedded-ui/compare/v1.2.6...v1.3.0) (2022-05-12)
 
 

package/README.md

@@ -8,7 +8,7 @@ Local viewer for YDB clusters
 
 1) Run on a machine with Docker installed:
    ```
-   docker pull cr.yandex/yc/yandex-docker-local-ydb`
+   docker pull cr.yandex/yc/yandex-docker-local-ydb
    docker run --hostname localhost -e YDB_ALLOW_ORIGIN="http://localhost:3000" -dp 2135:2135 -dp 8765:8765 cr.yandex/yc/yandex-docker-local-ydb
    ```
 2) Run the frontend app in the development mode, via invoking `npm run dev`

package/dist/components/EntityStatus/EntityStatus.scss

@@ -9,8 +9,7 @@
     line-height: var(--yc-text-body2-line-height);
 
     &__clipboard-button {
-        display: flex;
-        visibility: hidden;
+        display: none;
         align-items: center;
 
         margin-left: 8px;
@@ -22,7 +21,7 @@
         }
 
         &_visible {
-            visibility: visible;
+            display: flex;
         }
     }
 

package/dist/containers/App/App.scss

@@ -144,7 +144,7 @@ body,
 }
 
 .data-table__row:hover .entity-status__clipboard-button {
-    visibility: visible;
+    display: flex;
 }
 
 .no-problem {

package/dist/containers/App/NodesTable.scss

@@ -1,25 +1,26 @@
 .kv-nodes {
+    &__host-name-wrapper {
+        display: flex;
+    }
+
     &__external-button {
-        display: inline-flex;
-        visibility: hidden;
+        display: none;
         align-items: center;
 
         margin-left: 4px;
 
-        transform: translateY(-1px);
-
         .yc-button__text {
             margin: 0 4px;
         }
     }
 
     &__host-name {
-        width: 90%;
+        overflow: hidden;
     }
 }
 
 .data-table__row:hover {
     .kv-nodes__external-button {
-        visibility: visible;
+        display: inline-flex;
     }
 }

package/dist/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx

@@ -1,3 +1,4 @@
+import {connect} from 'react-redux';
 import {Link} from 'react-router-dom';
 import cn from 'bem-cn-lite';
 import {useLocation} from 'react-router';
@@ -11,6 +12,8 @@ import Diagnostics from '../Diagnostics/Diagnostics';
 
 import {TenantGeneralTabsIds, TenantTabsGroups, TENANT_GENERAL_TABS} from '../TenantPages';
 import routes, {createHref} from '../../../routes';
+import {setSettingValue} from '../../../store/reducers/settings';
+import {TENANT_INITIAL_TAB_KEY} from '../../../utils/constants';
 
 import './ObjectGeneral.scss';
 
@@ -20,6 +23,7 @@ interface ObjectGeneralProps {
     type: string;
     additionalTenantInfo?: any;
     additionalNodesInfo?: any;
+    setSettingValue: (name: string, value: string) => void;
 }
 
 function ObjectGeneral(props: ObjectGeneralProps) {
@@ -63,6 +67,7 @@ function ObjectGeneral(props: ObjectGeneralProps) {
                         );
                     }}
                     allowNotSelected
+                    onSelectTab={(id) => props.setSettingValue(TENANT_INITIAL_TAB_KEY, id)}
                 />
             </div>
         );
@@ -101,4 +106,8 @@ function ObjectGeneral(props: ObjectGeneralProps) {
     return renderContent();
 }
 
-export default ObjectGeneral;
+const mapDispatchToProps = {
+    setSettingValue,
+};
+
+export default connect(null, mapDispatchToProps)(ObjectGeneral);

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/dist/containers/Tenants/Tenants.js

@@ -17,9 +17,9 @@ import routes, {CLUSTER_PAGES, createHref} from '../../routes';
 import {formatCPU, formatBytesToGigabyte} from '../../utils';
 import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
 import {withSearch} from '../../HOCS';
-import {ALL, DEFAULT_TABLE_SETTINGS} from '../../utils/constants';
+import {ALL, DEFAULT_TABLE_SETTINGS, TENANT_INITIAL_TAB_KEY} from '../../utils/constants';
 import {getTenantsInfo} from '../../store/reducers/tenants';
-import {changeFilter} from '../../store/reducers/settings';
+import {changeFilter, getSettingValue} from '../../store/reducers/settings';
 import {setHeader} from '../../store/reducers/header';
 
 import {clusterName} from '../../store';
@@ -119,6 +119,7 @@ class Tenants extends React.Component {
             filter,
             handleSearchQuery,
             additionalTenantsInfo = {},
+            savedTenantInitialTab,
         } = this.props;
 
         const filteredTenantsBySearch = tenants.filter(
@@ -129,6 +130,9 @@ class Tenants extends React.Component {
         );
         const filteredTenants = Tenants.filterTenants(filteredTenantsBySearch, filter);
 
+        const initialTenantGeneralTab = savedTenantInitialTab || TENANT_GENERAL_TABS[0].id;
+        const initialTenantInfoTab = TENANT_INFO_TABS[0].id;
+
         const columns = [
             {
                 name: 'Name',
@@ -140,7 +144,7 @@ class Tenants extends React.Component {
                         : undefined;
                     const isExternalLink = Boolean(backend);
                     return (
-                        <React.Fragment>
+                        <div className={b('name-wrapper')}>
                             <EntityStatus
                                 externalLink={isExternalLink}
                                 className={b('name')}
@@ -150,12 +154,12 @@ class Tenants extends React.Component {
                                 path={createHref(routes.tenant, undefined, {
                                     name: value,
                                     backend: tenantBackend,
-                                    [TenantTabsGroups.info]: TENANT_INFO_TABS[0].id,
-                                    [TenantTabsGroups.general]: TENANT_GENERAL_TABS[0].id,
+                                    [TenantTabsGroups.info]: initialTenantInfoTab,
+                                    [TenantTabsGroups.general]: initialTenantGeneralTab,
                                 })}
                             />
                             {additionalTenantsInfo.name && additionalTenantsInfo.name(value, row)}
-                        </React.Fragment>
+                        </div>
                     );
                 },
                 width: 440,
@@ -347,6 +351,7 @@ const mapStateToProps = (state) => {
         loading,
         error,
         filter: state.settings.problemFilter,
+        savedTenantInitialTab: getSettingValue(state, TENANT_INITIAL_TAB_KEY),
     };
 };
 

package/dist/containers/Tenants/Tenants.scss

@@ -54,7 +54,13 @@
     .data-table__row:hover &__type-button {
         visibility: visible;
     }
+
+    &__name-wrapper {
+        display: flex;
+        align-items: center;
+    }
+
     &__name {
-        max-width: 90%;
+        overflow: hidden;
     }
 }

package/dist/store/reducers/settings.js

@@ -1,4 +1,4 @@
-import {ALL, defaultUserSettings, SAVED_QUERIES_KEY, THEME_KEY} from '../../utils/constants';
+import {ALL, defaultUserSettings, SAVED_QUERIES_KEY, THEME_KEY, TENANT_INITIAL_TAB_KEY} from '../../utils/constants';
 import '../../services/api';
 import {getValueFromLS} from '../../utils/utils';
 
@@ -13,6 +13,9 @@ const theme = window.web_version
 const savedQueries = window.web_version
     ? userSettings[SAVED_QUERIES_KEY]
     : getValueFromLS(SAVED_QUERIES_KEY, '[]');
+const savedTenantGeneralTab = window.web_version
+    ? userSettings[TENANT_INITIAL_TAB_KEY]
+    : getValueFromLS(TENANT_INITIAL_TAB_KEY);
 
 export const initialState = {
     problemFilter: ALL,
@@ -21,6 +24,7 @@ export const initialState = {
         ...userSettings,
         theme,
         [SAVED_QUERIES_KEY]: savedQueries,
+        [TENANT_INITIAL_TAB_KEY]: savedTenantGeneralTab,
     },
     systemSettings,
 };

package/dist/utils/constants.js

@@ -137,3 +137,5 @@ export const DEFAULT_TABLE_SETTINGS = {
     dynamicRender: true,
     highlightRows: true,
 };
+
+export const TENANT_INITIAL_TAB_KEY = 'saved_tenant_initial_tab';

package/dist/utils/getNodesColumns.js

@@ -31,7 +31,7 @@ export function getNodesColumns({showTooltip, hideTooltip, tabletsPath, getNodeR
                     return <span>—</span>;
                 }
                 return (
-                    <React.Fragment>
+                    <div className={b('host-name-wrapper')}>
                         <EntityStatus
                             name={row.Host}
                             status={row.Overall}
@@ -44,7 +44,7 @@ export function getNodesColumns({showTooltip, hideTooltip, tabletsPath, getNodeR
                                 <Icon name="external" />
                             </Button>
                         )}
-                    </React.Fragment>
+                    </div>
                 );
             },
             width: '350px',

package/package.json

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