From 9263cb06025c361e44b5793dfbdc28c35cc15a58 Mon Sep 17 00:00:00 2001 From: Ross Keenan Date: Sat, 29 Jan 2022 08:53:46 +0200 Subject: [PATCH] refactor(LimitTrailFields): :recycle: Use closedG where possible --- src/Views/TrailView.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Views/TrailView.ts b/src/Views/TrailView.ts index 5a299800..c2f1edc0 100644 --- a/src/Views/TrailView.ts +++ b/src/Views/TrailView.ts @@ -21,23 +21,24 @@ import { getFields, getOppDir, getOppFields } from "../Utils/HierUtils"; import { createJugglTrail } from "../Visualisations/Juggl"; function getLimitedTrailSub(plugin: BCPlugin) { - const { settings, mainG } = plugin; + const { settings, mainG, closedG } = plugin; const { limitTrailCheckboxes, userHiers } = settings; - let subGraph: MultiGraph; if ( getFields(userHiers).every((field) => limitTrailCheckboxes.includes(field)) ) { - subGraph = getSubInDirs(mainG, "up", "down"); + return getSubInDirs(closedG, "up"); } else { const oppFields = limitTrailCheckboxes .map((field) => getOppFields(userHiers, field, "up")?.[0]) .filter((field) => field !== undefined); - subGraph = getSubForFields(mainG, [...limitTrailCheckboxes, ...oppFields]); + const subGraph = getSubForFields(mainG, [ + ...limitTrailCheckboxes, + ...oppFields, + ]); + const closed = getReflexiveClosure(subGraph, userHiers); + return getSubInDirs(closed, "up"); } - - const closed = getReflexiveClosure(subGraph, userHiers); - return getSubInDirs(closed, "up"); } function getBreadcrumbs(