verdnatura/salix-front
verdnatura
/
salix-front
3
3
Fork 1
Code Issues Pull Requests 75 Releases Wiki Activity

Merge pull request 'hotFix_agencyDescriptorProxyRedirect' (!1832) from hotFix_agencyDescriptorProxyRedirect into master
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1832
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jose Antonio Tubau 2025-05-22 13:42:47 +00:00
parent fa141fdd66 dcff03a0c2
commit fe6afee950
2 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pages/Route/RouteList.vue
View File

@ -8,7 +8,6 @@ import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
import RouteFilter from 'pages/Route/Card/RouteFilter.vue'; import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import AgencyDescriptorProxy from 'src/pages/Route/Agency/Card/AgencyDescriptorProxy.vue';
import VehicleDescriptorProxy from 'src/pages/Route/Vehicle/Card/VehicleDescriptorProxy.vue'; import VehicleDescriptorProxy from 'src/pages/Route/Vehicle/Card/VehicleDescriptorProxy.vue';
import VnSection from 'src/components/common/VnSection.vue'; import VnSection from 'src/components/common/VnSection.vue';
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue'; import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
@ -72,6 +71,7 @@ const columns = computed(() => [
create: true, create: true,
columnFilter: true, columnFilter: true,
cardVisible: true, cardVisible: true,
format: ({agencyName}) => agencyName,
}, },
{ {
name: 'vehicleFk', name: 'vehicleFk',
@ -179,15 +179,6 @@ const columns = computed(() => [
<WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" /> <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
</span> </span>
</template> </template>
<template #column-agencyModeFk="{ row }">
<span class="link" @click.stop>
{{ row?.agencyName }}
<AgencyDescriptorProxy
:id="row?.agencyModeFk"
v-if="row?.agencyModeFk"
/>
</span>
</template>
<template #column-vehicleFk="{ row }"> <template #column-vehicleFk="{ row }">
<span class="link" @click.stop> <span class="link" @click.stop>
{{ row?.vehiclePlateNumber }} {{ row?.vehiclePlateNumber }}

39
test/cypress/integration/route/routeList.spec.js
View File

@ -5,7 +5,6 @@ describe('Route', { testIsolation: true }, () => {
const selectors = { const selectors = {
lastRow: 'tr:last-child > [data-col-field="workerFk"]', lastRow: 'tr:last-child > [data-col-field="workerFk"]',
workerLink: getSelector('workerFk'), workerLink: getSelector('workerFk'),
agencyLink: getSelector('agencyModeFk'),
vehicleLink: getSelector('vehicleFk'), vehicleLink: getSelector('vehicleFk'),
assignedTicketsBtn: 'tableAction-0', assignedTicketsBtn: 'tableAction-0',
rowSummaryBtn: 'tableAction-1', rowSummaryBtn: 'tableAction-1',
@ -127,44 +126,6 @@ describe('Route', { testIsolation: true }, () => {
}); });
}); });
describe('Agency pop-ups', () => {
it('Should redirect to summary from the agency pop-up descriptor', () => {
cy.get(selectors.agencyLink).click();
cy.get(selectors.descriptorTitle)
.invoke('text')
.then((text) => {
expect(text).to.include(data.Agency.val);
});
cy.get(selectors.descriptorGoToSummaryBtn).click();
cy.get(selectors.summaryTitle)
.invoke('text')
.then((text) => {
expect(text).to.include(data.Agency.val);
});
});
it('Should redirect to the summary from the agency pop-up summary', () => {
cy.get(selectors.agencyLink).click();
cy.get(selectors.descriptorTitle)
.invoke('text')
.then((text) => {
expect(text).to.include(data.Agency.val);
});
cy.get(selectors.descriptorOpenSummaryBtn).click();
cy.get(selectors.summaryTitle)
.invoke('text')
.then((text) => {
expect(text).to.include(data.Agency.val);
});
cy.get(selectors.SummaryGoToSummaryBtn).click();
cy.get(selectors.summaryTitle)
.invoke('text')
.then((text) => {
expect(text).to.include(data.Agency.val);
});
});
});
describe('Vehicle pop-ups', () => { describe('Vehicle pop-ups', () => {
it('Should redirect to summary from the vehicle pop-up descriptor', () => { it('Should redirect to summary from the vehicle pop-up descriptor', () => {
cy.get(selectors.vehicleLink).click(); cy.get(selectors.vehicleLink).click();