@cloud-ru/uikit-product-calculator 2.1.3-preview-ce2b12b4.0 → 2.2.0

package/CHANGELOG.md

@@ -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.
 
+# 2.2.0 (2026-10-19)
+
+
+### Features
+
+* **SITE-12146:** add EvolutionWorkflowStudio product to calculator ([73f4987](https://github.com/cloud-ru-tech/uikit-product/commit/73f4987e88f056e37cd27d0e672b9a9ebb4f28d8))
+
+
+
+
+
 ## 2.1.2 (2026-10-09)
 
 **Note:** Version bump only for package @cloud-ru/uikit-product-calculator

package/dist/cjs/config/platforms/evolution/catalog.js

@@ -50,6 +50,12 @@ exports.EVOLUTION_CATALOG = {
                 constants_2.EVOLUTION_PRODUCT.EvolutionArtifactRegistry,
             ],
         },
+        {
+            id: constants_1.CATEGORY.Development,
+            label: 'Разработка',
+            dataTestId: 'development',
+            visibleProducts: [constants_2.EVOLUTION_PRODUCT.EvolutionWorkflowStudio],
+        },
         {
             id: constants_1.CATEGORY.Database,
             label: 'Платформы данных',

package/dist/cjs/config/platforms/evolution/constants.d.ts

@@ -24,6 +24,7 @@ export declare const EVOLUTION_PRODUCT: {
     readonly EvolutionManagedKafka: "evolutionManagedKafka";
     readonly EvolutionLoadBalancer: "evolutionLoadBalancer";
     readonly EvolutionNotebooks: "evolutionNotebooks";
+    readonly EvolutionWorkflowStudio: "evolutionWorkflowStudio";
 };
 export declare const guaranteedPartToVCpuMap: {
     [x: string]: number[];

package/dist/cjs/config/platforms/evolution/constants.js

@@ -27,6 +27,7 @@ exports.EVOLUTION_PRODUCT = {
     EvolutionManagedKafka: 'evolutionManagedKafka',
     EvolutionLoadBalancer: 'evolutionLoadBalancer',
     EvolutionNotebooks: 'evolutionNotebooks',
+    EvolutionWorkflowStudio: 'evolutionWorkflowStudio',
 };
 const GuaranteedPartItem = {
     '10': '10',

package/dist/cjs/config/platforms/evolution/product-config/EvolutionWorkflowStudio.d.ts

@@ -0,0 +1,2 @@
+import { FormConfig } from '../../../../components';
+export declare const EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG: FormConfig;

package/dist/cjs/config/platforms/evolution/product-config/EvolutionWorkflowStudio.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG = void 0;
+const components_1 = require("../../../../components");
+exports.EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG = {
+    ui: [['runsPerMonth']],
+    controls: {
+        runsPerMonth: {
+            type: components_1.CONTROL.Stepper,
+            defaultValue: 50,
+            accessorKey: 'runsPerMonth',
+            decoratorProps: {
+                label: 'Количество запусков шагов в месяц (50 бесплатно)',
+                labelTooltip: '1 деплой в Services = состоит минимум из 3 шагов',
+            },
+            uiProps: {
+                min: 0,
+                step: 10,
+                max: 30000,
+                postfix: 'шт',
+            },
+        },
+    },
+};

package/dist/cjs/config/platforms/evolution/product-config/index.d.ts

@@ -23,3 +23,4 @@ export * from './EvolutionManagedClickHouse';
 export * from './EvolutionManagedSpark';
 export * from './EvolutionManagedKafka';
 export * from './EvolutionManagedAirflow';
+export * from './EvolutionWorkflowStudio';

package/dist/cjs/config/platforms/evolution/product-config/index.js

@@ -39,3 +39,4 @@ __exportStar(require("./EvolutionManagedClickHouse"), exports);
 __exportStar(require("./EvolutionManagedSpark"), exports);
 __exportStar(require("./EvolutionManagedKafka"), exports);
 __exportStar(require("./EvolutionManagedAirflow"), exports);
+__exportStar(require("./EvolutionWorkflowStudio"), exports);

package/dist/cjs/config/platforms/evolution/products.js

@@ -279,4 +279,15 @@ exports.EVOLUTION_PRODUCTS = {
         enableChangeProductQuantity: true,
         enableConnectToConsole: true,
     },
+    [constants_2.EVOLUTION_PRODUCT.EvolutionWorkflowStudio]: {
+        id: constants_2.EVOLUTION_PRODUCT.EvolutionWorkflowStudio,
+        platform: constants_1.PLATFORM.Evolution,
+        label: 'Evolution Workflow Studio',
+        caption: 'Платформа для создания инженерных сценариев в облаке',
+        icon: uikit_product_icons_1.EvolutionPipelineSVG,
+        formConfig: product_config_1.EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG,
+        dataTestId: constants_2.EVOLUTION_PRODUCT.EvolutionWorkflowStudio,
+        enableChangeProductQuantity: false,
+        enableConnectToConsole: true,
+    },
 };

package/dist/cjs/hooks/useProductDelete.js

@@ -4,28 +4,27 @@ exports.useProductDelete = useProductDelete;
 const contexts_1 = require("../contexts");
 const filterNonEmptyArrays_1 = require("../utils/filterNonEmptyArrays");
 const deleteItem = (productId, idx) => (oldValue) => {
-    const oldArrayValue = oldValue[productId];
+    const oldArrayValue = oldValue[productId !== null && productId !== void 0 ? productId : 0];
     if (!oldArrayValue) {
         return oldValue;
     }
-    return (0, filterNonEmptyArrays_1.filterNonEmptyArrays)(Object.assign(Object.assign({}, oldValue), { [productId]: oldArrayValue.filter((_, itemIdx) => itemIdx !== idx) }));
+    oldArrayValue.splice(idx !== null && idx !== void 0 ? idx : 0, 1);
+    const newValue = Object.assign(Object.assign({}, oldValue), { [productId]: oldArrayValue });
+    return Object.assign({}, (0, filterNonEmptyArrays_1.filterNonEmptyArrays)(newValue));
 };
 function useProductDelete() {
     const { setSelectedProduct, selectedProduct, products, setProducts, actions: { onProductDelete }, } = (0, contexts_1.useCalculatorContext)();
     return (productId, idx) => {
-        const nextProducts = deleteItem(productId, idx)(products);
         setProducts(deleteItem(productId, idx));
         onProductDelete === null || onProductDelete === void 0 ? void 0 : onProductDelete(productId);
-        if ((selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.id) !== productId) {
-            return;
-        }
-        if (selectedProduct.idx > idx) {
-            setSelectedProduct({ id: productId, idx: selectedProduct.idx - 1 });
-            return;
-        }
-        if (selectedProduct.idx === idx) {
-            const newProductId = Object.keys(nextProducts).find(id => nextProducts[id].length > 0);
-            setSelectedProduct(newProductId ? { id: newProductId, idx: 0 } : null);
+        if ((selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.id) === productId && (selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.idx) === idx) {
+            const newProductId = Object.keys(products).find(productId => products[productId].length > 0);
+            if (newProductId) {
+                setSelectedProduct({ id: newProductId, idx: 0 });
+            }
+            else {
+                setSelectedProduct(null);
+            }
         }
     };
 }

package/dist/esm/config/platforms/evolution/catalog.js

@@ -47,6 +47,12 @@ export const EVOLUTION_CATALOG = {
                 EVOLUTION_PRODUCT.EvolutionArtifactRegistry,
             ],
         },
+        {
+            id: CATEGORY.Development,
+            label: 'Разработка',
+            dataTestId: 'development',
+            visibleProducts: [EVOLUTION_PRODUCT.EvolutionWorkflowStudio],
+        },
         {
             id: CATEGORY.Database,
             label: 'Платформы данных',

package/dist/esm/config/platforms/evolution/constants.d.ts

@@ -24,6 +24,7 @@ export declare const EVOLUTION_PRODUCT: {
     readonly EvolutionManagedKafka: "evolutionManagedKafka";
     readonly EvolutionLoadBalancer: "evolutionLoadBalancer";
     readonly EvolutionNotebooks: "evolutionNotebooks";
+    readonly EvolutionWorkflowStudio: "evolutionWorkflowStudio";
 };
 export declare const guaranteedPartToVCpuMap: {
     [x: string]: number[];

package/dist/esm/config/platforms/evolution/constants.js

@@ -24,6 +24,7 @@ export const EVOLUTION_PRODUCT = {
     EvolutionManagedKafka: 'evolutionManagedKafka',
     EvolutionLoadBalancer: 'evolutionLoadBalancer',
     EvolutionNotebooks: 'evolutionNotebooks',
+    EvolutionWorkflowStudio: 'evolutionWorkflowStudio',
 };
 const GuaranteedPartItem = {
     '10': '10',

package/dist/esm/config/platforms/evolution/product-config/EvolutionWorkflowStudio.d.ts

@@ -0,0 +1,2 @@
+import { FormConfig } from '../../../../components';
+export declare const EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG: FormConfig;

package/dist/esm/config/platforms/evolution/product-config/EvolutionWorkflowStudio.js

@@ -0,0 +1,21 @@
+import { CONTROL } from '../../../../components';
+export const EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG = {
+    ui: [['runsPerMonth']],
+    controls: {
+        runsPerMonth: {
+            type: CONTROL.Stepper,
+            defaultValue: 50,
+            accessorKey: 'runsPerMonth',
+            decoratorProps: {
+                label: 'Количество запусков шагов в месяц (50 бесплатно)',
+                labelTooltip: '1 деплой в Services = состоит минимум из 3 шагов',
+            },
+            uiProps: {
+                min: 0,
+                step: 10,
+                max: 30000,
+                postfix: 'шт',
+            },
+        },
+    },
+};

package/dist/esm/config/platforms/evolution/product-config/index.d.ts

@@ -23,3 +23,4 @@ export * from './EvolutionManagedClickHouse';
 export * from './EvolutionManagedSpark';
 export * from './EvolutionManagedKafka';
 export * from './EvolutionManagedAirflow';
+export * from './EvolutionWorkflowStudio';

package/dist/esm/config/platforms/evolution/product-config/index.js

@@ -23,3 +23,4 @@ export * from './EvolutionManagedClickHouse';
 export * from './EvolutionManagedSpark';
 export * from './EvolutionManagedKafka';
 export * from './EvolutionManagedAirflow';
+export * from './EvolutionWorkflowStudio';

package/dist/esm/config/platforms/evolution/products.js

@@ -1,7 +1,7 @@
-import { AirflowSVG, ArenadataDbSVG, ArtifactRegistrySVG, BareMetalSVG, ContainerAppsSVG, EvoDnsSVG, EvolutionBiSVG, EvolutionComputeSVG, JupyterServersSVG, LoadBalancerSVG, ManagedClickHouseSVG, ManagedKafkaSVG, ManagedKubernetesSVG, ManagedPostgreSqlSVG, MetastoreSVG, MlInferenceSVG, PublicIpSVG, RedisSVG, S3StorageSVG, SnatSVG, SparkSVG, TrinoSVG, } from '@cloud-ru/uikit-product-icons';
+import { AirflowSVG, ArenadataDbSVG, ArtifactRegistrySVG, BareMetalSVG, ContainerAppsSVG, EvoDnsSVG, EvolutionBiSVG, EvolutionComputeSVG, EvolutionPipelineSVG, JupyterServersSVG, LoadBalancerSVG, ManagedClickHouseSVG, ManagedKafkaSVG, ManagedKubernetesSVG, ManagedPostgreSqlSVG, MetastoreSVG, MlInferenceSVG, PublicIpSVG, RedisSVG, S3StorageSVG, SnatSVG, SparkSVG, TrinoSVG, } from '@cloud-ru/uikit-product-icons';
 import { PLATFORM } from '../../../constants';
 import { EVOLUTION_PRODUCT } from './constants';
-import { EVOLUTION_ARENADATA_DB_FORM_CONFIG, EVOLUTION_ARTIFACT_REGISTRY, EVOLUTION_BARE_METAL_FORM_CONFIG, EVOLUTION_CLOUD_SERVER_FORM_CONFIG, EVOLUTION_CLOUD_SERVER_FREE_TIER_FORM_CONFIG, EVOLUTION_CONTAINER_APPS_CONFIG, EVOLUTION_CONTAINER_APPS_FREE_TIER_CONFIG, EVOLUTION_DNS_CONFIG, EVOLUTION_KUBERNETES_FORM_CONFIG, EVOLUTION_LOAD_BALANCER_CONFIG, EVOLUTION_MANAGED_AIRFLOW_CONFIG, EVOLUTION_MANAGED_BI, EVOLUTION_MANAGED_CLICKHOUSE_CONFIG, EVOLUTION_MANAGED_KAFKA_CONFIG, EVOLUTION_MANAGED_METASTORE_CONFIG, EVOLUTION_MANAGED_REDIS_CONFIG, EVOLUTION_MANAGED_SPARK_CONFIG, EVOLUTION_MANAGED_TRINO_CONFIG, EVOLUTION_ML_INFERENCE_FORM_CONFIG, EVOLUTION_NOTEBOOKS_CONFIG, EVOLUTION_POSTGRE_SQL_FORM_CONFIG, EVOLUTION_PUBLIC_IP_FORM_CONFIG, EVOLUTION_SNAT_GATEWAY_FORM_CONFIG, EVOLUTION_STORAGE_S3_FORM_CONFIG, EVOLUTION_STORAGE_S3_FREE_TIER_FORM_CONFIG, } from './product-config';
+import { EVOLUTION_ARENADATA_DB_FORM_CONFIG, EVOLUTION_ARTIFACT_REGISTRY, EVOLUTION_BARE_METAL_FORM_CONFIG, EVOLUTION_CLOUD_SERVER_FORM_CONFIG, EVOLUTION_CLOUD_SERVER_FREE_TIER_FORM_CONFIG, EVOLUTION_CONTAINER_APPS_CONFIG, EVOLUTION_CONTAINER_APPS_FREE_TIER_CONFIG, EVOLUTION_DNS_CONFIG, EVOLUTION_KUBERNETES_FORM_CONFIG, EVOLUTION_LOAD_BALANCER_CONFIG, EVOLUTION_MANAGED_AIRFLOW_CONFIG, EVOLUTION_MANAGED_BI, EVOLUTION_MANAGED_CLICKHOUSE_CONFIG, EVOLUTION_MANAGED_KAFKA_CONFIG, EVOLUTION_MANAGED_METASTORE_CONFIG, EVOLUTION_MANAGED_REDIS_CONFIG, EVOLUTION_MANAGED_SPARK_CONFIG, EVOLUTION_MANAGED_TRINO_CONFIG, EVOLUTION_ML_INFERENCE_FORM_CONFIG, EVOLUTION_NOTEBOOKS_CONFIG, EVOLUTION_POSTGRE_SQL_FORM_CONFIG, EVOLUTION_PUBLIC_IP_FORM_CONFIG, EVOLUTION_SNAT_GATEWAY_FORM_CONFIG, EVOLUTION_STORAGE_S3_FORM_CONFIG, EVOLUTION_STORAGE_S3_FREE_TIER_FORM_CONFIG, EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG, } from './product-config';
 export const EVOLUTION_PRODUCTS = {
     [EVOLUTION_PRODUCT.EvolutionCloudServer]: {
         id: EVOLUTION_PRODUCT.EvolutionCloudServer,
@@ -276,4 +276,15 @@ export const EVOLUTION_PRODUCTS = {
         enableChangeProductQuantity: true,
         enableConnectToConsole: true,
     },
+    [EVOLUTION_PRODUCT.EvolutionWorkflowStudio]: {
+        id: EVOLUTION_PRODUCT.EvolutionWorkflowStudio,
+        platform: PLATFORM.Evolution,
+        label: 'Evolution Workflow Studio',
+        caption: 'Платформа для создания инженерных сценариев в облаке',
+        icon: EvolutionPipelineSVG,
+        formConfig: EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG,
+        dataTestId: EVOLUTION_PRODUCT.EvolutionWorkflowStudio,
+        enableChangeProductQuantity: false,
+        enableConnectToConsole: true,
+    },
 };

package/dist/esm/hooks/useProductDelete.js

@@ -1,28 +1,27 @@
 import { useCalculatorContext } from '../contexts';
 import { filterNonEmptyArrays } from '../utils/filterNonEmptyArrays';
 const deleteItem = (productId, idx) => (oldValue) => {
-    const oldArrayValue = oldValue[productId];
+    const oldArrayValue = oldValue[productId !== null && productId !== void 0 ? productId : 0];
     if (!oldArrayValue) {
         return oldValue;
     }
-    return filterNonEmptyArrays(Object.assign(Object.assign({}, oldValue), { [productId]: oldArrayValue.filter((_, itemIdx) => itemIdx !== idx) }));
+    oldArrayValue.splice(idx !== null && idx !== void 0 ? idx : 0, 1);
+    const newValue = Object.assign(Object.assign({}, oldValue), { [productId]: oldArrayValue });
+    return Object.assign({}, filterNonEmptyArrays(newValue));
 };
 export function useProductDelete() {
     const { setSelectedProduct, selectedProduct, products, setProducts, actions: { onProductDelete }, } = useCalculatorContext();
     return (productId, idx) => {
-        const nextProducts = deleteItem(productId, idx)(products);
         setProducts(deleteItem(productId, idx));
         onProductDelete === null || onProductDelete === void 0 ? void 0 : onProductDelete(productId);
-        if ((selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.id) !== productId) {
-            return;
-        }
-        if (selectedProduct.idx > idx) {
-            setSelectedProduct({ id: productId, idx: selectedProduct.idx - 1 });
-            return;
-        }
-        if (selectedProduct.idx === idx) {
-            const newProductId = Object.keys(nextProducts).find(id => nextProducts[id].length > 0);
-            setSelectedProduct(newProductId ? { id: newProductId, idx: 0 } : null);
+        if ((selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.id) === productId && (selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.idx) === idx) {
+            const newProductId = Object.keys(products).find(productId => products[productId].length > 0);
+            if (newProductId) {
+                setSelectedProduct({ id: newProductId, idx: 0 });
+            }
+            else {
+                setSelectedProduct(null);
+            }
         }
     };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloud-ru/uikit-product-calculator",
   "title": "Calculator",
-  "version": "2.1.3-preview-ce2b12b4.0",
+  "version": "2.2.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -60,12 +60,12 @@
     "deepmerge": "^4.3.1",
     "lodash": "^4.18.1",
     "swr": "^2.2.5",
-    "@cloud-ru/uikit-product-icons": "19.2.0",
-    "@cloud-ru/uikit-product-mobile-dropdown": "3.0.2",
-    "@cloud-ru/uikit-product-mobile-accordion": "2.0.2",
-    "@cloud-ru/uikit-product-mobile-fields": "3.0.2",
-    "@cloud-ru/uikit-product-mobile-modal": "3.0.2",
-    "@cloud-ru/uikit-product-utils": "10.0.0"
+    "@cloud-ru/uikit-product-icons": "^19.2.0",
+    "@cloud-ru/uikit-product-mobile-modal": "^3.0.2",
+    "@cloud-ru/uikit-product-utils": "^10.0.0",
+    "@cloud-ru/uikit-product-mobile-fields": "^3.0.2",
+    "@cloud-ru/uikit-product-mobile-dropdown": "^3.0.2",
+    "@cloud-ru/uikit-product-mobile-accordion": "^2.0.2"
   },
   "devDependencies": {
     "@types/lodash": "4.17.24"

package/src/config/platforms/evolution/catalog.tsx

@@ -49,6 +49,12 @@ export const EVOLUTION_CATALOG: CatalogConfig['catalog'] = {
         EVOLUTION_PRODUCT.EvolutionArtifactRegistry,
       ],
     },
+    {
+      id: CATEGORY.Development,
+      label: 'Разработка',
+      dataTestId: 'development',
+      visibleProducts: [EVOLUTION_PRODUCT.EvolutionWorkflowStudio],
+    },
     {
       id: CATEGORY.Database,
       label: 'Платформы данных',

package/src/config/platforms/evolution/constants.ts

@@ -24,6 +24,7 @@ export const EVOLUTION_PRODUCT = {
   EvolutionManagedKafka: 'evolutionManagedKafka',
   EvolutionLoadBalancer: 'evolutionLoadBalancer',
   EvolutionNotebooks: 'evolutionNotebooks',
+  EvolutionWorkflowStudio: 'evolutionWorkflowStudio',
 } as const;
 
 const GuaranteedPartItem = {

package/src/config/platforms/evolution/product-config/EvolutionWorkflowStudio.ts

@@ -0,0 +1,22 @@
+import { CONTROL, FormConfig } from '../../../../components';
+
+export const EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG: FormConfig = {
+  ui: [['runsPerMonth']],
+  controls: {
+    runsPerMonth: {
+      type: CONTROL.Stepper,
+      defaultValue: 50,
+      accessorKey: 'runsPerMonth',
+      decoratorProps: {
+        label: 'Количество запусков шагов в месяц (50 бесплатно)',
+        labelTooltip: '1 деплой в Services = состоит минимум из 3 шагов',
+      },
+      uiProps: {
+        min: 0,
+        step: 10,
+        max: 30000,
+        postfix: 'шт',
+      },
+    },
+  },
+};

package/src/config/platforms/evolution/product-config/index.ts

@@ -23,3 +23,4 @@ export * from './EvolutionManagedClickHouse';
 export * from './EvolutionManagedSpark';
 export * from './EvolutionManagedKafka';
 export * from './EvolutionManagedAirflow';
+export * from './EvolutionWorkflowStudio';

package/src/config/platforms/evolution/products.ts

@@ -7,6 +7,7 @@ import {
   EvoDnsSVG,
   EvolutionBiSVG,
   EvolutionComputeSVG,
+  EvolutionPipelineSVG,
   JupyterServersSVG,
   LoadBalancerSVG,
   ManagedClickHouseSVG,
@@ -52,6 +53,7 @@ import {
   EVOLUTION_SNAT_GATEWAY_FORM_CONFIG,
   EVOLUTION_STORAGE_S3_FORM_CONFIG,
   EVOLUTION_STORAGE_S3_FREE_TIER_FORM_CONFIG,
+  EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG,
 } from './product-config';
 
 export const EVOLUTION_PRODUCTS: CatalogConfig['products'] = {
@@ -329,4 +331,15 @@ export const EVOLUTION_PRODUCTS: CatalogConfig['products'] = {
     enableChangeProductQuantity: true,
     enableConnectToConsole: true,
   },
+  [EVOLUTION_PRODUCT.EvolutionWorkflowStudio]: {
+    id: EVOLUTION_PRODUCT.EvolutionWorkflowStudio,
+    platform: PLATFORM.Evolution,
+    label: 'Evolution Workflow Studio',
+    caption: 'Платформа для создания инженерных сценариев в облаке',
+    icon: EvolutionPipelineSVG,
+    formConfig: EVOLUTION_WORKFLOW_STUDIO_FORM_CONFIG,
+    dataTestId: EVOLUTION_PRODUCT.EvolutionWorkflowStudio,
+    enableChangeProductQuantity: false,
+    enableConnectToConsole: true,
+  },
 };

package/src/hooks/useProductDelete.ts

@@ -1,21 +1,24 @@
-import { ProductsState, useCalculatorContext } from '../contexts';
+import { useCalculatorContext } from '../contexts';
+import { FormValues } from '../types';
 import { filterNonEmptyArrays } from '../utils/filterNonEmptyArrays';
 
-const deleteItem =
-  (productId: string, idx: number) =>
-  (oldValue: ProductsState): ProductsState => {
-    const oldArrayValue = oldValue[productId];
+const deleteItem = (productId: string, idx: number) => (oldValue: FormValues) => {
+  const oldArrayValue = oldValue[productId ?? 0];
 
-    if (!oldArrayValue) {
-      return oldValue;
-    }
+  if (!oldArrayValue) {
+    return oldValue;
+  }
+
+  oldArrayValue.splice(idx ?? 0, 1);
 
-    return filterNonEmptyArrays({
-      ...oldValue,
-      [productId]: oldArrayValue.filter((_, itemIdx) => itemIdx !== idx),
-    });
+  const newValue = {
+    ...oldValue,
+    [productId]: oldArrayValue,
   };
 
+  return { ...filterNonEmptyArrays(newValue) };
+};
+
 export function useProductDelete() {
   const {
     setSelectedProduct,
@@ -26,25 +29,18 @@ export function useProductDelete() {
   } = useCalculatorContext();
 
   return (productId: string, idx: number) => {
-    const nextProducts = deleteItem(productId, idx)(products);
-
     setProducts(deleteItem(productId, idx));
 
     onProductDelete?.(productId);
 
-    if (selectedProduct?.id !== productId) {
-      return;
-    }
-
-    if (selectedProduct.idx > idx) {
-      setSelectedProduct({ id: productId, idx: selectedProduct.idx - 1 });
-      return;
-    }
-
-    if (selectedProduct.idx === idx) {
-      const newProductId = Object.keys(nextProducts).find(id => nextProducts[id].length > 0);
+    if (selectedProduct?.id === productId && selectedProduct?.idx === idx) {
+      const newProductId = Object.keys(products).find(productId => products[productId].length > 0);
 
-      setSelectedProduct(newProductId ? { id: newProductId, idx: 0 } : null);
+      if (newProductId) {
+        setSelectedProduct({ id: newProductId, idx: 0 });
+      } else {
+        setSelectedProduct(null);
+      }
     }
   };
 }