diff --git a/es/components/relation/entityList/index.js b/es/components/relation/entityList/index.js index c172845d..f29a3010 100644 --- a/es/components/relation/entityList/index.js +++ b/es/components/relation/entityList/index.js @@ -1,7 +1,7 @@ export default OakComponent({ isList: true, formData() { - const { data, links } = this.features.relationAuth.getEntityGraph(); + const { data, links } = this.features.cache.getEntityGraph(); return { data, links, diff --git a/es/utils/DebugConnector.js b/es/utils/DebugConnector.js index 3e14b727..ab0f9c9e 100644 --- a/es/utils/DebugConnector.js +++ b/es/utils/DebugConnector.js @@ -1,6 +1,6 @@ import { createDebugStore } from '../debugStore'; -import { cloneDeep } from "oak-domain/lib/utils/lodash"; -import { registerPorts } from 'oak-common-aspect'; +import { cloneDeep, mergeConcatArray } from "oak-domain/lib/utils/lodash"; +import commonAspectDict, { registerPorts } from 'oak-common-aspect'; export default class DebugConnector { debugStore; contextBuilder; @@ -8,7 +8,7 @@ export default class DebugConnector { constructor(storageSchema, contextBuilder, aspectDict, triggers, checkers, watchers, timers, startRoutines, initialData, common, importations, exportations) { this.debugStore = createDebugStore(storageSchema, contextBuilder, triggers, checkers, watchers, timers, startRoutines, initialData, common); this.contextBuilder = contextBuilder; - this.aspectDict = aspectDict; + this.aspectDict = mergeConcatArray(aspectDict, commonAspectDict); if (importations || exportations) { registerPorts(importations || [], exportations || []); } diff --git a/lib/utils/DebugConnector.js b/lib/utils/DebugConnector.js index 16980484..ff04ee1c 100644 --- a/lib/utils/DebugConnector.js +++ b/lib/utils/DebugConnector.js @@ -1,8 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +const tslib_1 = require("tslib"); const debugStore_1 = require("../debugStore"); const lodash_1 = require("oak-domain/lib/utils/lodash"); -const oak_common_aspect_1 = require("oak-common-aspect"); +const oak_common_aspect_1 = tslib_1.__importStar(require("oak-common-aspect")); class DebugConnector { debugStore; contextBuilder; @@ -10,7 +11,7 @@ class DebugConnector { constructor(storageSchema, contextBuilder, aspectDict, triggers, checkers, watchers, timers, startRoutines, initialData, common, importations, exportations) { this.debugStore = (0, debugStore_1.createDebugStore)(storageSchema, contextBuilder, triggers, checkers, watchers, timers, startRoutines, initialData, common); this.contextBuilder = contextBuilder; - this.aspectDict = aspectDict; + this.aspectDict = (0, lodash_1.mergeConcatArray)(aspectDict, oak_common_aspect_1.default); if (importations || exportations) { (0, oak_common_aspect_1.registerPorts)(importations || [], exportations || []); } diff --git a/src/utils/DebugConnector.ts b/src/utils/DebugConnector.ts index 130fee39..c76539ce 100644 --- a/src/utils/DebugConnector.ts +++ b/src/utils/DebugConnector.ts @@ -8,10 +8,10 @@ import { Connector } from 'oak-domain/lib/types/Connector'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { createDebugStore } from '../debugStore'; import { DebugStore } from "../debugStore/DebugStore"; -import { cloneDeep } from "oak-domain/lib/utils/lodash"; +import { cloneDeep, mergeConcatArray, mergeConcatMany } from "oak-domain/lib/utils/lodash"; import { CommonConfiguration } from "oak-domain/lib/types/Configuration"; import { Importation, Exportation } from 'oak-domain/lib/types/Port'; -import { registerPorts } from 'oak-common-aspect'; +import commonAspectDict, { registerPorts } from 'oak-common-aspect'; export default class DebugConnector, FrontCxt extends SyncContext> @@ -34,11 +34,11 @@ export default class DebugConnector, importations?: Array>, exportations?: Array> - ) { + ) { this.debugStore = createDebugStore(storageSchema, contextBuilder, triggers, checkers, watchers, timers, startRoutines, initialData, common); this.contextBuilder = contextBuilder; - this.aspectDict = aspectDict; + this.aspectDict = mergeConcatArray(aspectDict, commonAspectDict) as typeof aspectDict; if (importations || exportations) { registerPorts(importations || [], exportations || []);