ydb-embedded-ui 20.1.0 → 20.2.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 (104) hide show
  1. package/dist/components/DiskStateProgressBar/AllModeCapacityAlertIndicator.d.ts +6 -0
  2. package/dist/components/DiskStateProgressBar/AllModeCapacityAlertIndicator.js +14 -0
  3. package/dist/components/DiskStateProgressBar/AllModeCapacityAlertIndicator.js.map +1 -0
  4. package/dist/components/DiskStateProgressBar/AllModeIndicators.d.ts +6 -0
  5. package/dist/components/DiskStateProgressBar/AllModeIndicators.js +10 -0
  6. package/dist/components/DiskStateProgressBar/AllModeIndicators.js.map +1 -0
  7. package/dist/components/DiskStateProgressBar/DiskBarLabel.d.ts +7 -0
  8. package/dist/components/DiskStateProgressBar/DiskBarLabel.js +10 -0
  9. package/dist/components/DiskStateProgressBar/DiskBarLabel.js.map +1 -0
  10. package/dist/components/DiskStateProgressBar/DiskIndicator.d.ts +12 -0
  11. package/dist/components/DiskStateProgressBar/DiskIndicator.js +17 -0
  12. package/dist/components/DiskStateProgressBar/DiskIndicator.js.map +1 -0
  13. package/dist/components/DiskStateProgressBar/DiskStateProgressBar.d.ts +12 -18
  14. package/dist/components/DiskStateProgressBar/DiskStateProgressBar.js +19 -94
  15. package/dist/components/DiskStateProgressBar/DiskStateProgressBar.js.map +1 -1
  16. package/dist/components/DiskStateProgressBar/DiskStateProgressBar.scss +67 -1
  17. package/dist/components/DiskStateProgressBar/PDiskAllModeIndicators.d.ts +6 -0
  18. package/dist/components/DiskStateProgressBar/PDiskAllModeIndicators.js +10 -0
  19. package/dist/components/DiskStateProgressBar/PDiskAllModeIndicators.js.map +1 -0
  20. package/dist/components/Drawer/Drawer.js +3 -1
  21. package/dist/components/Drawer/Drawer.js.map +1 -1
  22. package/dist/components/Drawer/i18n/en.json +3 -0
  23. package/dist/components/Drawer/i18n/index.d.ts +2 -0
  24. package/dist/components/Drawer/i18n/index.js +5 -0
  25. package/dist/components/Drawer/i18n/index.js.map +1 -0
  26. package/dist/components/EnableFullscreenButton/EnableFullscreenButton.js +1 -1
  27. package/dist/components/EnableFullscreenButton/EnableFullscreenButton.js.map +1 -1
  28. package/dist/components/EntityStatus/EntityStatus.js +2 -2
  29. package/dist/components/EntityStatus/EntityStatus.js.map +1 -1
  30. package/dist/components/PDiskInfo/i18n/index.d.ts +1 -1
  31. package/dist/components/VDisk/VDisk.d.ts +2 -2
  32. package/dist/components/VDisk/VDisk.js +72 -24
  33. package/dist/components/VDisk/VDisk.js.map +1 -1
  34. package/dist/containers/PDiskPage/PDiskSpaceDistribution/PDiskSpaceDistribution.js +8 -4
  35. package/dist/containers/PDiskPage/PDiskSpaceDistribution/PDiskSpaceDistribution.js.map +1 -1
  36. package/dist/containers/Storage/Disks/Disks.js.map +1 -1
  37. package/dist/containers/Storage/Disks/Disks.scss +3 -0
  38. package/dist/containers/Storage/Disks/constants.d.ts +3 -0
  39. package/dist/containers/Storage/Disks/constants.js +5 -0
  40. package/dist/containers/Storage/Disks/constants.js.map +1 -1
  41. package/dist/containers/Storage/PDisk/PDisk.js +108 -4
  42. package/dist/containers/Storage/PDisk/PDisk.js.map +1 -1
  43. package/dist/containers/Storage/PDisk/i18n/en.json +6 -0
  44. package/dist/containers/Storage/PDisk/i18n/index.d.ts +1 -0
  45. package/dist/containers/Storage/PDisk/i18n/index.js +5 -0
  46. package/dist/containers/Storage/PDisk/i18n/index.js.map +1 -0
  47. package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/columns.js +7 -2
  48. package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/columns.js.map +1 -1
  49. package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/hooks.js +10 -3
  50. package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/hooks.js.map +1 -1
  51. package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/types.d.ts +1 -0
  52. package/dist/containers/Storage/StorageExpertModePanel/StorageExpertModePanel.js +2 -0
  53. package/dist/containers/Storage/StorageExpertModePanel/StorageExpertModePanel.js.map +1 -1
  54. package/dist/containers/Storage/StorageExpertModePanel/components/AllLegend.d.ts +3 -1
  55. package/dist/containers/Storage/StorageExpertModePanel/components/AllLegend.js +4 -4
  56. package/dist/containers/Storage/StorageExpertModePanel/components/AllLegend.js.map +1 -1
  57. package/dist/containers/Storage/useStoragePDiskDisplayStateGetter.js +174 -69
  58. package/dist/containers/Storage/useStoragePDiskDisplayStateGetter.js.map +1 -1
  59. package/dist/containers/Storage/useStorageVDiskDisplayStateGetter.d.ts +2 -2
  60. package/dist/containers/Storage/useStorageVDiskDisplayStateGetter.js +86 -49
  61. package/dist/containers/Storage/useStorageVDiskDisplayStateGetter.js.map +1 -1
  62. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/ManagePartitioningDialog.js +7 -3
  63. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/ManagePartitioningDialog.js.map +1 -1
  64. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/constants.js +1 -0
  65. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/constants.js.map +1 -1
  66. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/i18n/en.json +1 -0
  67. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/i18n/index.d.ts +1 -1
  68. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/types.d.ts +10 -2
  69. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.d.ts +10 -2
  70. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.js +31 -18
  71. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.js.map +1 -1
  72. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo/preparePartitionConfig.js +12 -7
  73. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo/preparePartitionConfig.js.map +1 -1
  74. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/utils.js +17 -3
  75. package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/utils.js.map +1 -1
  76. package/dist/containers/Tenant/Healthcheck/components/HealthcheckDrawer.js +1 -1
  77. package/dist/containers/Tenant/Healthcheck/components/HealthcheckDrawer.js.map +1 -1
  78. package/dist/containers/Tenant/Healthcheck/components/HealthcheckRefresh.js +1 -1
  79. package/dist/containers/Tenant/Healthcheck/components/HealthcheckRefresh.js.map +1 -1
  80. package/dist/containers/Versions/Versions.js +1 -1
  81. package/dist/containers/Versions/Versions.js.map +1 -1
  82. package/dist/containers/Versions/Versions.scss +4 -0
  83. package/dist/store/reducers/tablePartitioning/tablePartitioning.d.ts +1 -1
  84. package/dist/store/reducers/tablePartitioning/tablePartitioning.js +6 -3
  85. package/dist/store/reducers/tablePartitioning/tablePartitioning.js.map +1 -1
  86. package/dist/types/store/partitioning.d.ts +9 -2
  87. package/dist/utils/disks/displayState.d.ts +38 -10
  88. package/dist/utils/disks/displayState.js +12 -5
  89. package/dist/utils/disks/displayState.js.map +1 -1
  90. package/dist/utils/disks/getDiskBarTone.d.ts +10 -0
  91. package/dist/utils/disks/getDiskBarTone.js +21 -0
  92. package/dist/utils/disks/getDiskBarTone.js.map +1 -0
  93. package/dist/utils/disks/pdiskState.d.ts +6 -2
  94. package/dist/utils/disks/pdiskState.js.map +1 -1
  95. package/dist/utils/disks/types.d.ts +1 -0
  96. package/dist/utils/versions/clusterVersionColors.js +3 -4
  97. package/dist/utils/versions/clusterVersionColors.js.map +1 -1
  98. package/dist/utils/versions/getVersionsColors.d.ts +1 -0
  99. package/dist/utils/versions/getVersionsColors.js +68 -26
  100. package/dist/utils/versions/getVersionsColors.js.map +1 -1
  101. package/dist/utils/versions/parseVersion.d.ts +4 -0
  102. package/dist/utils/versions/parseVersion.js +17 -0
  103. package/dist/utils/versions/parseVersion.js.map +1 -1
  104. package/package.json +1 -1
@@ -1,11 +1,16 @@
1
- import { DATA_SEVERITY } from './constants';
2
- export function getDefaultDiskDisplayState(vDisk) {
1
+ import { DATA_SEVERITY, DISK_COLOR_STATE_TO_NUMERIC_SEVERITY } from './constants';
2
+ export function getDefaultDiskDisplayState(vDisk, isDonor) {
3
3
  var _a;
4
+ const severity = ((_a = vDisk.Severity) !== null && _a !== void 0 ? _a : DATA_SEVERITY.GREY);
4
5
  return {
5
- severity: ((_a = vDisk.Severity) !== null && _a !== void 0 ? _a : DATA_SEVERITY.GREY),
6
+ severity,
6
7
  icon: undefined,
7
- modeModifier: undefined,
8
+ mode: undefined,
8
9
  isLegendInactive: false,
10
+ allocatedPercent: vDisk.AllocatedPercent,
11
+ showAllocatedPercentLabel: true,
12
+ striped: severity === DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Blue || Boolean(isDonor),
13
+ iconPlacement: 'inline',
9
14
  };
10
15
  }
11
16
  export function getDefaultPDiskDisplayState(pDisk) {
@@ -13,10 +18,12 @@ export function getDefaultPDiskDisplayState(pDisk) {
13
18
  return {
14
19
  severity: ((_a = pDisk.Severity) !== null && _a !== void 0 ? _a : DATA_SEVERITY.GREY),
15
20
  icon: undefined,
16
- modeModifier: undefined,
21
+ mode: undefined,
17
22
  isLegendInactive: false,
18
23
  showNoDataPlaceholder: true,
19
24
  allocatedPercent: pDisk.AllocatedPercent,
25
+ showAllocatedPercentLabel: true,
26
+ iconPlacement: 'inline',
20
27
  };
21
28
  }
22
29
  //# sourceMappingURL=displayState.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"displayState.js","sourceRoot":"","sources":["../../../src/utils/disks/displayState.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAyB1C,MAAM,UAAU,0BAA0B,CAAC,KAAoB;;IAC3D,OAAO;QACH,QAAQ,EAAE,CAAC,MAAA,KAAK,CAAC,QAAQ,mCAAI,aAAa,CAAC,IAAI,CAAoB;QACnE,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,SAAS;QACvB,gBAAgB,EAAE,KAAK;KAC1B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,KAAoB;;IAC5D,OAAO;QACH,QAAQ,EAAE,CAAC,MAAA,KAAK,CAAC,QAAQ,mCAAI,aAAa,CAAC,IAAI,CAAoB;QACnE,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,SAAS;QACvB,gBAAgB,EAAE,KAAK;QACvB,qBAAqB,EAAE,IAAI;QAC3B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KAC3C,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"displayState.js","sourceRoot":"","sources":["../../../src/utils/disks/displayState.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAE,oCAAoC,EAAC,MAAM,aAAa,CAAC;AAwEhF,MAAM,UAAU,0BAA0B,CACtC,KAAoB,EACpB,OAAiB;;IAEjB,MAAM,QAAQ,GAAG,CAAC,MAAA,KAAK,CAAC,QAAQ,mCAAI,aAAa,CAAC,IAAI,CAAoB,CAAC;IAE3E,OAAO;QACH,QAAQ;QACR,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,gBAAgB,EAAE,KAAK;QACvB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,yBAAyB,EAAE,IAAI;QAC/B,OAAO,EAAE,QAAQ,KAAK,oCAAoC,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;QACnF,aAAa,EAAE,QAAQ;KAC1B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,KAAoB;;IAC5D,OAAO;QACH,QAAQ,EAAE,CAAC,MAAA,KAAK,CAAC,QAAQ,mCAAI,aAAa,CAAC,IAAI,CAAoB;QACnE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,gBAAgB,EAAE,KAAK;QACvB,qBAAqB,EAAE,IAAI;QAC3B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,yBAAyB,EAAE,IAAI;QAC/B,aAAa,EAAE,QAAQ;KAC1B,CAAC;AACN,CAAC"}
@@ -0,0 +1,10 @@
1
+ import type { DiskIndicatorValue } from './displayState';
2
+ import type { DiskBarTone } from './types';
3
+ interface GetDiskBarToneParams {
4
+ severity?: number;
5
+ isDonor?: boolean;
6
+ showIndicator?: boolean;
7
+ indicator?: DiskIndicatorValue;
8
+ }
9
+ export declare function getDiskBarTone({ severity, isDonor, showIndicator, indicator, }: GetDiskBarToneParams): DiskBarTone;
10
+ export {};
@@ -0,0 +1,21 @@
1
+ import { CircleQuestionFill } from '@gravity-ui/icons';
2
+ import { DONOR_COLOR, NOT_AVAILABLE_SEVERITY } from './constants';
3
+ import { getDisplaySeverityColor } from './helpers';
4
+ function hasMissingDataIndicator(indicator) {
5
+ if (Array.isArray(indicator)) {
6
+ return indicator.some(({ icon }) => icon === CircleQuestionFill);
7
+ }
8
+ return indicator === CircleQuestionFill;
9
+ }
10
+ export function getDiskBarTone({ severity, isDonor, showIndicator, indicator, }) {
11
+ if (isDonor) {
12
+ return DONOR_COLOR;
13
+ }
14
+ if (showIndicator &&
15
+ severity === NOT_AVAILABLE_SEVERITY &&
16
+ hasMissingDataIndicator(indicator)) {
17
+ return 'LightGrey';
18
+ }
19
+ return getDisplaySeverityColor(severity);
20
+ }
21
+ //# sourceMappingURL=getDiskBarTone.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getDiskBarTone.js","sourceRoot":"","sources":["../../../src/utils/disks/getDiskBarTone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAC,WAAW,EAAE,sBAAsB,EAAC,MAAM,aAAa,CAAC;AAEhE,OAAO,EAAC,uBAAuB,EAAC,MAAM,WAAW,CAAC;AAUlD,SAAS,uBAAuB,CAAC,SAAyC;IACtE,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,SAAS,KAAK,kBAAkB,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAC3B,QAAQ,EACR,OAAO,EACP,aAAa,EACb,SAAS,GACU;IACnB,IAAI,OAAO,EAAE,CAAC;QACV,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,IACI,aAAa;QACb,QAAQ,KAAK,sBAAsB;QACnC,uBAAuB,CAAC,SAAS,CAAC,EACpC,CAAC;QACC,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,OAAO,uBAAuB,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC"}
@@ -1,6 +1,10 @@
1
+ import type { IconData } from '@gravity-ui/uikit';
1
2
  import type { EDecommitStatus, EDriveStatus, EMaintenanceStatus, TPDiskState } from '../../types/api/pdisk';
2
- import type { DiskDisplayState } from './displayState';
3
- type PDiskStateDisplayState = Pick<DiskDisplayState, 'severity' | 'icon'>;
3
+ import type { BaseDiskDisplayState } from './displayState';
4
+ type PDiskStateDisplayState = {
5
+ severity: BaseDiskDisplayState['severity'];
6
+ icon: IconData | undefined;
7
+ };
4
8
  export declare function getPDiskStateDisplayState(state?: TPDiskState): PDiskStateDisplayState;
5
9
  export declare function getPDiskDriveDisplayState(status?: EDriveStatus): PDiskStateDisplayState;
6
10
  export declare function getPDiskDecommitDisplayState(status?: EDecommitStatus): PDiskStateDisplayState;
@@ -1 +1 @@
1
- {"version":3,"file":"pdiskState.js","sourceRoot":"","sources":["../../../src/utils/disks/pdiskState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pdiskState.js","sourceRoot":"","sources":["../../../src/utils/disks/pdiskState.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,GAAG,EACH,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,WAAW,EACX,eAAe,EACf,KAAK,EACL,SAAS,EACT,cAAc,EACd,QAAQ,EACR,MAAM,EACN,KAAK,GACR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EACH,oCAAoC,EACpC,sBAAsB,EACtB,kBAAkB,GACrB,MAAM,aAAa,CAAC;AAQrB,MAAM,2BAA2B,GAA2B;IACxD,QAAQ,EAAE,sBAAsB;IAChC,IAAI,EAAE,SAAS;CAClB,CAAC;AAEF,MAAM,yBAAyB,GAAgD;IAC3E,MAAM,EAAE;QACJ,QAAQ,EAAE,oCAAoC,CAAC,KAAK;QACpD,IAAI,EAAE,SAAS;KAClB;IACD,OAAO,EAAE;QACL,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,SAAS;KAClB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,SAAS;KAClB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,SAAS;KAClB;IACD,oBAAoB,EAAE;QAClB,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,SAAS;KAClB;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,qBAAqB;KAC9B;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,qBAAqB;KAC9B;IACD,OAAO,EAAE;QACL,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,cAAc;KACvB;IACD,sBAAsB,EAAE;QACpB,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,sBAAsB,EAAE;QACpB,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,uBAAuB,EAAE;QACrB,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,yBAAyB,EAAE;QACvB,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,0BAA0B,EAAE;QACxB,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,qBAAqB,EAAE;QACnB,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,eAAe,EAAE;QACb,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE,eAAe;KACxB;IACD,OAAO,EAAE,2BAA2B;IACpC,OAAO,EAAE,2BAA2B;IACpC,gBAAgB,EAAE,2BAA2B;IAC7C,OAAO,EAAE,2BAA2B;CACvC,CAAC;AAEF,MAAM,UAAU,yBAAyB,CAAC,KAAmB;IACzD,OAAO,wBAAwB,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,2BAA2B,CAAC;AACtC,CAAC;AAED,MAAM,yBAAyB,GAAiD;IAC5E,MAAM,EAAE;QACJ,QAAQ,EAAE,oCAAoC,CAAC,KAAK;QACpD,IAAI,EAAE,SAAS;KAClB;IACD,QAAQ,EAAE;QACN,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,KAAK;KACd;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,QAAQ;KACjB;IACD,MAAM,EAAE;QACJ,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,iBAAiB;KAC1B;IACD,MAAM,EAAE;QACJ,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,WAAW;KACpB;IACD,OAAO,EAAE;QACL,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,kBAAkB;KAC3B;CACJ,CAAC;AAEF,MAAM,UAAU,yBAAyB,CAAC,MAAqB;IAC3D,IAAI,MAAM,KAAK,SAAS,IAAI,yBAAyB,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;QAC1E,OAAO,2BAA2B,CAAC;IACvC,CAAC;IACD,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,4BAA4B,GAAoD;IAClF,cAAc,EAAE;QACZ,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,kBAAkB;KAC3B;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,oCAAoC,CAAC,KAAK;QACpD,IAAI,EAAE,SAAS;KAClB;IACD,gBAAgB,EAAE;QACd,QAAQ,EAAE,oCAAoC,CAAC,IAAI;QACnD,IAAI,EAAE,cAAc;KACvB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,eAAe;KACxB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,KAAK;KACd;CACJ,CAAC;AAEF,MAAM,UAAU,4BAA4B,CAAC,MAAwB;;IACjE,OAAO,MAAM,KAAK,SAAS;QACvB,CAAC,CAAC,2BAA2B;QAC7B,CAAC,CAAC,CAAC,MAAA,4BAA4B,CAAC,MAAM,CAAC,mCAAI,2BAA2B,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,+BAA+B,GAAuD;IACxF,OAAO,EAAE;QACL,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,kBAAkB;KAC3B;IACD,UAAU,EAAE;QACR,QAAQ,EAAE,oCAAoC,CAAC,KAAK;QACpD,IAAI,EAAE,SAAS;KAClB;IACD,6BAA6B,EAAE;QAC3B,QAAQ,EAAE,oCAAoC,CAAC,GAAG;QAClD,IAAI,EAAE,MAAM;KACf;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,oCAAoC,CAAC,MAAM;QACrD,IAAI,EAAE,GAAG;KACZ;CACJ,CAAC;AAEF,MAAM,UAAU,+BAA+B,CAC3C,MAA2B;;IAE3B,OAAO,MAAM,KAAK,SAAS;QACvB,CAAC,CAAC,2BAA2B;QAC7B,CAAC,CAAC,CAAC,MAAA,+BAA+B,CAAC,MAAM,CAAC,mCAAI,2BAA2B,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,wBAAwB,CAC7B,KAAmB;IAEnB,OAAO,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;AAClF,CAAC"}
@@ -14,6 +14,7 @@ export type ExtendedDiskColor = 'SolidRed' | 'SpaceCyan' | 'SpaceLightYellow' |
14
14
  * All EFlag values are valid DiskColor values.
15
15
  */
16
16
  export type DiskColor = EFlag | ExtendedDiskColor;
17
+ export type DiskBarTone = DiskColor | 'DarkGrey' | 'LightGrey';
17
18
  /**
18
19
  * Basic severity levels for data storage (0-5).
19
20
  * Used in PreparedVDisk.Severity and PreparedPDisk.Severity.
@@ -1,4 +1,4 @@
1
- import { COLORS, DEFAULT_COLOR, getMinorVersionColorVariant, hashCode } from './getVersionsColors';
1
+ import { COLORS, DEFAULT_COLOR, compareMinorVersions, getMinorVersionColorVariant, } from './getVersionsColors';
2
2
  import { getMinorVersion } from './parseVersion';
3
3
  import { sortVersions } from './sortVersions';
4
4
  const UNDEFINED_COLOR_INDEX = '__no_color__';
@@ -17,9 +17,8 @@ export const getVersionsData = (versionMap) => {
17
17
  const versionsDataMap = new Map();
18
18
  for (const [baseColorIndex, item] of versionMap) {
19
19
  Array.from(item)
20
- // descending by version name: newer versions come first,
21
- // so the newer version gets the brighter color
22
- .sort((a, b) => hashCode(b) - hashCode(a))
20
+ // Newer on-prem builds come first; other formats keep hash-based ordering
21
+ .sort(compareMinorVersions)
23
22
  .forEach((minor, minorIndex) => {
24
23
  if (baseColorIndex === UNDEFINED_COLOR_INDEX) {
25
24
  versionsDataMap.set(minor, {
@@ -1 +1 @@
1
- {"version":3,"file":"clusterVersionColors.js","sourceRoot":"","sources":["../../../src/utils/versions/clusterVersionColors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAE,2BAA2B,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAQ5C,MAAM,qBAAqB,GAAG,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,QAA8B,EAC9B,aAAsC,IAAI,GAAG,EAAE,EACjD,EAAE;IACA,QAAQ,CAAC,OAAO,CACZ,CAAC,EAAC,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,GAAG,qBAAqB,EAAC,EAAE,EAAE;;QACnF,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACzC,UAAU,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QACrD,CAAC;QACD,MAAA,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,0CAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7D,CAAC,CACJ,CAAC;IACF,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,UAAmC,EAAE,EAAE;IACnE,MAAM,eAAe,GAAoB,IAAI,GAAG,EAAE,CAAC;IAEnD,KAAK,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,UAAU,EAAE,CAAC;QAC9C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,yDAAyD;YACzD,+CAA+C;aAC9C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;aACzC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YAC3B,IAAI,cAAc,KAAK,qBAAqB,EAAE,CAAC;gBAC3C,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE;oBACvB,KAAK,EAAE,aAAa;iBACvB,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,8EAA8E;gBAC9E,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;gBACjE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;gBAEhC,MAAM,iBAAiB,GAAG,2BAA2B,CACjD,UAAU,EACV,aAAa,CAChB,CAAC;gBACF,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,iBAAiB,CAAC,CAAC;gBAEhE,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE;oBACvB,KAAK,EAAE,UAAU;oBACjB,UAAU,EAAE,iBAAiB;oBAC7B,UAAU;iBACb,CAAC,CAAC;YACP,CAAC;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IAED,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAClC,kBAAwC,EAAE,EAC1C,eAAgC,EACf,EAAE;IACnB,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAExE,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,kDAAkD;YAClD,kCAAkC;YAClC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;YAElC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,YAAY,GAAG,SAAS,CAAC;QAC1D,CAAC;aAAM,CAAC;YACJ,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAE/C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,YAAY;gBACZ,KAAK,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK;gBAClB,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;gBAC5B,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;gBAC5B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC;aACzB,CAAC;QACN,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC"}
1
+ {"version":3,"file":"clusterVersionColors.js","sourceRoot":"","sources":["../../../src/utils/versions/clusterVersionColors.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import type { VersionsDataMap, VersionsMap } from './types';
2
2
  export declare const hashCode: (s: string) => number;
3
+ export declare const compareMinorVersions: (versionA: string, versionB: string) => number;
3
4
  export declare const COLORS: string[][];
4
5
  export declare const DEFAULT_COLOR = "var(--versions-default-color)";
5
6
  /** Calculates sub color index */
@@ -1,10 +1,66 @@
1
- import { getMajorVersion, getMinorVersion } from './parseVersion';
1
+ import { getMajorVersion, getMinorVersion, getOnPremBuild } from './parseVersion';
2
2
  export const hashCode = (s) => {
3
3
  return s.split('').reduce((a, b) => {
4
4
  const num = (a << 5) - a + b.charCodeAt(0); // eslint-disable-line
5
5
  return num & num; // eslint-disable-line
6
6
  }, 0);
7
7
  };
8
+ const onPremSuffixCollator = new Intl.Collator('en', { numeric: true });
9
+ const getOnPremSuffixPriority = (suffix) => {
10
+ if (suffix.startsWith('-hotfix')) {
11
+ return 0;
12
+ }
13
+ return suffix ? 2 : 1;
14
+ };
15
+ export const compareMinorVersions = (versionA, versionB) => {
16
+ const buildA = getOnPremBuild(versionA);
17
+ const buildB = getOnPremBuild(versionB);
18
+ if (buildA && !buildB) {
19
+ return -1;
20
+ }
21
+ if (!buildA && buildB) {
22
+ return 1;
23
+ }
24
+ if (buildA && buildB) {
25
+ if (buildA.number !== buildB.number) {
26
+ return buildB.number - buildA.number;
27
+ }
28
+ const priorityDifference = getOnPremSuffixPriority(buildA.suffix) - getOnPremSuffixPriority(buildB.suffix);
29
+ if (priorityDifference !== 0) {
30
+ return priorityDifference;
31
+ }
32
+ const suffixDifference = onPremSuffixCollator.compare(buildB.suffix, buildA.suffix);
33
+ if (suffixDifference !== 0) {
34
+ return suffixDifference;
35
+ }
36
+ return onPremSuffixCollator.compare(versionB, versionA);
37
+ }
38
+ return hashCode(versionB) - hashCode(versionA);
39
+ };
40
+ const getOnPremReleaseParts = (version) => {
41
+ if (!/^\d+\.\d+\.\d+$/.test(version)) {
42
+ return undefined;
43
+ }
44
+ return version.split('.').map(Number);
45
+ };
46
+ const compareMajorVersions = (versionA, versionB) => {
47
+ const partsA = getOnPremReleaseParts(versionA);
48
+ const partsB = getOnPremReleaseParts(versionB);
49
+ if (partsA && !partsB) {
50
+ return -1;
51
+ }
52
+ if (!partsA && partsB) {
53
+ return 1;
54
+ }
55
+ if (partsA && partsB) {
56
+ for (let index = 0; index < partsA.length; index++) {
57
+ if (partsA[index] !== partsB[index]) {
58
+ return partsB[index] - partsA[index];
59
+ }
60
+ }
61
+ }
62
+ return hashCode(versionA) - hashCode(versionB);
63
+ };
8
64
  export const COLORS = [
9
65
  [
10
66
  'var(--versions-orange-1)',
@@ -114,46 +170,32 @@ export const getVersionsMap = (versions, initialMap = new Map()) => {
114
170
  return initialMap;
115
171
  };
116
172
  export const getVersionsDataMap = (versionsMap) => {
117
- const clustersVersions = Array.from(versionsMap.keys()).map((version) => {
118
- return {
119
- version,
120
- hash: hashCode(version),
121
- };
122
- });
173
+ const clustersVersions = Array.from(versionsMap.keys());
123
174
  const versionsDataMap = new Map();
124
175
  // not every version is colored, therefore iteration index can't be used consistently
125
176
  // init with the colors length to put increment right after condition for better readability
126
177
  let currentColorIndex = COLORS.length - 1;
127
178
  clustersVersions
128
- // ascending by version name, just for consistency
129
- // sorting only impacts color choose for a version
130
- .sort((a, b) => a.hash - b.hash)
131
- .forEach((item) => {
132
- if (/^(\w+-)?stable/.test(item.version)) {
179
+ // Newer on-prem release lines come first; other formats keep hash-based ordering
180
+ .sort(compareMajorVersions)
181
+ .forEach((version) => {
182
+ if (/^(\w+-)?stable/.test(version) || /^\d+\.\d+\.\d+$/.test(version)) {
133
183
  currentColorIndex = (currentColorIndex + 1) % COLORS.length;
134
- versionsDataMap.set(item.version, {
184
+ versionsDataMap.set(version, {
135
185
  // Use first color for major
136
186
  color: COLORS[currentColorIndex][0],
137
187
  majorIndex: currentColorIndex,
138
188
  minorIndex: 0,
139
189
  });
140
- const minors = Array.from(versionsMap.get(item.version) || [])
141
- .filter((v) => v !== item.version)
142
- .map((v) => {
143
- return {
144
- version: v,
145
- hash: hashCode(v),
146
- };
147
- });
190
+ const minors = Array.from(versionsMap.get(version) || []).filter((v) => v !== version);
148
191
  const minorQuantity = minors.length;
149
192
  minors
150
- // descending by version name: newer versions come first,
151
- // so the newer version gets the brighter color
152
- .sort((a, b) => b.hash - a.hash)
193
+ // Newer on-prem builds come first; other formats keep hash-based ordering
194
+ .sort(compareMinorVersions)
153
195
  .forEach((minor, minorIndex) => {
154
196
  const minorColorVariant = getMinorVersionColorVariant(minorIndex, minorQuantity);
155
197
  const minorColor = COLORS[currentColorIndex][minorColorVariant];
156
- versionsDataMap.set(minor.version, {
198
+ versionsDataMap.set(minor, {
157
199
  color: minorColor,
158
200
  majorIndex: currentColorIndex,
159
201
  minorIndex: minorIndex,
@@ -161,7 +203,7 @@ export const getVersionsDataMap = (versionsMap) => {
161
203
  });
162
204
  }
163
205
  else {
164
- versionsDataMap.set(item.version, {
206
+ versionsDataMap.set(version, {
165
207
  color: DEFAULT_COLOR,
166
208
  });
167
209
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getVersionsColors.js","sourceRoot":"","sources":["../../../src/utils/versions/getVersionsColors.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getVersionsColors.js","sourceRoot":"","sources":["../../../src/utils/versions/getVersionsColors.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,6 @@
1
+ export declare const getOnPremBuild: (version: string) => {
2
+ number: number;
3
+ suffix: string;
4
+ } | undefined;
1
5
  export declare const getMinorVersion: (version: string) => string;
2
6
  export declare const getMajorVersion: (version: string) => string;
@@ -1,4 +1,17 @@
1
+ const ON_PREM_BUILD_SUFFIX_PATTERN = String.raw `[0-9a-zA-Z]*(?:-[0-9a-zA-Z]+)*`;
2
+ const ON_PREM_BUILD_PATTERN = String.raw `\d+${ON_PREM_BUILD_SUFFIX_PATTERN}`;
3
+ const ON_PREM_RUNTIME_VERSION_REGEXP = new RegExp(String.raw `^(\d+\.\d+\.\d+(?:\.ent)?\.${ON_PREM_BUILD_PATTERN})\.[0-9a-zA-Z]+$`);
4
+ const ON_PREM_RELEASE_VERSION_REGEXP = new RegExp(String.raw `^(\d+\.\d+\.\d+)(?:\.ent)?\.${ON_PREM_BUILD_PATTERN}$`);
5
+ const ON_PREM_BUILD_REGEXP = new RegExp(String.raw `^\d+\.\d+\.\d+(?:\.ent)?\.(\d+)(${ON_PREM_BUILD_SUFFIX_PATTERN})$`);
6
+ export const getOnPremBuild = (version) => {
7
+ const match = version.match(ON_PREM_BUILD_REGEXP);
8
+ return match ? { number: Number(match[1]), suffix: match[2] } : undefined;
9
+ };
1
10
  export const getMinorVersion = (version) => {
11
+ const onPremRuntimeVersionMatch = version.match(ON_PREM_RUNTIME_VERSION_REGEXP);
12
+ if (onPremRuntimeVersionMatch) {
13
+ return onPremRuntimeVersionMatch[1];
14
+ }
2
15
  const regexp = /\d{1,}-\d{1,}(-\d){0,}(-hotfix-\d{1,}(-\d{1,})?)?\.[0-9a-zA-Z]+$/;
3
16
  let result = version;
4
17
  if (regexp.test(version)) {
@@ -8,6 +21,10 @@ export const getMinorVersion = (version) => {
8
21
  };
9
22
  export const getMajorVersion = (version) => {
10
23
  const minorVersion = getMinorVersion(version);
24
+ const onPremReleaseVersionMatch = minorVersion.match(ON_PREM_RELEASE_VERSION_REGEXP);
25
+ if (onPremReleaseVersionMatch) {
26
+ return onPremReleaseVersionMatch[1];
27
+ }
11
28
  const regexp = /\d{1,}-\d{1,}-\d{1,}/; // to check versions that have minor part
12
29
  return regexp.test(minorVersion) ? minorVersion.replace(/-\d{1,}$/, '') : minorVersion;
13
30
  };
@@ -1 +1 @@
1
- {"version":3,"file":"parseVersion.js","sourceRoot":"","sources":["../../../src/utils/versions/parseVersion.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE;IAC/C,MAAM,MAAM,GAAG,kEAAkE,CAAC;IAElF,IAAI,MAAM,GAAG,OAAO,CAAC;IAErB,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,4CAA4C,EAAE,EAAE,CAAC,CAAC,CAAC,2CAA2C;IAC1H,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,sBAAsB,CAAC,CAAC,yCAAyC;IAEhF,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC3F,CAAC,CAAC"}
1
+ {"version":3,"file":"parseVersion.js","sourceRoot":"","sources":["../../../src/utils/versions/parseVersion.ts"],"names":[],"mappings":"AAAA,MAAM,4BAA4B,GAAG,MAAM,CAAC,GAAG,CAAA,gCAAgC,CAAC;AAChF,MAAM,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAA,MAAM,4BAA4B,EAAE,CAAC;AAC7E,MAAM,8BAA8B,GAAG,IAAI,MAAM,CAC7C,MAAM,CAAC,GAAG,CAAA,8BAA8B,qBAAqB,kBAAkB,CAClF,CAAC;AACF,MAAM,8BAA8B,GAAG,IAAI,MAAM,CAC7C,MAAM,CAAC,GAAG,CAAA,+BAA+B,qBAAqB,GAAG,CACpE,CAAC;AACF,MAAM,oBAAoB,GAAG,IAAI,MAAM,CACnC,MAAM,CAAC,GAAG,CAAA,mCAAmC,4BAA4B,IAAI,CAChF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,EAAE;IAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAClD,OAAO,KAAK,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE;IAC/C,MAAM,yBAAyB,GAAG,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAChF,IAAI,yBAAyB,EAAE,CAAC;QAC5B,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,MAAM,GAAG,kEAAkE,CAAC;IAElF,IAAI,MAAM,GAAG,OAAO,CAAC;IAErB,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,4CAA4C,EAAE,EAAE,CAAC,CAAC,CAAC,2CAA2C;IAC1H,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE;IAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,yBAAyB,GAAG,YAAY,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACrF,IAAI,yBAAyB,EAAE,CAAC;QAC5B,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,CAAC,yCAAyC;IAEhF,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC3F,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ydb-embedded-ui",
3
- "version": "20.1.0",
3
+ "version": "20.2.0",
4
4
  "files": [
5
5
  "dist"
6
6
  ],