adata-ui 2.1.40-beta.14 → 2.1.40-beta.16

package/components/elements/status-badge/AStatusBadge.vue

@@ -81,11 +81,11 @@ const pointSwitchValues: ViewType = {
 
 const classes = computed(() =>
   [
-    'text-body-md rounded-sm select-none inline-flex gap-[5.5px] justify-center items-center border',
+    'text-body-md rounded-2xl select-none inline-flex gap-[5.5px] justify-center items-center border',
     typeSwitchValues[props.view][props.type],
-    props.size === 'xs' ? 'px-4 py-[2px] text-body-sm font-bold' : '',
-    props.size === 'sm' ? 'text-body-sm font-semibold px-4 py-[2px] h-6' : '',
-    props.size === 'lg' ? 'px-4 py-[7.5px] font-semibold' : '',
+    props.size === 'xs' ? 'px-2 py-[2px] text-body-sm font-bold' : '',
+    props.size === 'sm' ? 'px-[10px] py-1 text-body-sm font-semibold h-6' : '',
+    props.size === 'lg' ? 'px-3 py-[6px] font-semibold' : '',
   ])
 
 const pointClasses = computed(() =>

package/components/features/payment/process/PaymentKaspiQrSidePanel.vue

@@ -122,11 +122,12 @@ watch(isOpen, async (value) => {
         <button
           type="button"
           class="rounded-md p-1 transition-colors hover:bg-gray-100 dark:hover:bg-white/[0.06]"
+          data-test-id="kaspi-qr-back-button"
           @click="onBack"
         >
           <a-icon-chevron-left class="size-6" />
         </button>
-        <p class="text-xl font-semibold text-deepblue-900 dark:text-gray-100">
+        <p class="text-xl font-semibold text-deepblue-900 dark:text-gray-100" data-test-id="kaspi-qr-title">
           {{ t('payment.kaspi.title') }}
         </p>
       </div>
@@ -137,7 +138,7 @@ watch(isOpen, async (value) => {
         {{ t('payment.kaspi.description') }}
       </p>
 
-      <div class="flex flex-col items-center gap-5 rounded-xl border border-gray-200 bg-white p-6 dark:border-gray-700 dark:bg-gray-900">
+      <div class="flex flex-col items-center gap-5 rounded-xl border border-gray-200 bg-white p-6 dark:border-gray-700 dark:bg-gray-900" data-test-id="kaspi-qr-payment-block">
         <div class="flex items-center gap-3">
           <a-icon-kaspi-qr class="size-14" />
           <span class="text-[40px] font-bold leading-none text-deepblue-900 dark:text-white">
@@ -165,6 +166,7 @@ watch(isOpen, async (value) => {
         view="outline"
         color="gray"
         size="lg"
+        data-test-id="kaspi-qr-change-payment-method-button"
         block
         @click="onBack"
       >

package/components/features/payment/process/PaymentMethodSidePanel.vue

@@ -18,8 +18,8 @@ const { t } = useI18n()
 
 const selected = ref<IBank>('kaspi')
 const cards = [
-  { id: 'kaspi', name: 'payment.method.kaspi', img: AIconPaymentKaspi },
-  { id: 'other', name: 'payment.method.other', img: AIconPaymentCard },
+  { id: 'kaspi', name: 'payment.method.kaspi', img: AIconPaymentKaspi, dataTestId: 'payment-method-kaspi-button' },
+  { id: 'other', name: 'payment.method.other', img: AIconPaymentCard, dataTestId: 'payment-method-other-bank-button' },
 ] as const
 
 const formattedSum = computed(() => Math.round(props.sum).toLocaleString('ru-RU'))
@@ -41,12 +41,14 @@ function onBack() {
   <a-side-panel
     v-model="isOpen"
     width="484px"
+    data-test-id="payment-method-modal"
   >
     <template #header>
       <div class="flex items-center gap-2">
         <button
           type="button"
           class="rounded-md p-1 transition-colors hover:bg-gray-100 dark:hover:bg-white/[0.06]"
+          data-test-id="payment-method-back-button"
           @click="onBack"
         >
           <a-icon-chevron-left class="size-6" />
@@ -75,6 +77,7 @@ function onBack() {
           :key="item.id"
           type="button"
           class="flex items-center gap-3 rounded-xl border p-4 text-left transition-colors"
+          :data-test-id="item.dataTestId"
           :class="selected === item.id
             ? 'border-blue-500 bg-blue-50/60 dark:border-blue-400 dark:bg-blue-950/30'
             : 'border-gray-200 bg-white hover:border-gray-300 hover:bg-gray-50 dark:border-gray-700 dark:bg-gray-900 dark:hover:bg-gray-800'"
@@ -111,6 +114,7 @@ function onBack() {
       <div class="flex flex-col gap-2">
         <a-button-v2
           size="lg"
+          data-test-id="payment-method-submit-button"
           block
           @click="confirm"
         >
@@ -120,6 +124,7 @@ function onBack() {
           view="outline"
           color="gray"
           size="lg"
+          data-test-id="payment-method-close-button"
           block
           @click="cancel"
         >

package/components/features/payment/process/PaymentTopUpSidePanel.vue

@@ -11,10 +11,10 @@ const money = ref<number | string>(0)
 const errorAlert = ref(false)
 
 const sumArr = [
-  { id: 1, value: 2000, label: '2 000 ₸' },
-  { id: 2, value: 5000, label: '5 000 ₸' },
-  { id: 3, value: 10000, label: '10 000 ₸' },
-  { id: 4, value: 20000, label: '20 000 ₸' },
+  { id: 1, value: 2000, label: '2 000 ₸', dataTestId: 'topup-balance-amount-2000-button' },
+  { id: 2, value: 5000, label: '5 000 ₸', dataTestId: 'topup-balance-amount-5000-button' },
+  { id: 3, value: 10000, label: '10 000 ₸', dataTestId: 'topup-balance-amount-10000-button' },
+  { id: 4, value: 20000, label: '20 000 ₸', dataTestId: 'topup-balance-amount-20000-button' },
 ]
 
 const amount = computed(() => Number(money.value) || 0)
@@ -45,6 +45,7 @@ function handlePayment() {
   <a-side-panel
     v-model="isOpen"
     width="484px"
+    data-test-id="topup-balance-modal"
   >
     <template #header>
       <div class="text-xl font-semibold text-deepblue-900 dark:text-gray-100">
@@ -67,6 +68,7 @@ function handlePayment() {
           type="number"
           size="md"
           clearable
+          data-test-id="topup-topup-balance-amount-input"
           :error="errorAlert ? t('modals.replenish_modal.error') : undefined"
         />
 
@@ -76,6 +78,7 @@ function handlePayment() {
             :key="item.id"
             type="button"
             class="rounded-lg border px-3 py-2.5 text-sm font-semibold transition-colors"
+            :data-test-id="item.dataTestId"
             :class="amount === item.value
               ? 'border-blue-500 bg-blue-50 text-blue-700 dark:border-blue-400 dark:bg-blue-950/40 dark:text-blue-300'
               : 'border-gray-200 bg-white text-deepblue-900 hover:border-gray-300 hover:bg-gray-50 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-100 dark:hover:bg-gray-800'"
@@ -91,6 +94,7 @@ function handlePayment() {
       <div class="flex flex-col gap-2">
         <a-button-v2
           size="lg"
+          data-test-id="topup-balance-submit-button"
           block
           :disabled="!filterMoney"
           @click="handlePayment"
@@ -101,6 +105,7 @@ function handlePayment() {
           view="outline"
           color="gray"
           size="lg"
+          data-test-id="topup-balance-back-button"
           block
           @click="onClose"
         >

package/components/modals/ReportBugModal.vue

@@ -28,7 +28,6 @@ const form: any = reactive({
 const phone = ref(form.phone_number)
 
 const scheme = z.object({
-  name: z.string().nonempty(t('modals.report_bug.validation.required')),
   email: z.string().nonempty(t('modals.report_bug.validation.required')).email(t('modals.submit_application_modal.rules.email')),
   phone_number: z.string().nonempty(t('modals.report_bug.validation.required')).min(17, t('modals.report_bug.validation.phone', { n: 10 })),
   comment: z.string().nonempty(t('modals.report_bug.validation.required')),
@@ -88,7 +87,11 @@ async function send() {
 </script>
 
 <template>
-  <a-modal-v2 v-model="isOpen" width="424px">
+  <a-modal-v2
+    v-model="isOpen"
+    width="424px"
+    data-test-id="report-form-modal"
+  >
     <template #header>
       <h2 class="text-base font-semibold text-gray-900 dark:text-gray-100" data-test-id="report-form-title">
         {{ t('modals.report_bug.title') }}
@@ -108,7 +111,6 @@ async function send() {
       <div class="flex flex-col gap-3">
         <a-input-v2
           v-model="form.name"
-          required
           :label="t('modals.report_bug.labels.name')"
           :error="getError('name')"
           data-test-id="report-form-name-input"

package/components/navigation/pill-tabs/APillTabsV2.vue

@@ -4,7 +4,7 @@ type CountColor = 'gray' | 'blue' | 'yellow' | 'red' | 'green' | 'neutral'
 export interface PillTab {
   key: string
   name: string
-  count?: number
+  count?: number | string
   countColor?: CountColor
   disabled?: boolean
   hideCount?: boolean
@@ -14,6 +14,7 @@ const props = withDefaults(defineProps<{
   modelValue: string
   options: PillTab[]
   showCount?: boolean
+  defaultCountColor?: CountColor
   ariaLabel?: string
   block?: boolean
   disabled?: boolean
@@ -47,6 +48,25 @@ const COUNT_COLOR_CLASS: Record<CountColor, string> = {
 
 const { t, te } = useI18n()
 
+function hasCount(option: PillTab) {
+  if (typeof option.count === 'string') {
+    return !!Number(String(option.count).replace(/\s/g, ''))
+  }
+  return !!option.count
+}
+
+function formatCount(option: PillTab) {
+  if (typeof option.count === 'number') {
+    return option.count.toLocaleString('ru-RU')
+  }
+  return option.count
+}
+
+function resolveCountColor(option: PillTab): CountColor {
+  if (!hasCount(option)) return 'gray'
+  return option.countColor ?? props.defaultCountColor ?? 'gray'
+}
+
 function localize(label: string) {
   return te(label) ? t(label) : label
 }
@@ -114,9 +134,9 @@ onMounted(scrollActiveIntoView)
           <span
             v-if="showCount && !option.hideCount"
             class="inline-flex min-w-5 shrink-0 items-center justify-center rounded-full px-1.5 text-body-sm font-semibold leading-5"
-            :class="COUNT_COLOR_CLASS[option.countColor ?? 'gray']"
+            :class="COUNT_COLOR_CLASS[resolveCountColor(option)]"
           >
-            {{ option.count }}
+            {{ formatCount(option) }}
           </span>
         </slot>
       </button>

package/components/overlays/side-panel/ASidePanel.vue

@@ -24,6 +24,7 @@ const props = withDefaults(defineProps<{
   headerClass?: string
   bodyClass?: string
   footerClass?: string
+  dataTestId?: string
 }>(), {
   idName: "vsp-container",
   side: "right",
@@ -36,7 +37,8 @@ const props = withDefaults(defineProps<{
   overlayOpacity: 0.5,
   overlayDuration: 500,
   panelColor: "bg-white dark:bg-gray-900",
-  panelDuration: 300
+  panelDuration: 300,
+  dataTestId: undefined,
 })
 
 defineEmits<{
@@ -219,6 +221,7 @@ const touchend = () => {
             class="vsp fixed flex flex-col"
             :class="[`vsp--${panelSide}-side`, $attrs.class, roundedClass, panelColor]"
             :style="panelStyles"
+            :data-test-id="dataTestId"
           >
             <div
               class="w-full flex justify-center items-center mt-1 lg:hidden"

package/composables/useHeaderNavigationLinks.ts

@@ -349,6 +349,12 @@ export function useHeaderNavigationLinks() {
             icon: CheckSb,
             to: urls.compliancemain + PAGES.compliance.sb,
           },
+          {
+            title: t('header.products.compliance.items.inspection.t'),
+            subtitle: t('header.products.compliance.items.inspection.st'),
+            icon: AIconShieldVerified,
+            to: urls.compliancemain + PAGES.compliance.inspection,
+          },
         ],
       },
       {

package/lang/en.ts

@@ -191,7 +191,7 @@ const EnLocale: RuLocale = {
             subtitle: 'Evaluate the volume of competitors\' procurements over a certain period',
           },
           activity: {
-            title: 'Activity index',
+            title: 'Business activity index',
             subtitle: 'Assessment of market risk of current business activity',
           },
           subjects: {
@@ -228,7 +228,7 @@ const EnLocale: RuLocale = {
             st: 'Calculation of Customs Payments. Customs Duties. Customs Fees',
           },
           tr: {
-            t: 'Market and tariffs',
+            t: 'International market and tariffs',
             st: 'Customs Tariffs and Quotas. Measures for Protecting the Domestic Market. Regulatory Requirements',
           },
           importerMap: {
@@ -272,6 +272,10 @@ const EnLocale: RuLocale = {
             t: 'Security check',
             st: '',
           },
+          inspection: {
+            t: 'Inspection registry',
+            st: '',
+          },
         },
       },
       edo: {

package/lang/kk.ts

@@ -191,7 +191,7 @@ const KkLocale: RuLocale = {
             subtitle: 'Бәсекелестердің белгілі бір кезеңдегі сатып алу көлемін бағалау',
           },
           activity: {
-            title: 'Белсенділік индексі',
+            title: 'Іскерлік белсенділік индексі',
             subtitle: 'Қазіргі іскерлік белсенділіктің нарықтық тәуекелін бағалау',
           },
           subjects: {
@@ -228,7 +228,7 @@ const KkLocale: RuLocale = {
             st: 'Кедендік төлемдерді есептеу. Кедендік баждар. Кедендік алымдар',
           },
           tr: {
-            t: 'Нарық және тарифтер',
+            t: 'Халықаралық нарық және тарифтер',
             st: 'Кедендік тарифтер мен квоталар. Ішкі нарықты қорғау шаралары. Нормативтік талаптар',
           },
           importerMap: {
@@ -272,6 +272,10 @@ const KkLocale: RuLocale = {
             t: 'Қауіпсіздік қызметінің тексеруі',
             st: '',
           },
+          inspection: {
+            t: 'Тексерулер тізілімі',
+            st: '',
+          },
         },
       },
       edo: {

package/lang/ru.ts

@@ -190,7 +190,7 @@ const RuLocale = {
               'Оцените объем закупок конкурентов за определенный период',
           },
           activity: {
-            title: 'Индекс активности',
+            title: 'Индекс деловой активности',
             subtitle:
               'Оценка рыночного риска текущей деловой активности',
           },
@@ -229,7 +229,7 @@ const RuLocale = {
             st: 'Расчет таможенных платежей. Таможенные пошлины. Таможенные сборы',
           },
           tr: {
-            t: 'Рынок и тарифы',
+            t: 'Международный рынок и тарифы',
             st: 'Таможенные тарифы и квоты. Меры защиты внутреннего рынка. Нормативные требования',
           },
           importerMap: {
@@ -273,6 +273,10 @@ const RuLocale = {
             t: 'Проверка СБ',
             st: '',
           },
+          inspection: {
+            t: 'Реестр проверок',
+            st: '',
+          },
         },
       },
       edo: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.1.40-beta.14",
+  "version": "2.1.40-beta.16",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",