@webitel/ui-sdk 24.12.140 → 24.12.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "24.12.140",
+  "version": "24.12.142",
   "private": false,
   "scripts": {
     "dev": "vite",

package/src/components/wt-navigation-bar/wt-navigation-bar.vue

@@ -182,7 +182,7 @@ export default {
             return flatNav.concat(currentNavItem.subNav);
           return [...flatNav, currentNavItem];
         }, [])
-        .find((navItem) => path.includes(navItem.route));
+        .find((navItem) => path.endsWith(navItem.route));
       const currentExpansion = this.nav
         .filter((nav) => nav.subNav)
         .find((nav) => nav.subNav.indexOf(currentNav) !== -1);

package/src/modules/Filters/v2/filters/components/values/_shared/composables/booleanFilterToolkit.ts

@@ -0,0 +1,33 @@
+import {useVuelidate} from "@vuelidate/core";
+import {computed, ModelRef, type Reactive, type Ref} from "vue";
+import {useI18n} from "vue-i18n";
+
+import {BooleanFilterModelValue} from "../types/BooleanFilter";
+
+export const usePrettifyBooleanValuePreview = (value: Reactive<boolean>): { localeValue: Ref<string> } => {
+    const { t } = useI18n();
+
+    const localeValue = computed(() => {
+        return value ? t('vocabulary.yes') : t('vocabulary.no');
+    });
+
+    return { localeValue };
+};
+
+export const useBooleanFilterValueValidation = <T extends BooleanFilterModelValue>(model: ModelRef<T>) => {
+    const v$ = useVuelidate(
+        computed(() => ({
+            model: {
+                required: (v: T) => !(!v && v !== false),
+            },
+        })),
+        { model },
+        { $autoDirty: true },
+    );
+
+    v$.value.$touch();
+
+    return {
+        v$,
+    };
+};

package/src/modules/Filters/v2/filters/components/values/_shared/types/BooleanFilter.ts

@@ -0,0 +1 @@
+export type BooleanFilterModelValue = boolean;

package/src/modules/Filters/v2/filters/components/values/has-file/has-file-filter-value-field.vue

@@ -7,26 +7,15 @@
 </template>
 
 <script lang="ts" setup>
-import { useVuelidate } from '@vuelidate/core';
-import { computed, watch } from 'vue';
+import { watch } from 'vue';
 
+import { useBooleanFilterValueValidation } from '../_shared/composables/booleanFilterToolkit';
 import HasOptionFilterValueField from '../_shared/has-options/has-option-filter-value-field.vue';
-import {HasFileFilterModelValue} from "./HasFileFilter";
+import {BooleanFilterModelValue} from "../_shared/types/BooleanFilter";
 
-const model = defineModel<HasFileFilterModelValue>();
+const model = defineModel<BooleanFilterModelValue>();
 
-const v$ = useVuelidate(
-  computed(() => ({
-    model: {
-      required: (v: HasFileFilterModelValue) => !(!v && v !== false),
-
-    },
-  })),
-  { model },
-  { $autoDirty: true },
-);
-
-v$.value.$touch();
+const { v$ } = useBooleanFilterValueValidation<BooleanFilterModelValue>(model);
 
 const emit = defineEmits<{
   'update:invalid': [boolean];

package/src/modules/Filters/v2/filters/components/values/has-file/has-file-filter-value-preview.vue

@@ -3,17 +3,15 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
+import {usePrettifyBooleanValuePreview} from "../_shared/composables/booleanFilterToolkit";
 
 const props = defineProps<{
   value: boolean;
 }>();
-const { t } = useI18n();
 
-const localeValue = computed(() => {
-  return props.value ? t('vocabulary.yes') : t('vocabulary.no');
-});
+const {
+  localeValue,
+} = usePrettifyBooleanValuePreview(props.value);
 </script>
 
 <style lang="scss" scoped></style>

package/src/modules/Filters/v2/filters/components/values/{rated/rated-filter-value-field.vue → has-rating/has-rating-filter-value-field.vue}

@@ -7,25 +7,15 @@
 </template>
 
 <script lang="ts" setup>
-import { useVuelidate } from '@vuelidate/core';
-import { required } from '@vuelidate/validators';
-import { computed, watch } from 'vue';
+import { watch } from 'vue';
 
+import {useBooleanFilterValueValidation} from "../_shared/composables/booleanFilterToolkit";
 import HasOptionFilterValueField from '../_shared/has-options/has-option-filter-value-field.vue';
+import {BooleanFilterModelValue} from "../_shared/types/BooleanFilter";
 
-const model = defineModel<string>();
+const model = defineModel<BooleanFilterModelValue>();
 
-const v$ = useVuelidate(
-  computed(() => ({
-    model: {
-      required,
-    },
-  })),
-  { model },
-  { $autoDirty: true },
-);
-
-v$.value.$touch();
+const { v$ } = useBooleanFilterValueValidation<BooleanFilterModelValue>(model);
 
 const emit = defineEmits<{
   'update:invalid': [boolean];

package/src/modules/Filters/v2/filters/components/values/has-rating/has-rating-filter-value-preview.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>{{ localeValue }}</div>
+</template>
+
+<script lang="ts" setup>
+import {usePrettifyBooleanValuePreview} from "../_shared/composables/booleanFilterToolkit";
+
+const props = defineProps<{
+  value: boolean;
+}>();
+
+const {
+  localeValue,
+} = usePrettifyBooleanValuePreview(props.value);
+</script>
+
+<style lang="scss" scoped></style>

package/src/modules/Filters/v2/filters/components/values/has-transcription/has-transcription-filter-value-field.vue

@@ -7,25 +7,16 @@
 </template>
 
 <script lang="ts" setup>
-import { useVuelidate } from '@vuelidate/core';
-import { computed, watch } from 'vue';
+import { watch } from 'vue';
 
+import {useBooleanFilterValueValidation} from "../_shared/composables/booleanFilterToolkit";
 import HasOptionFilterValueField from '../_shared/has-options/has-option-filter-value-field.vue';
-import {HasTranscriptionFilterModelValue} from "./HasTranscriptionFilter";
-
-const model = defineModel<HasTranscriptionFilterModelValue>();
-
-const v$ = useVuelidate(
-  computed(() => ({
-    model: {
-      required: (v: HasTranscriptionFilterModelValue) => !(!v && v !== false),
-    },
-  })),
-  { model },
-  { $autoDirty: true },
-);
+import {BooleanFilterModelValue} from "../_shared/types/BooleanFilter";
+
+const model = defineModel<BooleanFilterModelValue>();
+
+const { v$ } = useBooleanFilterValueValidation<BooleanFilterModelValue>(model);
 
-v$.value.$touch();
 
 const emit = defineEmits<{
   'update:invalid': [boolean];

package/src/modules/Filters/v2/filters/components/values/has-transcription/has-transcription-filter-value-preview.vue

@@ -3,17 +3,15 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
+import {usePrettifyBooleanValuePreview} from "../_shared/composables/booleanFilterToolkit";
 
 const props = defineProps<{
   value: boolean;
 }>();
-const { t } = useI18n();
 
-const localeValue = computed(() => {
-  return props.value ? t('vocabulary.yes') : t('vocabulary.no');
-});
+const {
+  localeValue,
+} = usePrettifyBooleanValuePreview(props.value);
 </script>
 
 <style lang="scss" scoped></style>

package/src/modules/Filters/v2/filters/components/values/index.js

@@ -32,6 +32,8 @@ import HasAttachmentFilter from './has-attachment/has-attachment-filter-value-fi
 import HasAttachmentFilterPreview from './has-attachment/has-attachment-filter-value-preview.vue';
 import HasFileFilter from './has-file/has-file-filter-value-field.vue';
 import HasFileFilterPreview from './has-file/has-file-filter-value-preview.vue';
+import HasRatingFilterValueField from './has-rating/has-rating-filter-value-field.vue';
+import HasRatingFilterValuePreview from './has-rating/has-rating-filter-value-preview.vue';
 import HasTranscriptionFilter from './has-transcription/has-transcription-filter-value-field.vue';
 import HasTranscriptionFilterPreview from './has-transcription/has-transcription-filter-value-preview.vue';
 import ImpactedFilter from './impacted/impacted-filter-value-field.vue';
@@ -40,8 +42,6 @@ import CasePriorityFilter from './priority-case/priority-case-filter-value-field
 import CasePriorityFilterPreview from './priority-case/priority-case-filter-value-preview.vue';
 import QueueFilter from './queue/queue-filter-value-field.vue';
 import QueueFilterPreview from './queue/queue-filter-value-preview.vue';
-import RatedFilter from './rated/rated-filter-value-field.vue';
-import RatedFilterPreview from './rated/rated-filter-value-preview.vue';
 import RatedByFilter from './rated-by/rated-by-filter-value-field.vue';
 import RatedByFilterPreview from './rated-by/rated-by-filter-value-preview.vue';
 import RatingFromToFilter from './rating/rating-from-to-filter-value-field.vue';
@@ -120,6 +120,8 @@ export {
   HasAttachmentFilterPreview,
   HasFileFilter,
   HasFileFilterPreview,
+  HasRatingFilterValueField,
+  HasRatingFilterValuePreview,
   HasTranscriptionFilter,
   HasTranscriptionFilterPreview,
   ImpactedFilter,
@@ -128,8 +130,6 @@ export {
   QueueFilterPreview,
   RatedByFilter,
   RatedByFilterPreview,
-  RatedFilter,
-  RatedFilterPreview,
   RatingFromToFilter,
   RatingFromToFilterPreview,
   ReactionTimeFilter,

package/src/modules/Filters/v2/filters/components/values/has-file/HasFileFilter.d.ts

@@ -1 +0,0 @@
-export type HasFileFilterModelValue = boolean;

package/src/modules/Filters/v2/filters/components/values/has-transcription/HasTranscriptionFilter.d.ts

@@ -1 +0,0 @@
-export type HasTranscriptionFilterModelValue = boolean;

package/src/modules/Filters/v2/filters/components/values/rated/rated-filter-value-preview.vue

@@ -1,22 +0,0 @@
-<template>
-  <div>{{ localeValue }}</div>
-</template>
-
-<script lang="ts" setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import { BooleanOptions } from '../../enums/boolean-options';
-
-const props = defineProps<{
-  value: boolean;
-}>();
-const { t } = useI18n();
-
-const localeValue = computed(() => {
-  const match = BooleanOptions.find((el) => el.value === props.value);
-  return match ? t(match.locale) : '';
-});
-</script>
-
-<style lang="scss" scoped></style>