@gravity-ui/dashkit 6.5.0 → 6.5.1-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,6 +18,9 @@ export default class GridLayout extends React.PureComponent<any, any, any> {
18
18
  adjustedWidgetLayout: any;
19
19
  }) => void;
20
20
  getItemsMeta: () => any;
21
+ getAutoupdateIntervalMs(): number;
22
+ getReloadIntervalRemains(): number;
23
+ startReloadItems(): any;
21
24
  reloadItems(): void;
22
25
  _onStart: () => void;
23
26
  _onStop: (newLayout: any) => void;
@@ -5,6 +5,7 @@ const react_1 = tslib_1.__importDefault(require("react"));
5
5
  const react_grid_layout_1 = tslib_1.__importStar(require("react-grid-layout"));
6
6
  const GridItem_1 = tslib_1.__importDefault(require("../GridItem/GridItem"));
7
7
  const DashKitContext_1 = require("../../context/DashKitContext");
8
+ const constants_1 = require("../../constants");
8
9
  const Layout = (0, react_grid_layout_1.WidthProvider)(react_grid_layout_1.default); // eslint-disable-line new-cap
9
10
  class GridLayout extends react_1.default.PureComponent {
10
11
  constructor(props, context) {
@@ -56,16 +57,37 @@ class GridLayout extends react_1.default.PureComponent {
56
57
  clearTimeout(this._timeout);
57
58
  document.removeEventListener('visibilitychange', this.onVisibilityChange);
58
59
  }
59
- reloadItems() {
60
- const { editMode, settings: { autoupdateInterval, silentLoading } = {}, reloadItems, } = this.context;
61
- const { isPageHidden } = this.state;
60
+ getAutoupdateIntervalMs() {
61
+ const { settings: { autoupdateInterval } = {} } = this.context;
62
62
  const autoupdateIntervalMs = Number(autoupdateInterval) * 1000;
63
+ return autoupdateIntervalMs;
64
+ }
65
+ getReloadIntervalRemains() {
66
+ const autoupdateIntervalMs = this.getAutoupdateIntervalMs();
67
+ const timeSinceLastReload = new Date().getTime() - (this._lastReloadAt || 0);
68
+ const reloadIntervalRemains = autoupdateIntervalMs - timeSinceLastReload;
69
+ return reloadIntervalRemains;
70
+ }
71
+ startReloadItems() {
72
+ const { editMode, settings: { silentLoading } = {}, reloadItems } = this.context;
73
+ const { isPageHidden } = this.state;
74
+ if (!isPageHidden && !editMode) {
75
+ this._lastReloadAt = new Date().getTime();
76
+ return reloadItems(this.pluginsRefs, { silentLoading, noVeil: true });
77
+ }
78
+ return Promise.resolve();
79
+ }
80
+ reloadItems() {
81
+ const { settings: { realtimeMode } = {} } = this.context;
82
+ if (realtimeMode) {
83
+ this.startReloadItems().then(() => this.reloadItems());
84
+ return;
85
+ }
86
+ const autoupdateIntervalMs = this.getAutoupdateIntervalMs();
87
+ const reloadIntervalRemains = this.getReloadIntervalRemains();
63
88
  if (autoupdateIntervalMs) {
64
- const timeSinceLastReload = new Date().getTime() - (this._lastReloadAt || 0);
65
- const reloadIntervalRemains = autoupdateIntervalMs - timeSinceLastReload;
66
- if (!isPageHidden && !editMode && reloadIntervalRemains <= 0) {
67
- this._lastReloadAt = new Date().getTime();
68
- reloadItems(this.pluginsRefs, { silentLoading, noVeil: true });
89
+ if (reloadIntervalRemains <= 0) {
90
+ this.startReloadItems();
69
91
  }
70
92
  this._timeout = setTimeout(() => this.reloadItems(), reloadIntervalRemains <= 0 ? autoupdateIntervalMs : reloadIntervalRemains);
71
93
  }
@@ -75,7 +97,7 @@ class GridLayout extends react_1.default.PureComponent {
75
97
  this.pluginsRefs.length = config.items.length;
76
98
  return (react_1.default.createElement(Layout, Object.assign({}, registerManager.gridLayout, { layout: layout, isDraggable: editMode, isResizable: editMode, onDragStart: this._onStart, onDragStop: this._onStop, onResizeStart: this._onStart, onResizeStop: this._onStop }, (draggableHandleClassName
77
99
  ? { draggableHandle: `.${draggableHandleClassName}` }
78
- : null)), config.items.map((item, i) => {
100
+ : null), { draggableCancel: `.${constants_1.OVERLAY_CONTROLS_CLASS_NAME}` }), config.items.map((item, i) => {
79
101
  return (react_1.default.createElement(GridItem_1.default, { forwardedPluginRef: (pluginRef) => {
80
102
  this.pluginsRefs[i] = pluginRef;
81
103
  }, key: item.id, id: item.id, item: item, layout: layout, adjustWidgetLayout: this.adjustWidgetLayout, isDragging: this.state.isDragging, noOverlay: noOverlay, withCustomHandle: Boolean(draggableHandleClassName), overlayControls: this.props.overlayControls }));
@@ -12,7 +12,7 @@ const DotsIcon_1 = require("../../icons/DotsIcon");
12
12
  const CogIcon_1 = require("../../icons/CogIcon");
13
13
  const CloseIcon_1 = require("../../icons/CloseIcon");
14
14
  const cn_1 = require("../../utils/cn");
15
- const b = (0, cn_1.cn)('dashkit-overlay-controls');
15
+ const b = (0, cn_1.cn)(constants_1.OVERLAY_CONTROLS_CLASS_NAME);
16
16
  var OverlayControlsPosition;
17
17
  (function (OverlayControlsPosition) {
18
18
  OverlayControlsPosition["TopRight"] = "top_right";
@@ -1,5 +1,6 @@
1
1
  export declare const COPIED_WIDGET_STORE_KEY = "dashCopiedItem";
2
2
  export declare const DEFAULT_NAMESPACE = "default";
3
+ export declare const OVERLAY_CONTROLS_CLASS_NAME = "dashkit-overlay-controls";
3
4
  export declare const MenuItems: {
4
5
  readonly Copy: "copy";
5
6
  readonly Delete: "delete";
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MenuItems = exports.DEFAULT_NAMESPACE = exports.COPIED_WIDGET_STORE_KEY = void 0;
3
+ exports.MenuItems = exports.OVERLAY_CONTROLS_CLASS_NAME = exports.DEFAULT_NAMESPACE = exports.COPIED_WIDGET_STORE_KEY = void 0;
4
4
  exports.COPIED_WIDGET_STORE_KEY = 'dashCopiedItem';
5
5
  exports.DEFAULT_NAMESPACE = 'default';
6
+ exports.OVERLAY_CONTROLS_CLASS_NAME = 'dashkit-overlay-controls';
6
7
  exports.MenuItems = {
7
8
  Copy: 'copy',
8
9
  Delete: 'delete',
@@ -121,7 +121,8 @@ function useMemoStateContext(props) {
121
121
  });
122
122
  }, [props.layout, layoutUpdateCounter]);
123
123
  const reloadItems = react_1.default.useCallback((pluginsRefs, data) => {
124
- pluginsRefs.forEach((ref) => ref && ref.reload && ref.reload(data));
124
+ const promises = pluginsRefs.map((ref) => ref && ref.reload && ref.reload(data));
125
+ return Promise.all(promises);
125
126
  }, []);
126
127
  return react_1.default.useMemo(() => ({
127
128
  layout: resultLayout,
@@ -11,6 +11,7 @@ export type MenuItem = (typeof MenuItems)[keyof typeof MenuItems] | OverlayCusto
11
11
  export interface SettingsProps {
12
12
  autoupdateInterval: number;
13
13
  silentLoading: boolean;
14
+ realtimeMode?: boolean;
14
15
  }
15
16
  export interface ContextProps {
16
17
  [key: string]: any;
@@ -18,6 +18,9 @@ export default class GridLayout extends React.PureComponent<any, any, any> {
18
18
  adjustedWidgetLayout: any;
19
19
  }) => void;
20
20
  getItemsMeta: () => any;
21
+ getAutoupdateIntervalMs(): number;
22
+ getReloadIntervalRemains(): number;
23
+ startReloadItems(): any;
21
24
  reloadItems(): void;
22
25
  _onStart: () => void;
23
26
  _onStop: (newLayout: any) => void;
@@ -2,6 +2,7 @@ import React from 'react';
2
2
  import ReactGridLayout, { WidthProvider } from 'react-grid-layout';
3
3
  import GridItem from '../GridItem/GridItem';
4
4
  import { DashKitContext } from '../../context/DashKitContext';
5
+ import { OVERLAY_CONTROLS_CLASS_NAME } from '../../constants';
5
6
  const Layout = WidthProvider(ReactGridLayout); // eslint-disable-line new-cap
6
7
  export default class GridLayout extends React.PureComponent {
7
8
  constructor(props, context) {
@@ -53,16 +54,37 @@ export default class GridLayout extends React.PureComponent {
53
54
  clearTimeout(this._timeout);
54
55
  document.removeEventListener('visibilitychange', this.onVisibilityChange);
55
56
  }
56
- reloadItems() {
57
- const { editMode, settings: { autoupdateInterval, silentLoading } = {}, reloadItems, } = this.context;
58
- const { isPageHidden } = this.state;
57
+ getAutoupdateIntervalMs() {
58
+ const { settings: { autoupdateInterval } = {} } = this.context;
59
59
  const autoupdateIntervalMs = Number(autoupdateInterval) * 1000;
60
+ return autoupdateIntervalMs;
61
+ }
62
+ getReloadIntervalRemains() {
63
+ const autoupdateIntervalMs = this.getAutoupdateIntervalMs();
64
+ const timeSinceLastReload = new Date().getTime() - (this._lastReloadAt || 0);
65
+ const reloadIntervalRemains = autoupdateIntervalMs - timeSinceLastReload;
66
+ return reloadIntervalRemains;
67
+ }
68
+ startReloadItems() {
69
+ const { editMode, settings: { silentLoading } = {}, reloadItems } = this.context;
70
+ const { isPageHidden } = this.state;
71
+ if (!isPageHidden && !editMode) {
72
+ this._lastReloadAt = new Date().getTime();
73
+ return reloadItems(this.pluginsRefs, { silentLoading, noVeil: true });
74
+ }
75
+ return Promise.resolve();
76
+ }
77
+ reloadItems() {
78
+ const { settings: { realtimeMode } = {} } = this.context;
79
+ if (realtimeMode) {
80
+ this.startReloadItems().then(() => this.reloadItems());
81
+ return;
82
+ }
83
+ const autoupdateIntervalMs = this.getAutoupdateIntervalMs();
84
+ const reloadIntervalRemains = this.getReloadIntervalRemains();
60
85
  if (autoupdateIntervalMs) {
61
- const timeSinceLastReload = new Date().getTime() - (this._lastReloadAt || 0);
62
- const reloadIntervalRemains = autoupdateIntervalMs - timeSinceLastReload;
63
- if (!isPageHidden && !editMode && reloadIntervalRemains <= 0) {
64
- this._lastReloadAt = new Date().getTime();
65
- reloadItems(this.pluginsRefs, { silentLoading, noVeil: true });
86
+ if (reloadIntervalRemains <= 0) {
87
+ this.startReloadItems();
66
88
  }
67
89
  this._timeout = setTimeout(() => this.reloadItems(), reloadIntervalRemains <= 0 ? autoupdateIntervalMs : reloadIntervalRemains);
68
90
  }
@@ -72,7 +94,7 @@ export default class GridLayout extends React.PureComponent {
72
94
  this.pluginsRefs.length = config.items.length;
73
95
  return (React.createElement(Layout, Object.assign({}, registerManager.gridLayout, { layout: layout, isDraggable: editMode, isResizable: editMode, onDragStart: this._onStart, onDragStop: this._onStop, onResizeStart: this._onStart, onResizeStop: this._onStop }, (draggableHandleClassName
74
96
  ? { draggableHandle: `.${draggableHandleClassName}` }
75
- : null)), config.items.map((item, i) => {
97
+ : null), { draggableCancel: `.${OVERLAY_CONTROLS_CLASS_NAME}` }), config.items.map((item, i) => {
76
98
  return (React.createElement(GridItem, { forwardedPluginRef: (pluginRef) => {
77
99
  this.pluginsRefs[i] = pluginRef;
78
100
  }, key: item.id, id: item.id, item: item, layout: layout, adjustWidgetLayout: this.adjustWidgetLayout, isDragging: this.state.isDragging, noOverlay: noOverlay, withCustomHandle: Boolean(draggableHandleClassName), overlayControls: this.props.overlayControls }));
@@ -3,13 +3,13 @@ import i18n from '../../i18n';
3
3
  import noop from 'lodash/noop';
4
4
  import { DashKitContext } from '../../context/DashKitContext';
5
5
  import { Icon, DropdownMenu, Button, } from '@gravity-ui/uikit';
6
- import { COPIED_WIDGET_STORE_KEY, MenuItems } from '../../constants';
6
+ import { COPIED_WIDGET_STORE_KEY, OVERLAY_CONTROLS_CLASS_NAME, MenuItems } from '../../constants';
7
7
  import { DotsIcon } from '../../icons/DotsIcon';
8
8
  import { CogIcon } from '../../icons/CogIcon';
9
9
  import { CloseIcon } from '../../icons/CloseIcon';
10
10
  import { cn } from '../../utils/cn';
11
11
  import './OverlayControls.css';
12
- const b = cn('dashkit-overlay-controls');
12
+ const b = cn(OVERLAY_CONTROLS_CLASS_NAME);
13
13
  export var OverlayControlsPosition;
14
14
  (function (OverlayControlsPosition) {
15
15
  OverlayControlsPosition["TopRight"] = "top_right";
@@ -1,5 +1,6 @@
1
1
  export declare const COPIED_WIDGET_STORE_KEY = "dashCopiedItem";
2
2
  export declare const DEFAULT_NAMESPACE = "default";
3
+ export declare const OVERLAY_CONTROLS_CLASS_NAME = "dashkit-overlay-controls";
3
4
  export declare const MenuItems: {
4
5
  readonly Copy: "copy";
5
6
  readonly Delete: "delete";
@@ -1,5 +1,6 @@
1
1
  export const COPIED_WIDGET_STORE_KEY = 'dashCopiedItem';
2
2
  export const DEFAULT_NAMESPACE = 'default';
3
+ export const OVERLAY_CONTROLS_CLASS_NAME = 'dashkit-overlay-controls';
3
4
  export const MenuItems = {
4
5
  Copy: 'copy',
5
6
  Delete: 'delete',
@@ -117,7 +117,8 @@ function useMemoStateContext(props) {
117
117
  });
118
118
  }, [props.layout, layoutUpdateCounter]);
119
119
  const reloadItems = React.useCallback((pluginsRefs, data) => {
120
- pluginsRefs.forEach((ref) => ref && ref.reload && ref.reload(data));
120
+ const promises = pluginsRefs.map((ref) => ref && ref.reload && ref.reload(data));
121
+ return Promise.all(promises);
121
122
  }, []);
122
123
  return React.useMemo(() => ({
123
124
  layout: resultLayout,
@@ -11,6 +11,7 @@ export type MenuItem = (typeof MenuItems)[keyof typeof MenuItems] | OverlayCusto
11
11
  export interface SettingsProps {
12
12
  autoupdateInterval: number;
13
13
  silentLoading: boolean;
14
+ realtimeMode?: boolean;
14
15
  }
15
16
  export interface ContextProps {
16
17
  [key: string]: any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/dashkit",
3
- "version": "6.5.0",
3
+ "version": "6.5.1-beta.0",
4
4
  "description": "Library for rendering dashboard grid layout",
5
5
  "license": "MIT",
6
6
  "repository": {