Merge branch 'master' into Fix-CustomerBalanceDescription

src/components/common/__tests__/VnDmsList.spec.js

@@ -25,6 +25,9 @@ describe('VnDmsList', () => {
                 deleteModel: 'WorkerDms',
                 downloadModel: 'WorkerDms',
             },
+            global: {
+                stubs: ['VnUserLink'],
+            },
         }).vm;
     });
 

src/components/common/__tests__/VnLog.spec.js

@@ -90,7 +90,7 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: [],
+                stubs: ['VnUserLink'],
                 mocks: {},
             },
             propsData: {

src/components/ui/VnUserLink.vue

@@ -1,18 +1,38 @@
 <script setup>
+import AccountDescriptorProxy from 'src/pages/Account/Card/AccountDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-
+import { ref, onMounted } from 'vue';
-defineProps({
+import axios from 'axios';
+const $props = defineProps({
     name: { type: String, default: null },
     tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
+const isWorker = ref(false);
+
+onMounted(async () => {
+    try {
+        const {
+            data: { exists },
+        } = await axios(`/Workers/${$props.workerId}/exists`);
+        isWorker.value = exists;
+    } catch (error) {
+        if (error.status === 403) return;
+        throw error;
+    }
+});
 </script>
 <template>
     <slot name="link">
         <span :class="{ link: workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : name }}
+            {{ defaultName ? (name ?? $t('globals.system')) : name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
+    <WorkerDescriptorProxy
+        v-if="isWorker"
+        :id="workerId"
+        @on-fetch="(data) => (isWorker = data?.workerId !== undefined)"
+    />
+    <AccountDescriptorProxy v-else :id="workerId" />
 </template>

test/cypress/support/commands.js

@@ -110,10 +110,11 @@ Cypress.Commands.add('waitSpinner', () => {
 
 // Fill Inputs
 Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
+    cy.get(selector).should('exist').scrollIntoView();
     cy.waitForElement(selector, timeout);
 
     cy.get(selector, { timeout })
-        .should('exist')
+
         .should('be.visible')
         .click()
         .then(($el) => {