ydb-embedded-ui 1.6.4 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.7.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.6.4...v1.7.0) (2022-06-29)
+
+
+### Features
+
+* **Storage:** show total groups count ([5e31cfe](https://github.com/ydb-platform/ydb-embedded-ui/commit/5e31cfee9edc50fa4bc0770c443b136291a3536e))
+* **Storage:** show total nodes count ([b438f70](https://github.com/ydb-platform/ydb-embedded-ui/commit/b438f7075961e878a1412ca185743c4374dd9178))
+* **Tenant:** display tables indexes ([693a100](https://github.com/ydb-platform/ydb-embedded-ui/commit/693a1001db6487b2d43aeca7d8168afcd06f5cbd))
+
 ## [1.6.4](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.6.3...v1.6.4) (2022-06-24)
 
 

package/dist/containers/Storage/Storage.js

@@ -20,6 +20,8 @@ import {
     StorageTypes,
     setStorageType,
     VisibleEntitiesTitles,
+    getStoragePoolsGroupsCount,
+    getStorageNodesCount,
 } from '../../store/reducers/storage';
 import {getNodesList} from '../../store/reducers/clusterNodes';
 import StorageGroups from './StorageGroups/StorageGroups';
@@ -52,6 +54,8 @@ class Storage extends React.Component {
         getStorageInfo: PropTypes.func,
         setInitialState: PropTypes.func,
         flatListStorageEntities: PropTypes.array,
+        groupsCount: PropTypes.object,
+        nodesCount: PropTypes.object,
         setStorageFilter: PropTypes.func,
         setVisibleEntities: PropTypes.func,
         visibleEntities: PropTypes.string,
@@ -199,10 +203,39 @@ class Storage extends React.Component {
         setStorageType(value);
     };
 
+    renderEntitiesCount() {
+        const {
+            storageType,
+            groupsCount,
+            nodesCount,
+            loading,
+            wasLoaded,
+        } = this.props;
+
+        let label = `${storageType === StorageTypes.groups ? 'Groups' : 'Nodes'}: `;
+        const count = storageType === StorageTypes.groups ? groupsCount : nodesCount;
+
+        if (loading && !wasLoaded) {
+            label += '...';
+            return label;
+        }
+
+        if (count.total === count.found) {
+            label += count.total;
+        } else {
+            label += `${count.found} of ${count.total}`;
+        }
+
+        return label;
+    }
+
     renderControls() {
-        const {setStorageFilter, visibleEntities, storageType, flatListStorageEntities, loading, wasLoaded} =
-            this.props;
-        const showLoader = loading && !wasLoaded;
+        const {
+            setStorageFilter,
+            visibleEntities,
+            storageType,
+        } = this.props;
+
         return (
             <div className={b('controls')}>
                 <div className={b('search')}>
@@ -231,9 +264,9 @@ class Storage extends React.Component {
                         {StorageTypes.nodes}
                     </RadioButton.Option>
                 </RadioButton>
-                <Label theme="info" size="m">{`${
-                    storageType === StorageTypes.groups ? 'Groups' : 'Nodes'
-                }: ${(showLoader) ? '...' : flatListStorageEntities.length}`}</Label>
+                <Label theme="info" size="m">
+                    {this.renderEntitiesCount()}
+                </Label>
             </div>
         );
     }
@@ -270,8 +303,10 @@ function mapStateToProps(state) {
 
     return {
         flatListStorageEntities: getFilteredEntities(state),
+        groupsCount: getStoragePoolsGroupsCount(state),
         autorefresh: state.schema.autorefresh,
         nodes: getNodesObject(state),
+        nodesCount: getStorageNodesCount(state),
         loading,
         wasLoaded,
         error,

package/dist/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx

@@ -3,6 +3,8 @@ import {useSelector} from 'react-redux';
 import cn from 'bem-cn-lite';
 
 import {Button, Modal} from '@yandex-cloud/uikit';
+
+import type {EPathType} from '../../../../types/api/schema';
 //@ts-ignore
 import Icon from '../../../../components/Icon/Icon';
 import Overview from '../Overview/Overview';
@@ -14,7 +16,7 @@ import TenantOverview from '../TenantOverview/TenantOverview';
 import './DetailedOverview.scss';
 
 interface DetailedOverviewProps {
-    type: string;
+    type?: EPathType;
     className?: string;
     tenantName: string;
     additionalTenantInfo?: any;

package/dist/containers/Tenant/Diagnostics/Diagnostics.tsx

@@ -29,7 +29,8 @@ import Compute from './Compute/Compute';
 import Tablets from '../../Tablets/Tablets';
 
 import routes, {createHref} from '../../../routes';
-import {OLAP_TABLE_TYPE, TABLE_TYPE} from '../Tenant';
+import type {EPathType} from '../../../types/api/schema';
+import {isTableType} from '../utils/schema';
 import {TenantGeneralTabsIds, TenantTabsGroups} from '../TenantPages';
 import {GeneralPagesIds, DATABASE_PAGES, TABLE_PAGES, DIR_PAGES} from './DiagnosticsPages';
 //@ts-ignore
@@ -39,7 +40,7 @@ import {setTopLevelTab, setDiagnosticsTab} from '../../../store/reducers/tenant'
 import './Diagnostics.scss';
 
 interface DiagnosticsProps {
-    type: string;
+    type?: EPathType;
     additionalTenantInfo?: any;
     additionalNodesInfo?: any;
 }
@@ -68,8 +69,7 @@ function Diagnostics(props: DiagnosticsProps) {
     const isDatabase = currentSchemaPath === tenantName;
 
     const pages = useMemo(() => {
-        const {type} = props;
-        const isTable = type === TABLE_TYPE || type === OLAP_TABLE_TYPE;
+        const isTable = isTableType(props.type);
 
         let pages = DIR_PAGES;
 

package/dist/containers/Tenant/Diagnostics/HotKeys/HotKeys.js

@@ -8,7 +8,7 @@ import Icon from '../../../../components/Icon/Icon';
 
 import {AutoFetcher} from '../../../../utils/autofetcher';
 import {getHotKeys, setHotKeysOptions} from '../../../../store/reducers/hotKeys';
-import {TABLE_TYPE} from '../../Tenant';
+import {EPathType} from '../../../../types/api/schema';
 import {prepareQueryError} from '../../../../utils';
 
 import './HotKeys.scss';
@@ -42,7 +42,8 @@ function HotKeys({
     type,
 }) {
     const fetchData = () => {
-        if (type === TABLE_TYPE) {
+        // ColumnTables excluded intentionally
+        if (type === EPathType.EPathTypeTable) {
             getHotKeys(currentSchemaPath);
         }
     };

package/dist/containers/Tenant/Diagnostics/Overview/Overview.tsx

@@ -7,7 +7,8 @@ import {Loader} from '@yandex-cloud/uikit';
 //@ts-ignore
 import SchemaInfoViewer from '../../Schema/SchemaInfoViewer/SchemaInfoViewer';
 
-import {OLAP_TABLE_TYPE} from '../../Tenant';
+import type {EPathType} from '../../../../types/api/schema';
+import {isColumnEntityType, isTableType} from '../../utils/schema';
 import {AutoFetcher} from '../../../../utils/autofetcher';
 //@ts-ignore
 import {getSchema} from '../../../../store/reducers/schema';
@@ -44,7 +45,7 @@ function prepareOlapTableGeneral(tableData: any, olapStats: any[]) {
 }
 
 interface OverviewProps {
-    type: string;
+    type?: EPathType;
     className?: string;
     tenantName?: string;
 }
@@ -70,7 +71,7 @@ function Overview(props: OverviewProps) {
         const schemaPath = currentSchemaPath || tenantName;
         dispatch(getSchema({path: schemaPath}));
 
-        if (type === OLAP_TABLE_TYPE) {
+        if (isTableType(type) && isColumnEntityType(type)) {
             dispatch(getOlapStats({path: schemaPath}));
         }
     };
@@ -98,7 +99,7 @@ function Overview(props: OverviewProps) {
         currentItem?.PathDescription?.Table || currentItem?.PathDescription?.ColumnTableDescription;
 
     const schemaData = useMemo(() => {
-        return props.type === OLAP_TABLE_TYPE
+        return isTableType(props.type) && isColumnEntityType(props.type)
             ? prepareOlapTableGeneral(tableSchema, olapStats)
             : currentItem;
     }, [props.type, tableSchema, olapStats, currentItem]);

package/dist/containers/Tenant/Diagnostics/TopQueries/TopQueries.js

@@ -9,7 +9,7 @@ import {changeUserInput} from '../../../../store/reducers/executeQuery';
 import {sendQuery, setQueryOptions} from '../../../../store/reducers/executeTopQueries';
 import TruncatedQuery from '../../../../components/TruncatedQuery/TruncatedQuery';
 import {AutoFetcher} from '../../../../utils/autofetcher';
-import {OLAP_STORE_TYPE, OLAP_TABLE_TYPE} from '../../Tenant';
+import {isColumnEntityType} from '../../utils/schema';
 
 import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
 import {TenantGeneralTabsIds} from '../../TenantPages';
@@ -149,7 +149,7 @@ class TopQueries extends React.Component {
 
         let message;
 
-        if (type === OLAP_STORE_TYPE || type === OLAP_TABLE_TYPE) {
+        if (isColumnEntityType(type)) {
             message = 'No data';
         } else if (error && !error.isCancelled) {
             message = prepareQueryError(error).slice(0, 300);

package/dist/containers/Tenant/Diagnostics/TopShards/TopShards.js

@@ -12,7 +12,7 @@ import {setCurrentSchemaPath, getSchema} from '../../../../store/reducers/schema
 import {AutoFetcher} from '../../../../utils/autofetcher';
 import HistoryContext from '../../../../contexts/HistoryContext';
 import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
-import {OLAP_STORE_TYPE, OLAP_TABLE_TYPE} from '../../Tenant';
+import {isColumnEntityType} from '../../utils/schema';
 import {prepareQueryError} from '../../../../utils';
 
 import './TopShards.scss';
@@ -120,7 +120,7 @@ function TopShards({
     };
 
     const renderContent = () => {
-        if (type === OLAP_STORE_TYPE || type === OLAP_TABLE_TYPE) {
+        if (isColumnEntityType(type)) {
             return 'No data';
         }
         if (error) {

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

@@ -14,13 +14,14 @@ import {TenantGeneralTabsIds, TenantTabsGroups, TENANT_GENERAL_TABS} from '../Te
 import routes, {createHref} from '../../../routes';
 import {setSettingValue} from '../../../store/reducers/settings';
 import {TENANT_INITIAL_TAB_KEY} from '../../../utils/constants';
+import type {EPathType} from '../../../types/api/schema';
 
 import './ObjectGeneral.scss';
 
 const b = cn('object-general');
 
 interface ObjectGeneralProps {
-    type: string;
+    type?: EPathType;
     additionalTenantInfo?: any;
     additionalNodesInfo?: any;
     setSettingValue: (name: string, value: string) => void;

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

@@ -16,7 +16,8 @@ import CopyToClipboard from '../../../components/CopyToClipboard/CopyToClipboard
 import InfoViewer from '../../../components/InfoViewer/InfoViewer';
 import Icon from '../../../components/Icon/Icon';
 
-import {OLAP_TABLE_TYPE, TABLE_TYPE} from '../Tenant';
+import type {EPathType} from '../../../types/api/schema';
+import {isColumnEntityType, isTableType} from '../utils/schema';
 
 import {
     DEFAULT_IS_TENANT_COMMON_INFO_COLLAPSED,
@@ -69,7 +70,7 @@ function prepareOlapTableSchema(tableSchema: any) {
 }
 
 interface ObjectSummaryProps {
-    type: string;
+    type?: EPathType;
     onCollapseSummary: VoidFunction;
     onExpandSummary: VoidFunction;
     isCollapsed: boolean;
@@ -104,12 +105,13 @@ function ObjectSummary(props: ObjectSummaryProps) {
     const tableSchema =
         currentItem?.PathDescription?.Table || currentItem?.PathDescription?.ColumnTableDescription;
 
-    const schema =
-        props.type === OLAP_TABLE_TYPE ? prepareOlapTableSchema(tableSchema) : tableSchema;
+    const schema = isTableType(props.type) && isColumnEntityType(props.type)
+        ? prepareOlapTableSchema(tableSchema)
+        : tableSchema;
 
     useEffect(() => {
         const {type} = props;
-        const isTable = type === TABLE_TYPE || type === OLAP_TABLE_TYPE;
+        const isTable = isTableType(type);
 
         if (type && !isTable && !TENANT_INFO_TABS.find((el) => el.id === infoTab)) {
             history.push({
@@ -120,8 +122,7 @@ function ObjectSummary(props: ObjectSummaryProps) {
     }, [props.type]);
 
     const renderTabs = () => {
-        const {type} = props;
-        const isTable = type === TABLE_TYPE || type === OLAP_TABLE_TYPE;
+        const isTable = isTableType(props.type);
         const tabsItems = isTable ? [...TENANT_INFO_TABS, ...TENANT_SCHEMA_TAB] : TENANT_INFO_TABS;
 
         return (
@@ -228,8 +229,7 @@ function ObjectSummary(props: ObjectSummaryProps) {
     };
 
     const renderCommonInfoControls = () => {
-        const {type} = props;
-        const isTable = type === TABLE_TYPE || type === OLAP_TABLE_TYPE;
+        const isTable = isTableType(props.type);
         return (
             <React.Fragment>
                 {isTable && (
@@ -257,8 +257,8 @@ function ObjectSummary(props: ObjectSummaryProps) {
             message = `${Status}: ${Reason}`;
         }
 
-        return props.type ? (
-            <div className={b('entity-type')}>{type}</div>
+        return type ? (
+            <div className={b('entity-type')}>{type.replace('EPathType', '')}</div>
         ) : (
             <div className={b('entity-type', {error: true})}>
                 <HelpPopover content={message} offset={{left: 0}} />

package/dist/containers/Tenant/Preview/Preview.js

@@ -13,7 +13,7 @@ import {sendQuery, setQueryOptions} from '../../../store/reducers/preview';
 import {showTooltip, hideTooltip} from '../../../store/reducers/tooltip';
 import {prepareQueryError, prepareQueryResponse} from '../../../utils/index';
 
-import {OLAP_TABLE_TYPE, TABLE_TYPE} from '../Tenant';
+import {isTableType} from '../utils/schema';
 import {AutoFetcher} from '../../../utils/autofetcher';
 import EnableFullscreenButton from '../../../components/EnableFullscreenButton/EnableFullscreenButton';
 import {DEFAULT_TABLE_SETTINGS} from '../../../utils/constants';
@@ -82,7 +82,7 @@ class Preview extends React.Component {
     sendQueryForPreview = () => {
         const {sendQuery, database, table, type} = this.props;
 
-        if (type !== TABLE_TYPE && type !== OLAP_TABLE_TYPE) {
+        if (!isTableType(type)) {
             return;
         }
 
@@ -150,7 +150,7 @@ class Preview extends React.Component {
 
         let message;
 
-        if (type !== TABLE_TYPE && type !== OLAP_TABLE_TYPE) {
+        if (!isTableType(type)) {
             message = <div className={b('message-container')}>Not available</div>;
         }
 

package/dist/containers/Tenant/Schema/SchemaTree/SchemaTree.tsx

@@ -35,6 +35,9 @@ export function SchemaTree(props: SchemaTreeProps) {
             return Children.map(({Name = '', PathType}) => ({
                 name: Name,
                 type: mapPathTypeToNavigationTreeType(PathType),
+                // FIXME: should only be explicitly set to true for tables with indexes
+                // at the moment of writing there is no property to determine this, fix later
+                expandable: true,
             }));
         });
 

package/dist/containers/Tenant/Tenant.tsx

@@ -1,4 +1,4 @@
-import {useEffect, useMemo, useReducer} from 'react';
+import {useEffect, useReducer} from 'react';
 import {useDispatch, useSelector} from 'react-redux';
 import cn from 'bem-cn-lite';
 import {useLocation} from 'react-router';
@@ -22,28 +22,12 @@ import {
 //@ts-ignore
 import {getTenantInfo, clearTenant} from '../../store/reducers/tenant';
 import routes, {CLUSTER_PAGES, createHref} from '../../routes';
+import type {TEvDescribeSchemeResult} from '../../types/api/schema';
 
 import './Tenant.scss';
 
 const b = cn('tenant-page');
 
-export const TABLE_TYPE = 'Table';
-export const OLAP_TABLE_TYPE = 'ColumnTable';
-export const OLAP_STORE_TYPE = 'ColumnStore';
-
-export function calcEntityType(currentPathType?: string) {
-    return currentPathType && currentPathType.replace('EPathType', '');
-}
-
-export function isTableType(currentPathType?: string) {
-    const type = calcEntityType(currentPathType);
-
-    if (type === TABLE_TYPE || type === OLAP_TABLE_TYPE) {
-        return true;
-    }
-    return false;
-}
-
 const getInitialIsSummaryCollapsed = () => {
     return Boolean(localStorage.getItem(DEFAULT_IS_TENANT_SUMMARY_COLLAPSED));
 };
@@ -114,11 +98,7 @@ function Tenant(props: TenantProps) {
         };
     }, [tenantName, dispatch]);
 
-    const currentPathType = currentItem.PathDescription?.Self?.PathType;
-
-    const entityType = useMemo(() => {
-        return calcEntityType(currentPathType);
-    }, [currentPathType]);
+    const currentPathType = (currentItem as TEvDescribeSchemeResult).PathDescription?.Self?.PathType;
 
     const onCollapseSummaryHandler = () => {
         dispatchSummaryVisibilityAction(PaneVisibilityActionTypes.triggerCollapse);
@@ -142,14 +122,14 @@ function Tenant(props: TenantProps) {
                 onSplitStartDragAdditional={onSplitStartDragAdditional}
             >
                 <ObjectSummary
-                    type={entityType as string}
+                    type={currentPathType}
                     onCollapseSummary={onCollapseSummaryHandler}
                     onExpandSummary={onExpandSummaryHandler}
                     isCollapsed={summaryVisibilityState.collapsed}
                     additionalTenantInfo={props.additionalTenantInfo}
                 />
                 <ObjectGeneral
-                    type={entityType as string}
+                    type={currentPathType}
                     additionalTenantInfo={props.additionalTenantInfo}
                     additionalNodesInfo={props.additionalNodesInfo}
                 />

package/dist/containers/Tenant/utils/schema.ts

@@ -13,8 +13,16 @@ export const mapPathTypeToNavigationTreeType = (
             return 'table';
         case EPathType.EPathTypeDir:
         case EPathType.EPathTypeColumnStore:
+        case EPathType.EPathTypeTableIndex:
             return 'directory';
         default:
             return defaultType;
     }
 };
+
+export const isTableType = (type?: EPathType) =>
+    mapPathTypeToNavigationTreeType(type) === 'table';
+
+export const isColumnEntityType = (type?: EPathType) =>
+    type === EPathType.EPathTypeColumnStore ||
+    type === EPathType.EPathTypeColumnTable;

package/dist/services/api.js

@@ -83,7 +83,6 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
                 path,
                 enums: true,
                 backup: false,
-                private: false,
                 partition_config: false,
                 partition_stats: false,
                 partitioning_info: false,
@@ -111,7 +110,6 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             path,
             enums: true,
             backup: false,
-            private: false,
             children: false,
             partition_config: false,
             partition_stats: true,

package/dist/store/reducers/storage.js

@@ -125,7 +125,15 @@ export function setVisibleEntities(value) {
 }
 
 export const getStoragePools = (state) => state.storage.data?.StoragePools;
+export const getStoragePoolsGroupsCount = (state) => ({
+    total: state.storage.data?.TotalGroups || 0,
+    found: state.storage.data?.FoundGroups || 0,
+});
 export const getStorageNodes = (state) => state.storage.data?.Nodes;
+export const getStorageNodesCount = (state) => ({
+    total: state.storage.data?.TotalNodes || 0,
+    found: state.storage.data?.FoundNodes || 0,
+});
 export const getStorageFilter = (state) => state.storage.filter;
 export const getVisibleEntities = (state) => state.storage.visible;
 export const getStorageType = (state) => state.storage.type;

package/dist/types/api/schema.ts

@@ -88,6 +88,7 @@ export enum EPathType {
     EPathTypeSubDomain = 'EPathTypeSubDomain',
     EPathTypeColumnStore = 'EPathTypeColumnStore',
     EPathTypeColumnTable = 'EPathTypeColumnTable',
+    EPathTypeTableIndex = 'EPathTypeTableIndex', 
 }
 
 enum EPathSubType {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "1.6.4",
+  "version": "1.7.0",
   "files": [
     "dist"
   ],
@@ -40,7 +40,7 @@
     "reselect": "4.0.0",
     "sass": "1.32.8",
     "web-vitals": "1.1.2",
-    "ydb-ui-components": "2.0.2"
+    "ydb-ui-components": "2.1.0"
   },
   "scripts": {
     "start": "react-app-rewired start",