ydb-embedded-ui 2.6.0 → 3.0.1

package/dist/store/reducers/{shardsWorkload.js → shardsWorkload.ts}

@@ -1,10 +1,13 @@
+import type {Reducer} from 'redux';
+
 import '../../services/api';
+import type {IShardsWorkloadAction, IShardsWorkloadState} from '../../types/store/shardsWorkload';
 
 import {parseQueryAPIExecuteResponse} from '../../utils/query';
 
 import {createRequestActionTypes, createApiRequest} from '../utils';
 
-const SEND_SHARD_QUERY = createRequestActionTypes('query', 'SEND_SHARD_QUERY');
+export const SEND_SHARD_QUERY = createRequestActionTypes('query', 'SEND_SHARD_QUERY');
 const SET_SHARD_QUERY_OPTIONS = 'query/SET_SHARD_QUERY_OPTIONS';
 
 const initialState = {
@@ -12,18 +15,21 @@ const initialState = {
     wasLoaded: false,
 };
 
-function formatSortOrder({columnId, order}) {
+export interface SortOrder {
+    columnId: string;
+    order: string;
+}
+
+function formatSortOrder({columnId, order}: SortOrder) {
     return `${columnId} ${order}`;
 }
 
-function createShardQuery(path, sortOrder, tenantName) {
-    const orderBy = Array.isArray(sortOrder) ?
-        `ORDER BY ${sortOrder.map(formatSortOrder).join(', ')}` :
-        '';
+function createShardQuery(path: string, sortOrder?: SortOrder[], tenantName?: string) {
+    const orderBy = sortOrder ? `ORDER BY ${sortOrder.map(formatSortOrder).join(', ')}` : '';
 
-    const pathSelect = tenantName ?
-        `CAST(SUBSTRING(CAST(Path AS String), ${tenantName.length}) AS Utf8) AS Path` :
-        'Path';
+    const pathSelect = tenantName
+        ? `CAST(SUBSTRING(CAST(Path AS String), ${tenantName.length}) AS Utf8) AS Path`
+        : 'Path';
 
     return `SELECT
     ${pathSelect},
@@ -40,7 +46,10 @@ LIMIT 20`;
 
 const queryAction = 'execute-scan';
 
-const shardsWorkload = (state = initialState, action) => {
+const shardsWorkload: Reducer<IShardsWorkloadState, IShardsWorkloadAction> = (
+    state = initialState,
+    action,
+) => {
     switch (action.type) {
         case SEND_SHARD_QUERY.REQUEST: {
             return {
@@ -76,7 +85,13 @@ const shardsWorkload = (state = initialState, action) => {
     }
 };
 
-export const sendShardQuery = ({database, path = '', sortOrder}) => {
+interface SendShardQueryParams {
+    database?: string;
+    path?: string;
+    sortOrder?: SortOrder[];
+}
+
+export const sendShardQuery = ({database, path = '', sortOrder}: SendShardQueryParams) => {
     return createApiRequest({
         request: window.api.sendQuery({
             schema: 'modern',
@@ -91,11 +106,11 @@ export const sendShardQuery = ({database, path = '', sortOrder}) => {
     });
 };
 
-export function setShardQueryOptions(options) {
+export function setShardQueryOptions(options: Partial<IShardsWorkloadState>) {
     return {
         type: SET_SHARD_QUERY_OPTIONS,
         data: options,
-    };
+    } as const;
 }
 
 export default shardsWorkload;

package/dist/store/reducers/{tooltip.js → tooltip.ts}

@@ -1,8 +1,19 @@
-import {toolTipConstants} from '../../utils/actionsConstants';
+import isEqual from 'lodash/isEqual';
+import type {Reducer} from 'redux';
+
 import {tooltipTemplates} from '../../utils/tooltip';
-import _ from 'lodash';
 
-const initialState = {
+import {
+    ITooltipAction,
+    ITooltipPositions,
+    ITooltipState,
+    ITooltipTemplateType,
+} from '../../types/store/tooltip';
+
+const HIDE_TOOLTIP = 'tooltip/HIDE_TOOLTIP';
+const UPDATE_REF = 'tooltip/UPDATE_REF';
+
+const initialState: ITooltipState = {
     toolTipVisible: false,
     currentHoveredRef: undefined,
     data: undefined,
@@ -10,9 +21,9 @@ const initialState = {
     template: tooltipTemplates['pool'],
 };
 
-const tooltip = (state = initialState, action) => {
+const tooltip: Reducer<ITooltipState, ITooltipAction> = (state = initialState, action) => {
     switch (action.type) {
-        case toolTipConstants.HIDE_TOOLTIP: {
+        case HIDE_TOOLTIP: {
             return {
                 ...state,
                 currentHoveredRef: undefined,
@@ -20,8 +31,8 @@ const tooltip = (state = initialState, action) => {
             };
         }
 
-        case toolTipConstants.UPDATE_REF: {
-            if (action.templateType === 'cell' && _.isEqual(action.node, state.currentHoveredRef)) {
+        case UPDATE_REF: {
+            if (action.templateType === 'cell' && isEqual(action.node, state.currentHoveredRef)) {
                 return {
                     ...state,
                     currentHoveredRef: undefined,
@@ -36,7 +47,7 @@ const tooltip = (state = initialState, action) => {
                 positions: action.positions,
                 data: action.data,
                 additionalData: action.additionalData,
-                type: action.templateType,
+                templateType: action.templateType,
                 template: tooltipTemplates[action.templateType],
             };
         }
@@ -47,12 +58,18 @@ const tooltip = (state = initialState, action) => {
 };
 
 export const hideTooltip = () => {
-    return {type: toolTipConstants.HIDE_TOOLTIP};
+    return {type: HIDE_TOOLTIP} as const;
 };
 
-export const showTooltip = (node, data, templateType, additionalData, positions) => {
+export const showTooltip = (
+    node: EventTarget,
+    data: any,
+    templateType: ITooltipTemplateType,
+    additionalData?: any,
+    positions?: ITooltipPositions,
+) => {
     return {
-        type: toolTipConstants.UPDATE_REF,
+        type: UPDATE_REF,
         node,
         data,
         templateType,

package/dist/types/api/nodes.ts

@@ -12,14 +12,14 @@ export interface TNodesInfo {
     FoundNodes: string;
 }
 
-interface TNodeInfo {
+export interface TNodeInfo {
     NodeId: number;
     SystemState: TSystemStateInfo;
     PDisks?: TPDiskStateInfo[];
     Tablets?: TTabletStateInfo[];
 }
 
-interface TSystemStateInfo {
+export interface TSystemStateInfo {
     /** uint64 */
     StartTime?: string;
     /** uint64 */
@@ -57,7 +57,7 @@ interface TSystemStateInfo {
     Location?: TNodeLocation;
 }
 
-interface TPoolStats {
+export interface TPoolStats {
     Name?: string;
     /** double */
     Usage?: number;

package/dist/types/api/schema.ts

@@ -38,7 +38,7 @@ enum EStatus {
 }
 
 // incomplete interface, only currently used fields are covered
-interface TPathDescription {
+export interface TPathDescription {
     /** info about the path itself */
     Self?: TDirEntry;
     DomainDescription?: TDomainDescription;

package/dist/types/api/tenant.ts

@@ -0,0 +1,131 @@
+import {EFlag} from './enums';
+import {TPoolStats, TSystemStateInfo} from './nodes';
+import {TTabletStateInfo} from './tablet';
+
+export interface TTenants {
+    Tenants?: TTenant[];
+}
+
+export interface TTenantInfo {
+    TenantInfo?: TTenant[];
+    Errors?: string[];
+}
+
+export interface TTenant {
+    Name: string;
+    Id: string;
+    Type: ETenantType;
+    State: State;
+    StateStats?: THiveDomainStatsStateCount[];
+    Metrics: TMetrics;
+    NodeIds?: number[];
+    AliveNodes: number;
+    Resources: TTenantResources;
+    /** uint64 */
+    CreateTime: string;
+    Owner: string;
+    Users?: string[];
+    PoolStats?: TPoolStats[];
+    UserAttributes: Record<string, string>;
+    Overall: EFlag;
+    SystemTablets?: TTabletStateInfo[];
+    ResourceId: string;
+    Tablets?: TTabletStateInfo[];
+    /** uint64 */
+    StorageAllocatedSize: string;
+    /** uint64 */
+    StorageMinAvailableSize: string;
+    Nodes?: TSystemStateInfo[];
+    /** uint64 */
+    MemoryUsed: string;
+    /** uint64 */
+    MemoryLimit: string;
+    /** double */
+    CoresUsed: number;
+    /** uint64 */
+    StorageGroups: string;
+}
+
+interface THiveDomainStatsStateCount {
+    VolatileState?: ETabletVolatileState;
+    Count?: number;
+}
+
+interface TMetrics {
+    /** uint64 */
+    CPU?: string;
+    /** uint64 */
+    Memory?: string;
+    /** uint64 */
+    Network?: string;
+    /** uint64 */
+    Counter?: string;
+    /** uint64 */
+    Storage?: string;
+    /** uint64 */
+    ReadThroughput?: string;
+    /** uint64 */
+    WriteThroughput?: string;
+    /** uint64 */
+    ReadIops?: string;
+    /** uint64 */
+    WriteIops?: string;
+
+    GroupReadThroughput?: TThroughputRecord[];
+    GroupWriteThroughput?: TThroughputRecord[];
+
+    GroupReadIops?: TIopsRecord[];
+    GroupWriteIops?: TIopsRecord[];
+}
+
+interface TThroughputRecord {
+    GroupID?: number;
+    Channel?: number;
+    /** uint64 */
+    Throughput?: string;
+}
+
+interface TIopsRecord {
+    GroupID?: number;
+    Channel?: number;
+    /** uint64 */
+    Iops?: string;
+}
+
+interface TTenantResources {
+    Required?: TTenantResource[];
+    Allocated?: TTenantResource[];
+}
+
+interface TTenantResource {
+    Type: string;
+    Zone: string;
+    Kind: string;
+    Count: number;
+}
+
+export enum ETenantType {
+    'UnknownTenantType' = 'UnknownTenantType',
+    'Domain' = 'Domain',
+    'Dedicated' = 'Dedicated',
+    'Shared' = 'Shared',
+    'Serverless' = 'Serverless',
+}
+
+enum State {
+    'STATE_UNSPECIFIED' = 'STATE_UNSPECIFIED',
+    'CREATING' = 'CREATING',
+    'RUNNING' = 'RUNNING',
+    'REMOVING' = 'REMOVING',
+    'PENDING_RESOURCES' = 'PENDING_RESOURCES',
+    'CONFIGURING' = 'CONFIGURING',
+}
+
+enum ETabletVolatileState {
+    'TABLET_VOLATILE_STATE_UNKNOWN' = 'TABLET_VOLATILE_STATE_UNKNOWN',
+    'TABLET_VOLATILE_STATE_STOPPED' = 'TABLET_VOLATILE_STATE_STOPPED',
+    'TABLET_VOLATILE_STATE_BOOTING' = 'TABLET_VOLATILE_STATE_BOOTING',
+    'TABLET_VOLATILE_STATE_STARTING' = 'TABLET_VOLATILE_STATE_STARTING',
+    'TABLET_VOLATILE_STATE_RUNNING' = 'TABLET_VOLATILE_STATE_RUNNING',
+    '_TABLET_VOLATILE_STATE_BLOCKED' = '_TABLET_VOLATILE_STATE_BLOCKED',
+}

package/dist/types/store/nodes.ts

@@ -0,0 +1,32 @@
+import {NodesUptimeFilterValues} from '../../utils/nodes';
+import {
+    FETCH_NODES,
+    clearNodes,
+    setDataWasNotLoaded,
+    setNodesUptimeFilter,
+} from '../../store/reducers/nodes';
+import {ApiRequestAction} from '../../store/utils';
+import {IResponseError} from '../api/error';
+import {TNodesInfo} from '../api/nodes';
+
+export interface INodesState {
+    loading: boolean;
+    wasLoaded: boolean;
+    nodesUptimeFilter: NodesUptimeFilterValues;
+    data?: TNodesInfo;
+    error?: IResponseError;
+}
+
+type INodesApiRequestAction = ApiRequestAction<typeof FETCH_NODES, TNodesInfo, IResponseError>;
+
+export type INodesAction =
+    | INodesApiRequestAction
+    | (
+          | ReturnType<typeof clearNodes>
+          | ReturnType<typeof setDataWasNotLoaded>
+          | ReturnType<typeof setNodesUptimeFilter>
+      );
+
+export interface INodesRootStateSlice {
+    nodes: INodesState;
+}

package/dist/types/store/shardsWorkload.ts

@@ -0,0 +1,19 @@
+import {SEND_SHARD_QUERY, setShardQueryOptions} from '../../store/reducers/shardsWorkload';
+import type {ApiRequestAction} from '../../store/utils';
+import type {IResponseError} from '../api/error';
+import type {IQueryResult} from './query';
+
+export interface IShardsWorkloadState {
+    loading: boolean;
+    wasLoaded: boolean;
+    data?: IQueryResult;
+    error?: IResponseError;
+}
+
+export type IShardsWorkloadAction =
+    | ApiRequestAction<typeof SEND_SHARD_QUERY, IQueryResult, IResponseError>
+    | ReturnType<typeof setShardQueryOptions>;
+
+export interface IShardsWorkloadRootStateSlice {
+    shardsWorkload: IShardsWorkloadState;
+}

package/dist/types/store/tooltip.ts

@@ -0,0 +1,25 @@
+import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
+import {tooltipTemplates} from '../../utils/tooltip';
+
+export type ITooltipTemplateType = keyof typeof tooltipTemplates;
+
+export interface ITooltipPositions {
+    left: number;
+    top: number;
+}
+
+export interface ITooltipState {
+    toolTipVisible: boolean;
+    positions?: ITooltipPositions;
+    currentHoveredRef?: EventTarget;
+    template: (data: any) => JSX.Element;
+    templateType: ITooltipTemplateType;
+    data?: any;
+    additionalData?: any;
+}
+
+export type ITooltipAction = ReturnType<typeof hideTooltip> | ReturnType<typeof showTooltip>;
+
+export interface ITooltipRootStateSlice {
+    tooltip: ITooltipState;
+}

package/dist/utils/constants.ts

@@ -118,6 +118,8 @@ export const COLORS_PRIORITY = {
 export const ALL = 'All';
 export const PROBLEMS = 'With problems';
 
+export type IProblemFilterValues = typeof ALL | typeof PROBLEMS;
+
 export const THEME_KEY = 'theme';
 export const INVERTED_DISKS_KEY = 'invertedDisks';
 export const SAVED_QUERIES_KEY = 'saved_queries';

package/dist/utils/nodes.ts

@@ -1,7 +1,7 @@
-export const NodesUptimeFilterValues = {
-    All: 'All',
-    SmallUptime: 'SmallUptime',
-};
+export enum NodesUptimeFilterValues {
+    'All' = 'All',
+    'SmallUptime' = 'SmallUptime',
+}
 
 export const NodesUptimeFilterTitles = {
     [NodesUptimeFilterValues.All]: 'All',

package/dist/utils/tooltip.js

@@ -122,12 +122,14 @@ const NodeEndpointsTooltip = (props) => {
                                 <td className={nodeB('value')}>{data.Rack}</td>
                             </tr>
                         )}
-                        {data.Endpoints && data.Endpoints.length && data.Endpoints.map(({Name, Address}) => (
-                            <tr key={Name}>
-                                <td className={nodeB('label')}>{Name}</td>
-                                <td className={nodeB('value')}>{Address}</td>
-                            </tr>
-                        ))}
+                        {data.Endpoints &&
+                            data.Endpoints.length &&
+                            data.Endpoints.map(({Name, Address}) => (
+                                <tr key={Name}>
+                                    <td className={nodeB('label')}>{Name}</td>
+                                    <td className={nodeB('value')}>{Address}</td>
+                                </tr>
+                            ))}
                     </tbody>
                 </table>
             </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "2.6.0",
+  "version": "3.0.1",
   "files": [
     "dist"
   ],
@@ -9,6 +9,7 @@
     "url": "git@github.com:ydb-platform/ydb-embedded-ui.git"
   },
   "dependencies": {
+    "@gravity-ui/axios-wrapper": "^1.3.0",
     "@gravity-ui/i18n": "^1.0.0",
     "@yandex-cloud/paranoid": "^1.3.0",
     "@yandex-cloud/react-data-table": "0.2.1",
@@ -42,7 +43,8 @@
     "start": "react-app-rewired start",
     "dev": "DISABLE_ESLINT_PLUGIN=true TSC_COMPILE_ON_ERROR=true REACT_APP_BACKEND=http://localhost:8765 npm start",
     "build": "react-app-rewired build",
-    "build:embedded": "rm -rf build && REACT_APP_BACKEND=http://localhost:8765 npm run build && ./prepare-build.sh",
+    "//build:embedded": "echo 'PUBLIC_URL is a setting for create-react-app. Embedded version is built and hosted as is on ydb servers, with no way of knowing the final URL pattern. PUBLIC_URL=. keeps paths to all static relative, allowing servers to handle them as needed'",
+    "build:embedded": "rm -rf build && PUBLIC_URL=. REACT_APP_BACKEND=http://localhost:8765 npm run build",
     "lint:styles": "stylelint 'src/**/*.scss'",
     "package": "rm -rf dist && copyfiles -u 1 'src/**/*' dist",
     "test": "react-app-rewired test",
@@ -111,7 +113,6 @@
     "@types/react-router-dom": "^5.3.2",
     "@types/react-transition-group": "^4.4.4",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
-    "@yandex-cloud/axios-wrapper": "^1.0.2",
     "copyfiles": "^2.4.1",
     "eslint-config-prettier": "^8.3.0",
     "husky": "^7.0.4",

package/dist/components/ProblemFilter/ProblemFilter.js

@@ -1,24 +0,0 @@
-import PropTypes from 'prop-types';
-
-import {RadioButton} from '@gravity-ui/uikit';
-
-import {ALL, PROBLEMS} from '../../utils/constants';
-
-export default function ProblemFilter(props) {
-    const {value, onChange, className} = props;
-
-    return (
-        <RadioButton value={value} onUpdate={(value) => onChange(value)} className={className}>
-            <RadioButton.Option value={ALL}>{ALL}</RadioButton.Option>
-            <RadioButton.Option value={PROBLEMS}>{PROBLEMS}</RadioButton.Option>
-        </RadioButton>
-    );
-}
-
-export const problemFilterType = PropTypes.oneOf([ALL, PROBLEMS]);
-
-ProblemFilter.propTypes = {
-    value: problemFilterType,
-    onChange: PropTypes.func,
-    className: PropTypes.string,
-};

package/dist/utils/actionsConstants.js

@@ -1,4 +0,0 @@
-export const toolTipConstants = {
-    UPDATE_REF: 'UPDATE_REF',
-    HIDE_TOOLTIP: 'HIDE_TOOLTIP',
-};