DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:233829223e2a2a623a9a4787c9d7b28734413342
Branches Tags
DebaucheryLibrarian:main
..
compare: DebaucheryLibrarian:83efdf59d478583e1fa57da80c2e5e038e235016
Branches Tags
DebaucheryLibrarian:main

No commits in common. "233829223e2a2a623a9a4787c9d7b28734413342" and "83efdf59d478583e1fa57da80c2e5e038e235016" have entirely different histories.
233829223e ... 83efdf59d4

3 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{
"name": "traxxx-web",
"version": "0.41.22",
"version": "0.41.21",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"version": "0.41.22",
"version": "0.41.21",
"dependencies": {
"@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5",

2
package.json
View File

@ -87,7 +87,7 @@
"overrides": {
"vite": "$vite"
},
"version": "0.41.22",
"version": "0.41.21",
"imports": {
"#/*": "./*.js"
}

8
src/entities.js
View File

@ -97,18 +97,18 @@ export async function fetchEntitiesById(entityIds, options = {}, reqUser) {
.select(
'entities.*',
knex.raw('row_to_json(parents) as parent'),
knex.raw('coalesce(row_to_json(affiliates), row_to_json(network_affiliates)) as affiliate'),
knex.raw('row_to_json(affiliates) as affiliate'),
)
.whereIn('entities.id', entityIds)
.leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
.leftJoin('affiliates', 'affiliates.entity_id', 'entities.id')
.leftJoin('affiliates as network_affiliates', 'network_affiliates.entity_id', 'parents.id')
.leftJoin('affiliates', knex.raw('affiliates.entity_id in (entities.id, parents.id)'))
.modify((builder) => {
if (options.order) {
builder.orderBy(...options.order);
}
})
.groupBy('entities.id', 'parents.id', 'affiliates.id', 'affiliates.entity_id', 'network_affiliates.id', 'network_affiliates.entity_id'),
.orderBy(knex.raw('case when affiliates.entity_id = entities.id then 1 else 2 end'))
.groupBy('entities.id', 'parents.id', 'affiliates.id', 'affiliates.entity_id'),
options.includeChildren ? knex('entities')
.whereIn('entities.parent_id', entityIds)
.whereNot('type', 'info')