@webitel/ui-sdk 3.2.145 → 3.2.147
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.
- package/dist/ui-sdk.common.js +11 -11
- package/dist/ui-sdk.common.js.map +1 -1
- package/dist/ui-sdk.css +1 -1
- package/dist/ui-sdk.umd.js +11 -11
- package/dist/ui-sdk.umd.js.map +1 -1
- package/dist/ui-sdk.umd.min.js +1 -1
- package/dist/ui-sdk.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/src/components/wt-search-bar/__tests__/WtSearchBar.spec.js +9 -0
- package/src/components/wt-search-bar/wt-search-bar.vue +2 -2
- package/src/mixins/validationMixin/useValidation.js +19 -19
package/package.json
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
|
+
import { ref } from 'vue';
|
|
1
2
|
import { shallowMount } from '@vue/test-utils';
|
|
2
3
|
import WtSearchBar from '../wt-search-bar.vue';
|
|
4
|
+
import { useValidation } from '../../../mixins/validationMixin/useValidation';
|
|
5
|
+
|
|
6
|
+
jest.mock('../../../mixins/validationMixin/useValidation');
|
|
7
|
+
useValidation.mockImplementation(() => ({
|
|
8
|
+
isValidation: ref(false),
|
|
9
|
+
invalid: ref(false),
|
|
10
|
+
validationText: ref(''),
|
|
11
|
+
}));
|
|
3
12
|
|
|
4
13
|
describe('WtSearchBar', () => {
|
|
5
14
|
it('renders a component', () => {
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
</template>
|
|
41
41
|
|
|
42
42
|
<script setup>
|
|
43
|
-
import {
|
|
43
|
+
import { toRefs } from 'vue';
|
|
44
44
|
import debounce from '../../scripts/debounce';
|
|
45
45
|
import { useValidation } from '../../mixins/validationMixin/useValidation';
|
|
46
46
|
|
|
@@ -81,7 +81,7 @@ const emit = defineEmits([
|
|
|
81
81
|
'enter',
|
|
82
82
|
]);
|
|
83
83
|
|
|
84
|
-
const { v, customValidators } =
|
|
84
|
+
const { v, customValidators } = toRefs(props);
|
|
85
85
|
|
|
86
86
|
const { invalid } = useValidation({ v, customValidators });
|
|
87
87
|
|
|
@@ -3,32 +3,32 @@ import { useI18n } from 'vue-i18n';
|
|
|
3
3
|
|
|
4
4
|
export function useValidation({ v, customValidators }) {
|
|
5
5
|
const { t } = useI18n();
|
|
6
|
-
const isValidation = computed(() => !!v && !!Object.keys(v).length);
|
|
7
|
-
const invalid = computed(() => isValidation.value && v.$error);
|
|
6
|
+
const isValidation = computed(() => !!v.value && !!Object.keys(v.value).length);
|
|
7
|
+
const invalid = computed(() => isValidation.value && v.value.$error);
|
|
8
8
|
|
|
9
9
|
const validationText = computed(() => {
|
|
10
10
|
let validationText = '';
|
|
11
11
|
if (isValidation && invalid) {
|
|
12
|
-
if (v.required?.$invalid) validationText = t('validation.required');
|
|
13
|
-
else if (v.numeric?.$invalid) validationText = t('validation.numeric');
|
|
14
|
-
else if (v.email?.$invalid) validationText = t('validation.email');
|
|
15
|
-
else if (v.gatewayHostValidator?.$invalid) validationText = t('validation.gatewayHostValidator');
|
|
16
|
-
else if (v.ipValidator?.$invalid) validationText = t('validation.ipValidator');
|
|
17
|
-
else if (v.macValidator?.$invalid) validationText = t('validation.macValidator');
|
|
18
|
-
else if (v.minValue?.$invalid) validationText = `${t('validation.minValue')} ${v.minValue.$params.min}`;
|
|
19
|
-
else if (v.maxValue?.$invalid) validationText = `${t('validation.maxValue')} ${v.maxValue.$params.max}`;
|
|
20
|
-
else if (v.sipAccountValidator?.$invalid) validationText = t('validation.sipAccountValidator');
|
|
21
|
-
else if (v.minLength?.$invalid) validationText = `${t('validation.minLength')} ${v.minLength.$params.min}`;
|
|
22
|
-
else if (v.url?.$invalid) validationText = `${t('validation.url')}`;
|
|
23
|
-
else if (v.regExpValidator?.$invalid) validationText = `${t('validation.regExpValidator')}`;
|
|
24
|
-
else if (v.sameAs?.$invalid) validationText = `${t('validation.sameAs')}`;
|
|
25
|
-
else if (v.domainValidator?.$invalid) validationText = `${t('validation.domainValidator')}`;
|
|
26
|
-
else if (v.decimalValidator?.$invalid) validationText = `${t('validation.decimalValidator')} ${v.decimalValidator.$params.count}`;
|
|
27
|
-
else if (v.integer?.$invalid) validationText = `${t('validation.integer')}`;
|
|
12
|
+
if (v.value.required?.$invalid) validationText = t('validation.required');
|
|
13
|
+
else if (v.value.numeric?.$invalid) validationText = t('validation.numeric');
|
|
14
|
+
else if (v.value.email?.$invalid) validationText = t('validation.email');
|
|
15
|
+
else if (v.value.gatewayHostValidator?.$invalid) validationText = t('validation.gatewayHostValidator');
|
|
16
|
+
else if (v.value.ipValidator?.$invalid) validationText = t('validation.ipValidator');
|
|
17
|
+
else if (v.value.macValidator?.$invalid) validationText = t('validation.macValidator');
|
|
18
|
+
else if (v.value.minValue?.$invalid) validationText = `${t('validation.minValue')} ${v.value.minValue.$params.min}`;
|
|
19
|
+
else if (v.value.maxValue?.$invalid) validationText = `${t('validation.maxValue')} ${v.value.maxValue.$params.max}`;
|
|
20
|
+
else if (v.value.sipAccountValidator?.$invalid) validationText = t('validation.sipAccountValidator');
|
|
21
|
+
else if (v.value.minLength?.$invalid) validationText = `${t('validation.minLength')} ${v.value.minLength.$params.min}`;
|
|
22
|
+
else if (v.value.url?.$invalid) validationText = `${t('validation.url')}`;
|
|
23
|
+
else if (v.value.regExpValidator?.$invalid) validationText = `${t('validation.regExpValidator')}`;
|
|
24
|
+
else if (v.value.sameAs?.$invalid) validationText = `${t('validation.sameAs')}`;
|
|
25
|
+
else if (v.value.domainValidator?.$invalid) validationText = `${t('validation.domainValidator')}`;
|
|
26
|
+
else if (v.value.decimalValidator?.$invalid) validationText = `${t('validation.decimalValidator')} ${v.value.decimalValidator.$params.count}`;
|
|
27
|
+
else if (v.value.integer?.$invalid) validationText = `${t('validation.integer')}`;
|
|
28
28
|
}
|
|
29
29
|
// eslint-disable-next-line no-restricted-syntax
|
|
30
30
|
for (const { name, text } of customValidators) {
|
|
31
|
-
if (v[name]?.$invalid) validationText = text;
|
|
31
|
+
if (v.value[name]?.$invalid) validationText = text;
|
|
32
32
|
}
|
|
33
33
|
return validationText;
|
|
34
34
|
});
|