verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

fix: refs #7323 fetch from right source #2933

Merged
jorgep merged 4 commits from 7323-replaceWorkerDataSource into dev 2024-09-09 07:05:02 +00:00
Conversation 0 Commits 4 Files Changed 3 +25 -41
3 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/worker/back/models/worker.json
View File

@ -143,6 +143,10 @@
],
"scopes": {
"descriptor": {
"fields": [
jorgep commented 2024-09-06 15:54:15 +00:00
Review
Copy Link

Me he dado cuenta, que en el filtro original que había en salix se estaban devolviendo muchos datos de los que se quiere realmente. Ahora solo se pueden obtener los necesarios.

Me he dado cuenta, que en el filtro original que había en salix se estaban devolviendo muchos datos de los que se quiere realmente. Ahora solo se pueden obtener los necesarios.
"id",
"phone"
],
"include": [
{
"relation": "user",
@ -164,15 +168,29 @@
{
"relation": "department",
"scope": {
"fields": [
"departmentFk"
],
"include": [
{
"relation": "department"
"relation": "department",
"scope": {
"fields": [
"id",
"name"
]
}
}
]
}
},
{
"relation": "sip"
"relation": "sip",
"scope": {
"fields": [
"extension"
]
}
}
]
}

38
modules/worker/front/descriptor/index.js
View File

@ -36,42 +36,8 @@ class Controller extends Descriptor {
}
loadData() {
const filter = {
include: [
{
relation: 'user',
scope: {
fields: ['name', 'emailVerified'],
include: {
relation: 'emailUser',
scope: {
fields: ['email']
}
}
}
}, {
relation: 'client',
scope: {
fields: ['fi']
}
}, {
relation: 'sip',
scope: {
fields: ['extension']
}
}, {
relation: 'department',
scope: {
include: {
relation: 'department'
}
}
}
]
};
return this.getData(`Workers/${this.id}`, {filter})
.then(res => this.entity = res.data);
return this.getData('Workers/descriptor', {filter: {where: {id: this.id}}})
jorgep commented 2024-09-06 14:12:02 +00:00
Review
Copy Link

Los scope devuelven arrays.

Los scope devuelven arrays.
.then(res => this.entity = res.data[0]);
}
getPassRequirements() {

6
modules/worker/front/descriptor/index.spec.js
View File

@ -14,14 +14,14 @@ describe('vnWorkerDescriptor', () => {
describe('loadData()', () => {
it(`should perform a get query to store the worker data into the controller`, () => {
const id = 1;
const response = 'foo';
const response = ['foo'];
$httpBackend.whenGET('UserConfigs/getUserConfig').respond({});
$httpBackend.expectRoute('GET', `Workers/${id}`).respond(response);
$httpBackend.expectRoute('GET', 'Workers/descriptor').respond(response);
controller.id = id;
$httpBackend.flush();
expect(controller.worker).toEqual(response);
expect(controller.worker).toEqual(response[0]);
});
});