@webitel/ui-sdk 3.2.144 → 3.2.146

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "3.2.144",
+  "version": "3.2.146",
   "private": false,
   "scripts": {
     "serve-lib": "vue-cli-service serve",

package/src/components/wt-search-bar/__tests__/WtSearchBar.spec.js

@@ -1,5 +1,14 @@
+import { ref } from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import WtSearchBar from '../wt-search-bar.vue';
+import { useValidation } from '../../../mixins/validationMixin/useValidation';
+
+jest.mock('../../../mixins/validationMixin/useValidation');
+useValidation.mockImplementation(() => ({
+  isValidation: ref(false),
+  invalid: ref(false),
+  validationText: ref(''),
+}));
 
 describe('WtSearchBar', () => {
   it('renders a component', () => {

package/src/locale/en/en.js

@@ -247,6 +247,8 @@ export default {
     url: 'Should look like url',
     regExpValidator: 'This regular expression is not valid',
     domainValidator: 'Incorrect domain',
+    decimalValidator: 'Decimal precision should be no more than { count } places',
+    integer: 'The field should contain only whole numbers',
   },
   webitelUI: {
     searchBar: {

package/src/locale/ru/ru.js

@@ -245,6 +245,8 @@ export default {
     url: 'Необходимо ввести корректный url-адрес',
     regExpValidator: 'Не правильное регулярное выражение',
     domainValidator: 'Неправильный домен',
+    decimalValidator: 'Количество десятичных знаков не должно быть больше { count }',
+    integer: 'Поле должно содержать только целые числа',
   },
   webitelUI: {
     searchBar: {

package/src/locale/ua/ua.js

@@ -245,6 +245,8 @@ export default {
     url: 'Необхідно ввести правильну url-адресу',
     regExpValidator: 'Не правильний регулярний вираз',
     domainValidator: 'Невірний домен',
+    decimalValidator: 'Кількість десяткових знаків не повинна бути більше { count }',
+    integer: 'Поле повинно містити лише цілі числа',
   },
   webitelUI: {
     searchBar: {

package/src/mixins/validationMixin/useValidation.js

@@ -23,6 +23,8 @@ export function useValidation({ v, customValidators }) {
       else if (v.regExpValidator?.$invalid) validationText = `${t('validation.regExpValidator')}`;
       else if (v.sameAs?.$invalid) validationText = `${t('validation.sameAs')}`;
       else if (v.domainValidator?.$invalid) validationText = `${t('validation.domainValidator')}`;
+      else if (v.decimalValidator?.$invalid) validationText = `${t('validation.decimalValidator')} ${v.decimalValidator.$params.count}`;
+      else if (v.integer?.$invalid) validationText = `${t('validation.integer')}`;
     }
     // eslint-disable-next-line no-restricted-syntax
     for (const { name, text } of customValidators) {

package/src/mixins/validationMixin/validationMixin.js

@@ -33,6 +33,8 @@ export default {
         else if (this.v.regExpValidator?.$invalid) validationText = `${this.$t('validation.regExpValidator')}`;
         else if (this.v.sameAs?.$invalid) validationText = `${this.$t('validation.sameAs')}`;
         else if (this.v.domainValidator?.$invalid) validationText = `${this.$t('validation.domainValidator')}`;
+        else if (this.v.decimalValidator?.$invalid) validationText = `${this.$t('validation.decimalValidator')} ${this.v.decimalValidator.$params.count}`;
+        else if (this.v.integer?.$invalid) validationText = `${this.$t('validation.integer')}`;
       }
       // eslint-disable-next-line no-restricted-syntax
       for (const { name, text } of this.customValidators) {

package/src/modules/AuditForm/components/questions/options/audit-form-question-options-write-row.vue

@@ -14,7 +14,7 @@
       type="number"
       @input="emit('update:option', { name: option.name, score: $event })"
     ></wt-input>
-    <wt-tooltip>
+    <wt-tooltip class="audit-form-question-options-write-row__tooltip">
       <template v-slot:activator>
         <wt-icon-btn
           :disabled="first"
@@ -34,6 +34,7 @@ import { computed, onMounted, toRefs } from 'vue';
 import WtTooltip from '../../../../../components/wt-tooltip/wt-tooltip.vue';
 import WtIconBtn from '../../../../../components/wt-icon-btn/wt-icon-btn.vue';
 import WtInput from '../../../../../components/wt-input/wt-input.vue';
+import decimalValidator from '../../../../../validators/decimalValidator';
 
 const props = defineProps({
   option: {
@@ -63,6 +64,7 @@ const v$ = useVuelidate(
           required,
           minValue: minValue(0),
           maxValue: maxValue(10),
+          decimalValidator: decimalValidator(2),
         },
       },
     })),
@@ -77,8 +79,11 @@ onMounted(() => v$.value.$touch());
 <style lang="scss" scoped>
 .audit-form-question-options-write-row {
   display: grid;
-  align-items: center;
   grid-template-columns: 3fr 1fr 24px;
   gap: var(--spacing-sm);
+
+  &__tooltip {
+    padding-top: var(--spacing-md);
+  }
 }
 </style>

package/src/modules/AuditForm/components/questions/score/audit-form-question-score.vue

@@ -43,7 +43,7 @@
 
 <script setup>
 import { useVuelidate } from '@vuelidate/core';
-import { maxValue, minValue, required } from '@vuelidate/validators';
+import { maxValue, minValue, required, integer } from '@vuelidate/validators';
 import { computed, onMounted, toRefs } from 'vue';
 import isEmpty from '../../../../../scripts/isEmpty';
 import updateObject from '../../../../../scripts/updateObject';
@@ -81,11 +81,13 @@ const v$ = useVuelidate(
           minValue: minValue(0),
           maxValue: maxValue(9),
           required,
+          integer,
         },
         max: {
           minValue: minValue(1),
           maxValue: maxValue(10),
           required,
+          integer,
         },
       },
     })),

package/src/validators/decimalValidator.js

@@ -0,0 +1,9 @@
+/* [WTEL-3791] */
+/* Check value is an integer or has n* decimal places */
+import { helpers } from '@vuelidate/validators';
+
+const decimalValidator = (count) => helpers.withParams(
+    { count },
+    (value) => value % 1 == 0 || value.toString().split('.')[1].length <= count);
+
+export default decimalValidator;