ydb-embedded-ui 8.22.0 → 8.23.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.
Files changed (74) hide show
  1. package/dist/components/TenantNameWrapper/TenantNameWrapper.js +1 -1
  2. package/dist/components/TenantNameWrapper/TenantNameWrapper.js.map +1 -1
  3. package/dist/containers/AsideNavigation/AsideNavigation.js +8 -32
  4. package/dist/containers/AsideNavigation/AsideNavigation.js.map +1 -1
  5. package/dist/containers/AsideNavigation/InformationPopup/InformationPopup.js +1 -1
  6. package/dist/containers/AsideNavigation/InformationPopup/InformationPopup.js.map +1 -1
  7. package/dist/containers/AsideNavigation/hooks/useHotkeysPanel.d.ts +33 -0
  8. package/dist/containers/AsideNavigation/hooks/useHotkeysPanel.js +73 -0
  9. package/dist/containers/AsideNavigation/hooks/useHotkeysPanel.js.map +1 -0
  10. package/dist/containers/AsideNavigation/i18n/en.json +9 -2
  11. package/dist/containers/AsideNavigation/i18n/index.d.ts +1 -1
  12. package/dist/containers/Cluster/utils.d.ts +2 -1
  13. package/dist/containers/Cluster/utils.js +2 -2
  14. package/dist/containers/Cluster/utils.js.map +1 -1
  15. package/dist/containers/Clusters/columns.js +2 -2
  16. package/dist/containers/Clusters/columns.js.map +1 -1
  17. package/dist/containers/PDiskPage/PDiskPage.js +2 -2
  18. package/dist/containers/PDiskPage/PDiskPage.js.map +1 -1
  19. package/dist/containers/Storage/TableGroup/TableGroup.scss +2 -1
  20. package/dist/containers/Tenant/Diagnostics/TopQueries/utils.js +1 -0
  21. package/dist/containers/Tenant/Diagnostics/TopQueries/utils.js.map +1 -1
  22. package/dist/containers/Tenant/TenantPages.d.ts +2 -1
  23. package/dist/containers/Tenant/TenantPages.js +2 -2
  24. package/dist/containers/Tenant/TenantPages.js.map +1 -1
  25. package/dist/containers/Tenants/Tenants.js +2 -1
  26. package/dist/containers/Tenants/Tenants.js.map +1 -1
  27. package/dist/routes.d.ts +4 -1
  28. package/dist/routes.js +10 -3
  29. package/dist/routes.js.map +1 -1
  30. package/dist/store/__test__/getUrlData.test.d.ts +1 -0
  31. package/dist/store/__test__/getUrlData.test.js +113 -0
  32. package/dist/store/__test__/getUrlData.test.js.map +1 -0
  33. package/dist/store/configureStore.js +0 -1
  34. package/dist/store/configureStore.js.map +1 -1
  35. package/dist/store/getUrlData.d.ts +1 -2
  36. package/dist/store/getUrlData.js +28 -12
  37. package/dist/store/getUrlData.js.map +1 -1
  38. package/dist/store/reducers/pdisk/pdisk.js +1 -1
  39. package/dist/store/reducers/pdisk/pdisk.js.map +1 -1
  40. package/dist/store/reducers/storage/prepareGroupsDisks.js +2 -1
  41. package/dist/store/reducers/storage/prepareGroupsDisks.js.map +1 -1
  42. package/dist/types/api/pdisk.d.ts +1 -0
  43. package/dist/types/api/pdisk.js +1 -0
  44. package/dist/types/api/pdisk.js.map +1 -1
  45. package/dist/utils/__test__/index.test.d.ts +1 -0
  46. package/dist/utils/__test__/index.test.js +38 -0
  47. package/dist/utils/__test__/index.test.js.map +1 -0
  48. package/dist/utils/disks/constants.d.ts +2 -1
  49. package/dist/utils/disks/constants.js +2 -1
  50. package/dist/utils/disks/constants.js.map +1 -1
  51. package/dist/utils/disks/helpers.d.ts +4 -1
  52. package/dist/utils/disks/helpers.js +1 -1
  53. package/dist/utils/disks/helpers.js.map +1 -1
  54. package/dist/utils/disks/prepareDisks.js +1 -1
  55. package/dist/utils/disks/prepareDisks.js.map +1 -1
  56. package/dist/utils/hooks/useAutoRefreshInterval.js +28 -8
  57. package/dist/utils/hooks/useAutoRefreshInterval.js.map +1 -1
  58. package/dist/utils/hooks/useChangedQuerySettings.d.ts +1 -2
  59. package/dist/utils/hooks/useChangedQuerySettings.js +5 -6
  60. package/dist/utils/hooks/useChangedQuerySettings.js.map +1 -1
  61. package/dist/utils/index.d.ts +1 -0
  62. package/dist/utils/index.js +5 -0
  63. package/dist/utils/index.js.map +1 -1
  64. package/dist/utils/parseBalancer.js +2 -3
  65. package/dist/utils/parseBalancer.js.map +1 -1
  66. package/dist/utils/versions/parseNodesToVersionsValues.js +1 -1
  67. package/dist/utils/versions/parseNodesToVersionsValues.js.map +1 -1
  68. package/package.json +2 -1
  69. package/dist/containers/AsideNavigation/constants.d.ts +0 -8
  70. package/dist/containers/AsideNavigation/constants.js +0 -34
  71. package/dist/containers/AsideNavigation/constants.js.map +0 -1
  72. package/dist/containers/AsideNavigation/utils.d.ts +0 -1
  73. package/dist/containers/AsideNavigation/utils.js +0 -2
  74. package/dist/containers/AsideNavigation/utils.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAC,MAAM,SAAS,CAAC;AACnE,OAAO,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;AACnC,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;AACjC,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;AAC/B,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC;AAC3B,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAC;AAC7B,MAAM,CAAC,MAAM,KAAK,GAAG,OAAO,CAAC;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAC5C,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;AAE/B,MAAM,MAAM,GAAG;IACX,QAAQ,EAAE,IAAI,QAAQ,EAAE;IACxB,OAAO,EAAE,IAAI,OAAO,cAAc;IAClC,MAAM,EAAE,IAAI,MAAM,EAAE;IACpB,IAAI,EAAE,IAAI,IAAI,kBAAkB;IAChC,KAAK,EAAE,IAAI,KAAK,EAAE;IAClB,KAAK,EAAE,IAAI,KAAK,EAAE;IAClB,YAAY,EAAE,IAAI,aAAa,EAAE;IACjC,MAAM,EAAE,IAAI,MAAM,MAAM;IACxB,IAAI,EAAE,OAAO;CACP,CAAC;AAEX,eAAe,MAAM,CAAC;AAEtB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAE,EAAE;IAC7C,OAAO,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;QAC7B,iBAAiB,EAAE,IAAI;KAC1B,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE;IACnC,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,MAAM,UAAU,GAAG,WAAW,CAAC;IAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE1C,+EAA+E;IAC/E,4DAA4D;IAC5D,+DAA+D;IAC/D,gDAAgD;IAChD,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,aAAa,CAAC;AACzB,CAAC,CAAC;AAQF,MAAM,UAAU,UAAU,CACtB,KAAa,EACb,MAAoD,EACpD,QAAe,EAAE,EACjB,UAA6B,EAAE;IAE/B,IAAI,aAAa,GAAG,KAAK,CAAC;IAE1B,MAAM,gBAAgB,GAAG,SAAS,IAAI,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,OAAO,IAAI,CAAC,gBAAgB,IAAI,UAAU,EAAE,CAAC;QAC7C,aAAa,GAAG,EAAC,GAAG,KAAK,EAAE,OAAO,EAAC,CAAC;IACxC,CAAC;IAED,MAAM,oBAAoB,GAAG,aAAa,IAAI,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAClF,IAAI,WAAW,IAAI,CAAC,oBAAoB,IAAI,UAAU,EAAE,CAAC;QACrD,aAAa,GAAG,EAAC,GAAG,aAAa,EAAE,WAAW,EAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;QACjC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,EAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAC,CAAC,EAAE,CAAC;IAEhF,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IAEnE,IAAI,OAAO,CAAC,YAAY,IAAI,QAAQ,EAAE,CAAC;QACnC,kDAAkD;QAClD,wDAAwD;QACxD,OAAO,oBAAoB,CAAC,GAAG,QAAQ,IAAI,aAAa,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,2FAA2F;AAC3F,4FAA4F;AAC5F,yCAAyC;AACzC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,EAAE,CAC/C,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAE3D,MAAM,UAAU,yBAAyB,CAAC,IAAY;IAClD,MAAM,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IACnE,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC;AACpC,CAAC;AASD,MAAM,UAAU,gBAAgB,CAC5B,OAAwB,EACxB,MAAuB,EACvB,QAAe,EAAE;IAEjB,OAAO,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAC,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,WAA4B,EAC5B,OAAwB,EACxB,MAAuB,EACvB,QAAe,EAAE;IAEjB,OAAO,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAC,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAC,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAwB,EAAE,QAAe,EAAE;IAC3E,OAAO,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,EAAE,EAAC,GAAG,KAAK,EAAE,OAAO,EAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,QAAQ,EAAE,WAAW;IACrB,WAAW,EAAE,WAAW;IACxB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,WAAW;CACjB,CAAC;AAIX,MAAM,UAAU,iBAAiB,CAAC,QAAyB,EAAE,QAAyB,EAAE;IACpF,OAAO,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,EAAE,EAAE,QAAQ,EAAC,EAAE,EAAC,GAAG,KAAK,EAAC,CAAC,CAAC;AACjE,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,113 @@
1
+ import { getUrlData } from '../getUrlData';
2
+ describe('getUrlData', () => {
3
+ const windowSpy = jest.spyOn(window, 'window', 'get');
4
+ afterEach(() => {
5
+ windowSpy.mockClear();
6
+ });
7
+ afterAll(() => {
8
+ windowSpy.mockRestore();
9
+ });
10
+ describe('multi-cluster version', () => {
11
+ test('should parse pathname with folder', () => {
12
+ windowSpy.mockImplementation(() => {
13
+ return {
14
+ location: {
15
+ href: 'http://ydb-ui/ui/cluster?clusterName=my_cluster&backend=http://my-node:8765',
16
+ pathname: '/ui/cluster?clusterName=my_cluster&backend=http://my-node:8765',
17
+ },
18
+ };
19
+ });
20
+ const result = getUrlData({ singleClusterMode: false, customBackend: undefined });
21
+ expect(result).toEqual({
22
+ basename: '/ui',
23
+ backend: 'http://my-node:8765',
24
+ clusterName: 'my_cluster',
25
+ });
26
+ });
27
+ test('should parse pathname with folder and some prefix', () => {
28
+ windowSpy.mockImplementation(() => {
29
+ return {
30
+ location: {
31
+ href: 'http://ydb-ui/monitoring/ui/cluster?clusterName=my_cluster&backend=http://my-node:8765',
32
+ pathname: '/monitoring/ui/cluster?clusterName=my_cluster&backend=http://my-node:8765',
33
+ },
34
+ };
35
+ });
36
+ const result = getUrlData({ singleClusterMode: false, customBackend: undefined });
37
+ expect(result).toEqual({
38
+ basename: '/monitoring/ui',
39
+ backend: 'http://my-node:8765',
40
+ clusterName: 'my_cluster',
41
+ });
42
+ });
43
+ test('should parse pathname with folder and some prefix', () => {
44
+ windowSpy.mockImplementation(() => {
45
+ return {
46
+ location: {
47
+ href: 'http://ydb-ui/cluster?clusterName=my_cluster&backend=http://my-node:8765',
48
+ pathname: '/cluster?clusterName=my_cluster&backend=http://my-node:8765',
49
+ },
50
+ };
51
+ });
52
+ const result = getUrlData({ singleClusterMode: false, customBackend: undefined });
53
+ expect(result).toEqual({
54
+ basename: '',
55
+ backend: 'http://my-node:8765',
56
+ clusterName: 'my_cluster',
57
+ });
58
+ });
59
+ });
60
+ describe('single-cluster version with custom backend', () => {
61
+ test('should parse correclty parse pathname', () => {
62
+ windowSpy.mockImplementation(() => {
63
+ return {
64
+ location: {
65
+ href: 'http://localhost:3000/cluster',
66
+ pathname: '/cluster',
67
+ },
68
+ };
69
+ });
70
+ const result = getUrlData({
71
+ singleClusterMode: true,
72
+ customBackend: 'http://my-node:8765',
73
+ });
74
+ expect(result).toEqual({
75
+ basename: '',
76
+ backend: 'http://my-node:8765',
77
+ });
78
+ });
79
+ });
80
+ describe('single-cluster embedded version', () => {
81
+ test('should parse pathname with folder', () => {
82
+ windowSpy.mockImplementation(() => {
83
+ return {
84
+ location: {
85
+ href: 'http://my-node:8765/monitoring/cluster',
86
+ pathname: '/monitoring/cluster',
87
+ },
88
+ };
89
+ });
90
+ const result = getUrlData({ singleClusterMode: true, customBackend: undefined });
91
+ expect(result).toEqual({
92
+ basename: '/monitoring',
93
+ backend: '',
94
+ });
95
+ });
96
+ test('should parse pathname with folder and some prefix', () => {
97
+ windowSpy.mockImplementation(() => {
98
+ return {
99
+ location: {
100
+ href: 'http://my-node:8765/node/12/monitoring/cluster',
101
+ pathname: '/node/12/monitoring/cluster',
102
+ },
103
+ };
104
+ });
105
+ const result = getUrlData({ singleClusterMode: true, customBackend: undefined });
106
+ expect(result).toEqual({
107
+ basename: '/node/12/monitoring',
108
+ backend: '/node/12',
109
+ });
110
+ });
111
+ });
112
+ });
113
+ //# sourceMappingURL=getUrlData.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getUrlData.test.js","sourceRoot":"","sources":["../../../src/store/__test__/getUrlData.test.ts"],"names":[],"mappings":"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"}
@@ -38,7 +38,6 @@ export const codeAssistBackend = window.code_assist_backend;
38
38
  const isSingleClusterMode = `${metaBackend}` === 'undefined';
39
39
  export function configureStore({ aRootReducer = rootReducer, singleClusterMode = isSingleClusterMode, api = new YdbEmbeddedAPI({ webVersion, withCredentials: !customBackend }), } = {}) {
40
40
  ({ backend, basename, clusterName } = getUrlData({
41
- href: window.location.href,
42
41
  singleClusterMode,
43
42
  customBackend,
44
43
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"configureStore.js","sourceRoot":"","sources":["../../src/store/configureStore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"configureStore.js","sourceRoot":"","sources":["../../src/store/configureStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,IAAI,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAGvE,OAAO,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAC,sBAAsB,EAAC,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,WAAW,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,GAAG,IAAI,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,qBAAqB,MAAM,qBAAqB,CAAC;AAExD,MAAM,CAAC,IAAI,OAA2B,EAAE,QAAgB,EAAE,WAA+B,CAAC;AAE1F,SAAS,eAAe,CAKtB,YAA8B,EAAE,OAAgB,EAAE,cAAiB,EAAE,UAAe;IAClF,MAAM,EAAC,kBAAkB,EAAE,oBAAoB,EAAC,GAAG,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAEhG,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAC9B,OAAO,EAAE,oBAAoB;QAC7B,cAAc;QACd,UAAU,EAAE,CAAC,oBAAoB,EAAE,EAAE,CACjC,oBAAoB,CAAC;YACjB,cAAc,EAAE,MAAM,CAAC,wBAAwB;gBAC3C,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC;oBACI,YAAY,EAAE,CAAC,2BAA2B,CAAC;iBAC9C;YACP,iBAAiB,EAAE,MAAM,CAAC,wBAAwB;gBAC9C,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC;oBACI,YAAY,EAAE,CAAC,2BAA2B,EAAE,KAAK,CAAC;oBAClD,cAAc,EAAE,CAAC,UAAU,EAAE,wBAAwB,CAAC;iBACzD;SACV,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,GAAG,UAAU,CAAC;KACnD,CAAC,CAAC;IAEH,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAE9B,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC;AAC7C,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC;AACnD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC;AAE5D,MAAM,mBAAmB,GAAG,GAAG,WAAW,EAAE,KAAK,WAAW,CAAC;AAE7D,MAAM,UAAU,cAAc,CAAC,EAC3B,YAAY,GAAG,WAAW,EAC1B,iBAAiB,GAAG,mBAAmB,EACvC,GAAG,GAAG,IAAI,cAAc,CAAC,EAAC,UAAU,EAAE,eAAe,EAAE,CAAC,aAAa,EAAC,CAAC,GAC1E,GAAG,EAAE;IACF,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAC,GAAG,UAAU,CAAC;QAC3C,iBAAiB;QACjB,aAAa;KAChB,CAAC,CAAC,CAAC;IACJ,MAAM,OAAO,GAAG,oBAAoB,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAG,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,EAAC,iBAAiB,EAAC,EAAE;QACtE,QAAQ,CAAC,UAAU;KACtB,CAAC,CAAC;IACH,sBAAsB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IAEjB,OAAO,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;AAC5B,CAAC"}
@@ -1,5 +1,4 @@
1
- export declare const getUrlData: ({ href, singleClusterMode, customBackend, }: {
2
- href: string;
1
+ export declare const getUrlData: ({ singleClusterMode, customBackend, }: {
3
2
  singleClusterMode: boolean;
4
3
  customBackend?: string;
5
4
  }) => {
@@ -1,27 +1,43 @@
1
- export const getUrlData = ({ href, singleClusterMode, customBackend, }) => {
2
- var _a, _b, _c;
1
+ import { normalizePathSlashes } from '../utils';
2
+ export const getUrlData = ({ singleClusterMode, customBackend, }) => {
3
+ var _a, _b;
4
+ // UI could be located in "monitoring" or "ui" folders
5
+ // my-host:8765/some/path/monitoring/react-router-path or my-host:8765/some/path/ui/react-router-path
6
+ const parsedPrefix = window.location.pathname.match(/.*(?=\/(monitoring|ui)\/)/) || [];
7
+ const basenamePrefix = parsedPrefix.length > 0 ? parsedPrefix[0] : '';
8
+ const folder = parsedPrefix.length > 1 ? parsedPrefix[1] : '';
9
+ let basename = '';
10
+ if (folder && !basenamePrefix) {
11
+ basename = normalizePathSlashes(`/${folder}`);
12
+ }
13
+ else if (folder && basenamePrefix) {
14
+ basename = normalizePathSlashes(`${basenamePrefix}/${folder}`);
15
+ }
16
+ const urlSearchParams = new URL(window.location.href).searchParams;
17
+ const backend = (_a = urlSearchParams.get('backend')) !== null && _a !== void 0 ? _a : undefined;
18
+ const clusterName = (_b = urlSearchParams.get('clusterName')) !== null && _b !== void 0 ? _b : undefined;
3
19
  if (!singleClusterMode) {
4
- const urlSearchParams = new URL(href).searchParams;
5
- const backend = (_a = urlSearchParams.get('backend')) !== null && _a !== void 0 ? _a : undefined;
6
- const clusterName = (_b = urlSearchParams.get('clusterName')) !== null && _b !== void 0 ? _b : undefined;
20
+ // Multi-cluster version
21
+ // Cluster and backend are determined by url params
7
22
  return {
8
- basename: '/',
23
+ basename,
9
24
  backend,
10
25
  clusterName,
11
26
  };
12
27
  }
13
28
  else if (customBackend) {
14
- const urlSearchParams = new URL(href).searchParams;
15
- const backend = (_c = urlSearchParams.get('backend')) !== null && _c !== void 0 ? _c : undefined;
29
+ // Single-cluster version
30
+ // UI and backend are on different hosts
31
+ // There is a backend url param for requests
16
32
  return {
17
- basename: '/',
33
+ basename,
18
34
  backend: backend ? backend : customBackend,
19
35
  };
20
36
  }
21
37
  else {
22
- const parsedPrefix = window.location.pathname.match(/.*(?=\/monitoring)/) || [];
23
- const basenamePrefix = parsedPrefix.length > 0 ? parsedPrefix[0] : '';
24
- const basename = [basenamePrefix, 'monitoring'].filter(Boolean).join('/');
38
+ // Single-cluster version
39
+ // UI and backend are located on the same host
40
+ // We use the the host for backend requests
25
41
  return {
26
42
  basename,
27
43
  backend: basenamePrefix || '',
@@ -1 +1 @@
1
- {"version":3,"file":"getUrlData.js","sourceRoot":"","sources":["../../src/store/getUrlData.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACvB,IAAI,EACJ,iBAAiB,EACjB,aAAa,GAKhB,EAAE,EAAE;;IACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;QACnD,MAAM,OAAO,GAAG,MAAA,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,mCAAI,SAAS,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAA,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,SAAS,CAAC;QACpE,OAAO;YACH,QAAQ,EAAE,GAAG;YACb,OAAO;YACP,WAAW;SACd,CAAC;IACN,CAAC;SAAM,IAAI,aAAa,EAAE,CAAC;QACvB,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;QACnD,MAAM,OAAO,GAAG,MAAA,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,mCAAI,SAAS,CAAC;QAC5D,OAAO;YACH,QAAQ,EAAE,GAAG;YACb,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa;SAC7C,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;QAChF,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,QAAQ,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1E,OAAO;YACH,QAAQ;YACR,OAAO,EAAE,cAAc,IAAI,EAAE;SAChC,CAAC;IACN,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"getUrlData.js","sourceRoot":"","sources":["../../src/store/getUrlData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,UAAU,CAAC;AAE9C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACvB,iBAAiB,EACjB,aAAa,GAIhB,EAAE,EAAE;;IACD,sDAAsD;IACtD,qGAAqG;IACrG,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC;IACvF,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,IAAI,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,QAAQ,GAAG,oBAAoB,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;SAAM,IAAI,MAAM,IAAI,cAAc,EAAE,CAAC;QAClC,QAAQ,GAAG,oBAAoB,CAAC,GAAG,cAAc,IAAI,MAAM,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;IACnE,MAAM,OAAO,GAAG,MAAA,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,mCAAI,SAAS,CAAC;IAC5D,MAAM,WAAW,GAAG,MAAA,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,SAAS,CAAC;IAEpE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACrB,wBAAwB;QACxB,mDAAmD;QACnD,OAAO;YACH,QAAQ;YACR,OAAO;YACP,WAAW;SACd,CAAC;IACN,CAAC;SAAM,IAAI,aAAa,EAAE,CAAC;QACvB,yBAAyB;QACzB,wCAAwC;QACxC,4CAA4C;QAC5C,OAAO;YACH,QAAQ;YACR,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa;SAC7C,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,yBAAyB;QACzB,8CAA8C;QAC9C,2CAA2C;QAC3C,OAAO;YACH,QAAQ;YACR,OAAO,EAAE,cAAc,IAAI,EAAE;SAChC,CAAC;IACN,CAAC;AACL,CAAC,CAAC"}
@@ -48,7 +48,7 @@ export const pDiskApi = api.injectEndpoints({
48
48
  'All',
49
49
  {
50
50
  type: 'PDiskData',
51
- id: getPDiskId(arg.nodeId, arg.pDiskId),
51
+ id: getPDiskId({ nodeId: arg.nodeId, pDiskId: arg.pDiskId }),
52
52
  },
53
53
  ],
54
54
  }),
@@ -1 +1 @@
1
- {"version":3,"file":"pdisk.js","sourceRoot":"","sources":["../../../../src/store/reducers/pdisk/pdisk.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAC,wBAAwB,EAAC,MAAM,SAAS,CAAC;AAOjD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,CAAC;IACxC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAC,EAAE,EAAE;gBAC5E,MAAM,uBAAuB,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,SAAS,EAAE;oBAC5E,QAAQ,EAAE,QAAoB;oBAC9B,QAAQ;iBACX,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,uBAAuB,GAAG,CAAC,CAAC;gBAEpD,IAAI,eAA4C,CAAC;gBACjD,IAAI,eAAe,EAAE,CAAC;oBAClB,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;gBACjF,CAAC;qBAAM,CAAC;oBACJ,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM;yBAC9B,0BAA0B,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC;yBACvD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;wBACb,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;4BACxB,OAAO;gCACH,UAAU,EAAE;oCACR,KAAK,EAAE;wCACH,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;wCAC3B,iBAAiB,EAAE,SAAS;qCAC/B;iCACJ;6BACJ,CAAC;wBACN,CAAC;wBACD,OAAO,EAAE,CAAC;oBACd,CAAC,CAAC,CAAC;gBACX,CAAC;gBAED,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBAC/B,eAAe;wBACf,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAC,MAAM,EAAC,CAAC;qBAClD,CAAC,CAAC;oBACH,MAAM,IAAI,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;oBAChD,OAAO,EAAC,IAAI,EAAC,CAAC;gBAClB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,EAAC,KAAK,EAAC,CAAC;gBACnB,CAAC;YACL,CAAC;YACD,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;gBACpC,KAAK;gBACL;oBACI,IAAI,EAAE,WAAW;oBACjB,EAAE,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC;iBAC1C;aACJ;SACJ,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,OAAO;CAC5B,CAAC,CAAC"}
1
+ {"version":3,"file":"pdisk.js","sourceRoot":"","sources":["../../../../src/store/reducers/pdisk/pdisk.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAC,wBAAwB,EAAC,MAAM,SAAS,CAAC;AAOjD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,CAAC;IACxC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAC,EAAE,EAAE;gBAC5E,MAAM,uBAAuB,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,SAAS,EAAE;oBAC5E,QAAQ,EAAE,QAAoB;oBAC9B,QAAQ;iBACX,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,uBAAuB,GAAG,CAAC,CAAC;gBAEpD,IAAI,eAA4C,CAAC;gBACjD,IAAI,eAAe,EAAE,CAAC;oBAClB,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;gBACjF,CAAC;qBAAM,CAAC;oBACJ,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM;yBAC9B,0BAA0B,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC;yBACvD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;wBACb,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;4BACxB,OAAO;gCACH,UAAU,EAAE;oCACR,KAAK,EAAE;wCACH,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;wCAC3B,iBAAiB,EAAE,SAAS;qCAC/B;iCACJ;6BACJ,CAAC;wBACN,CAAC;wBACD,OAAO,EAAE,CAAC;oBACd,CAAC,CAAC,CAAC;gBACX,CAAC;gBAED,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBAC/B,eAAe;wBACf,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAC,MAAM,EAAC,CAAC;qBAClD,CAAC,CAAC;oBACH,MAAM,IAAI,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;oBAChD,OAAO,EAAC,IAAI,EAAC,CAAC;gBAClB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,EAAC,KAAK,EAAC,CAAC;gBACnB,CAAC;YACL,CAAC;YACD,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;gBACpC,KAAK;gBACL;oBACI,IAAI,EAAE,WAAW;oBACjB,EAAE,EAAE,UAAU,CAAC,EAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAC,CAAC;iBAC7D;aACJ;SACJ,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,OAAO;CAC5B,CAAC,CAAC"}
@@ -44,7 +44,8 @@ export function prepareGroupsPDisk(data = {}) {
44
44
  ...bscPDisk,
45
45
  PDiskId: whiteboardPDisk === null || whiteboardPDisk === void 0 ? void 0 : whiteboardPDisk.PDiskId,
46
46
  };
47
- const StringifiedId = bscPDisk.PDiskId || getPDiskId(mergedPDiskData.NodeId, mergedPDiskData.PDiskId);
47
+ const StringifiedId = bscPDisk.PDiskId ||
48
+ getPDiskId({ nodeId: mergedPDiskData.NodeId, pDiskId: mergedPDiskData.PDiskId });
48
49
  const { AllocatedPercent, AllocatedSize, AvailableSize, TotalSize } = preparePDiskSizeFields({
49
50
  AvailableSize: mergedPDiskData.AvailableSize,
50
51
  TotalSize: mergedPDiskData.TotalSize,
@@ -1 +1 @@
1
- {"version":3,"file":"prepareGroupsDisks.js","sourceRoot":"","sources":["../../../../src/store/reducers/storage/prepareGroupsDisks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareGroupsDisks.js","sourceRoot":"","sources":["../../../../src/store/reducers/storage/prepareGroupsDisks.ts"],"names":[],"mappings":"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"}
@@ -62,6 +62,7 @@ export declare enum TPDiskState {
62
62
  OpenFileError = "OpenFileError",
63
63
  ChunkQuotaError = "ChunkQuotaError",
64
64
  DeviceIoError = "DeviceIoError",
65
+ Stopped = "Stopped",
65
66
  Missing = "Missing",
66
67
  Timeout = "Timeout",
67
68
  NodeDisconnected = "NodeDisconnected",
@@ -14,6 +14,7 @@ export var TPDiskState;
14
14
  TPDiskState["OpenFileError"] = "OpenFileError";
15
15
  TPDiskState["ChunkQuotaError"] = "ChunkQuotaError";
16
16
  TPDiskState["DeviceIoError"] = "DeviceIoError";
17
+ TPDiskState["Stopped"] = "Stopped";
17
18
  // these can't be sent to UI
18
19
  TPDiskState["Missing"] = "Missing";
19
20
  TPDiskState["Timeout"] = "Timeout";
@@ -1 +1 @@
1
- {"version":3,"file":"pdisk.js","sourceRoot":"","sources":["../../../src/types/api/pdisk.ts"],"names":[],"mappings":"AAoDA,MAAM,CAAN,IAAY,WAqBX;AArBD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,sDAAuC,CAAA;IACvC,gEAAiD,CAAA;IACjD,sDAAuC,CAAA;IACvC,gEAAiD,CAAA;IACjD,kEAAmD,CAAA;IACnD,4DAA6C,CAAA;IAC7C,sEAAuD,CAAA;IACvD,wEAAyD,CAAA;IACzD,8DAA+C,CAAA;IAC/C,gCAAiB,CAAA;IACjB,8CAA+B,CAAA;IAC/B,kDAAmC,CAAA;IACnC,8CAA+B,CAAA;IAE/B,4BAA4B;IAC5B,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,oDAAqC,CAAA;IACrC,kCAAmB,CAAA;AACvB,CAAC,EArBW,WAAW,KAAX,WAAW,QAqBtB"}
1
+ {"version":3,"file":"pdisk.js","sourceRoot":"","sources":["../../../src/types/api/pdisk.ts"],"names":[],"mappings":"AAoDA,MAAM,CAAN,IAAY,WAsBX;AAtBD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,sDAAuC,CAAA;IACvC,gEAAiD,CAAA;IACjD,sDAAuC,CAAA;IACvC,gEAAiD,CAAA;IACjD,kEAAmD,CAAA;IACnD,4DAA6C,CAAA;IAC7C,sEAAuD,CAAA;IACvD,wEAAyD,CAAA;IACzD,8DAA+C,CAAA;IAC/C,gCAAiB,CAAA;IACjB,8CAA+B,CAAA;IAC/B,kDAAmC,CAAA;IACnC,8CAA+B,CAAA;IAC/B,kCAAmB,CAAA;IAEnB,4BAA4B;IAC5B,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,oDAAqC,CAAA;IACrC,kCAAmB,CAAA;AACvB,CAAC,EAtBW,WAAW,KAAX,WAAW,QAsBtB"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,38 @@
1
+ import { normalizePathSlashes } from '../';
2
+ describe('normalizePathSlashes', () => {
3
+ test('should handle empty strings', () => {
4
+ expect(normalizePathSlashes('')).toBe('');
5
+ });
6
+ test('should handle strings without slashes', () => {
7
+ expect(normalizePathSlashes('path')).toBe('path');
8
+ });
9
+ test('should handle paths with single slash', () => {
10
+ expect(normalizePathSlashes('/path')).toBe('/path');
11
+ });
12
+ test('should handle paths with trailing slash', () => {
13
+ expect(normalizePathSlashes('path/')).toBe('path/');
14
+ });
15
+ test('should handle paths with multiple trailing slashes', () => {
16
+ expect(normalizePathSlashes('path////')).toBe('path/');
17
+ });
18
+ test('should handle paths with multiple leading slashes', () => {
19
+ expect(normalizePathSlashes('////path')).toBe('/path');
20
+ });
21
+ test('should handle full paths with normal slashes', () => {
22
+ expect(normalizePathSlashes('http://example.com/path/to/resource')).toBe('http://example.com/path/to/resource');
23
+ });
24
+ test('should replace multiple slashes with a single slash', () => {
25
+ expect(normalizePathSlashes('http://example.com//path//to////resource')).toBe('http://example.com/path/to/resource');
26
+ });
27
+ test('should not replace double slashes near protocols (after a colon)', () => {
28
+ expect(normalizePathSlashes('http://host.ydb.com')).toBe('http://host.ydb.com');
29
+ expect(normalizePathSlashes('https://host.ydb.com')).toBe('https://host.ydb.com');
30
+ expect(normalizePathSlashes('grpc://host.ydb.com')).toBe('grpc://host.ydb.com');
31
+ });
32
+ test('should replace slashes more than two slashes after a colon', () => {
33
+ expect(normalizePathSlashes('http:////host.ydb.com')).toBe('http://host.ydb.com');
34
+ expect(normalizePathSlashes('https://///host.ydb.com')).toBe('https://host.ydb.com');
35
+ expect(normalizePathSlashes('grpc://///host.ydb.com')).toBe('grpc://host.ydb.com');
36
+ });
37
+ });
38
+ //# sourceMappingURL=index.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/utils/__test__/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,KAAK,CAAC;AAEzC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CAAC,oBAAoB,CAAC,qCAAqC,CAAC,CAAC,CAAC,IAAI,CACpE,qCAAqC,CACxC,CAAC;IACN,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,oBAAoB,CAAC,0CAA0C,CAAC,CAAC,CAAC,IAAI,CACzE,qCAAqC,CACxC,CAAC;IACN,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChF,MAAM,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClF,MAAM,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAClF,MAAM,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACrF,MAAM,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
@@ -7,8 +7,8 @@ export declare const NOT_AVAILABLE_SEVERITY: number;
7
7
  export declare const NOT_AVAILABLE_SEVERITY_COLOR: EFlag;
8
8
  export declare const VDISK_STATE_SEVERITY: Record<EVDiskState, number>;
9
9
  export declare const PDISK_STATE_SEVERITY: {
10
- Initial: number;
11
10
  Normal: number;
11
+ Initial: number;
12
12
  InitialFormatRead: number;
13
13
  InitialSysLogRead: number;
14
14
  InitialCommonLogRead: number;
@@ -21,5 +21,6 @@ export declare const PDISK_STATE_SEVERITY: {
21
21
  OpenFileError: number;
22
22
  ChunkQuotaError: number;
23
23
  DeviceIoError: number;
24
+ Stopped: number;
24
25
  };
25
26
  export {};
@@ -21,8 +21,8 @@ export const VDISK_STATE_SEVERITY = {
21
21
  [EVDiskState.PDiskError]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Red,
22
22
  };
23
23
  export const PDISK_STATE_SEVERITY = {
24
- [TPDiskState.Initial]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Grey,
25
24
  [TPDiskState.Normal]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Green,
25
+ [TPDiskState.Initial]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Yellow,
26
26
  [TPDiskState.InitialFormatRead]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Yellow,
27
27
  [TPDiskState.InitialSysLogRead]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Yellow,
28
28
  [TPDiskState.InitialCommonLogRead]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Yellow,
@@ -35,5 +35,6 @@ export const PDISK_STATE_SEVERITY = {
35
35
  [TPDiskState.OpenFileError]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Red,
36
36
  [TPDiskState.ChunkQuotaError]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Red,
37
37
  [TPDiskState.DeviceIoError]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Red,
38
+ [TPDiskState.Stopped]: DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Red,
38
39
  };
39
40
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/disks/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAElD,+CAA+C;AAC/C,MAAM,CAAC,MAAM,oCAAoC,GAA0B;IACvE,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,GAAG,EAAE,CAAC;CACA,CAAC;AAIX,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,OAAO,CAC9D,oCAAoC,CACvC,CAAC,MAAM,CAAkB,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAc,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,sBAAsB,GAAG,oCAAoC,CAAC,IAAI,CAAC;AAChF,MAAM,CAAC,MAAM,4BAA4B,GACrC,oCAAoC,CAAC,sBAAsB,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,oBAAoB,GAAgC;IAC7D,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,oCAAoC,CAAC,KAAK;IAE5D,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAClE,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAE3E,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC1E,CAAC,WAAW,CAAC,qBAAqB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC7E,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,oCAAoC,CAAC,GAAG;CACrE,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,oCAAoC,CAAC,IAAI;IAChE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,oCAAoC,CAAC,KAAK;IAEhE,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAC5E,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAC5E,CAAC,WAAW,CAAC,oBAAoB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAE/E,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC9E,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC9E,CAAC,WAAW,CAAC,uBAAuB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC/E,CAAC,WAAW,CAAC,yBAAyB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACjF,CAAC,WAAW,CAAC,0BAA0B,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAClF,CAAC,WAAW,CAAC,qBAAqB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC7E,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACrE,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACvE,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,oCAAoC,CAAC,GAAG;CACxE,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/disks/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAElD,+CAA+C;AAC/C,MAAM,CAAC,MAAM,oCAAoC,GAA0B;IACvE,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,GAAG,EAAE,CAAC;CACA,CAAC;AAIX,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,OAAO,CAC9D,oCAAoC,CACvC,CAAC,MAAM,CAAkB,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAc,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,sBAAsB,GAAG,oCAAoC,CAAC,IAAI,CAAC;AAChF,MAAM,CAAC,MAAM,4BAA4B,GACrC,oCAAoC,CAAC,sBAAsB,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,oBAAoB,GAAgC;IAC7D,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,oCAAoC,CAAC,KAAK;IAE5D,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAClE,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAE3E,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC1E,CAAC,WAAW,CAAC,qBAAqB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC7E,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,oCAAoC,CAAC,GAAG;CACrE,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAChC,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,oCAAoC,CAAC,KAAK;IAEhE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAClE,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAC5E,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAC5E,CAAC,WAAW,CAAC,oBAAoB,CAAC,EAAE,oCAAoC,CAAC,MAAM;IAE/E,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC9E,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC9E,CAAC,WAAW,CAAC,uBAAuB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC/E,CAAC,WAAW,CAAC,yBAAyB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACjF,CAAC,WAAW,CAAC,0BAA0B,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAClF,CAAC,WAAW,CAAC,qBAAqB,CAAC,EAAE,oCAAoC,CAAC,GAAG;IAC7E,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACrE,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACvE,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,oCAAoC,CAAC,GAAG;IACrE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,oCAAoC,CAAC,GAAG;CAClE,CAAC"}
@@ -5,5 +5,8 @@ export declare function isFullVDiskData(disk: PreparedVDisk | TVDiskStateInfo |
5
5
  export declare const getSpaceSeverity: (allocatedPercent?: number) => number;
6
6
  export declare function getSeverityColor(severity: number | undefined): EFlag;
7
7
  export declare function getColorSeverity(color?: EFlag): number;
8
- export declare function getPDiskId(nodeId?: string | number | null, pDiskId?: string | number | null): string | undefined;
8
+ export declare function getPDiskId({ nodeId, pDiskId, }: {
9
+ nodeId?: string | number | null;
10
+ pDiskId?: string | number | null;
11
+ }): string | undefined;
9
12
  export declare function getVDiskSlotBasedId(nodeId: string | number, pDiskId: string | number, vDiskSlotId: string | number): string;
@@ -18,7 +18,7 @@ export function getSeverityColor(severity) {
18
18
  export function getColorSeverity(color) {
19
19
  return color ? DISK_COLOR_STATE_TO_NUMERIC_SEVERITY[color] : 0;
20
20
  }
21
- export function getPDiskId(nodeId, pDiskId) {
21
+ export function getPDiskId({ nodeId, pDiskId, }) {
22
22
  if (valueIsDefined(nodeId) && valueIsDefined(pDiskId)) {
23
23
  return `${nodeId}-${pDiskId}`;
24
24
  }
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/disks/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,IAAI,CAAC;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EACH,oCAAoC,EACpC,oCAAoC,EACpC,4BAA4B,GAC/B,MAAM,aAAa,CAAC;AAGrB,MAAM,UAAU,eAAe,CAC3B,IAAgD;IAEhD,OAAO,SAAS,IAAI,IAAI,CAAC;AAC7B,CAAC;AAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,gBAAyB,EAAE,EAAE;IAC1D,OAAO,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,QAA4B;IACzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,4BAA4B,CAAC;IACxC,CAAC;IAED,OAAO,oCAAoC,CAAC,QAAQ,CAAC,IAAI,4BAA4B,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,oCAAoC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAA+B,EAAE,OAAgC;IACxF,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,OAAO,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;IAClC,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,MAAuB,EACvB,OAAwB,EACxB,WAA4B;IAE5B,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/disks/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,IAAI,CAAC;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EACH,oCAAoC,EACpC,oCAAoC,EACpC,4BAA4B,GAC/B,MAAM,aAAa,CAAC;AAGrB,MAAM,UAAU,eAAe,CAC3B,IAAgD;IAEhD,OAAO,SAAS,IAAI,IAAI,CAAC;AAC7B,CAAC;AAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,gBAAyB,EAAE,EAAE;IAC1D,OAAO,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,QAA4B;IACzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,4BAA4B,CAAC;IACxC,CAAC;IAED,OAAO,oCAAoC,CAAC,QAAQ,CAAC,IAAI,4BAA4B,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,oCAAoC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,EACvB,MAAM,EACN,OAAO,GAIV;IACG,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,OAAO,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;IAClC,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,MAAuB,EACvB,OAAwB,EACxB,WAA4B;IAE5B,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpD,CAAC"}
@@ -49,7 +49,7 @@ export function prepareWhiteboardVDiskData(vDiskState = {}) {
49
49
  }
50
50
  export function prepareWhiteboardPDiskData(pdiskState = {}) {
51
51
  const { AvailableSize, TotalSize, Category, State, PDiskId, NodeId, EnforcedDynamicSlotSize, ...restPDiskFields } = pdiskState;
52
- const StringifiedId = getPDiskId(PDiskId, NodeId);
52
+ const StringifiedId = getPDiskId({ nodeId: NodeId, pDiskId: PDiskId });
53
53
  const Type = getPDiskType(Category);
54
54
  const pdiskPreparedSizeFields = preparePDiskSizeFields({
55
55
  AvailableSize,
@@ -1 +1 @@
1
- {"version":3,"file":"prepareDisks.js","sourceRoot":"","sources":["../../../src/utils/disks/prepareDisks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,WAAW,CAAC;AAGtD,MAAM,UAAU,0BAA0B,CACtC,aAAyC,EAAE;;IAE3C,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,UAAU,CAAC;QAE9C,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACnC,MAAM;YACN,OAAO;YACP,OAAO;SACV,CAAC,CAAC;QAEH,OAAO;YACH,aAAa;YACb,MAAM;YACN,OAAO;YACP,oEAAoE;YACpE,WAAW,EAAE,OAAO;SACvB,CAAC;IACN,CAAC;IAED,MAAM,EACF,KAAK,EACL,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,aAAa,EACb,aAAa,EACb,GAAG,eAAe,EACrB,GAAG,UAAU,CAAC;IAEf,sCAAsC;IACtC,MAAM,aAAa,GAAG,KAAK;QACvB,CAAC,CAAC,0BAA0B,CAAC,EAAC,GAAG,KAAK,EAAE,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,MAAM,EAAC,CAAC;QACzE,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,aAAa,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC;IAExD,MAAM,eAAe,GAAG,sBAAsB,CAAC;QAC3C,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa;QACpD,aAAa,EAAE,aAAa;KAC/B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,OAAO,0BAA0B,CAAC,EAAC,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,GAAG,eAAe;QAClB,GAAG,eAAe;QAElB,OAAO;QACP,MAAM;QACN,OAAO,EAAE,aAAa;QACtB,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,cAAc;QAEtB,QAAQ;QACR,aAAa;KAChB,CAAC;AACN,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,aAA8B,EAAE;IACvE,MAAM,EACF,aAAa,EACb,SAAS,EACT,QAAQ,EACR,KAAK,EACL,OAAO,EACP,MAAM,EACN,uBAAuB,EACvB,GAAG,eAAe,EACrB,GAAG,UAAU,CAAC;IAEf,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEpC,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;QACnD,aAAa;QACb,SAAS;KACZ,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACpC,KAAK;QACL,gBAAgB,EAAE,uBAAuB,CAAC,gBAAgB;KAC7D,CAAC,CAAC;IAEH,OAAO;QACH,GAAG,eAAe;QAClB,GAAG,uBAAuB;QAC1B,OAAO;QACP,MAAM;QACN,aAAa;QACb,IAAI;QACJ,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,QAAQ,EAAE,uBAAuB;KACpC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACnC,aAAa,EACb,aAAa,GAIhB;IACG,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,SAAS,GAAG,SAAS,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAE/D,OAAO;QACH,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACnC,aAAa,EACb,SAAS,GAIZ;IACG,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAE/D,OAAO;QACH,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,SAAS;QACxB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"prepareDisks.js","sourceRoot":"","sources":["../../../src/utils/disks/prepareDisks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,WAAW,CAAC;AAGtD,MAAM,UAAU,0BAA0B,CACtC,aAAyC,EAAE;;IAE3C,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,UAAU,CAAC;QAE9C,MAAM,aAAa,GAAG,gBAAgB,CAAC;YACnC,MAAM;YACN,OAAO;YACP,OAAO;SACV,CAAC,CAAC;QAEH,OAAO;YACH,aAAa;YACb,MAAM;YACN,OAAO;YACP,oEAAoE;YACpE,WAAW,EAAE,OAAO;SACvB,CAAC;IACN,CAAC;IAED,MAAM,EACF,KAAK,EACL,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,aAAa,EACb,aAAa,EACb,GAAG,eAAe,EACrB,GAAG,UAAU,CAAC;IAEf,sCAAsC;IACtC,MAAM,aAAa,GAAG,KAAK;QACvB,CAAC,CAAC,0BAA0B,CAAC,EAAC,GAAG,KAAK,EAAE,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,MAAM,EAAC,CAAC;QACzE,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,aAAa,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC;IAExD,MAAM,eAAe,GAAG,sBAAsB,CAAC;QAC3C,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa;QACpD,aAAa,EAAE,aAAa;KAC/B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,OAAO,0BAA0B,CAAC,EAAC,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,GAAG,eAAe;QAClB,GAAG,eAAe;QAElB,OAAO;QACP,MAAM;QACN,OAAO,EAAE,aAAa;QACtB,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,cAAc;QAEtB,QAAQ;QACR,aAAa;KAChB,CAAC;AACN,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,aAA8B,EAAE;IACvE,MAAM,EACF,aAAa,EACb,SAAS,EACT,QAAQ,EACR,KAAK,EACL,OAAO,EACP,MAAM,EACN,uBAAuB,EACvB,GAAG,eAAe,EACrB,GAAG,UAAU,CAAC;IAEf,MAAM,aAAa,GAAG,UAAU,CAAC,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAC,CAAC,CAAC;IAErE,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEpC,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;QACnD,aAAa;QACb,SAAS;KACZ,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACpC,KAAK;QACL,gBAAgB,EAAE,uBAAuB,CAAC,gBAAgB;KAC7D,CAAC,CAAC;IAEH,OAAO;QACH,GAAG,eAAe;QAClB,GAAG,uBAAuB;QAC1B,OAAO;QACP,MAAM;QACN,aAAa;QACb,IAAI;QACJ,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,QAAQ,EAAE,uBAAuB;KACpC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACnC,aAAa,EACb,aAAa,GAIhB;IACG,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,SAAS,GAAG,SAAS,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAE/D,OAAO;QACH,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACnC,aAAa,EACb,SAAS,GAIZ;IACG,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAE/D,OAAO;QACH,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,SAAS;QACxB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC;AACN,CAAC"}
@@ -1,20 +1,40 @@
1
1
  import React from 'react';
2
2
  import { AUTO_REFRESH_INTERVAL } from '../constants';
3
3
  import { useSetting } from './useSetting';
4
+ const IMMEDIATE_UPDATE_INTERVAL = 1;
5
+ const DISABLED_INTERVAL = 0;
4
6
  export function useAutoRefreshInterval() {
5
- const [settingValue, setSettingValue] = useSetting(AUTO_REFRESH_INTERVAL, 0);
6
- const [effectiveInterval, setEffectiveInterval] = React.useState(document.visibilityState === 'visible' ? settingValue : 0);
7
+ const [settingValue, setSettingValue] = useSetting(AUTO_REFRESH_INTERVAL, DISABLED_INTERVAL);
8
+ const [effectiveInterval, setEffectiveInterval] = React.useState(document.visibilityState === 'visible' ? settingValue : DISABLED_INTERVAL);
9
+ const lastHiddenTimeRef = React.useRef(null);
7
10
  React.useEffect(() => {
8
- // Update the effective interval when the setting changes
9
11
  setEffectiveInterval(document.visibilityState === 'visible' ? settingValue : 0);
10
- // Handle visibility change events
11
12
  const handleVisibilityChange = () => {
12
- setEffectiveInterval(document.visibilityState === 'visible' ? settingValue : 0);
13
+ const isVisible = document.visibilityState === 'visible';
14
+ if (isVisible) {
15
+ // If more than settingValue milliseconds have passed since the page was hidden,
16
+ // trigger an immediate update
17
+ const shouldTriggerImmediate = lastHiddenTimeRef.current &&
18
+ settingValue !== DISABLED_INTERVAL &&
19
+ Date.now() - lastHiddenTimeRef.current >= settingValue;
20
+ if (shouldTriggerImmediate) {
21
+ setEffectiveInterval(IMMEDIATE_UPDATE_INTERVAL);
22
+ setTimeout(() => {
23
+ setEffectiveInterval(settingValue);
24
+ }, 0);
25
+ }
26
+ else {
27
+ setEffectiveInterval(settingValue);
28
+ }
29
+ lastHiddenTimeRef.current = null;
30
+ }
31
+ else {
32
+ lastHiddenTimeRef.current = Date.now();
33
+ setEffectiveInterval(DISABLED_INTERVAL);
34
+ }
13
35
  };
14
36
  document.addEventListener('visibilitychange', handleVisibilityChange);
15
- return () => {
16
- document.removeEventListener('visibilitychange', handleVisibilityChange);
17
- };
37
+ return () => document.removeEventListener('visibilitychange', handleVisibilityChange);
18
38
  }, [settingValue]);
19
39
  return [effectiveInterval, setSettingValue];
20
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useAutoRefreshInterval.js","sourceRoot":"","sources":["../../../src/utils/hooks/useAutoRefreshInterval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,qBAAqB,EAAC,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,UAAU,sBAAsB;IAClC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;IAC7E,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAC5D,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAC5D,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,yDAAyD;QACzD,oBAAoB,CAAC,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEhF,kCAAkC;QAClC,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAChC,oBAAoB,CAAC,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,CAAC,CAAC;QAEF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;QAEtE,OAAO,GAAG,EAAE;YACR,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;QAC7E,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;AAChD,CAAC"}
1
+ {"version":3,"file":"useAutoRefreshInterval.js","sourceRoot":"","sources":["../../../src/utils/hooks/useAutoRefreshInterval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,qBAAqB,EAAC,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AACpC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,UAAU,sBAAsB;IAClC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,UAAU,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;IAC7F,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAC5D,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAC5E,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAgB,IAAI,CAAC,CAAC;IAE5D,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,oBAAoB,CAAC,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEhF,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAChC,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAe,KAAK,SAAS,CAAC;YACzD,IAAI,SAAS,EAAE,CAAC;gBACZ,gFAAgF;gBAChF,8BAA8B;gBAC9B,MAAM,sBAAsB,GACxB,iBAAiB,CAAC,OAAO;oBACzB,YAAY,KAAK,iBAAiB;oBAClC,IAAI,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAC,OAAO,IAAI,YAAY,CAAC;gBAE3D,IAAI,sBAAsB,EAAE,CAAC;oBACzB,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;oBAEhD,UAAU,CAAC,GAAG,EAAE;wBACZ,oBAAoB,CAAC,YAAY,CAAC,CAAC;oBACvC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACV,CAAC;qBAAM,CAAC;oBACJ,oBAAoB,CAAC,YAAY,CAAC,CAAC;gBACvC,CAAC;gBAED,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACJ,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC,CAAC;QAEF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;QACtE,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;IAC1F,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;AAChD,CAAC"}
@@ -1,10 +1,9 @@
1
1
  export declare const useChangedQuerySettings: () => {
2
2
  isBannerShown: boolean;
3
- isIndicatorShown: boolean | 0 | undefined;
4
3
  closeBanner: () => void;
5
4
  resetBanner: () => void;
6
5
  changedCurrentSettings: (("queryMode" | "transactionMode" | "statisticsMode" | "tracingLevel") | ("timeout" | "limitRows"))[];
7
6
  changedCurrentSettingsDescriptions: Record<string, string>;
8
- changedLastExucutionSettings: (("queryMode" | "transactionMode" | "statisticsMode" | "tracingLevel") | ("timeout" | "limitRows"))[];
7
+ changedLastExecutionSettings: (("queryMode" | "transactionMode" | "statisticsMode" | "tracingLevel") | ("timeout" | "limitRows"))[];
9
8
  changedLastExecutionSettingsDescriptions: Record<string, string>;
10
9
  };
@@ -9,13 +9,14 @@ export const useChangedQuerySettings = () => {
9
9
  const [bannerLastClosedTimestamp, setBannerLastClosedTimestamp] = useSetting(QUERY_SETTINGS_BANNER_LAST_CLOSED_KEY);
10
10
  const [lastQuerySettings] = useLastQueryExecutionSettings();
11
11
  const [currentQuerySettings] = useQueryExecutionSettings();
12
- const changedLastExucutionSettings = lastQuerySettings
12
+ const changedLastExecutionSettings = lastQuerySettings
13
13
  ? getChangedQueryExecutionSettings(lastQuerySettings, DEFAULT_QUERY_SETTINGS)
14
14
  : [];
15
15
  const changedCurrentSettings = currentQuerySettings
16
16
  ? getChangedQueryExecutionSettings(currentQuerySettings, DEFAULT_QUERY_SETTINGS)
17
17
  : [];
18
- const hasChangedLastExucutionSettings = changedLastExucutionSettings.length > 0;
18
+ const hasChangedImportantSettings = changedLastExecutionSettings.includes('transactionMode') ||
19
+ changedLastExecutionSettings.includes('queryMode');
19
20
  const changedLastExecutionSettingsDescriptions = lastQuerySettings
20
21
  ? getChangedQueryExecutionSettingsDescription({
21
22
  currentSettings: lastQuerySettings,
@@ -30,18 +31,16 @@ export const useChangedQuerySettings = () => {
30
31
  : {};
31
32
  const isClosedRecently = bannerLastClosedTimestamp &&
32
33
  Date.now() - bannerLastClosedTimestamp < WEEK_IN_SECONDS * 1000;
33
- const isBannerShown = hasChangedLastExucutionSettings && !isClosedRecently;
34
- const isIndicatorShown = hasChangedLastExucutionSettings && isClosedRecently;
34
+ const isBannerShown = hasChangedImportantSettings && !isClosedRecently;
35
35
  const closeBanner = () => setBannerLastClosedTimestamp(Date.now());
36
36
  const resetBanner = () => setBannerLastClosedTimestamp(undefined);
37
37
  return {
38
38
  isBannerShown,
39
- isIndicatorShown,
40
39
  closeBanner,
41
40
  resetBanner,
42
41
  changedCurrentSettings,
43
42
  changedCurrentSettingsDescriptions,
44
- changedLastExucutionSettings,
43
+ changedLastExecutionSettings,
45
44
  changedLastExecutionSettingsDescriptions,
46
45
  };
47
46
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useChangedQuerySettings.js","sourceRoot":"","sources":["../../../src/utils/hooks/useChangedQuerySettings.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,MAAM,0FAA0F,CAAC;AACxI,OAAO,2CAA2C,MAAM,qGAAqG,CAAC;AAC9J,OAAO,EAAC,qCAAqC,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AACpF,OAAO,EAAC,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAC,6BAA6B,EAAC,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IACxC,MAAM,CAAC,yBAAyB,EAAE,4BAA4B,CAAC,GAAG,UAAU,CAE1E,qCAAqC,CAAC,CAAC;IACzC,MAAM,CAAC,iBAAiB,CAAC,GAAG,6BAA6B,EAAE,CAAC;IAC5D,MAAM,CAAC,oBAAoB,CAAC,GAAG,yBAAyB,EAAE,CAAC;IAE3D,MAAM,4BAA4B,GAAG,iBAAiB;QAClD,CAAC,CAAC,gCAAgC,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;QAC7E,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,sBAAsB,GAAG,oBAAoB;QAC/C,CAAC,CAAC,gCAAgC,CAAC,oBAAoB,EAAE,sBAAsB,CAAC;QAChF,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,+BAA+B,GAAG,4BAA4B,CAAC,MAAM,GAAG,CAAC,CAAC;IAEhF,MAAM,wCAAwC,GAAG,iBAAiB;QAC9D,CAAC,CAAC,2CAA2C,CAAC;YACxC,eAAe,EAAE,iBAAiB;YAClC,eAAe,EAAE,sBAAsB;SAC1C,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,kCAAkC,GAAG,oBAAoB;QAC3D,CAAC,CAAC,2CAA2C,CAAC;YACxC,eAAe,EAAE,oBAAoB;YACrC,eAAe,EAAE,sBAAsB;SAC1C,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,gBAAgB,GAClB,yBAAyB;QACzB,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,GAAG,eAAe,GAAG,IAAI,CAAC;IAEpE,MAAM,aAAa,GAAG,+BAA+B,IAAI,CAAC,gBAAgB,CAAC;IAC3E,MAAM,gBAAgB,GAAG,+BAA+B,IAAI,gBAAgB,CAAC;IAE7E,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEnE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;IAElE,OAAO;QACH,aAAa;QACb,gBAAgB;QAChB,WAAW;QACX,WAAW;QAEX,sBAAsB;QACtB,kCAAkC;QAElC,4BAA4B;QAC5B,wCAAwC;KAC3C,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"useChangedQuerySettings.js","sourceRoot":"","sources":["../../../src/utils/hooks/useChangedQuerySettings.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,MAAM,0FAA0F,CAAC;AACxI,OAAO,2CAA2C,MAAM,qGAAqG,CAAC;AAC9J,OAAO,EAAC,qCAAqC,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AACpF,OAAO,EAAC,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAC,6BAA6B,EAAC,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IACxC,MAAM,CAAC,yBAAyB,EAAE,4BAA4B,CAAC,GAAG,UAAU,CAE1E,qCAAqC,CAAC,CAAC;IACzC,MAAM,CAAC,iBAAiB,CAAC,GAAG,6BAA6B,EAAE,CAAC;IAC5D,MAAM,CAAC,oBAAoB,CAAC,GAAG,yBAAyB,EAAE,CAAC;IAE3D,MAAM,4BAA4B,GAAG,iBAAiB;QAClD,CAAC,CAAC,gCAAgC,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;QAC7E,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,sBAAsB,GAAG,oBAAoB;QAC/C,CAAC,CAAC,gCAAgC,CAAC,oBAAoB,EAAE,sBAAsB,CAAC;QAChF,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,2BAA2B,GAC7B,4BAA4B,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACxD,4BAA4B,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEvD,MAAM,wCAAwC,GAAG,iBAAiB;QAC9D,CAAC,CAAC,2CAA2C,CAAC;YACxC,eAAe,EAAE,iBAAiB;YAClC,eAAe,EAAE,sBAAsB;SAC1C,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,kCAAkC,GAAG,oBAAoB;QAC3D,CAAC,CAAC,2CAA2C,CAAC;YACxC,eAAe,EAAE,oBAAoB;YACrC,eAAe,EAAE,sBAAsB;SAC1C,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,gBAAgB,GAClB,yBAAyB;QACzB,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,GAAG,eAAe,GAAG,IAAI,CAAC;IAEpE,MAAM,aAAa,GAAG,2BAA2B,IAAI,CAAC,gBAAgB,CAAC;IAEvE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEnE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;IAElE,OAAO;QACH,aAAa;QACb,WAAW;QACX,WAAW;QAEX,sBAAsB;QACtB,kCAAkC;QAElC,4BAA4B;QAC5B,wCAAwC;KAC3C,CAAC;AACN,CAAC,CAAC"}
@@ -1,3 +1,4 @@
1
1
  export declare const getArray: (arrayLength: number) => number[];
2
2
  export declare function valueIsDefined<T>(value: T | null | undefined): value is T;
3
3
  export declare function wait<T = unknown>(time: number, value?: T): Promise<T | undefined>;
4
+ export declare function normalizePathSlashes(path: string): string;