ydb-embedded-ui 20.0.0 → 20.2.0

package/dist/utils/hooks/useWhoami.js

@@ -1,4 +1,5 @@
 import { authenticationApi } from '../../store/reducers/authentication/authentication';
+import { getUserInfo } from '../user';
 import { useDatabaseFromQuery } from './useDatabaseFromQuery';
 import { useMetaAuth } from './useMetaAuth';
 /**
@@ -49,7 +50,7 @@ export function useIsViewerUser() {
 }
 export function useUser() {
     const { currentData } = useWhoami();
-    return (currentData === null || currentData === void 0 ? void 0 : currentData.AuthType) === 'Login' ? currentData.UserSID : undefined;
+    return getUserInfo(currentData);
 }
 export function useMetaUser() {
     const { currentData } = useWhoami();

package/dist/utils/hooks/useWhoami.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWhoami.js","sourceRoot":"","sources":["../../../src/utils/hooks/useWhoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,oDAAoD,CAAC;AAGrF,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAO1C;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,SAAS;IACrB,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;IACxC,2EAA2E;IAC3E,iEAAiE;IACjE,wEAAwE;IACxE,yEAAyE;IACzE,MAAM,OAAO,GAAG,WAAW,EAAE,IAAI,SAAS,CAAC;IAE3C,OAAO,iBAAiB,CAAC,cAAc,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,kBAAkB;IAC9B,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAC,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,EAAE,uBAAuB,EAAC,GACpF,WAAW,CAAC;IAEhB,OAAO;QACH,iBAAiB;QACjB,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KAC1B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,6BAA6B;IACzC,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,wCAAwC;IACxC,2DAA2D;IAC3D,mDAAmD;IACnD,8CAA8C;IAC9C,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,mBAAmB,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,eAAe;IAC3B,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,OAAO;IACnB,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,MAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"useWhoami.js","sourceRoot":"","sources":["../../../src/utils/hooks/useWhoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,oDAAoD,CAAC;AAErF,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAO1C;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,SAAS;IACrB,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;IACxC,2EAA2E;IAC3E,iEAAiE;IACjE,wEAAwE;IACxE,yEAAyE;IACzE,MAAM,OAAO,GAAG,WAAW,EAAE,IAAI,SAAS,CAAC;IAE3C,OAAO,iBAAiB,CAAC,cAAc,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,kBAAkB;IAC9B,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAC,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,EAAE,uBAAuB,EAAC,GACpF,WAAW,CAAC;IAEhB,OAAO;QACH,iBAAiB;QACjB,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KAC1B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,6BAA6B;IACzC,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,wCAAwC;IACxC,2DAA2D;IAC3D,mDAAmD;IACnD,8CAA8C;IAC9C,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,mBAAmB,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,eAAe;IAC3B,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,OAAO;IACnB,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,WAAW,CAAC,WAAW,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,MAAM,EAAC,WAAW,EAAC,GAAG,SAAS,EAAE,CAAC;IAElC,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAC;AAC/B,CAAC"}

package/dist/utils/user.d.ts

@@ -0,0 +1,6 @@
+import type { TUserToken } from '../types/api/whoami';
+export interface UserInfo {
+    login: string;
+    isSso: boolean;
+}
+export declare function getUserInfo(userToken?: TUserToken): UserInfo | undefined;

package/dist/utils/user.js

@@ -0,0 +1,24 @@
+const SSO_SUFFIX = '@sso';
+function removeExternalIdpSuffix(userSid) {
+    return userSid.endsWith(SSO_SUFFIX) ? userSid.slice(0, -SSO_SUFFIX.length) : userSid;
+}
+export function getUserInfo(userToken) {
+    if (!(userToken === null || userToken === void 0 ? void 0 : userToken.UserSID)) {
+        return undefined;
+    }
+    if (userToken.AuthType === 'Login') {
+        return {
+            login: userToken.UserSID,
+            isSso: false,
+        };
+    }
+    if (userToken.AuthType === 'ExternalIdp') {
+        const login = removeExternalIdpSuffix(userToken.UserSID);
+        return {
+            login,
+            isSso: true,
+        };
+    }
+    return undefined;
+}
+//# sourceMappingURL=user.js.map

package/dist/utils/user.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/utils/user.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,GAAG,MAAM,CAAC;AAE1B,SAAS,uBAAuB,CAAC,OAAe;IAC5C,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,SAAsB;IAC9C,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAA,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,SAAS,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO;YACH,KAAK,EAAE,SAAS,CAAC,OAAO;YACxB,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;IAED,IAAI,SAAS,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,uBAAuB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEzD,OAAO;YACH,KAAK;YACL,KAAK,EAAE,IAAI;SACd,CAAC;IACN,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}

package/dist/utils/versions/clusterVersionColors.js

@@ -1,4 +1,4 @@
-import { COLORS, DEFAULT_COLOR, getMinorVersionColorVariant, hashCode } from './getVersionsColors';
+import { COLORS, DEFAULT_COLOR, compareMinorVersions, getMinorVersionColorVariant, } from './getVersionsColors';
 import { getMinorVersion } from './parseVersion';
 import { sortVersions } from './sortVersions';
 const UNDEFINED_COLOR_INDEX = '__no_color__';
@@ -17,9 +17,8 @@ export const getVersionsData = (versionMap) => {
     const versionsDataMap = new Map();
     for (const [baseColorIndex, item] of versionMap) {
         Array.from(item)
-            // descending by version name: newer versions come first,
-            // so the newer version gets the brighter color
-            .sort((a, b) => hashCode(b) - hashCode(a))
+            // Newer on-prem builds come first; other formats keep hash-based ordering
+            .sort(compareMinorVersions)
             .forEach((minor, minorIndex) => {
             if (baseColorIndex === UNDEFINED_COLOR_INDEX) {
                 versionsDataMap.set(minor, {

package/dist/utils/versions/clusterVersionColors.js.map

@@ -1 +1 @@
-{"version":3,"file":"clusterVersionColors.js","sourceRoot":"","sources":["../../../src/utils/versions/clusterVersionColors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clusterVersionColors.js","sourceRoot":"","sources":["../../../src/utils/versions/clusterVersionColors.ts"],"names":[],"mappings":"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"}

package/dist/utils/versions/getVersionsColors.d.ts

@@ -1,5 +1,6 @@
 import type { VersionsDataMap, VersionsMap } from './types';
 export declare const hashCode: (s: string) => number;
+export declare const compareMinorVersions: (versionA: string, versionB: string) => number;
 export declare const COLORS: string[][];
 export declare const DEFAULT_COLOR = "var(--versions-default-color)";
 /** Calculates sub color index */

package/dist/utils/versions/getVersionsColors.js

@@ -1,10 +1,66 @@
-import { getMajorVersion, getMinorVersion } from './parseVersion';
+import { getMajorVersion, getMinorVersion, getOnPremBuild } from './parseVersion';
 export const hashCode = (s) => {
     return s.split('').reduce((a, b) => {
         const num = (a << 5) - a + b.charCodeAt(0); // eslint-disable-line
         return num & num; // eslint-disable-line
     }, 0);
 };
+const onPremSuffixCollator = new Intl.Collator('en', { numeric: true });
+const getOnPremSuffixPriority = (suffix) => {
+    if (suffix.startsWith('-hotfix')) {
+        return 0;
+    }
+    return suffix ? 2 : 1;
+};
+export const compareMinorVersions = (versionA, versionB) => {
+    const buildA = getOnPremBuild(versionA);
+    const buildB = getOnPremBuild(versionB);
+    if (buildA && !buildB) {
+        return -1;
+    }
+    if (!buildA && buildB) {
+        return 1;
+    }
+    if (buildA && buildB) {
+        if (buildA.number !== buildB.number) {
+            return buildB.number - buildA.number;
+        }
+        const priorityDifference = getOnPremSuffixPriority(buildA.suffix) - getOnPremSuffixPriority(buildB.suffix);
+        if (priorityDifference !== 0) {
+            return priorityDifference;
+        }
+        const suffixDifference = onPremSuffixCollator.compare(buildB.suffix, buildA.suffix);
+        if (suffixDifference !== 0) {
+            return suffixDifference;
+        }
+        return onPremSuffixCollator.compare(versionB, versionA);
+    }
+    return hashCode(versionB) - hashCode(versionA);
+};
+const getOnPremReleaseParts = (version) => {
+    if (!/^\d+\.\d+\.\d+$/.test(version)) {
+        return undefined;
+    }
+    return version.split('.').map(Number);
+};
+const compareMajorVersions = (versionA, versionB) => {
+    const partsA = getOnPremReleaseParts(versionA);
+    const partsB = getOnPremReleaseParts(versionB);
+    if (partsA && !partsB) {
+        return -1;
+    }
+    if (!partsA && partsB) {
+        return 1;
+    }
+    if (partsA && partsB) {
+        for (let index = 0; index < partsA.length; index++) {
+            if (partsA[index] !== partsB[index]) {
+                return partsB[index] - partsA[index];
+            }
+        }
+    }
+    return hashCode(versionA) - hashCode(versionB);
+};
 export const COLORS = [
     [
         'var(--versions-orange-1)',
@@ -114,46 +170,32 @@ export const getVersionsMap = (versions, initialMap = new Map()) => {
     return initialMap;
 };
 export const getVersionsDataMap = (versionsMap) => {
-    const clustersVersions = Array.from(versionsMap.keys()).map((version) => {
-        return {
-            version,
-            hash: hashCode(version),
-        };
-    });
+    const clustersVersions = Array.from(versionsMap.keys());
     const versionsDataMap = new Map();
     // not every version is colored, therefore iteration index can't be used consistently
     // init with the colors length to put increment right after condition for better readability
     let currentColorIndex = COLORS.length - 1;
     clustersVersions
-        // ascending by version name, just for consistency
-        // sorting only impacts color choose for a version
-        .sort((a, b) => a.hash - b.hash)
-        .forEach((item) => {
-        if (/^(\w+-)?stable/.test(item.version)) {
+        // Newer on-prem release lines come first; other formats keep hash-based ordering
+        .sort(compareMajorVersions)
+        .forEach((version) => {
+        if (/^(\w+-)?stable/.test(version) || /^\d+\.\d+\.\d+$/.test(version)) {
             currentColorIndex = (currentColorIndex + 1) % COLORS.length;
-            versionsDataMap.set(item.version, {
+            versionsDataMap.set(version, {
                 // Use first color for major
                 color: COLORS[currentColorIndex][0],
                 majorIndex: currentColorIndex,
                 minorIndex: 0,
             });
-            const minors = Array.from(versionsMap.get(item.version) || [])
-                .filter((v) => v !== item.version)
-                .map((v) => {
-                return {
-                    version: v,
-                    hash: hashCode(v),
-                };
-            });
+            const minors = Array.from(versionsMap.get(version) || []).filter((v) => v !== version);
             const minorQuantity = minors.length;
             minors
-                // descending by version name: newer versions come first,
-                // so the newer version gets the brighter color
-                .sort((a, b) => b.hash - a.hash)
+                // Newer on-prem builds come first; other formats keep hash-based ordering
+                .sort(compareMinorVersions)
                 .forEach((minor, minorIndex) => {
                 const minorColorVariant = getMinorVersionColorVariant(minorIndex, minorQuantity);
                 const minorColor = COLORS[currentColorIndex][minorColorVariant];
-                versionsDataMap.set(minor.version, {
+                versionsDataMap.set(minor, {
                     color: minorColor,
                     majorIndex: currentColorIndex,
                     minorIndex: minorIndex,
@@ -161,7 +203,7 @@ export const getVersionsDataMap = (versionsMap) => {
             });
         }
         else {
-            versionsDataMap.set(item.version, {
+            versionsDataMap.set(version, {
                 color: DEFAULT_COLOR,
             });
         }

package/dist/utils/versions/getVersionsColors.js.map

@@ -1 +1 @@
-{"version":3,"file":"getVersionsColors.js","sourceRoot":"","sources":["../../../src/utils/versions/getVersionsColors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAGhE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,EAAE;IAClC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAClE,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,sBAAsB;IAC5C,CAAC,EAAE,CAAC,CAAC,CAAC;AACV,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB;QACI,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;KAC7B;IACD;QACI,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;KAC7B;IACD;QACI,yBAAyB;QACzB,yBAAyB;QACzB,yBAAyB;QACzB,yBAAyB;KAC5B;IACD;QACI,6BAA6B;QAC7B,6BAA6B;QAC7B,6BAA6B;QAC7B,6BAA6B;KAChC;IACD;QACI,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;KAC3B;IACD;QACI,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;KAC7B;IACD;QACI,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;KAC3B;IACD;QACI,2BAA2B;QAC3B,2BAA2B;QAC3B,2BAA2B;QAC3B,2BAA2B;KAC9B;IACD;QACI,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;QACxB,wBAAwB;KAC3B;IACD;QACI,6BAA6B;QAC7B,6BAA6B;QAC7B,6BAA6B;QAC7B,6BAA6B;KAChC;IACD;QACI,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;QAC1B,0BAA0B;KAC7B;IACD;QACI,yBAAyB;QACzB,yBAAyB;QACzB,yBAAyB;QACzB,yBAAyB;KAC5B;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,+BAA+B,CAAC;AAE7D,iCAAiC;AACjC,MAAM,UAAU,2BAA2B,CAAC,UAAkB,EAAE,aAAqB;IACjF,sCAAsC;IACtC,2EAA2E;IAC3E,0DAA0D;IAC1D,wDAAwD;IAExD,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,CAAC;IACb,CAAC;IACD,oBAAoB;IACpB,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,aAAa,CAAC,CAAC;IACxD,CAAC;IACD,oBAAoB;IACpB,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,uCAAuC;IACvC,uDAAuD;IACvD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,aAAa,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAE,aAA0B,IAAI,GAAG,EAAE,EAAE,EAAE;IACtF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;QACzB,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,MAAA,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,0CAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAAwB,EAAE,EAAE;IAC3D,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACpE,OAAO;YACH,OAAO;YACP,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;SAC1B,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAoB,IAAI,GAAG,EAAE,CAAC;IACnD,qFAAqF;IACrF,4FAA4F;IAC5F,IAAI,iBAAiB,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAE1C,gBAAgB;QACZ,kDAAkD;QAClD,kDAAkD;SACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;SAC/B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,iBAAiB,GAAG,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YAE5D,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;gBAC9B,4BAA4B;gBAC5B,KAAK,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBACnC,UAAU,EAAE,iBAAiB;gBAC7B,UAAU,EAAE,CAAC;aAChB,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;iBACzD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC;iBACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACP,OAAO;oBACH,OAAO,EAAE,CAAC;oBACV,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACpB,CAAC;YACN,CAAC,CAAC,CAAC;YAEP,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;YAEpC,MAAM;gBACF,yDAAyD;gBACzD,+CAA+C;iBAC9C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;iBAC/B,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;gBAC3B,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,CAAC,OAAO,EAAE;oBAC/B,KAAK,EAAE,UAAU;oBACjB,UAAU,EAAE,iBAAiB;oBAC7B,UAAU,EAAE,UAAU;iBACzB,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACX,CAAC;aAAM,CAAC;YACJ,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;gBAC9B,KAAK,EAAE,aAAa;aACvB,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC,CAAC;IACP,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,WAAqB,EAAE,EAAE,EAAE;IACtE,OAAO,kBAAkB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,UAAU,wBAAwB,CACpC,OAAe,EACf,eAA4C;IAE5C,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAEvD,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"getVersionsColors.js","sourceRoot":"","sources":["../../../src/utils/versions/getVersionsColors.ts"],"names":[],"mappings":"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"}

package/dist/utils/versions/parseVersion.d.ts

@@ -1,2 +1,6 @@
+export declare const getOnPremBuild: (version: string) => {
+    number: number;
+    suffix: string;
+} | undefined;
 export declare const getMinorVersion: (version: string) => string;
 export declare const getMajorVersion: (version: string) => string;

package/dist/utils/versions/parseVersion.js

@@ -1,4 +1,17 @@
+const ON_PREM_BUILD_SUFFIX_PATTERN = String.raw `[0-9a-zA-Z]*(?:-[0-9a-zA-Z]+)*`;
+const ON_PREM_BUILD_PATTERN = String.raw `\d+${ON_PREM_BUILD_SUFFIX_PATTERN}`;
+const ON_PREM_RUNTIME_VERSION_REGEXP = new RegExp(String.raw `^(\d+\.\d+\.\d+(?:\.ent)?\.${ON_PREM_BUILD_PATTERN})\.[0-9a-zA-Z]+$`);
+const ON_PREM_RELEASE_VERSION_REGEXP = new RegExp(String.raw `^(\d+\.\d+\.\d+)(?:\.ent)?\.${ON_PREM_BUILD_PATTERN}$`);
+const ON_PREM_BUILD_REGEXP = new RegExp(String.raw `^\d+\.\d+\.\d+(?:\.ent)?\.(\d+)(${ON_PREM_BUILD_SUFFIX_PATTERN})$`);
+export const getOnPremBuild = (version) => {
+    const match = version.match(ON_PREM_BUILD_REGEXP);
+    return match ? { number: Number(match[1]), suffix: match[2] } : undefined;
+};
 export const getMinorVersion = (version) => {
+    const onPremRuntimeVersionMatch = version.match(ON_PREM_RUNTIME_VERSION_REGEXP);
+    if (onPremRuntimeVersionMatch) {
+        return onPremRuntimeVersionMatch[1];
+    }
     const regexp = /\d{1,}-\d{1,}(-\d){0,}(-hotfix-\d{1,}(-\d{1,})?)?\.[0-9a-zA-Z]+$/;
     let result = version;
     if (regexp.test(version)) {
@@ -8,6 +21,10 @@ export const getMinorVersion = (version) => {
 };
 export const getMajorVersion = (version) => {
     const minorVersion = getMinorVersion(version);
+    const onPremReleaseVersionMatch = minorVersion.match(ON_PREM_RELEASE_VERSION_REGEXP);
+    if (onPremReleaseVersionMatch) {
+        return onPremReleaseVersionMatch[1];
+    }
     const regexp = /\d{1,}-\d{1,}-\d{1,}/; // to check versions that have minor part
     return regexp.test(minorVersion) ? minorVersion.replace(/-\d{1,}$/, '') : minorVersion;
 };

package/dist/utils/versions/parseVersion.js.map

@@ -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"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "20.0.0",
+  "version": "20.2.0",
   "files": [
     "dist"
   ],