diff --git a/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.scss b/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.scss
index 833ec26..f479a36 100644
--- a/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.scss
+++ b/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.scss
@@ -24,4 +24,51 @@ bp-avatar {
// flex row
display: flex;
flex-direction: row;
+}
+
+
+// ----
+.aggregates {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ gap: 24px;
+ align-items: center;
+ margin-top: 8px;
+}
+
+.aggregate-button {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ width: 150px;
+ height: 150px;
+
+ .p {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+
+
+}
+
+:host ::ng-deep .p-avatar {
+ opacity: 1;
+ transition: box-shadow 500ms out;
+ transition: opacity 500ms out;
+
+}
+
+html.bp-light-mode :host ::ng-deep .p-avatar:hover {
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.8);
+ cursor: pointer;
+}
+
+
+
+html.bp-dark-mode :host ::ng-deep .p-avatar:hover {
+ cursor: pointer;
+ opacity: 0.8;
}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.ts b/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.ts
index 1583d3a..73b2935 100644
--- a/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.ts
+++ b/projects/blueprint/src/app/core/ui-view/view-component-library/tree-view/tree-view.component.ts
@@ -1,24 +1,311 @@
-import { Component, input, output } from '@angular/core';
+import { Component, computed, effect, inject, input, output, signal } from '@angular/core';
import { NodeElement } from '../../../model/node-element/node-element.class';
import { TreeNode } from 'primeng/api';
import { TreeModule, TreeNodeSelectEvent } from 'primeng/tree';
-import { AvatarComponent } from '@blueprint/component/avatar/avatar.component';
+import { Avatar, AvatarComponent } from '@blueprint/component/avatar/avatar.component';
+import { BadgeModule } from 'primeng/badge';
+import { AvatarModule } from 'primeng/avatar';
+import { UiDetailService } from '@blueprint/service/ui-config/ui-detail/ui-detail.service';
+import { toObservable, toSignal } from '@angular/core/rxjs-interop';
+import { map, of, switchMap } from 'rxjs';
+import { RdfDetailConfigurationElement } from '@blueprint/service/ui-config/ui-detail/model/ui-detail-configuration-element';
+import { blueprint, rdfs, shacl } from '@blueprint/ontology';
+import { sparqlUtils } from '@blueprint/utils';
+import { SparqlService } from '@blueprint/service/sparql/sparql.service';
+import { ClownfaceObject } from '@blueprint/model/clownface-object/clownface-object';
+import { GraphPointer } from 'clownface';
+import rdfEnvironment from '@zazuko/env';
+import { TableModule } from 'primeng/table';
+import { LiteralRenderType } from '../../../service/ui-config/ui-detail/model/ui-detail-configuration-element';
+/**
+ * TreeViewComponent
+ *
+ * @input data: TreeNode
[]
+ * @input label: string
+ */
@Component({
selector: 'bp-tree-view',
standalone: true,
- imports: [TreeModule, AvatarComponent],
+ imports: [
+ TreeModule,
+ AvatarComponent,
+ AvatarModule,
+ BadgeModule,
+ TableModule,
+ ],
templateUrl: './tree-view.component.html',
styleUrl: './tree-view.component.scss'
})
export class TreeViewComponent {
data = input.required[]>();
label = input('');
-
nodeSelected = output();
+ #detailService = inject(UiDetailService);
+ #sparqlService = inject(SparqlService);
+
+ LiteralViewType = LiteralRenderType;
+ selectedClassIri = signal(null);
+
+
+ table = toSignal(
+ toObservable(this.selectedClassIri).pipe(
+ switchMap(classIri => {
+ if (!classIri) {
+ return of([]);
+ }
+ return this.#detailService.getDetailConfigurationForClass(classIri);
+ }),
+ switchMap((detailConfig: RdfDetailConfigurationElement[]) => {
+ /* if (detailConfig.length < 1) {
+ return of({ columns: [], rows: [] } as Table);
+ }
+
+ */
+ const data = this.data();
+ if (data.length < 1) {
+ return of({ columns: [], rows: [] } as Table);
+ }
+
+ const flattenTree = (nodes: TreeNode[]): NodeElement[] => {
+ return nodes.reduce((acc, node) => {
+ acc.push(node.data);
+ if (node.children) {
+ acc.push(...flattenTree(node.children));
+ }
+ return acc;
+ }, [] as NodeElement[]);
+ };
+
+ const flattenedData = flattenTree(data);
+ const iris = flattenedData.filter(node => node.avatars.find(a => a.classIri === this.selectedClassIri())).map(node => node.iri);
+ if (iris.length < 1) {
+ return of({ columns: [], rows: [] } as Table);
+ }
+ const rowValues = `VALUES ?row { ${iris.map(iri => `<${iri}>`).join(' ')} }`;
+ let constructBody = '';
+ constructBody += ` ${rdfs.labelPrefixed} 'Label'.\n`;
+ constructBody += ` ${shacl.orderPrefixed} -1.\n`;
+ constructBody += ` ${blueprint.showAsPrefixed} .\n`;
+
+ const predicates: string[] = [];
+
+ predicates.push(`(${rdfs.labelPrefixed} )`);
+ detailConfig.forEach(config => {
+ constructBody += `<${config.iri}> ${rdfs.labelPrefixed} '${config.label}'.\n`;
+ constructBody += `<${config.iri}> ${shacl.orderPrefixed} ${config.order}.\n`;
+ constructBody += `<${config.iri}> ${blueprint.showAsPrefixed} <${config.renderLiteralAsNode}>.\n`;
+
+ predicates.push(`(<${config.path}> <${config.iri}>)`);
+ }
+ );
+
+ constructBody += ` ?row ?detail [
+ ${blueprint.valuePrefixed} ?o ;
+ ${blueprint.hasRowPrefixed} ?detail ;
+ ].
+ a ${blueprint.TablePrefixed} ;
+ ${blueprint.hasRowPrefixed} ?row ;
+ ${blueprint.hasColumnPrefixed} ?detail .
+ \n`;
+
+ const query = `
+ ${rdfs.sparqlPrefix()}
+ ${blueprint.sparqlPrefix()}
+ ${shacl.sparqlPrefix()}
+
+ CONSTRUCT { ${constructBody} } WHERE {
+ VALUES (?p ?detail) { ${predicates.join(' ')} }
+ ${rowValues}
+
+ ?row ?p ?o .
+ }
+ `;
+
+ console.log(sparqlUtils.format(query));
+ return this.#sparqlService.construct(sparqlUtils.format(query)).pipe(
+ map(result => {
+ const tableArray = rdfEnvironment.clownface({ dataset: result, term: rdfEnvironment.namedNode('http://localhost/Table') }).map(n => new RdfTable(n));
+
+ if (tableArray.length !== 1) {
+ return { columns: [], rows: [] } as Table;
+ }
+ const table = tableArray[0];
+
+ const columns = table.columns.sort((a, b) => a.order - b.order);
+ const rows = table.rows;
+ return { columns, rows } as Table;
+
+ })
+ );
+ }
+ )));
+
+
+
+
+
+ typeAggregate = computed(() => {
+ const treeData = this.data();
+ const level1 = treeData[0].children;
+
+ const typeCountMap = new Map();
+ level1.forEach(node => {
+ node.data.classLabel.forEach((classLabel, index) => {
+ const avatar = node.data.avatars[index];
+ if (!typeCountMap.has(classLabel)) {
+ typeCountMap.set(classLabel, { avatar, label: classLabel, count: 0 });
+ }
+ const aggregate = typeCountMap.get(classLabel);
+ aggregate.count++;
+ typeCountMap.set(classLabel, aggregate);
+ });
+ });
+
+ return [...typeCountMap.values()];
+
+ });
emitNodeSelected(event: TreeNodeSelectEvent) {
this.nodeSelected.emit(event.node.data.iri);
}
+
+ selectClassIri(iri: string) {
+ this.selectedClassIri.set(iri);
+ }
+
+
+ constructor() {
+ effect(() => {
+
+ const table = this.table();
+ console.log(table.columns.map(c => c.label).join(', '));
+
+ const oneRow = table.rows[0];
+ if (!oneRow) {
+ return;
+ }
+ console.log(oneRow.iri);
+ console.log(oneRow.cells);
+ console.log(oneRow.cells.get(oneRow.cells.keys().next().value).showAs);
+ });
+ }
}
+
+interface TypeAggregate {
+ label: string;
+ count: number;
+ avatar: Avatar;
+}
+
+
+interface Table {
+ columns: TableColumn[];
+ rows: TableRow[];
+}
+
+interface TableColumn {
+ label: string;
+ iri: string;
+ order: number;
+}
+
+
+class RdfTable extends ClownfaceObject implements Table {
+ #_columns: TableColumn[] | null = null;
+ #_rows: TableRow[] | null = null;
+
+ constructor(pointer: GraphPointer) {
+ super(pointer);
+ }
+
+ get columns(): TableColumn[] {
+ if (this.#_columns === null) {
+ this.#_columns = this._node.out(blueprint.hasColumnNamedNode).map(pointer => new RdfTableColumn(pointer));
+ }
+ return this._node.out(blueprint.hasColumnNamedNode).map(n => new RdfTableColumn(n));
+ }
+
+ get rows(): TableRow[] {
+ if (this.#_rows === null) {
+ this.#_rows = this._node.out(blueprint.hasRowNamedNode).map(node => {
+ const iri = node.value;
+
+ const predicates = ClownfaceObject.getPredicatesForNode(node);
+ const cellMap = new Map();
+
+ predicates.forEach(pred => {
+ const value = node.out(rdfEnvironment.namedNode(pred)).out(blueprint.valueNamedNode).value ?? '';
+ const rendererIri = node.out(rdfEnvironment.namedNode(pred)).out(blueprint.hasRowNamedNode).out(blueprint.showAsNamedNode).value;
+ let showAs: LiteralRenderType = LiteralRenderType.PHONE;
+ switch (rendererIri) {
+ case 'https://ld.flux.zazuko.com/shapes/metadata/Link':
+ showAs = LiteralRenderType.LINK;
+ break;
+ case 'https://ld.flux.zazuko.com/shapes/metadata/Email':
+ showAs = LiteralRenderType.EMAIL;
+ break;
+ case 'https://ld.flux.zazuko.com/shapes/metadata/PhoneNumber':
+ showAs = LiteralRenderType.PHONE;
+ break;
+ case 'https://ld.flux.zazuko.com/shapes/metadata/Plain':
+ showAs = LiteralRenderType.PLAIN;
+ break;
+ case 'https://ld.flux.zazuko.com/shapes/metadata/Boolean':
+ showAs = LiteralRenderType.BOOLEAN;
+ break;
+ default:
+ showAs = LiteralRenderType.UNKNOWN;
+ }
+ const cell = {
+ iri: node.value,
+ value,
+ showAs
+ } as TableCell;
+ cellMap.set(pred, cell);
+ });
+ return { iri, cells: cellMap };
+ });
+ }
+ return this.#_rows;
+ }
+
+
+
+}
+
+interface TableRow {
+ iri: string;
+ cells: Map;
+}
+
+interface TableCell {
+ iri: string;
+ value: string;
+ showAs: LiteralRenderType;
+}
+
+
+class RdfTableColumn extends ClownfaceObject implements TableColumn {
+ private _label: string | null = null;
+ private _order: number | null = null;
+
+ constructor(pointer: GraphPointer) {
+ super(pointer);
+ }
+
+ get label(): string {
+ if (this._label === null) {
+ this._label = this._node.out(rdfs.labelNamedNode).value ?? '';
+ }
+ return this._label;
+ }
+
+ get order(): number {
+ if (this._order === null) {
+ this._order = Number(this._node.out(shacl.orderNamedNode).value ?? 0);
+ }
+ return this._order;
+ }
+}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/dev/group-table/group-table.component.html b/projects/blueprint/src/app/dev/group-table/group-table.component.html
deleted file mode 100644
index 8a9ef8f..0000000
--- a/projects/blueprint/src/app/dev/group-table/group-table.component.html
+++ /dev/null
@@ -1,30 +0,0 @@
-@if(tableDataSignal() !== null) {
-
-
-
-
-
- @for (head of rowsHeaderSignal(); track head) {
- | {{head.label}} |
- }
-
-
-
-
-
- |
- {{row[groupByField]}}
- |
-
-
-
-
-
- @for (head of rowsHeaderSignal(); track head) {
- | {{row[head.key]}} |
- }
-
-
-
-}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/dev/group-table/group-table.component.scss b/projects/blueprint/src/app/dev/group-table/group-table.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/projects/blueprint/src/app/dev/group-table/group-table.component.ts b/projects/blueprint/src/app/dev/group-table/group-table.component.ts
deleted file mode 100644
index 2faf9e4..0000000
--- a/projects/blueprint/src/app/dev/group-table/group-table.component.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Component, signal, computed, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { TableModule } from 'primeng/table';
-import { Table } from '../../features/inventory/inventory-detail/service/hierarchy-table.service';
-
-
-@Component({
- selector: 'bp-group-table',
- standalone: true,
- imports: [TableModule],
- templateUrl: './group-table.component.html',
- styleUrl: './group-table.component.scss'
-})
-export class GroupTableComponent implements OnChanges {
- @Input() data: Table | null = null;
-
- tableDataSignal = signal(null)
- groupByField = 'OCI Registry';
-
- globalFilterFieldsSignal = computed(() => {
- const tableData = this.tableDataSignal();
- if (tableData === null) {
- return [];
- }
- return this.data.header.map(header => header.label);
- });
- rowsHeaderSignal = computed(() => {
- const tableData = this.tableDataSignal();
- if (tableData === null) {
- return [];
- }
- return this.data.header;
- })
-
- ngOnChanges(changes: SimpleChanges): void {
- const data = changes['data'].currentValue;
- if (data) {
- this.tableDataSignal.set(data);
- }
- }
-
-
-}
diff --git a/projects/blueprint/src/app/features/configuration/class-detail-configurator/class-detail-configurator.component.ts b/projects/blueprint/src/app/features/configuration/class-detail-configurator/class-detail-configurator.component.ts
index 6e1c894..d690cc5 100644
--- a/projects/blueprint/src/app/features/configuration/class-detail-configurator/class-detail-configurator.component.ts
+++ b/projects/blueprint/src/app/features/configuration/class-detail-configurator/class-detail-configurator.component.ts
@@ -63,6 +63,7 @@ export class ClassDetailConfiguratorComponent implements OnChanges {
label: classMetadata.label,
color: classMetadata.color,
icon: classMetadata.icon,
+ classIri: classMetadata.targetNode.value
}];
}
return [];
diff --git a/projects/blueprint/src/app/features/configuration/topology/horizontal-tree-detail/horizontal-tree-detail.component.ts b/projects/blueprint/src/app/features/configuration/topology/horizontal-tree-detail/horizontal-tree-detail.component.ts
index 11faf90..cdcd281 100644
--- a/projects/blueprint/src/app/features/configuration/topology/horizontal-tree-detail/horizontal-tree-detail.component.ts
+++ b/projects/blueprint/src/app/features/configuration/topology/horizontal-tree-detail/horizontal-tree-detail.component.ts
@@ -68,7 +68,7 @@ export class HorizontalTreeDetailComponent implements OnChanges {
const id = changes['id']?.currentValue;
if (id) {
this.loadingIndicator.loading();
- this.hierarchyService.getHierarchyByIri(id).subscribe((hierarchyDefinition) => {
+ this.hierarchyService.getHierarchyDefinitionByIri(id).subscribe((hierarchyDefinition) => {
this.hierarchyDefinition.set(hierarchyDefinition);
this.loadingIndicator.done();
}
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/hierarchy.service.ts b/projects/blueprint/src/app/features/configuration/topology/service/hierarchy.service.ts
index 845e30f..e45ab28 100644
--- a/projects/blueprint/src/app/features/configuration/topology/service/hierarchy.service.ts
+++ b/projects/blueprint/src/app/features/configuration/topology/service/hierarchy.service.ts
@@ -7,21 +7,30 @@ import { SparqlService } from '@blueprint/service/sparql/sparql.service';
import { UiClassMetadataService } from '@blueprint/service/ui-class-metadata/ui-class-metadata.service';
import { sparqlUtils } from '@blueprint/utils';
-import { blueprint, rdf, rdfs, shacl } from '@blueprint/ontology';
+import { blueprint, rdf } from '@blueprint/ontology';
import { HierarchyDefinition } from './model/hierarchy-definition.model';
+import { hierarchyByIriQuery } from './query/hierarchy-by-iri.query';
+import { hierarchyForClassQuery } from './query/hierarchy-for-class.query';
+import { allHierarchiesQuery } from './query/all-hierarchy.query';
@Injectable({
providedIn: 'root'
})
export class HierarchyService {
- private readonly sparqlService = inject(SparqlService);
- private readonly uiClassMetadataService = inject(UiClassMetadataService);
-
- getHierarchyByIri(iri: string): Observable {
- const classMetadataQuery = this.uiClassMetadataService.getClassMetadataSparqlQuery();
+ readonly #sparqlService = inject(SparqlService);
+ readonly #uiClassMetadataService = inject(UiClassMetadataService);
+
+ /**
+ * Get the hierarchy definition for a specific IRI
+ *
+ * @param iri Returns the hierarchy definition for this IRI
+ * @returns Observable of the hierarchy definition
+ */
+ getHierarchyDefinitionByIri(iri: string): Observable {
+ const classMetadataQuery = this.#uiClassMetadataService.getClassMetadataSparqlQuery();
const hierarchyQuery = hierarchyByIriQuery(iri);
- return this.sparqlService.construct(sparqlUtils.mergeConstruct([classMetadataQuery, hierarchyQuery])).pipe(
+ return this.#sparqlService.construct(sparqlUtils.mergeConstruct([classMetadataQuery, hierarchyQuery])).pipe(
map((dataset) => {
const hierarchyGraph = rdfEnvironment.clownface({ dataset }).node(blueprint.HierarchyNamedNode).in(rdf.typeNamedNode);
if (hierarchyGraph.values.length !== 1) {
@@ -32,15 +41,22 @@ export class HierarchyService {
return new HierarchyDefinition(hierarchyNode, dataset)
})
return hierarchies[0];
- }));
+ })
+ );
}
+ /**
+ * Get all hierarchies for a specific class
+ *
+ * @param iri the class IRI
+ * @returns an Observable of all hierarchies for the class
+ */
getHierarchiesForClass(iri: string): Observable {
- const classMetadataQuery = this.uiClassMetadataService.getClassMetadataSparqlQuery();
+ const classMetadataQuery = this.#uiClassMetadataService.getClassMetadataSparqlQuery();
const hierarchyQuery = hierarchyForClassQuery(iri);
- return this.sparqlService.construct(sparqlUtils.mergeConstruct([classMetadataQuery, hierarchyQuery])).pipe(
+ return this.#sparqlService.construct(sparqlUtils.mergeConstruct([classMetadataQuery, hierarchyQuery])).pipe(
map((dataset) => {
const hierarchyGraph = rdfEnvironment.clownface({ dataset }).node(blueprint.HierarchyNamedNode).in(rdf.typeNamedNode);
const hierarchies = hierarchyGraph.map(hierarchyCfNode => {
@@ -48,14 +64,20 @@ export class HierarchyService {
return new HierarchyDefinition(hierarchyNode, dataset)
})
return hierarchies;
- }));
+ })
+ );
}
+ /**
+ * Get all available hierarchies
+ *
+ * @returns an Observable of all hierarchies
+ */
getAllHierarchies(): Observable {
- const classMetadataQuery = this.uiClassMetadataService.getClassMetadataSparqlQuery();
- const hierarchyQuery = getAllHierarchiesQuery();
+ const classMetadataQuery = this.#uiClassMetadataService.getClassMetadataSparqlQuery();
+ const hierarchyQuery = allHierarchiesQuery();
- return this.sparqlService.construct(sparqlUtils.mergeConstruct([classMetadataQuery, hierarchyQuery])).pipe(
+ return this.#sparqlService.construct(sparqlUtils.mergeConstruct([classMetadataQuery, hierarchyQuery])).pipe(
map((dataset) => {
const hierarchyGraph = rdfEnvironment.clownface({ dataset }).node(blueprint.HierarchyNamedNode).in(rdf.typeNamedNode);
const hierarchies = hierarchyGraph.map(hierarchyCfNode => {
@@ -63,234 +85,27 @@ export class HierarchyService {
return new HierarchyDefinition(hierarchyNode, dataset)
})
return hierarchies;
- }));
+ })
+ );
}
+ /**
+ * Returns the SPARQL query to get all hierarchies
+ *
+ * @returns SPARQL query to get all hierarchies
+ */
getAllHierarchiesQuery(): string {
- return getAllHierarchiesQuery();
+ return allHierarchiesQuery();
}
-
+ /**
+ * Returns the SPARQL query to get the hierarchy for a specific class
+ *
+ * @param iri The IRI of the class
+ * @returns SPARQL query to get the hierarchy for a specific class
+ */
getHierarchiesForClassQuery(iri: string): string {
return hierarchyForClassQuery(iri);
}
}
-
-function hierarchyByIriQuery(iri: string): string {
-
- return `
-${shacl.sparqlPrefix()}
-${blueprint.sparqlPrefix()}
-${rdf.sparqlPrefix()}
-${rdfs.sparqlPrefix()}
-
- CONSTRUCT {
- ?hierarchy ?hierarchyP ?hierarchyO .
- ?shape ?shapeP ?shapeO .
- ?property ?propertyP ?propertyO .
- ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
- } WHERE {
- {
- {
- SELECT ?hierarchy WHERE {
- BIND(<${iri}> as ?hierarchy)
- }
- }
- VALUES ?hierarchyP {
- ${blueprint.hasRootPrefixed}
- ${blueprint.parentPrefixed}
- ${rdfs.commentPrefixed}
- ${rdfs.labelPrefixed}
- ${rdf.typePrefixed}
- }
- ?hierarchy ?hierarchyP ?hierarchyO .
- } UNION
- {
- {
- SELECT ?root WHERE {
- BIND(<${iri}> as ?hierarchy)
- ?hierarchy ${blueprint.hasRootPrefixed} ?root .
- }
- }
- ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
- VALUES ?shapeP {
- ${shacl.targetClassPrefixed}
- ${shacl.groupPrefixed}
- ${rdfs.labelPrefixed}
- ${shacl.propertyPrefixed}
- ${rdf.typePrefixed}
- }
- ?shape ?shapeP ?shapeO .
- } UNION
- {
- {
- SELECT ?root WHERE {
- BIND(<${iri}> as ?hierarchy)
- ?hierarchy ${blueprint.hasRootPrefixed} ?root .
- }
- }
- ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
- ?shape ${shacl.propertyPrefixed} ?property .
- VALUES ?propertyP {
- ${shacl.pathPrefixed}
- ${shacl.nodePrefixed}
- }
-
- ?property ?propertyP ?propertyO .
- OPTIONAL {
- ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
- }
- }
-
- }
- `;
-}
-
-function hierarchyForClassQuery(iri: string): string {
-
-
- return `
-${shacl.sparqlPrefix()}
-${blueprint.sparqlPrefix()}
-${rdf.sparqlPrefix()}
-${rdfs.sparqlPrefix()}
-
- CONSTRUCT {
- ?group ?groupP ?groupO .
- ?shape ?shapeP ?shapeO .
- ?property ?propertyP ?propertyO .
- ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
- } WHERE {
- {
- {
- SELECT ?group WHERE {
- BIND(<${iri}> as ?class)
- ?shape ${shacl.targetClassPrefixed} ?class .
- ?shape ${shacl.groupPrefixed} ?group .
- ?group a ${blueprint.HierarchyPrefixed} .
- }
- }
- VALUES ?groupP {
- ${blueprint.hasRootPrefixed}
- ${blueprint.parentPrefixed}
- ${rdfs.labelPrefixed}
- ${rdf.typePrefixed}
- }
- ?group ?groupP ?groupO .
- } UNION
- {
- {
- SELECT ?root WHERE {
- BIND(<${iri}> as ?class)
- ?shape ${shacl.targetClassPrefixed} ?class .
- ?shape ${shacl.groupPrefixed} ?group .
- ?group a ${blueprint.HierarchyPrefixed} .
- ?group ${blueprint.hasRootPrefixed} ?root .
- }
- }
- ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
- VALUES ?shapeP {
- ${shacl.targetClassPrefixed}
- ${shacl.groupPrefixed}
- ${rdfs.labelPrefixed}
- ${shacl.propertyPrefixed}
- ${rdf.typePrefixed}
- }
- ?shape ?shapeP ?shapeO .
- } UNION
- {
- {
- SELECT ?root WHERE {
- BIND(<${iri}> as ?class)
- ?shape ${shacl.targetClassPrefixed} ?class .
- ?shape ${shacl.groupPrefixed} ?group .
- ?group a ${blueprint.HierarchyPrefixed} .
- ?group ${blueprint.hasRootPrefixed} ?root .
- }
- }
- ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
- ?shape sh:property ?property .
- VALUES ?propertyP {
- ${shacl.pathPrefixed}
- ${shacl.nodePrefixed}
- }
-
- ?property ?propertyP ?propertyO .
- OPTIONAL {
- ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
- }
- }
-
- }
- `;
-}
-
-function getAllHierarchiesQuery(): string {
- return `
- ${shacl.sparqlPrefix()}
- ${blueprint.sparqlPrefix()}
- ${rdf.sparqlPrefix()}
- ${rdfs.sparqlPrefix()}
-
- CONSTRUCT {
- ?hierarchy ?hierarchyP ?hierarchyO .
- ?shape ?shapeP ?shapeO .
- ?property ?propertyP ?propertyO .
- ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
- } WHERE {
- {
- {
- SELECT ?hierarchy WHERE {
- ?hierarchy a ${blueprint.HierarchyPrefixed} .
- }
- }
- VALUES ?hierarchyP {
- ${blueprint.hasRootPrefixed}
- ${blueprint.parentPrefixed}
- ${rdfs.commentPrefixed}
- ${rdfs.labelPrefixed}
- ${rdf.typePrefixed}
- }
- ?hierarchy ?hierarchyP ?hierarchyO .
- } UNION
- {
- {
- SELECT ?root WHERE {
- ?hierarchy a ${blueprint.HierarchyPrefixed} .
- ?hierarchy ${blueprint.hasRootPrefixed} ?root .
- }
- }
- ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
- VALUES ?shapeP {
- ${shacl.targetClassPrefixed}
- ${shacl.groupPrefixed}
- ${rdfs.labelPrefixed}
- ${shacl.propertyPrefixed}
- ${rdf.typePrefixed}
- }
- ?shape ?shapeP ?shapeO .
- } UNION
- {
- {
- SELECT ?root WHERE {
- ?hierarchy a ${blueprint.HierarchyPrefixed} .
- ?hierarchy ${blueprint.hasRootPrefixed} ?root .
- }
- }
- ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
- ?shape ${shacl.propertyPrefixed} ?property .
- VALUES ?propertyP {
- ${shacl.pathPrefixed}
- ${shacl.nodePrefixed}
- }
-
- ?property ?propertyP ?propertyO .
- OPTIONAL {
- ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
- }
- }
-
- }
- `;
-}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-definition.model.ts b/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-definition.model.ts
index 0f6796b..94a2b4e 100644
--- a/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-definition.model.ts
+++ b/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-definition.model.ts
@@ -9,10 +9,10 @@ import { Aggregation } from '@blueprint/service/graph/aggregate/model/aggregatio
import { HierarchyNode } from './hierarchy-node.model';
export class HierarchyDefinition extends Aggregation {
- private _label: string | null = null;
- private _description: string | null = null;
- private _rootNode: HierarchyNode | null | undefined = undefined;
- private _avatars: Avatar[] | null = null;
+ #_label: string | null = null;
+ #_description: string | null = null;
+ #_rootNode: HierarchyNode | null | undefined = undefined;
+ #_avatars: Avatar[] | null = null;
/**
*
@@ -28,69 +28,72 @@ export class HierarchyDefinition extends Aggregation {
* The label of the hierarchy.
*
* @readonly
- * @link rdfs:label
*/
get label(): string {
- if (this._label === null) {
+ if (this.#_label === null) {
const labels = this._node.out(rdfs.labelNamedNode).values;
if (labels.length === 0) {
console.warn(`Hierarchy ${this._node.value} has no label. Defaulting to ''.`);
- this._label = '';
+ this.#_label = '';
} else {
if (labels.length > 1) {
console.warn(`Hierarchy ${this._node.value} has ${labels.length} labels. Expected 1. Using first label.`);
}
- this._label = labels[0];
+ this.#_label = labels[0];
}
}
- return this._label;
+ return this.#_label;
}
/**
* The comment of the hierarchy.
*
* @readonly
- * @link rdfs:comment
*/
get description(): string {
- if (this._description === null) {
+ if (this.#_description === null) {
const comments = this._node.out(rdfs.commentNamedNode).values;
if (comments.length === 0) {
console.warn(`Hierarchy ${this._node.value} has no comment. Defaulting to ''.`);
- this._description = '';
+ this.#_description = '';
}
else if (comments.length > 1) {
console.warn(`Hierarchy ${this._node.value} has ${comments.length} comments. Expected 1. Joining comments.`);
- this._description = comments.join('\n');
+ this.#_description = comments.join('\n');
} else {
- this._description = comments[0];
+ this.#_description = comments[0];
}
}
- return this._description;
+ return this.#_description;
}
/**
* The avatars of the hierarchy.
*
* @readonly
- * @link blueprint:avatar
*/
get avatars(): Avatar[] {
- if (this._avatars === null) {
+ if (this.#_avatars === null) {
const uiClassMetadatas = this._node.in(shacl.groupNamedNode).out(shacl.targetClassNamedNode).in(shacl.targetNodeNamedNode).has(rdf.typeNamedNode, blueprintShape.ClassMetadataShapeNamedNode).map(metaNode => new RdfUiClassMetadata(metaNode));
- this._avatars = uiClassMetadatas.map(uiClassMetadata => {
+ this.#_avatars = uiClassMetadatas.map(uiClassMetadata => {
return {
label: uiClassMetadata.label,
icon: uiClassMetadata.icon,
- color: uiClassMetadata.color
+ color: uiClassMetadata.color,
+ classIri: uiClassMetadata.targetNode.value
};
});
}
- return this._avatars;
+ return this.#_avatars;
}
- get contentList(): ContentItem[] {
+ /**
+ * The table of contents of the hierarchy.
+ *
+ * @readonly
+ */
+ get tableOfContents(): ContentItem[] {
const uiClassMetadatas = this._node.in(shacl.groupNamedNode).out(shacl.targetClassNamedNode).in(shacl.targetNodeNamedNode).has(rdf.typeNamedNode, blueprintShape.ClassMetadataShapeNamedNode).map(metaNode => new RdfUiClassMetadata(metaNode));
return uiClassMetadatas.map(meta => {
return {
@@ -99,14 +102,20 @@ export class HierarchyDefinition extends Aggregation {
avatar: {
label: meta.label,
icon: meta.icon,
- color: meta.color
+ color: meta.color,
+ classIri: meta.targetNode.value
}
};
});
}
+ /**
+ * The labels of the content items.
+ *
+ * @readonly
+ */
get contentLabels(): string[] {
- return this.contentList.map(item => item.label);
+ return this.tableOfContents.map(item => item.label);
}
/**
@@ -115,41 +124,18 @@ export class HierarchyDefinition extends Aggregation {
* @readonly
*/
get rootNode(): HierarchyNode | null {
- if (this._rootNode === undefined) {
+ if (this.#_rootNode === undefined) {
const root = this._node.out(blueprint.hasRootNamedNode);
if (root.values.length === 1) {
const nodeNode = rdfEnvironment.namedNode(root.value);
const rootCfNode = rdfEnvironment.clownface({ dataset: this._node.dataset }).node(nodeNode);
- this._rootNode = new HierarchyNode(rootCfNode);
+ this.#_rootNode = new HierarchyNode(rootCfNode);
} else {
console.warn(`Hierarchy ${this._node.value}> has ${root.values.length} root nodes. Expected 1. Wr do not provide a root node.`);
- this._rootNode = null;
+ this.#_rootNode = null;
}
}
- return this._rootNode;
- }
-
- /**
- * A tree can be shown as a table if all nodes have exactly one child.
- *
- * @returns {boolean} true if the tree can be shown as a table.
- */
- isTable(): boolean {
- const root = this.rootNode;
- if (root) {
- const queue = [root];
- while (queue.length > 0) {
- const node = queue.shift();
- if (node) {
- if (node.children.length > 1) {
- return false;
- }
- queue.push(...node.children);
- }
- }
- return true;
- }
- return false;
+ return this.#_rootNode;
}
/**
@@ -165,6 +151,7 @@ export class HierarchyDefinition extends Aggregation {
getDataSparqlQueryForType(type: string): string {
const node = this._node.in(shacl.groupNamedNode).has(shacl.targetClassNamedNode, rdfEnvironment.namedNode(type));
+ console.log(`found ${type}: ${node.values}`);
const nodesToRoot = this._collectNodesToRoot(node);
const query = nodesToRoot.map((_node, index) => this._queryForNode(index, nodesToRoot)).join(' UNION \n');
@@ -202,7 +189,6 @@ export class HierarchyDefinition extends Aggregation {
private _queryForNode(index: number, nodesToRoot: AnyPointer[]): string | null {
if (index === 0) {
const target = nodesToRoot[index].out(shacl.targetClassNamedNode).value;
-
return this._elementQuery(index, target);
}
@@ -278,85 +264,6 @@ export class HierarchyDefinition extends Aggregation {
return `^<${path.value}>`;
}
- getDataTableSparqlQuery(): string {
- const root = this.rootNode;
- // Breadth-first (BFS) traversal
- const allChildNodes = this._collectAllChildNodes(root);
-
- const vars = allChildNodes.map((_node, index) => {
- return `?var_${index}`;
- }
- )
- const constructHead = `
- ${rdfs.sparqlPrefix()}
- ${blueprint.sparqlPrefix()}
- ${shacl.sparqlPrefix()}
-
- PREFIX data:
-
- CONSTRUCT {
- data:TableInstance a ${blueprint.TablePrefixed} .
- data:TableInstance ${blueprint.hasHeaderPrefixed} ?header .
- ?header ?tableP ?metaO .
- ?header ${blueprint.colorIndexPrefixed} ?columnIndex .
-
- ?instance a ?class .
- ?instance ${rdfs.labelPrefixed} ?label .
- ?instance ${blueprint.keyPrefixed} ?key .
-
- data:TableInstance ${blueprint.hasRowPrefixed} ?row .
- ?row ${blueprint.cellPrefixed} ${vars.join(', ')} .
- }
- `;
- const classes = allChildNodes.map(node => node.targetClass);
- const headerBlock = `
- {
- VALUES (?columnIndex ?rowClass) {
- ${classes.map((c, index) => `(${index} <${c}>)`).join('\n')}
- }
- ?rowClass ^${shacl.targetNodePrefixed} ?meta .
- VALUES (?metaP ?tableP) {
- (${blueprint.colorIndexPrefixed} ${blueprint.colorIndexPrefixed})
- (${blueprint.faIconPrefixed} ${blueprint.faIconPrefixed})
- (${rdfs.labelPrefixed} ${blueprint.keyPrefixed})
- }
- ?meta ?metaP ?metaO .
- BIND (IRI(CONCAT(STR(data:table), "/header", STR(?columnIndex))) AS ?header)
- }
- `;
-
- const allInstanceBlock = `
- {
- {
- SELECT ?instance ?class WHERE {
- VALUES ?class {
- ${classes.map((c) => `<${c}>`).join('\n')}
- }
- ?instance a ?class .
- }
- }
- ?instance ${rdfs.labelPrefixed} ?label .
- ?class ^${shacl.targetNodePrefixed} ?meta .
- ?meta ${rdfs.labelPrefixed} ?key .
- }
- `;
-
- const tableBlock = `
- {
- {
- SELECT ${vars.join(' ')} WHERE {
- ${vars.map((variable, index) => {
- return `${variable} a <${classes[index]}> .\n${(index === 0) ? `` : `# var ${variable}\n ?var_${index - 1} ${allChildNodes[index].pathFromRoot} ${variable} .\n`}`;
- }).join('\n')}
- }
- }
- BIND (UUID() AS ?row)
- }
- `;
-
- return `${constructHead} WHERE { ${headerBlock} UNION ${allInstanceBlock} UNION ${tableBlock} }`;
- }
-
// Breadth-first (BFS) traversal
private _collectAllChildNodes(root: HierarchyNode) {
const queue = [root];
@@ -377,6 +284,7 @@ export class HierarchyDefinition extends Aggregation {
const node = this._node.in(shacl.groupNamedNode).has(shacl.targetClassNamedNode, rdfEnvironment.namedNode(typeIri));
if (node.values.length !== 1) {
+
console.error(`Expected exactly one node for type ${typeIri}. Found ${node.values.length}.`);
return '';
}
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-node.model.ts b/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-node.model.ts
index 6212351..6e44142 100644
--- a/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-node.model.ts
+++ b/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-node.model.ts
@@ -5,6 +5,7 @@ import { ClownfaceObject } from '@blueprint/model/clownface-object/clownface-obj
export class HierarchyNode extends ClownfaceObject {
+ // lazy evaluation
#_children: HierarchyNode[] | null = null;
#_targetClass: string | null = null;
#_label: string | null = null;
@@ -80,11 +81,24 @@ export class HierarchyNode extends ClownfaceObject {
// we have to invert it because we need the path to the parent node
if (pathFromParentToThisNode.term.termType === 'BlankNode') {
const inverse = pathFromParentToThisNode.out(shacl.inversePathNamedNode);
-
+ const zeroOrMorePath = pathFromParentToThisNode.out(shacl.zeroOrMorePathNamedNode);
if (inverse.values.length === 1) {
return `<${inverse.value}>`;
}
- console.error(`Expected exactly one inversePath for node ${this.iri}. Found ${inverse.values.length}.`);
+ if (zeroOrMorePath.values.length === 1) {
+ if (zeroOrMorePath.term.termType === 'BlankNode') {
+ const inverse = zeroOrMorePath.out(shacl.inversePathNamedNode);
+ if (inverse.values.length === 1) {
+ return `<${inverse.value}>*`;
+ }
+ console.error(`Expected exactly one inversePath for node ${this.iri} zeroToMorePath. Found ${inverse.values.length}.`);
+
+ return '';
+ }
+ return `^<${zeroOrMorePath.value}>*`;
+ }
+
+ console.error(`Expected exactly one inversePath for node ${this.iri} or one zeroToMorePath Found ${inverse.values.length}.`);
return '';
}
if (pathFromParentToThisNode.values.length === 1) {
@@ -102,9 +116,15 @@ export class HierarchyNode extends ClownfaceObject {
if (path.term.termType === 'BlankNode') {
const inverse = path.out(shacl.inversePathNamedNode);
+ const zeroOrMorePath = path.out(shacl.zeroOrMorePathNamedNode);
+
if (inverse.values.length === 1) {
return `^<${inverse.value}>`;
}
+ if (zeroOrMorePath.values.length === 1) {
+ return `<${zeroOrMorePath.value}>`;
+ }
+
console.error(`Expected exactly one inversePath for node ${this.iri}. Found ${inverse.values.length}.`);
return '';
}
@@ -131,4 +151,12 @@ export class HierarchyNode extends ClownfaceObject {
return this.#_parent;
}
+
+ isInversePath(): boolean {
+ return this.pathToParent?.startsWith('^');
+ }
+
+ isRecursivePath(): boolean {
+ return this.pathToParent.endsWith('*');
+ }
}
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-shape-node.model.ts b/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-shape-node.model.ts
new file mode 100644
index 0000000..e99e530
--- /dev/null
+++ b/projects/blueprint/src/app/features/configuration/topology/service/model/hierarchy-shape-node.model.ts
@@ -0,0 +1,17 @@
+import * as RDF from '@rdfjs/types';
+
+import { TopologyPath, TopologyPathElement } from './topology-path.model';
+import { ClownfaceObject } from '@blueprint/model/clownface-object/clownface-object';
+import { shacl } from '@blueprint/ontology';
+import { GraphPointer } from 'clownface';
+
+
+export class HierarchyShapeNode extends ClownfaceObject {
+
+ constructor(node: GraphPointer) {
+ super(node);
+ }
+
+}
+
+
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/model/topology-node.model.ts b/projects/blueprint/src/app/features/configuration/topology/service/model/topology-node.model.ts
new file mode 100644
index 0000000..97dc89a
--- /dev/null
+++ b/projects/blueprint/src/app/features/configuration/topology/service/model/topology-node.model.ts
@@ -0,0 +1,104 @@
+import * as RDF from '@rdfjs/types';
+
+import { TopologyPath, TopologyPathElement } from './topology-path.model';
+
+export class TopologyNode {
+ #_label: string;
+ #_comment: string;
+ #_children: TopologyNode[] = [];
+
+ protected _rootNode: TopologyNode | null = null;
+ protected _pathToRoot: TopologyPathElement[] = [];
+
+ constructor(private rdfClass: RDF.NamedNode, label: string = '', comment: string = '') {
+ this._pathToRoot = [];
+ this.#_label = label;
+ this.#_comment = comment;
+ }
+
+ get rdfClassId(): string {
+ return this.rdfClass.value;
+ }
+
+ get rdfClassNode(): RDF.NamedNode {
+ return this.rdfClass;
+ }
+
+ get label(): string {
+ return this.#_label;
+ }
+
+ get comment(): string {
+ return this.#_comment;
+ }
+
+ get rootPath(): TopologyPathElement[] {
+ return this._pathToRoot;
+ }
+
+ addChild(node: TopologyNode, path: TopologyPathElement[]) {
+ const childNode = new TopologyNode(node.rdfClass, node.label, node.comment);
+ childNode._pathToRoot = path;
+ childNode._rootNode = this;
+ childNode.#_children = node.children;
+ this.#_children.push(childNode);
+ }
+
+ hasNode(classIri: RDF.NamedNode, visited = new Set()): boolean {
+ if (this.rdfClassId === classIri.value) {
+ return true;
+ }
+
+ visited.add(this.rdfClassId);
+
+ for (const child of this.#_children) {
+ if (!visited.has(child.rdfClassId) && child.hasNode(classIri, visited)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ findNode(classIri: RDF.NamedNode, visited = new Set()): TopologyNode | null {
+ if (this.rdfClassId === classIri.value) {
+ return this;
+ }
+
+ visited.add(this.rdfClassId);
+
+ for (const child of this.#_children) {
+ if (!visited.has(child.rdfClassId)) {
+ const node = child.findNode(classIri, visited);
+ if (node) {
+ return node;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ getFullPathToRoot(): TopologyPath[] {
+ if (this._rootNode === null) {
+ return [];
+ }
+
+ const pathElement = this._pathToRoot;
+ const pathToRoot: TopologyPath = {
+ path: pathElement,
+ toClass: this._rootNode.rdfClass
+ };
+
+ return [pathToRoot, ...this._rootNode.getFullPathToRoot()];
+ }
+
+ get children(): TopologyNode[] {
+ return this.#_children;
+ }
+
+
+ protected set children(nodes: TopologyNode[]) {
+ this.#_children = nodes;
+ }
+}
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/model/topology-path.model.ts b/projects/blueprint/src/app/features/configuration/topology/service/model/topology-path.model.ts
new file mode 100644
index 0000000..cdc7f36
--- /dev/null
+++ b/projects/blueprint/src/app/features/configuration/topology/service/model/topology-path.model.ts
@@ -0,0 +1,12 @@
+import * as RDF from '@rdfjs/types';
+
+export interface TopologyPathElement {
+ predicate: RDF.NamedNode;
+ isInverse?: boolean;
+ isReverse?: boolean;
+}
+
+export interface TopologyPath {
+ path: TopologyPathElement[];
+ toClass: RDF.NamedNode;
+}
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/model/topology.model.ts b/projects/blueprint/src/app/features/configuration/topology/service/model/topology.model.ts
deleted file mode 100644
index 47f40ff..0000000
--- a/projects/blueprint/src/app/features/configuration/topology/service/model/topology.model.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import * as RDF from "@rdfjs/types";
-
-export interface Topology {
- id: string;
- label: string;
- comment: string;
-}
-export class TopologyIpl implements Topology {
- private _node: RDF.NamedNode;
- private _label: string = '';
- private _comment: string = '';
- private _rootNode: TopologyNode;
-
- protected constructor(node: RDF.NamedNode, label: string, comment: string, root: TopologyNode) {
- this._node = node;
- this._label = label;
- this._comment = comment;
- this._rootNode = root;
- }
-
- get node(): RDF.NamedNode {
- return this._node;
- }
-
- get id(): string {
- return this._node.value;
- }
-
- get label(): string {
- return this._label;
- }
-
- get comment(): string {
- return this._comment;
- }
-
- get rootNode(): TopologyNode {
- return this._rootNode;
- }
-}
-
-export class TreeTopology extends TopologyIpl {
-
- constructor(iri: RDF.NamedNode, label: string, comment: string, root: TopologyNode) {
- super(iri, label, comment, root);
- }
-
-
-
- hasNode(classIri: RDF.NamedNode): boolean {
-
- return this.rootNode.hasNode(classIri);
- }
-
- getUpstreamPathToRoot(classIri: RDF.NamedNode): TopologyPath[] {
- const path: TopologyPath[] = [];
-
-
-
- // find node in tree
- const node = this.rootNode.findNode(classIri);
- if (!node) {
- return path;
- }
-
- // find all paths to root
- const paths = node.getFullPathToRoot();
-
-
- return paths;
- }
-
-
-
-
-
-
-}
-
-export class TopologyNode {
- private _label: string;
- private _comment: string;
-
- protected _rootNode: TopologyNode | null = null;
- private _children: TopologyNode[] = [];
- protected _pathToRoot: TopologyPathElement[] = [];
-
- constructor(private rdfClass: RDF.NamedNode, label: string = '', comment: string = '') {
- this._pathToRoot = [];
- this._label = label;
- this._comment = comment;
- }
-
- get rdfClassId(): string {
- return this.rdfClass.value;
- }
-
- get rdfClassNode(): RDF.NamedNode {
- return this.rdfClass;
- }
-
- get label(): string {
- return this._label;
- }
-
- get comment(): string {
- return this._comment;
- }
-
- get rootPath(): TopologyPathElement[] {
- return this._pathToRoot;
- }
-
- addChild(node: TopologyNode, path: TopologyPathElement[]) {
- const childNode = new TopologyNode(node.rdfClass, node.label, node.comment);
- childNode._pathToRoot = path;
- childNode._rootNode = this;
- childNode._children = node.children;
- this._children.push(childNode);
- }
-
- hasNode(classIri: RDF.NamedNode, visited = new Set()): boolean {
- if (this.rdfClassId === classIri.value) {
- return true;
- }
-
- visited.add(this.rdfClassId);
-
- for (const child of this._children) {
- if (!visited.has(child.rdfClassId) && child.hasNode(classIri, visited)) {
- return true;
- }
- }
-
- return false;
- }
-
- findNode(classIri: RDF.NamedNode, visited = new Set()): TopologyNode | null {
- if (this.rdfClassId === classIri.value) {
- return this;
- }
-
- visited.add(this.rdfClassId);
-
- for (const child of this._children) {
- if (!visited.has(child.rdfClassId)) {
- const node = child.findNode(classIri, visited);
- if (node) {
- return node;
- }
- }
- }
-
- return null;
- }
-
- getFullPathToRoot(): TopologyPath[] {
- if (this._rootNode === null) {
- return [];
- }
-
- const pathElement = this._pathToRoot;
- const pathToRoot: TopologyPath = {
- path: pathElement,
- toClass: this._rootNode.rdfClass
- };
-
- return [pathToRoot, ...this._rootNode.getFullPathToRoot()];
- }
-
- get children(): TopologyNode[] {
- return this._children;
- }
-
-
- protected set children(nodes: TopologyNode[]) {
- this._children = nodes;
- }
-}
-
-export interface TopologyPathElement {
- predicate: RDF.NamedNode;
- isInverse?: boolean;
-}
-
-export interface TopologyPath {
- path: TopologyPathElement[];
- toClass: RDF.NamedNode;
-}
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/query/all-hierarchy.query.ts b/projects/blueprint/src/app/features/configuration/topology/service/query/all-hierarchy.query.ts
new file mode 100644
index 0000000..a32593d
--- /dev/null
+++ b/projects/blueprint/src/app/features/configuration/topology/service/query/all-hierarchy.query.ts
@@ -0,0 +1,80 @@
+import { blueprint, rdf, rdfs, shacl } from "@blueprint/ontology";
+
+export function allHierarchiesQuery(): string {
+ return `
+ ${shacl.sparqlPrefix()}
+ ${blueprint.sparqlPrefix()}
+ ${rdf.sparqlPrefix()}
+ ${rdfs.sparqlPrefix()}
+
+ CONSTRUCT {
+ ?hierarchy ?hierarchyP ?hierarchyO .
+ ?shape ?shapeP ?shapeO .
+ ?property ?propertyP ?propertyO .
+ ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
+ ?propertyO ${shacl.zeroOrMorePathPrefixed} ?zeroOrMorePath .
+ ?zeroOrMorePath ${shacl.inversePathPrefixed} ?zeroOrMoreInversePath .
+
+ } WHERE {
+ {
+ {
+ SELECT ?hierarchy WHERE {
+ ?hierarchy a ${blueprint.HierarchyPrefixed} .
+ }
+ }
+ VALUES ?hierarchyP {
+ ${blueprint.hasRootPrefixed}
+ ${blueprint.parentPrefixed}
+ ${rdfs.commentPrefixed}
+ ${rdfs.labelPrefixed}
+ ${rdf.typePrefixed}
+ }
+ ?hierarchy ?hierarchyP ?hierarchyO .
+ } UNION
+ {
+ {
+ SELECT ?root WHERE {
+ ?hierarchy a ${blueprint.HierarchyPrefixed} .
+ ?hierarchy ${blueprint.hasRootPrefixed} ?root .
+ }
+ }
+ ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
+ VALUES ?shapeP {
+ ${shacl.targetClassPrefixed}
+ ${shacl.groupPrefixed}
+ ${rdfs.labelPrefixed}
+ ${shacl.propertyPrefixed}
+ ${rdf.typePrefixed}
+ }
+ ?shape ?shapeP ?shapeO .
+ } UNION
+ {
+ {
+ SELECT ?root WHERE {
+ ?hierarchy a ${blueprint.HierarchyPrefixed} .
+ ?hierarchy ${blueprint.hasRootPrefixed} ?root .
+ }
+ }
+ ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
+ ?shape ${shacl.propertyPrefixed} ?property .
+ VALUES ?propertyP {
+ ${shacl.pathPrefixed}
+ ${shacl.nodePrefixed}
+ }
+
+ ?property ?propertyP ?propertyO .
+ OPTIONAL {
+ ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
+ }
+ OPTIONAL {
+ ?propertyO ${shacl.zeroOrMorePathPrefixed} ?zeroOrMorePath .
+ OPTIONAL {
+ ?zeroOrMorePath ${shacl.inversePathPrefixed} ?zeroOrMoreInversePath .
+ }
+
+ }
+ }
+
+ }
+ `;
+}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/query/hierarchy-by-iri.query.ts b/projects/blueprint/src/app/features/configuration/topology/service/query/hierarchy-by-iri.query.ts
new file mode 100644
index 0000000..d68ac3f
--- /dev/null
+++ b/projects/blueprint/src/app/features/configuration/topology/service/query/hierarchy-by-iri.query.ts
@@ -0,0 +1,83 @@
+import { blueprint, rdf, rdfs, shacl } from "@blueprint/ontology";
+
+
+export function hierarchyByIriQuery(iri: string): string {
+
+ const query = `
+${shacl.sparqlPrefix()}
+${blueprint.sparqlPrefix()}
+${rdf.sparqlPrefix()}
+${rdfs.sparqlPrefix()}
+
+ CONSTRUCT {
+ ?hierarchy ?hierarchyP ?hierarchyO .
+ ?shape ?shapeP ?shapeO .
+ ?property ?propertyP ?propertyO .
+ ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
+ ?propertyO ${shacl.zeroOrMorePathPrefixed} ?zeroOrMorePath .
+ ?zeroOrMorePath ${shacl.inversePathPrefixed} ?zeroOrMoreInversePath .
+
+ } WHERE {
+ {
+ {
+ SELECT ?hierarchy WHERE {
+ BIND(<${iri}> as ?hierarchy)
+ }
+ }
+ VALUES ?hierarchyP {
+ ${blueprint.hasRootPrefixed}
+ ${blueprint.parentPrefixed}
+ ${rdfs.commentPrefixed}
+ ${rdfs.labelPrefixed}
+ ${rdf.typePrefixed}
+ }
+ ?hierarchy ?hierarchyP ?hierarchyO .
+ } UNION
+ {
+ {
+ SELECT ?root WHERE {
+ BIND(<${iri}> as ?hierarchy)
+ ?hierarchy ${blueprint.hasRootPrefixed} ?root .
+ }
+ }
+ ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
+ VALUES ?shapeP {
+ ${shacl.targetClassPrefixed}
+ ${shacl.groupPrefixed}
+ ${rdfs.labelPrefixed}
+ ${shacl.propertyPrefixed}
+ ${rdf.typePrefixed}
+ }
+ ?shape ?shapeP ?shapeO .
+ } UNION
+ {
+ {
+ SELECT ?root WHERE {
+ BIND(<${iri}> as ?hierarchy)
+ ?hierarchy ${blueprint.hasRootPrefixed} ?root .
+ }
+ }
+ ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
+ ?shape ${shacl.propertyPrefixed} ?property .
+ VALUES ?propertyP {
+ ${shacl.pathPrefixed}
+ ${shacl.nodePrefixed}
+ }
+
+ ?property ?propertyP ?propertyO .
+ OPTIONAL {
+ ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
+ }
+ OPTIONAL {
+ ?propertyO ${shacl.zeroOrMorePathPrefixed} ?zeroOrMorePath .
+ OPTIONAL {
+ ?zeroOrMorePath ${shacl.inversePathPrefixed} ?zeroOrMoreInversePath .
+ }
+ }
+ }
+
+ }
+ `;
+
+ return query;
+}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/query/hierarchy-for-class.query.ts b/projects/blueprint/src/app/features/configuration/topology/service/query/hierarchy-for-class.query.ts
new file mode 100644
index 0000000..b804e6e
--- /dev/null
+++ b/projects/blueprint/src/app/features/configuration/topology/service/query/hierarchy-for-class.query.ts
@@ -0,0 +1,92 @@
+import { blueprint, rdf, rdfs, shacl } from "@blueprint/ontology";
+
+
+export function hierarchyForClassQuery(iri: string): string {
+
+
+ const query = `
+${shacl.sparqlPrefix()}
+${blueprint.sparqlPrefix()}
+${rdf.sparqlPrefix()}
+${rdfs.sparqlPrefix()}
+
+ CONSTRUCT {
+ ?group ?groupP ?groupO .
+ ?shape ?shapeP ?shapeO .
+ ?property ?propertyP ?propertyO .
+ ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
+ ?propertyO ${shacl.zeroOrMorePathPrefixed} ?zeroOrMorePath .
+ ?zeroOrMorePath ${shacl.inversePathPrefixed} ?zeroOrMoreInversePath .
+
+ } WHERE {
+ {
+ {
+ SELECT ?group WHERE {
+ BIND(<${iri}> as ?class)
+ ?shape ${shacl.targetClassPrefixed} ?class .
+ ?shape ${shacl.groupPrefixed} ?group .
+ ?group a ${blueprint.HierarchyPrefixed} .
+ }
+ }
+ VALUES ?groupP {
+ ${blueprint.hasRootPrefixed}
+ ${blueprint.parentPrefixed}
+ ${rdfs.labelPrefixed}
+ ${rdf.typePrefixed}
+ }
+ ?group ?groupP ?groupO .
+ } UNION
+ {
+ {
+ SELECT ?root WHERE {
+ BIND(<${iri}> as ?class)
+ ?shape ${shacl.targetClassPrefixed} ?class .
+ ?shape ${shacl.groupPrefixed} ?group .
+ ?group a ${blueprint.HierarchyPrefixed} .
+ ?group ${blueprint.hasRootPrefixed} ?root .
+ }
+ }
+ ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
+ VALUES ?shapeP {
+ ${shacl.targetClassPrefixed}
+ ${shacl.groupPrefixed}
+ ${rdfs.labelPrefixed}
+ ${shacl.propertyPrefixed}
+ ${rdf.typePrefixed}
+ }
+ ?shape ?shapeP ?shapeO .
+ } UNION
+ {
+ {
+ SELECT ?root WHERE {
+ BIND(<${iri}> as ?class)
+ ?shape ${shacl.targetClassPrefixed} ?class .
+ ?shape ${shacl.groupPrefixed} ?group .
+ ?group a ${blueprint.HierarchyPrefixed} .
+ ?group ${blueprint.hasRootPrefixed} ?root .
+ }
+ }
+ ?root (${shacl.propertyPrefixed}/${shacl.nodePrefixed})* ?shape .
+ ?shape sh:property ?property .
+ VALUES ?propertyP {
+ ${shacl.pathPrefixed}
+ ${shacl.nodePrefixed}
+ }
+
+ ?property ?propertyP ?propertyO .
+ OPTIONAL {
+ ?propertyO ${shacl.inversePathPrefixed} ?inversePath .
+ }
+ OPTIONAL {
+ ?propertyO ${shacl.zeroOrMorePathPrefixed} ?zeroOrMorePath .
+ OPTIONAL {
+ ?zeroOrMorePath ${shacl.inversePathPrefixed} ?zeroOrMoreInversePath .
+ }
+ }
+ }
+
+ }
+ `;
+
+ return query;
+}
\ No newline at end of file
diff --git a/projects/blueprint/src/app/features/configuration/topology/service/topology.service.ts b/projects/blueprint/src/app/features/configuration/topology/service/topology.service.ts
deleted file mode 100644
index d9e9c5a..0000000
--- a/projects/blueprint/src/app/features/configuration/topology/service/topology.service.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* eslint-disable @typescript-eslint/no-duplicate-enum-values */
-import { Injectable } from '@angular/core';
-import { TopologyNode, TreeTopology } from './model/topology.model';
-
-import rdfEnvironment from '@zazuko/env';
-
-enum RDF_TYPE {
- DATABASE_SCHEMA = 'http://schema.table.org/DatabaseSchema', // OK
- TABLE = 'http://schema.table.org/Table', // ok
- COLUMN = 'http://schema.table.org/Column', // OK
- BUSINESS_OBJECT = 'http://example.org/ea/BusinessObject', // ok
- ATTRIBUTE = 'http://example.org/ea/Attribute', // ok
- VALUE_RANGE = 'http://example.org/ea/Range', // ok
- APPLICATION = 'http://schema.org/SoftwareApplication', // ok
- ORGANIZATION = 'http://schema.org/GovernmentOrganization', // ok
- PERSON = 'http://schema.org/Person' // OK
-}
-
-enum RDF_PREDICATE {
- HAS_TABLE = 'http://schema.table.org/hasTable', // OK
- HAS_COLUMN = 'http://schema.table.org/column', // OK
- HAS_ATTRIBUTE = 'http://example.org/ea/assignment', // OK
- HAS_RANGE = 'http://example.org/ea/assignment', // OK
- HAS_BUSINESS_OBJECT = 'http://example.org/ea/assignment', // OK
- HAS_DATABASE_SCHEMA = 'http://example.org/ea/isServedBy', // OK
- HAS_PERSON = 'http://schema.org/employee', // OK
- RESPONSIBLE = 'http://example.org/ea/assignment', // OK
- HAS_APPLICATION = 'http://example.org/ea/assignment' // OK
-}
-
-@Injectable({
- providedIn: 'root'
-})
-export class TopologyService {
- private _topologies: TreeTopology[] = [];
-
-
-
-
- constructor() {
- const dbSchemaRoot = new TopologyNode(rdfEnvironment.namedNode(RDF_TYPE.DATABASE_SCHEMA), 'Database Schema', 'Database Schema');
- const tableNode = new TopologyNode(rdfEnvironment.namedNode(RDF_TYPE.TABLE), 'Table', 'Table');
- const columnNode = new TopologyNode(rdfEnvironment.namedNode(RDF_TYPE.COLUMN), 'Column', 'Column');
-
- tableNode.addChild(columnNode, [{ predicate: rdfEnvironment.namedNode(RDF_PREDICATE.HAS_COLUMN), isInverse: true }]);
- dbSchemaRoot.addChild(tableNode, [{ predicate: rdfEnvironment.namedNode(RDF_PREDICATE.HAS_TABLE), isInverse: true }]);
-
- const dbTree = new TreeTopology(rdfEnvironment.namedNode('dbTree'), 'Database Tree', 'Database Tree', dbSchemaRoot);
-
- this._topologies.push(dbTree);
- }
-
- get topologies(): TreeTopology[] {
- return this._topologies.map(t => t);
- }
-
- getTopologyById(id: string): TreeTopology | null {
- const topology = this._topologies.find(t => t.id === id);
- if (topology) {
- return topology;
- }
- return null;
- }
-
- getTopologyRelatedToClass(rdfClass: string): TreeTopology[] | null {
- return this._topologies.filter(t => t.hasNode(rdfEnvironment.namedNode(rdfClass)));
- }
-}
diff --git a/projects/blueprint/src/app/features/configuration/topology/topology.component.ts b/projects/blueprint/src/app/features/configuration/topology/topology.component.ts
index afbac51..b9f579a 100644
--- a/projects/blueprint/src/app/features/configuration/topology/topology.component.ts
+++ b/projects/blueprint/src/app/features/configuration/topology/topology.component.ts
@@ -15,17 +15,29 @@ import { HierarchyDefinition } from './service/model/hierarchy-definition.model'
standalone: true,
templateUrl: './topology.component.html',
styleUrl: './topology.component.scss',
- imports: [RouterLink, BreadcrumbPageComponent, ConfigurationCardComponent]
+ imports: [
+ RouterLink,
+ BreadcrumbPageComponent,
+ ConfigurationCardComponent
+ ]
})
export class TopologyComponent implements OnInit {
- private readonly messageChannel = inject(MessageChannelService);
- private readonly hierarchyService = inject(HierarchyService);
- private readonly loadingIndicatorService = inject(LoadingIndicatorService);
- private readonly destroyRef = inject(DestroyRef);
+ readonly #messageChannel = inject(MessageChannelService);
+ readonly #hierarchyService = inject(HierarchyService);
+ readonly #loadingIndicatorService = inject(LoadingIndicatorService);
+ readonly #destroyRef = inject(DestroyRef);
public hierarchiesSignal = signal([]);
- public graphSignal = signal([{ iri: 'https://ld.flux.zazuko.com/blueprint/app/K8SNamespaceTree', label: 'Graph', comment: 'Graph' }]);
+ public graphSignal = signal(
+ [
+ {
+ iri: 'https://ld.flux.zazuko.com/blueprint/app/K8SNamespaceTree',
+ label: 'Graph',
+ comment: 'Graph'
+ }
+ ]
+ );
public readonly breadcrumbs: Breadcrumb[] = [
{
@@ -41,22 +53,22 @@ export class TopologyComponent implements OnInit {
];
ngOnInit(): void {
- this.loadingIndicatorService.loading();
- this.hierarchyService.getAllHierarchies().pipe(takeUntilDestroyed(this.destroyRef)).subscribe(
+ this.#loadingIndicatorService.loading();
+ this.#hierarchyService.getAllHierarchies().pipe(takeUntilDestroyed(this.#destroyRef)).subscribe(
{
next: (result) => {
this.hierarchiesSignal.set(result);
- this.loadingIndicatorService.done();
- this.messageChannel.debug('Hierarchies loaded. Update UI');
+ this.#loadingIndicatorService.done();
+ this.#messageChannel.debug('Hierarchies loaded. Update UI');
},
error: (error) => {
- this.loadingIndicatorService.done();
- this.messageChannel.error('Hierarchies load failed', error, 'Check your hierarchy configuration');
+ this.#loadingIndicatorService.done();
+ this.#messageChannel.error('Hierarchies load failed', error, 'Check your hierarchy configuration');
},
complete: () => {
- this.loadingIndicatorService.done();
- this.messageChannel.debug('Hierarchies load completed');
+ this.#loadingIndicatorService.done();
+ this.#messageChannel.debug('Hierarchies load completed');
}
});
}
diff --git a/projects/blueprint/src/app/features/configuration/topology/tree-detail/tree-detail.component.ts b/projects/blueprint/src/app/features/configuration/topology/tree-detail/tree-detail.component.ts
index 06c23bd..37fba40 100644
--- a/projects/blueprint/src/app/features/configuration/topology/tree-detail/tree-detail.component.ts
+++ b/projects/blueprint/src/app/features/configuration/topology/tree-detail/tree-detail.component.ts
@@ -18,19 +18,21 @@ import { HierarchyDefinition } from '../service/model/hierarchy-definition.model
export class TreeDetailComponent implements OnChanges {
@Input({ required: true }) id: string = '';
- private readonly hierarchyService = inject(HierarchyService);
- private readonly loadingIndicator = inject(LoadingIndicatorService);
+ readonly #hierarchyService = inject(HierarchyService);
+ readonly #loadingIndicator = inject(LoadingIndicatorService);
- public hierarchyDefinition = signal(undefined);
+ hierarchyDefinition = signal(undefined);
hierarchy = computed(() => {
- if (this.hierarchyDefinition() === null || this.hierarchyDefinition() === undefined) {
+ const hierarchyDefinition = this.hierarchyDefinition();
+ if (!hierarchyDefinition) {
return [];
}
- const rootNode = this.hierarchyDefinition()!.rootNode;
- if (rootNode === null || rootNode === undefined) {
+ const rootNode = hierarchyDefinition.rootNode;
+ if (!rootNode) {
return [];
}
+
const uiTreeNode = {
label: rootNode.label,
expanded: true,
@@ -39,9 +41,11 @@ export class TreeDetailComponent implements OnChanges {
};
rootNode.children.forEach(child => {
- this.createChildUiNodeFromTopologyTreeNode(child, uiTreeNode);
+ this.createChildUiNodeFromTopologyTreeNode(child, uiTreeNode, [rootNode.iri]);
});
+ console.log(uiTreeNode);
+
return [uiTreeNode];
});
@@ -66,16 +70,16 @@ export class TreeDetailComponent implements OnChanges {
ngOnChanges(changes: SimpleChanges): void {
const id = changes['id']?.currentValue;
if (id) {
- this.loadingIndicator.loading();
- this.hierarchyService.getHierarchyByIri(id).subscribe((hierarchyDefinition) => {
+ this.#loadingIndicator.loading();
+ this.#hierarchyService.getHierarchyDefinitionByIri(id).subscribe((hierarchyDefinition) => {
this.hierarchyDefinition.set(hierarchyDefinition);
- this.loadingIndicator.done();
+ this.#loadingIndicator.done();
}
);
}
}
- private createChildUiNodeFromTopologyTreeNode(childNode: HierarchyNode, parentUiNode: TreeNode): TreeNode {
+ private createChildUiNodeFromTopologyTreeNode(childNode: HierarchyNode, parentUiNode: TreeNode, nodeShapeIris: string[]): TreeNode {
const childUiNode = {
label: childNode.label,
@@ -87,8 +91,13 @@ export class TreeDetailComponent implements OnChanges {
parentUiNode.children = [];
}
parentUiNode.children.push(childUiNode);
+ if (nodeShapeIris.includes(childNode.iri)) {
+ childUiNode.label = `${childUiNode.label} (circular reference)`;
+ return childUiNode;
+ }
+ nodeShapeIris.push(childNode.iri);
childNode.children.forEach(child => {
- this.createChildUiNodeFromTopologyTreeNode(child, childUiNode);
+ this.createChildUiNodeFromTopologyTreeNode(child, childUiNode, nodeShapeIris);
});
return childUiNode;
}
diff --git a/projects/blueprint/src/app/features/explore/explore/explore.component.ts b/projects/blueprint/src/app/features/explore/explore/explore.component.ts
index 1f73d39..f45b06d 100644
--- a/projects/blueprint/src/app/features/explore/explore/explore.component.ts
+++ b/projects/blueprint/src/app/features/explore/explore/explore.component.ts
@@ -210,7 +210,8 @@ export class ExploreComponent implements OnInit, OnDestroy, AfterViewInit {
const icon = uiClassMetaData.icon;
const color = uiClassMetaData.color;
const label = uiClassMetaData.label;
- return { label, icon, color };
+ const classIri = uiClassMetaData.targetNode.value;
+ return { label, icon, color, classIri };
});
this.subjectAvatars.set(avatarArray);
//
diff --git a/projects/blueprint/src/app/features/explore/service/query-builder/query-builder.service.ts b/projects/blueprint/src/app/features/explore/service/query-builder/query-builder.service.ts
index f732ce0..b43ed73 100644
--- a/projects/blueprint/src/app/features/explore/service/query-builder/query-builder.service.ts
+++ b/projects/blueprint/src/app/features/explore/service/query-builder/query-builder.service.ts
@@ -138,6 +138,9 @@ CONSTRUCT {
}
function getIncomingLinksQuery(input: NamedNode, link: UiLinkDefinition): string {
+ if (link.propertyPath.length > 1) {
+ debugger;
+ }
return `
${shacl.sparqlPrefix()}
${rdf.sparqlPrefix()}
diff --git a/projects/blueprint/src/app/features/inventory/inventory-detail/inventory-detail.component.ts b/projects/blueprint/src/app/features/inventory/inventory-detail/inventory-detail.component.ts
index 89a6525..efb3e55 100644
--- a/projects/blueprint/src/app/features/inventory/inventory-detail/inventory-detail.component.ts
+++ b/projects/blueprint/src/app/features/inventory/inventory-detail/inventory-detail.component.ts
@@ -12,7 +12,6 @@ import { InputTextModule } from 'primeng/inputtext';
import { BreadcrumbPageComponent } from "../../../core/page/breadcrumb-page/breadcrumb-page.component";
import { Breadcrumb } from '../../../core/layout/breadcrumb-navigation/model/breadcrumb.model';
import { LoadingIndicatorService } from '../../../core/component/loading-indicator/service/loading-indicator.service';
-import { GroupTableComponent } from "../../../dev/group-table/group-table.component";
import { ClusterDiagramComponent } from "../../../dev/cluster-diagram/cluster-diagram.component";
import { HierarchyTreeDataService } from './service/hierarchy-tree-data.service';
import { NodeElement } from '../../../core/model/node-element/node-element.class';
@@ -35,7 +34,6 @@ import { labelAlphaSort } from '../../../core/utils/sort-functions';
AvatarComponent,
FormsModule,
NgClass,
- GroupTableComponent,
ClusterDiagramComponent,
ToolbarModule,
SelectButtonModule,
@@ -89,7 +87,7 @@ export class InventoryDetailComponent implements OnChanges {
console.error('No definition');
return [];
}
- return definition.contentList
+ return definition.tableOfContents;
})
readonly breadcrumbs: Breadcrumb[] = [
{
@@ -130,7 +128,7 @@ export class InventoryDetailComponent implements OnChanges {
ngOnChanges(changes: SimpleChanges): void {
const id = changes['id']?.currentValue ?? null;
if (id) {
- this.#hierarchyService.getHierarchyByIri(id).pipe(
+ this.#hierarchyService.getHierarchyDefinitionByIri(id).pipe(
takeUntilDestroyed(this.#destroyRef)
).subscribe({
next: hierarchy => {
diff --git a/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-table.service.ts b/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-table.service.ts
deleted file mode 100644
index b6e16b8..0000000
--- a/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-table.service.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Injectable, inject } from '@angular/core';
-import { Observable, map, switchMap } from 'rxjs';
-
-import rdfEnvironment from '@zazuko/env';
-
-import { SparqlService } from '@blueprint/service/sparql/sparql.service';
-import { blueprint, rdf, rdfs } from '@blueprint/ontology';
-
-import { HierarchyService } from '../../../configuration/topology/service/hierarchy.service';
-
-@Injectable({
- providedIn: 'root'
-})
-export class HierarchyTableService {
- private readonly hierarchyService = inject(HierarchyService);
- private readonly sparqlService = inject(SparqlService);
-
- getTableForHierarchy(iri: string): Observable {
- return this.hierarchyService.getHierarchyByIri(iri).pipe(
- switchMap(hierarchy => {
- return this.sparqlService.construct(hierarchy.getDataTableSparqlQuery()).pipe(map(dataset => {
- const cfTable = rdfEnvironment.clownface({ dataset }).node(blueprint.TableNamedNode).in(rdf.typeNamedNode);
- if (cfTable.values.length !== 1) {
- console.error('Expected exactly one table for Registry');
- return {
- header: [],
- data: []
- };
- }
-
- const headers: ColumnHeader[] = cfTable.out(blueprint.hasHeaderNamedNode).map(header => {
- return {
- icon: header.out(blueprint.faIconNamedNode).value,
- color: header.out(blueprint.colorIndexNamedNode).value,
- label: header.out(blueprint.keyNamedNode).value,
- key: header.out(blueprint.keyNamedNode).value,
- columnIndex: Number(header.out(blueprint.columnIndexNamedNode).value)
- }
- }).sort((a, b) => a.columnIndex - b.columnIndex);
-
- const rows = cfTable.out(blueprint.hasRowNamedNode).map(row => {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const rowObject: any = {};
- row.out(blueprint.cellNamedNode).forEach(cell => {
- const key = cell.out(blueprint.keyNamedNode).value;
- const header = headers.find(header => header.key === key);
- if (header) {
- rowObject[header.key] = cell.out(rdfs.labelNamedNode).value;
- } else {
- console.error('Could not find header for key', key);
- }
- });
- return rowObject;
- });
- return {
- header: headers,
- data: rows
- };
- }));
- })
- );
- }
-}
-
-export interface Table {
- header: ColumnHeader[];
- data: unknown[];
-}
-
-export interface ColumnHeader {
- icon: string;
- color: string;
- label: string;
- key: string;
- columnIndex: number;
-}
-
diff --git a/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-tree-data.service.ts b/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-tree-data.service.ts
index 6853b42..598c101 100644
--- a/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-tree-data.service.ts
+++ b/projects/blueprint/src/app/features/inventory/inventory-detail/service/hierarchy-tree-data.service.ts
@@ -22,18 +22,23 @@ import { ClownfaceObject } from '@blueprint/model/clownface-object/clownface-obj
providedIn: 'root'
})
export class HierarchyTreeDataService {
- private readonly hierarchyService = inject(HierarchyService);
- private readonly sparqlService = inject(SparqlService);
- private readonly uiClassMetadataService = inject(UiClassMetadataService);
+ readonly #hierarchyService = inject(HierarchyService);
+ readonly #sparqlService = inject(SparqlService);
+ readonly #uiClassMetadataService = inject(UiClassMetadataService);
+ /**
+ *
+ * @param iri the iri of the hierarchy
+ * @returns an Observable of the tree nodes
+ */
getTreeDataForHierarchy(iri: string): Observable[]> {
- return this.hierarchyService.getHierarchyByIri(iri).pipe(
+ return this.#hierarchyService.getHierarchyDefinitionByIri(iri).pipe(
switchMap(hierarchy => {
const query = this.getQueryFor(hierarchy.rootNode);
- const metadataQuery = this.uiClassMetadataService.getClassMetadataSparqlQuery();
- return this.sparqlService.construct(sparqlUtils.mergeConstruct([query, metadataQuery]));
+ const metadataQuery = this.#uiClassMetadataService.getClassMetadataSparqlQuery();
+ return this.#sparqlService.construct(sparqlUtils.mergeConstruct([query, metadataQuery]));
}),
map(dataset => {
@@ -97,7 +102,9 @@ export class HierarchyTreeDataService {
?parent_${index} a <${parentClass}> .
?child_${index} a <${childClass}> .
- ?child_${index} ${parentPredicate} ?parent_${index} .\n
+
+ ${hierarchyNode.isRecursivePath() ? `?recursive_child_${index} ${parentPredicate} ?child_${index}.\n ?child_${index} ${parentPredicate.replace(`*`, '')} ?parent_${index}.\n` : `?child_${index} ${parentPredicate} ?parent_${index} .\n`}
+
`;
return [query];
@@ -122,6 +129,7 @@ export class HierarchyTreeDataService {
${queriesForBranches.map((_q, index) => {
return `
?child_${index + 1} a ${blueprint.ChildPrefixed}.\n
+ ?parent_${index + 1} ${blueprint.childPrefixed} ?child_${index + 1}.\n
?parent_${index + 1} ${blueprint.childPrefixed} ?child_${index + 1}.\n`;
}).join('\n')}
@@ -148,6 +156,7 @@ export class HierarchyTreeDataService {
private _pathsToLeaves(node: HierarchyNode, path: HierarchyNode[] = []): HierarchyNode[][] {
// Add the current node to the path
path = [...path, node];
+ const nodeShapeIris = path.map(node => node.iri);
// If the node is a leaf, return the path to it
if (node.children.length === 0) {
@@ -157,7 +166,14 @@ export class HierarchyTreeDataService {
// If the node is not a leaf, recursively find paths for all children
let paths: HierarchyNode[][] = [];
for (const child of node.children) {
- paths = [...paths, ...this._pathsToLeaves(child, path)];
+ if (nodeShapeIris.includes(child.iri)) {
+ // If the child is already in the path, we have a cycle
+ console.error('Cycle detected in hierarchy', path.map(node => node.iri).join(' -> '));
+ return [path];
+ } else {
+ paths = [...paths, ...this._pathsToLeaves(child, path)];
+
+ }
}
return paths;
diff --git a/projects/blueprint/src/config.json b/projects/blueprint/src/config.json
index 41babc3..be93f89 100644
--- a/projects/blueprint/src/config.json
+++ b/projects/blueprint/src/config.json
@@ -3,7 +3,7 @@
"endpointUrl": "https://ld.flux.zazuko.com/query",
"sparqlConsoleUrl": "https://ld.flux.zazuko.com/sparql/#query",
"graphExplorerUrl": "https://ld.flux.zazuko.com/graph-explorer/?resource",
- "fullTextSearchDialect": "fuseki",
+ "fullTextSearchDialect": "stardog",
"neptune": {
"ftsEndpoint": " https://vpc-opensearch-zazuko-blueprint-glbaecqrcqwr5om3z5jj2duuiq.eu-central-1.es.amazonaws.com"
}
diff --git a/proxy.conf.json b/proxy.conf.json
index 9f9e829..017a44e 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -1,10 +1,10 @@
{
"/query": {
- "target_1": "https://ld.aws.zazukoians.org/query",
- "target_334": "https://ld.flux.zazuko.com/query",
+ "target": "https://ld.bafu.zazukoians.org/query",
+ "target_22": "https://ld.flux.zazuko.com/query",
"target_12": "http://localhost:8080/query",
"target_4": "https://ld.aws.zazukoians.org/query",
- "target": "http://127.0.0.1:7200/repositories/blueprint",
+ "target_33": "http://127.0.0.1:7200/repositories/blueprint",
"headers": {
"Connection": "keep-alive"
},