adata-ui 2.1.34 → 2.1.36

package/components/elements/button-login/index.vue

@@ -9,6 +9,7 @@ defineEmits(['click'])
 <template>
   <div
     class="hidden w-max cursor-pointer items-center gap-2 rounded-2xl bg-blue-700 px-4 py-[6px] font-semibold dark:bg-blue-500 lg:flex"
+    data-test-id="header-login-button"
     @click="$emit('click')"
   >
     <icon-logout class="text-white dark:text-gray-900 lg:h-4 lg:w-4" />

package/components/features/color-mode/AColorMode.client.vue

@@ -44,6 +44,7 @@ onMounted(() => {
       on-icon-class="w-4 h-4"
       :on-icon="Moon"
       active-container-class="dark:bg-black"
+      data-test-id="header-switch-theme-toggle"
     />
   </client-only>
 </template>

package/components/features/lang-switcher/lang-switcher.vue

@@ -28,6 +28,7 @@ function onClick(loc: any) {
   <div
     ref="langSwitcher"
     class="relative"
+    data-test-id="header-switch-language-button"
   >
 
     <button
@@ -43,6 +44,7 @@ function onClick(loc: any) {
     >
       <nuxt-link
         v-for="loc in locales"
+        :data-test-id="`header-switch-${loc?.code}-language-button`"
         :class="[
           'text-sm cursor-pointer px-4 py-2.5 flex justify-between',
           {'text-primary bg-deepblue-500/5': locale === loc.code}

package/components/modals/ContentNavigationModal.vue

@@ -98,7 +98,7 @@ const sideLinks = <any>{
     {
       label: 'header.products.edo.label',
       icon: AIconFiles,
-      link: urls.edo + PAGES.edo.l
+      link: urls.edo_docs,
     }
   ],
   pk: [

package/components/modals/ReportBugModal.vue

@@ -85,9 +85,9 @@ async function send() {
 </script>
 
 <template>
-  <a-modal v-model="isOpen">
+  <a-modal v-model="isOpen" data-test-id="report-form-modal">
     <template #header>
-      <p class="heading-02 text-center">
+      <p class="heading-02 text-center" data-test-id="report-form-title">
         {{ t('modals.report_bug.title') }}
       </p>
     </template>
@@ -104,12 +104,14 @@ async function send() {
         <a-input-standard
           v-model="form.name"
           required
+          data-test-id="report-form-name-input"
           :label="t('modals.report_bug.labels.name')"
           :error="getError('name')"
         />
         <a-input-standard
           v-model="form.email"
           required
+          data-test-id="report-form-email-input"
           :label="t('modals.report_bug.labels.email')"
           :error="getError('email')"
         />
@@ -119,6 +121,7 @@ async function send() {
           required
           data-maska="8 (###) ### ## ##"
           clearable
+          data-test-id="report-form-phone-input"
           :label="t('modals.report_bug.labels.phone')"
           :error="getError('phone_number')"
         />
@@ -126,6 +129,7 @@ async function send() {
           <a-textarea
             v-model="form.comment"
             required
+            data-test-id="report-form-comment-textarea"
             :label="t('modals.report_bug.labels.comment')"
             size="md"
             :error="getError('comment')"
@@ -140,12 +144,14 @@ async function send() {
         <a-button
           view="outline"
           class="w-full"
+          data-test-id="report-form-close-button"
           @click="emit('close')"
         >
           {{ t('actions.close') }}
         </a-button>
         <a-button
           class="w-full"
+          data-test-id="report-form-submit-button"
           @click="send"
         >
           {{ t('actions.send') }}

package/components/modals/id/IdLoginModal.vue

@@ -178,10 +178,12 @@ async function submit() {
 }
 
 function authWithSocial(social: string) {
-  const mode = (useNuxtApp().$config.public.authApiURL as string).includes('adata')
-    ? 'adata'
-    : 'adtdev'
-  document.location.replace(`https://auth.${mode}.kz/api/login/social?source=${social}`)
+  const url = new URL(`https://auth.${mode}.kz/api/login/social`)
+
+  url.searchParams.set('source', social)
+  url.searchParams.set('redirect_url', window.location.origin)
+
+  document.location.replace(url.toString())
 }
 
 function onRegister() {
@@ -226,26 +228,28 @@ onBeforeUnmount(() => {
 
 <template>
   <div class="flex flex-col gap-5">
-    <h1 class="heading-02 text-center">
+    <h1 class="heading-02 text-center" data-test-id="login-form-title">
       {{ t('modals.id.login.title') }}
     </h1>
-    <p class="body-400 text-center">
+    <p class="body-400 text-center" data-test-id="login-form-subtitle">
       {{ t('modals.id.login.subtitle') }}
     </p>
     <div class="flex flex-col gap-4">
       <a-input-standard
         v-model="form.username"
         type="email"
+        data-test-id="login-form-email-input"
         :label="t('modals.id.login.labels.email')"
         :error="getError('username')"
       />
       <a-input-password
         v-model="form.password"
+        data-test-id="login-form-password-input"
         :label="t('modals.id.login.labels.password')"
         :error="getError('password')"
       />
       <div class="flex items-center justify-between">
-        <div class="body-400 flex gap-2">
+        <div class="body-400 flex gap-2" data-test-id="login-form-remember-me-checkbox">
           <a-checkbox
             v-model="rememberMe"
             name="remember_me"
@@ -259,6 +263,7 @@ onBeforeUnmount(() => {
         </div>
         <button
           class="link-s-400"
+          data-test-id="login-form-forgot-password-button"
           @click="onForgotPassword"
         >
           {{ t('modals.id.login.forget_password') }}
@@ -270,18 +275,21 @@ onBeforeUnmount(() => {
       <div class="flex shrink-0 gap-4">
         <span
           class="cursor-pointer"
+          data-test-id="login-form-google-button"
           @click="authWithSocial('google')"
         >
           <a-icon-google />
         </span>
         <span
           class="cursor-pointer"
+          data-test-id="login-form-yandex-button"
           @click="authWithSocial('yandex')"
         >
           <a-icon-yandex />
         </span>
         <span
           class="cursor-pointer"
+          data-test-id="login-form-mailru-button"
           @click="authWithSocial('mailru')"
         >
           <a-icon-mailru />
@@ -292,6 +300,7 @@ onBeforeUnmount(() => {
     <a-button
       :loading="loading"
       type="submit"
+      data-test-id="login-form-login-button"
       @click="submit"
     >
       {{ t('actions.login') }}
@@ -304,6 +313,7 @@ onBeforeUnmount(() => {
       type="button"
       view="outline"
       class="w-full"
+      data-test-id="login-form-register-button"
       @click="onRegister"
     >
       {{ t('actions.register') }}
@@ -313,6 +323,7 @@ onBeforeUnmount(() => {
       type="button"
       view="transparent"
       class="w-full"
+      data-test-id="login-form-tariffs-button"
       @click="toTariffs"
     >
       {{ t('actions.toTariffs') }}

package/components/modals/id/IdModals.vue

@@ -76,7 +76,7 @@ const autoLoginClose = () => {
 </script>
 
 <template>
-  <a-modal v-model="loginModal">
+  <a-modal v-model="loginModal" data-test-id="login-form-modal">
     <id-login-modal v-if="loginModal" />
   </a-modal>
   <a-modal v-model="twoFactorModal">

package/components/navigation/footer/AFooter.vue

@@ -85,7 +85,7 @@ const mainLinks = computed(() => ({
         },
         {
           title: t('header.products.edo.label'),
-          link: urls.edo + PAGES.edo.l,
+          link: urls.edo_docs,
           isNew: true
         },
         {

package/components/navigation/header/AHeader.vue

@@ -160,6 +160,7 @@ onMounted(() => {
             aria-label="Adata-logo"
             :to="buildLocalizedUrl(locale, urls.landing)"
             class="text-deepblue cursor-pointer dark:text-[#E3E5E8]"
+            data-test-id="header-main-adata-logo"
             @click="goToAnotherModule"
           >
             <adata-logo
@@ -187,6 +188,7 @@ onMounted(() => {
             <template #default="{ onExpand, expanded }">
               <div
                 class="hidden cursor-pointer items-center gap-2 text-sm font-semibold lg:flex"
+                data-test-id="header-email-text"
                 @click.stop="onExpand"
               >
                 <span>{{ email }}</span>

package/components/navigation/header/HeaderLink.vue

@@ -14,15 +14,18 @@ const { t, locale } = useI18n()
 const navs: any = [
   {
     label: 'header.navs.products',
-    to: landing + PAGES.totalServices
+    to: landing + PAGES.totalServices,
+    data_attribute: 'header-products-and-solutions-button',
   },
   {
     label: 'header.navs.contacts',
-    to: landing + PAGES.contacts
+    to: landing + PAGES.contacts,
+    data_attribute: 'header-contacts-button',
   },
   {
     label: 'header.navs.tariffs',
-    to: landing + PAGES.tariffs
+    to: landing + PAGES.tariffs,
+    data_attribute: 'header-tariffs-button',
   },
   // {
   //   label: 'header.navs.api',
@@ -177,6 +180,7 @@ watch(
         v-for="(nav, index) in navs"
         :key="nav.label"
         class="group inline-block border-r border-[#2C3E501A] px-2 last-of-type:border-none dark:border-[#E3E5E81A]"
+        :data-test-id="nav.data_attribute"
         @click="lockMenu"
         role="listitem"
       >

package/components/navigation/header/ProductMenu.vue

@@ -54,6 +54,7 @@ function isCurrentModule(currentModule: string) {
                   :to="module.to"
                   :icon="module.icon"
                   :badge="module.is_new"
+                  :data-test-id="module.data_attribute"
                 />
               </div>
               <div class="flex flex-col gap-5 w-[290px] pl-[10px]">
@@ -68,6 +69,7 @@ function isCurrentModule(currentModule: string) {
                   :to="module.to"
                   :icon="module.icon"
                   :badge="module.is_new"
+                  :data-test-id="module.data_attribute"
                 />
               </div>
               <div class="flex flex-col gap-5 w-[330px] pl-[10px]">
@@ -82,6 +84,7 @@ function isCurrentModule(currentModule: string) {
                   :to="module.to"
                   :icon="module.icon"
                   :badge="module.is_new"
+                  :data-test-id="module.data_attribute"
                 />
               </div>
             </div>

package/components/navigation/header/TopHeader.vue

@@ -142,7 +142,7 @@ const closeMessage = () => {
         class="hidden min-h-10 bg-gray-50 dark:bg-gray-950 lg:block"
       >
         <div class="a-container flex justify-between py-2 items-center text-sm">
-          <div class="flex items-center leading-[24px]">
+          <div class="flex items-center leading-[24px]" data-test-id="header-currency-bar">
             <div v-for="currency in currencies" :key="currency.currency" class="mr-4 flex gap-2">
               <div class="flex items-center">
                 <component
@@ -165,13 +165,13 @@ const closeMessage = () => {
           <div v-if="isAuthenticated" class="flex items-center gap-5">
             <div v-if="limitRemaining != null || limitRemaining != undefined">
               <span class="mr-2 text-xs">{{ t('header.top.requestLimit') }}</span>
-              <a-status-badge size="sm">
+              <a-status-badge size="sm" data-test-id="header-daily-requests-count">
                 {{ limitRemaining }}
               </a-status-badge>
             </div>
             <div v-if="daysRemaining">
               <span class="mr-2 text-xs">{{ t('header.top.daysLeft') }}</span>
-              <a-status-badge size="sm">
+              <a-status-badge size="sm" data-test-id="header-tariff-days-remaining-count">
                 {{ daysRemaining }}
               </a-status-badge>
             </div>

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

@@ -17,6 +17,7 @@
         activeTab === option.key ? selectedClasses() : defaultClasses(!!option.disabled),
         sizeOptions[size]
       ]"
+      :data-test-id="option?.dataTestId"
       @click="onChanged(option, $event)"
     >
       <slot name="option" :option="option">

package/components/navigation/pill-tabs/types.ts

@@ -20,4 +20,5 @@ export interface Tab {
   disabled?: boolean
   prevent?:boolean
   badgeColor?: 'primary' | 'success' | 'danger' | 'gray' | 'orange' | 'warning'
+  dataTestId?: string
 }

package/components/overlays/modal/AModal.vue

@@ -58,6 +58,7 @@ interface Props {
   isScrollable?: boolean
   width?: string | number
   heightModalClass?: string
+  dataTestId?: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -70,6 +71,7 @@ const props = withDefaults(defineProps<Props>(), {
   name: 'modal',
   width: 424,
   heightModalClass: '',
+  dataTestId: undefined,
 })
 const content = ref()
 
@@ -274,6 +276,7 @@ watch(modelValue, async (newValue) => {
               ref="modal"
               :class="baseClasses"
               :style="modalStyles"
+              :data-test-id="dataTestId"
             >
               <div
                 v-if="isMobile"

package/composables/useHeaderNavigationLinks.ts

@@ -63,6 +63,7 @@ export const useHeaderNavigationLinks = () => {
         link: buildLocalizedUrl(locale, urls.pk, PAGES.pk.main),
         icon: AIconUsersThree,
         to: urls.pk,
+        data_attribute: 'navigation-menu-counterparty-block',
         items: [
           {
             title: t('header.products.counterparties.items.counterparty.title'),
@@ -115,6 +116,7 @@ export const useHeaderNavigationLinks = () => {
         name: t('header.products.fines.label'),
         link: buildLocalizedUrl(locale, urls.avto, PAGES.fines.main),
         icon: AIconCar,
+        data_attribute: 'navigation-menu-fines-block',
         items: [
           {
             title: t('header.products.fines.items.fines.title'),
@@ -141,6 +143,7 @@ export const useHeaderNavigationLinks = () => {
         name: t('header.products.jobs.label'),
         link: urls.work,
         icon: AIconWorkBag,
+        data_attribute: 'navigation-menu-work-block',
         items: [
           {
             title: t('header.products.jobs.items.vacancies.title'),
@@ -162,6 +165,7 @@ export const useHeaderNavigationLinks = () => {
         name: t('header.products.fea.label'),
         link: buildLocalizedUrl(locale, urls.tnved, PAGES.fea.main),
         icon: AIconGlobe,
+        data_attribute: 'navigation-menu-ved-block',
         items: [
           {
             title: t('header.products.fea.items.o.t'),
@@ -215,6 +219,7 @@ export const useHeaderNavigationLinks = () => {
         icon: AIconReceipt,
         is_new: true,
         to: urls.tender,
+        data_attribute: 'navigation-menu-zakupki-block',
         items: [
           {
             title: t('header.products.tenders.items.customers.title'),
@@ -258,14 +263,15 @@ export const useHeaderNavigationLinks = () => {
         key: 'edo',
         is_new: true,
         name: t('header.products.edo.label'),
-        link: buildLocalizedUrl(locale, urls.edo , ''),
+        link: buildLocalizedUrl(locale, urls.edo_docs , ''),
         icon: AIconFiles,
+        data_attribute: 'navigation-menu-edo-block',
         items: [
           {
             title: t('header.products.edo.items.l.t'),
             subtitle: t('header.products.edo.items.l.t'),
             icon: AIconFiles,
-            to: buildLocalizedUrl(locale, urls.edo , '')
+            to: buildLocalizedUrl(locale, urls.edo_docs , '')
           }
         ]
       },
@@ -275,6 +281,7 @@ export const useHeaderNavigationLinks = () => {
         name: t('header.products.compliance.label'),
         link: buildLocalizedUrl(locale, urls.compliance, ''),
         icon: AIconId,
+        data_attribute: 'navigation-menu-compliance-block',
         items: [
           {
             title: t('header.products.compliance.items.assistant.t'),
@@ -319,6 +326,7 @@ export const useHeaderNavigationLinks = () => {
         name: t('header.products.analytics.label'),
         link: buildLocalizedUrl(locale, urls.analytics, ''),
         icon: AIconArrowGraphUp,
+        data_attribute: 'navigation-menu-analytics-block',
         items: [
           // {
           //   title: t('header.products.analytics.items.procurement.title'),

package/composables/useUrls.ts

@@ -15,6 +15,7 @@ export function useUrls() {
     analyticsNew: `https://analytics.${mode}.kz`,
     tnved: `https://tnved.${mode}.kz`,
     edo: `https://edo.${mode}.kz`,
+    edo_docs: `https://docs.${mode}.kz`,
     compliance: `https://ac.${mode}.kz/compliance`,
     compliancemain: `https://ac.${mode}.kz/main`,
     mode,

package/package.json

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