npm - @cloud-ru/uikit-product-calculator - Versions diffs - 1.6.1 → 1.7.0 - Mend

@cloud-ru/uikit-product-calculator 1.6.1 → 1.7.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.7.0 (2026-05-07)
+### Features
+* **SITE-11087:** update calc notebooks ([3709f40](https://github.com/cloud-ru-tech/uikit-product/commit/3709f40bb7aeb272e45b92fd8968ab7e51ee562c))
 ## 1.6.1 (2026-04-30)
 ### Only dependencies have been changed

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

@@ -77,18 +77,23 @@ exports.EVOLUTION_NOTEBOOKS_CONFIG = {
             type: components_1.CONTROL.Stepper,
             accessorKey: 'workingHours',
             defaultValue: 1,
-            uiProps: { min: 1 },
-            decoratorProps: { label: 'Время работы' },
-            watchedControls: { period: 'workingHoursSpecification' },
-            relateFn: ({ period }) => {
+            uiProps: { min: 1, max: 1, postfix: 'час' },
+            decoratorProps: { label: 'Время работы за период' },
+            watchedControls: { period: 'workingHoursSpecification', workingHours: 'workingHours' },
+            relateFn: ({ period, workingHours }) => {
                 const maxWorkingAmount = (0, utils_1.getMaxWorkingHoursAmount)(period, {
-                    hour: 24,
-                    day: 31,
-                    month: 12,
+                    hour: 1,
+                    day: 24,
+                    month: 720,
                 });
+                const isStepperDisabled = maxWorkingAmount === 1;
                 return {
                     uiProps: {
+                        min: 1,
                         max: maxWorkingAmount,
+                        showHint: !isStepperDisabled,
+                        disabled: isStepperDisabled,
+                        postfix: (0, utils_1.getNumeralWord)(workingHours, ['час', 'часа', 'часов']),
                     },
                 };
             },
@@ -97,13 +102,9 @@ exports.EVOLUTION_NOTEBOOKS_CONFIG = {
             type: components_1.CONTROL.SelectSingle,
             accessorKey: 'workingHoursSpecification',
             defaultValue: constants_1.WorkingHoursSpecification.Hour,
-            items: constants_1.WORKING_HOURS_ITEMS,
+            items: constants_1.WORKING_HOURS_PER_PERIOD_ITEMS,
             uiProps: { showClearButton: false, searchable: false },
             decoratorProps: { label: 'Период' },
-            onChangePeriod: (period, setValue) => {
-                setValue([['workingHoursSpecification', period]]);
-            },
-            canChangeWholePricePeriod: true,
         },
     },
 };

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

@@ -1,6 +1,6 @@
 import { CONTROL } from '../../../../components';
-import { WORKING_HOURS_ITEMS, WorkingHoursSpecification } from '../../../../constants';
-import { DEFAULT_NOTEBOOKS_CONFIG_VALUE, getDefaultNotebooksConfigParams, getMaxWorkingHoursAmount, getNotebookConfigParamsByInstance, } from '../../../utils';
+import { WORKING_HOURS_PER_PERIOD_ITEMS, WorkingHoursSpecification } from '../../../../constants';
+import { DEFAULT_NOTEBOOKS_CONFIG_VALUE, getDefaultNotebooksConfigParams, getMaxWorkingHoursAmount, getNotebookConfigParamsByInstance, getNumeralWord, } from '../../../utils';
 const DEFAULT_CONFIG_PARAMS = getDefaultNotebooksConfigParams();
 const configItems = [
     { value: 'ncpu.medium.4', label: '1 vCPU, 4 ГБ RAM' },
@@ -74,18 +74,23 @@ export const EVOLUTION_NOTEBOOKS_CONFIG = {
             type: CONTROL.Stepper,
             accessorKey: 'workingHours',
             defaultValue: 1,
-            uiProps: { min: 1 },
-            decoratorProps: { label: 'Время работы' },
-            watchedControls: { period: 'workingHoursSpecification' },
-            relateFn: ({ period }) => {
+            uiProps: { min: 1, max: 1, postfix: 'час' },
+            decoratorProps: { label: 'Время работы за период' },
+            watchedControls: { period: 'workingHoursSpecification', workingHours: 'workingHours' },
+            relateFn: ({ period, workingHours }) => {
                 const maxWorkingAmount = getMaxWorkingHoursAmount(period, {
-                    hour: 24,
-                    day: 31,
-                    month: 12,
+                    hour: 1,
+                    day: 24,
+                    month: 720,
                 });
+                const isStepperDisabled = maxWorkingAmount === 1;
                 return {
                     uiProps: {
+                        min: 1,
                         max: maxWorkingAmount,
+                        showHint: !isStepperDisabled,
+                        disabled: isStepperDisabled,
+                        postfix: getNumeralWord(workingHours, ['час', 'часа', 'часов']),
                     },
                 };
             },
@@ -94,13 +99,9 @@ export const EVOLUTION_NOTEBOOKS_CONFIG = {
             type: CONTROL.SelectSingle,
             accessorKey: 'workingHoursSpecification',
             defaultValue: WorkingHoursSpecification.Hour,
-            items: WORKING_HOURS_ITEMS,
+            items: WORKING_HOURS_PER_PERIOD_ITEMS,
             uiProps: { showClearButton: false, searchable: false },
             decoratorProps: { label: 'Период' },
-            onChangePeriod: (period, setValue) => {
-                setValue([['workingHoursSpecification', period]]);
-            },
-            canChangeWholePricePeriod: true,
         },
     },
 };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloud-ru/uikit-product-calculator",
   "title": "Calculator",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -71,5 +71,5 @@
   "devDependencies": {
     "@types/lodash": "4.17.13"
   },
-  "gitHead": "46f40e7ec89f4173d660983a5f0368937d45bf9d"
+  "gitHead": "389dde91f58f699641258e4ec600443313bf2988"
 }

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

@@ -1,10 +1,11 @@
 import { CONTROL, FormConfig } from '../../../../components';
-import { WORKING_HOURS_ITEMS, WorkingHoursSpecification } from '../../../../constants';
+import { WORKING_HOURS_PER_PERIOD_ITEMS, WorkingHoursSpecification } from '../../../../constants';
 import {
   DEFAULT_NOTEBOOKS_CONFIG_VALUE,
   getDefaultNotebooksConfigParams,
   getMaxWorkingHoursAmount,
   getNotebookConfigParamsByInstance,
+  getNumeralWord,
 } from '../../../utils';
 const DEFAULT_CONFIG_PARAMS = getDefaultNotebooksConfigParams();
@@ -85,19 +86,24 @@ export const EVOLUTION_NOTEBOOKS_CONFIG: FormConfig = {
       type: CONTROL.Stepper,
       accessorKey: 'workingHours',
       defaultValue: 1,
-      uiProps: { min: 1 },
-      decoratorProps: { label: 'Время работы' },
-      watchedControls: { period: 'workingHoursSpecification' },
-      relateFn: ({ period }) => {
+      uiProps: { min: 1, max: 1, postfix: 'час' },
+      decoratorProps: { label: 'Время работы за период' },
+      watchedControls: { period: 'workingHoursSpecification', workingHours: 'workingHours' },
+      relateFn: ({ period, workingHours }) => {
         const maxWorkingAmount = getMaxWorkingHoursAmount(period, {
-          hour: 24,
-          day: 31,
-          month: 12,
+          hour: 1,
+          day: 24,
+          month: 720,
         });
+        const isStepperDisabled = maxWorkingAmount === 1;
         return {
           uiProps: {
+            min: 1,
             max: maxWorkingAmount,
+            showHint: !isStepperDisabled,
+            disabled: isStepperDisabled,
+            postfix: getNumeralWord(workingHours, ['час', 'часа', 'часов']),
           },
         };
       },
@@ -106,13 +112,9 @@ export const EVOLUTION_NOTEBOOKS_CONFIG: FormConfig = {
       type: CONTROL.SelectSingle,
       accessorKey: 'workingHoursSpecification',
       defaultValue: WorkingHoursSpecification.Hour,
-      items: WORKING_HOURS_ITEMS,
+      items: WORKING_HOURS_PER_PERIOD_ITEMS,
       uiProps: { showClearButton: false, searchable: false },
       decoratorProps: { label: 'Период' },
-      onChangePeriod: (period, setValue) => {
-        setValue([['workingHoursSpecification', period]]);
-      },
-      canChangeWholePricePeriod: true,
     },
   },
 };