Merge pull request 'hotFix(VnUserLink): improve worker existence check and refactor template logic' (!1773) from hotFix_VnUserLink_whenNotIsWorker into master
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1773 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>
This commit is contained in:
commit
b70e23498b
|
@ -25,6 +25,9 @@ describe('VnDmsList', () => {
|
||||||
deleteModel: 'WorkerDms',
|
deleteModel: 'WorkerDms',
|
||||||
downloadModel: 'WorkerDms',
|
downloadModel: 'WorkerDms',
|
||||||
},
|
},
|
||||||
|
global: {
|
||||||
|
stubs: ['VnUserLink'],
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@ describe('VnLog', () => {
|
||||||
|
|
||||||
vm = createWrapper(VnLog, {
|
vm = createWrapper(VnLog, {
|
||||||
global: {
|
global: {
|
||||||
stubs: [],
|
stubs: ['VnUserLink'],
|
||||||
mocks: {},
|
mocks: {},
|
||||||
},
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
|
|
|
@ -1,18 +1,38 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import AccountDescriptorProxy from 'src/pages/Account/Card/AccountDescriptorProxy.vue';
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.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 },
|
name: { type: String, default: null },
|
||||||
tag: { type: String, default: null },
|
tag: { type: String, default: null },
|
||||||
workerId: { type: Number, default: null },
|
workerId: { type: Number, default: null },
|
||||||
defaultName: { type: Boolean, default: false },
|
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>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<slot name="link">
|
<slot name="link">
|
||||||
<span :class="{ link: workerId }">
|
<span :class="{ link: workerId }">
|
||||||
{{ defaultName ? name ?? $t('globals.system') : name }}
|
{{ defaultName ? (name ?? $t('globals.system')) : name }}
|
||||||
</span>
|
</span>
|
||||||
</slot>
|
</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>
|
</template>
|
||||||
|
|
|
@ -110,10 +110,11 @@ Cypress.Commands.add('waitSpinner', () => {
|
||||||
|
|
||||||
// Fill Inputs
|
// Fill Inputs
|
||||||
Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
|
Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
|
||||||
|
cy.get(selector).should('exist').scrollIntoView();
|
||||||
cy.waitForElement(selector, timeout);
|
cy.waitForElement(selector, timeout);
|
||||||
|
|
||||||
cy.get(selector, { timeout })
|
cy.get(selector, { timeout })
|
||||||
.should('exist')
|
|
||||||
.should('be.visible')
|
.should('be.visible')
|
||||||
.click()
|
.click()
|
||||||
.then(($el) => {
|
.then(($el) => {
|
||||||
|
|
Loading…
Reference in New Issue