npm - @cloud-ru/uikit-product-calculator - Versions diffs - 1.14.5 → 1.15.0 - Mend

@cloud-ru/uikit-product-calculator 1.14.5 → 1.15.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 (5) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 1.15.0 (2026-09-18)
+### Features
+* **EVODBAAS-8814:** added vCPU RAM for ClickHouse ([f20b8b0](https://github.com/cloud-ru-tech/uikit-product/commit/f20b8b0e4b71f6302255f90bbc60a7d2f3b94152))
 ## 1.14.5 (2026-09-09)
 ### Only dependencies have been changed

package/dist/cjs/config/platforms/evolution/product-config/EvolutionManagedClickHouse.js CHANGED Viewed

@@ -6,21 +6,13 @@ const utils_1 = require("../../../utils");
 const valueSingleNode = 'Single-node';
 const valueSingleShard = 'Single-shard';
 const valueMultiShard = 'Multi-shard';
-const CPU = [4, 8];
-const RAM = [16, 32];
+const CPU = [2, 4, 8, 16];
+const RAM = [16, 32, 64, 128];
 const cpuToRamMap = {
-    '4': [16],
-    '8': [32],
-};
-const cpuConfigItems = {
-    [valueSingleNode]: (0, utils_1.generateCpuItems)(CPU),
-    [valueSingleShard]: (0, utils_1.generateCpuItems)(CPU),
-    [valueMultiShard]: (0, utils_1.generateCpuItems)([CPU[0]]),
-};
-const ramConfigItems = {
-    [valueSingleNode]: RAM,
-    [valueSingleShard]: RAM,
-    [valueMultiShard]: [RAM[0]],
+    '2': [16],
+    '4': [16, 32],
+    '8': [16, 32, 64],
+    '16': [32, 64, 128],
 };
 const instanceTypePartCards = [
     {
@@ -93,12 +85,6 @@ exports.EVOLUTION_MANAGED_CLICKHOUSE_CONFIG = {
             decoratorProps: {
                 label: 'Количество ядер vCPU',
             },
-            relateFn: ({ instanceType }) => {
-                const items = cpuConfigItems[instanceType];
-                if ((items === null || items === void 0 ? void 0 : items.length) > 0) {
-                    return { items };
-                }
-            },
         },
         ramAmount: {
             type: components_1.CONTROL.Segmented,
@@ -109,13 +95,11 @@ exports.EVOLUTION_MANAGED_CLICKHOUSE_CONFIG = {
             decoratorProps: {
                 label: 'Количество оперативной памяти (RAM)',
             },
-            relateFn: ({ instanceType, vCpuCoreCount }) => {
-                const itemsByInstanceType = ramConfigItems[instanceType];
-                const itemsByCpu = new Set(cpuToRamMap[vCpuCoreCount]);
-                if ((itemsByInstanceType === null || itemsByInstanceType === void 0 ? void 0 : itemsByInstanceType.length) > 0) {
-                    const resolvedItems = itemsByInstanceType.filter(item => itemsByCpu.has(item));
+            relateFn: ({ vCpuCoreCount }) => {
+                const itemsByCpu = cpuToRamMap[vCpuCoreCount];
+                if ((itemsByCpu === null || itemsByCpu === void 0 ? void 0 : itemsByCpu.length) > 0) {
                     return {
-                        items: (0, utils_1.generateRamItems)(resolvedItems),
+                        items: (0, utils_1.generateRamItems)(itemsByCpu),
                     };
                 }
             },

package/dist/esm/config/platforms/evolution/product-config/EvolutionManagedClickHouse.js CHANGED Viewed

@@ -3,21 +3,13 @@ import { generateCpuItems, generateRamItems, getDisk } from '../../../utils';
 const valueSingleNode = 'Single-node';
 const valueSingleShard = 'Single-shard';
 const valueMultiShard = 'Multi-shard';
-const CPU = [4, 8];
-const RAM = [16, 32];
+const CPU = [2, 4, 8, 16];
+const RAM = [16, 32, 64, 128];
 const cpuToRamMap = {
-    '4': [16],
-    '8': [32],
-};
-const cpuConfigItems = {
-    [valueSingleNode]: generateCpuItems(CPU),
-    [valueSingleShard]: generateCpuItems(CPU),
-    [valueMultiShard]: generateCpuItems([CPU[0]]),
-};
-const ramConfigItems = {
-    [valueSingleNode]: RAM,
-    [valueSingleShard]: RAM,
-    [valueMultiShard]: [RAM[0]],
+    '2': [16],
+    '4': [16, 32],
+    '8': [16, 32, 64],
+    '16': [32, 64, 128],
 };
 const instanceTypePartCards = [
     {
@@ -90,12 +82,6 @@ export const EVOLUTION_MANAGED_CLICKHOUSE_CONFIG = {
             decoratorProps: {
                 label: 'Количество ядер vCPU',
             },
-            relateFn: ({ instanceType }) => {
-                const items = cpuConfigItems[instanceType];
-                if ((items === null || items === void 0 ? void 0 : items.length) > 0) {
-                    return { items };
-                }
-            },
         },
         ramAmount: {
             type: CONTROL.Segmented,
@@ -106,13 +92,11 @@ export const EVOLUTION_MANAGED_CLICKHOUSE_CONFIG = {
             decoratorProps: {
                 label: 'Количество оперативной памяти (RAM)',
             },
-            relateFn: ({ instanceType, vCpuCoreCount }) => {
-                const itemsByInstanceType = ramConfigItems[instanceType];
-                const itemsByCpu = new Set(cpuToRamMap[vCpuCoreCount]);
-                if ((itemsByInstanceType === null || itemsByInstanceType === void 0 ? void 0 : itemsByInstanceType.length) > 0) {
-                    const resolvedItems = itemsByInstanceType.filter(item => itemsByCpu.has(item));
+            relateFn: ({ vCpuCoreCount }) => {
+                const itemsByCpu = cpuToRamMap[vCpuCoreCount];
+                if ((itemsByCpu === null || itemsByCpu === void 0 ? void 0 : itemsByCpu.length) > 0) {
                     return {
-                        items: generateRamItems(resolvedItems),
+                        items: generateRamItems(itemsByCpu),
                     };
                 }
             },

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloud-ru/uikit-product-calculator",
   "title": "Calculator",
-  "version": "1.14.5",
+  "version": "1.15.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -71,5 +71,5 @@
   "devDependencies": {
     "@types/lodash": "4.17.13"
   },
-  "gitHead": "be0899466862c8165b118bc16b07e9d2b9ed2513"
+  "gitHead": "238046dc433803a09ddb969be2c5143350cfda71"
 }

package/src/config/platforms/evolution/product-config/EvolutionManagedClickHouse.ts CHANGED Viewed

@@ -5,31 +5,14 @@ const valueSingleNode = 'Single-node';
 const valueSingleShard = 'Single-shard';
 const valueMultiShard = 'Multi-shard';
-const CPU = [4, 8];
-const RAM = [16, 32];
+const CPU = [2, 4, 8, 16];
+const RAM = [16, 32, 64, 128];
 const cpuToRamMap: Record<string, number[]> = {
-  '4': [16],
-  '8': [32],
-};
-const cpuConfigItems: {
-  [key: string]: {
-    value: string;
-    label: string;
-  }[];
-} = {
-  [valueSingleNode]: generateCpuItems(CPU),
-  [valueSingleShard]: generateCpuItems(CPU),
-  [valueMultiShard]: generateCpuItems([CPU[0]]),
-};
-const ramConfigItems: {
-  [key: string]: number[];
-} = {
-  [valueSingleNode]: RAM,
-  [valueSingleShard]: RAM,
-  [valueMultiShard]: [RAM[0]],
+  '2': [16],
+  '4': [16, 32],
+  '8': [16, 32, 64],
+  '16': [32, 64, 128],
 };
 const instanceTypePartCards = [
@@ -104,13 +87,6 @@ export const EVOLUTION_MANAGED_CLICKHOUSE_CONFIG: FormConfig = {
       decoratorProps: {
         label: 'Количество ядер vCPU',
       },
-      relateFn: ({ instanceType }) => {
-        const items = cpuConfigItems[instanceType];
-        if (items?.length > 0) {
-          return { items };
-        }
-      },
     },
     ramAmount: {
@@ -122,14 +98,12 @@ export const EVOLUTION_MANAGED_CLICKHOUSE_CONFIG: FormConfig = {
       decoratorProps: {
         label: 'Количество оперативной памяти (RAM)',
       },
-      relateFn: ({ instanceType, vCpuCoreCount }) => {
-        const itemsByInstanceType = ramConfigItems[instanceType];
-        const itemsByCpu = new Set(cpuToRamMap[vCpuCoreCount as string]);
+      relateFn: ({ vCpuCoreCount }) => {
+        const itemsByCpu = cpuToRamMap[vCpuCoreCount as string];
-        if (itemsByInstanceType?.length > 0) {
-          const resolvedItems = itemsByInstanceType.filter(item => itemsByCpu.has(item));
+        if (itemsByCpu?.length > 0) {
           return {
-            items: generateRamItems(resolvedItems),
+            items: generateRamItems(itemsByCpu),
           };
         }
       },