yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-09 08:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

sort connect array only when necessary

Browse Source
This commit is contained in:
Marc-Roig 2022-12-05 10:54:26 +01:00
parent 05e09eee46
commit b0e37e832b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/database/lib/entity-manager/relations-orderer.js
View File

@ -22,18 +22,27 @@ const _ = require('lodash/fp');
*/ */
const sortConnectArray = (connectArr, initialArr = []) => { const sortConnectArray = (connectArr, initialArr = []) => {
const sortedConnect = []; const sortedConnect = [];
// Boolean to know if we have to recalculate the order of the relations
let needsSorting = false;
// Map to validate if relation is already in sortedConnect or DB. // Map to validate if relation is already in sortedConnect or DB.
const relInArray = initialArr.reduce((acc, rel) => ({ ...acc, [rel.id]: true }), {}); const relInArray = initialArr.reduce((acc, rel) => ({ ...acc, [rel.id]: true }), {});
// Map to validate if connect relation has already been computed
const computedIdx = {};
// Map to store the first index where a relation id is connected // Map to store the first index where a relation id is connected
const firstSeen = {}; const firstSeen = {};
// Map to validate if connect relation has already been computed
const computedIdx = {};
// Populate firstSeen
connectArr.forEach((rel, idx) => { connectArr.forEach((rel, idx) => {
// If adjacent relation is not in the database or seen yet in the connect array
// then we need to sort the connect array
const adjacentRelId = rel.position?.before || rel.position?.after;
if (!relInArray[adjacentRelId] && !firstSeen[adjacentRelId]) needsSorting = true;
// Populate firstSeen
if (!(rel.id in firstSeen)) firstSeen[rel.id] = idx; if (!(rel.id in firstSeen)) firstSeen[rel.id] = idx;
}); });
// If we don't need to sort the connect array, we can return it as is
if (!needsSorting) return connectArr;
// Iterate over connectArr and populate sortedConnect // Iterate over connectArr and populate sortedConnect
connectArr.forEach((rel, idx) => { connectArr.forEach((rel, idx) => {
const pushRelation = (rel) => { const pushRelation = (rel) => {