@webitel/ui-sdk 3.2.86 → 3.2.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "3.2.86",
+  "version": "3.2.88",
   "private": false,
   "scripts": {
     "serve-lib": "vue-cli-service serve",
@@ -40,6 +40,7 @@
     "deep-copy": "^1.4.2",
     "deep-equal": "^2.0.3",
     "file-saver": "^2.0.2",
+    "is-valid-domain": "^0.1.6",
     "jszip": "^3.5.0",
     "jszip-utils": "^0.1.0",
     "node-polyfill-webpack-plugin": "^1.1.4",

package/src/locale/en/en.js

@@ -245,6 +245,7 @@ export default {
     minLength: 'Quantity of characters should not be less than',
     url: 'Should look like url',
     regExpValidator: 'This regular expression is not valid',
+    domainValidator: 'Incorrect domain',
   },
   webitelUI: {
     searchBar: {

package/src/locale/ru/ru.js

@@ -242,6 +242,7 @@ export default {
     minLength: 'Количество символов не должно быть меньше, чем',
     url: 'Необходимо ввести корректный url-адрес',
     regExpValidator: 'Не правильное регулярное выражение',
+    domainValidator: 'Неправильный домен',
   },
   webitelUI: {
     searchBar: {

package/src/locale/ua/ua.js

@@ -242,6 +242,7 @@ export default {
     minLength: 'Кількість символів повинна бути не меншою, ніж',
     url: 'Необхідно ввести правильну url-адресу',
     regExpValidator: 'Не правильний регулярний вираз',
+    domainValidator: 'Невірний домен',
   },
   webitelUI: {
     searchBar: {

package/src/mixins/validationMixin/validationMixin.js

@@ -32,6 +32,7 @@ export default {
         else if (this.v.url?.$invalid) validationText = `${this.$t('validation.url')}`;
         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')}`;
       }
       // eslint-disable-next-line no-restricted-syntax
       for (const { name, text } of this.customValidators) {

package/src/modules/AuditForm/components/__tests__/audit-form.spec.js

@@ -2,12 +2,11 @@ import { mount } from '@vue/test-utils';
 import { ref } from 'vue';
 import AuditForm from '../audit-form.vue';
 import { generateQuestionSchema } from '../../schemas/AuditFormQuestionSchema';
-
 import {
   useDestroyableSortable,
-} from '../../composables/useDestroyableSortable';
+} from '../../../../composables/useDestroyableSortable/useDestroyableSortable';
 
-jest.mock('../../composables/useDestroyableSortable');
+jest.mock('../../../../composables/useDestroyableSortable/useDestroyableSortable');
 
 useDestroyableSortable.mockImplementation(() => ({ reloadSortable: ref(false) }));
 

package/src/modules/AuditForm/components/audit-form.vue

@@ -37,7 +37,7 @@ import {
   reactive, nextTick,
 } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
-import { useDestroyableSortable } from '../composables/useDestroyableSortable';
+import { useDestroyableSortable } from '../../../composables/useDestroyableSortable/useDestroyableSortable';
 import AuditFormQuestion from './audit-form-question.vue';
 import WtButton from '../../../components/atoms/wt-button/wt-button.vue';
 import { generateQuestionSchema } from '../schemas/AuditFormQuestionSchema';

package/src/scripts/validators/domainValidator.js

@@ -0,0 +1,5 @@
+import isValidDomain from 'is-valid-domain';
+
+const domainValidator = (value) => isValidDomain(value);
+
+export default domainValidator;

package/src/modules/AuditForm/composables/useDestroyableSortable.js

@@ -1,66 +0,0 @@
-import Sortable from 'sortablejs';
-import {
-  ref,
-  nextTick,
-  onMounted,
-  onUnmounted,
-} from 'vue';
-
-/**
- * @param elRef
- * @param options
- * @returns {{reloadSortable: Ref<UnwrapRef<boolean>>}}
- *
- * @description initializes Sortable on passed element ref and reinitializes it after each reorder
- *
- * WHY TO REINITIALIZE SORTABLE AFTER EACH ARRAY REORDER?
- * Sortable and Vue both changing DOM so that there are collisions
- * because both Vue and Sortable try to put element to the position. So element is put incorrectly.
- *
- * There are 2 vue packages for sortable (vue 2 and vue 3), but I had encountered issues when tried to use them.
- * Also, it seems to me that they aren't supported now :(
- *
- * So that I decided to reinitialize Sortable each time order changes to represent it correctly.
- * Bad decision, but I haven't come up with a better one
- */
-
-// eslint-disable-next-line import/prefer-default-export
-export function useDestroyableSortable(elRef, options) {
-  let sortable = null;
-
-  const reloadSortable = ref(false);
-
-  function destroySortable() {
-    return sortable.destroy();
-  }
-
-  function initSortable() {
-    const replaceSortable = async () => {
-      if (!sortable) return;
-      destroySortable();
-      reloadSortable.value = true;
-      await nextTick();
-      reloadSortable.value = false;
-      await nextTick();
-      initSortable();
-    };
-
-    sortable = Sortable.create(elRef.value, {
-      ...options,
-      onEnd: async (e) => {
-        if (options.onEnd) options.onEnd(e);
-        await replaceSortable();
-      },
-    });
-  }
-
-  onMounted(() => {
-    initSortable();
-  });
-
-  onUnmounted(() => {
-    destroySortable();
-  });
-
-  return { reloadSortable };
-}