Fix application exploration

buildingmotif-app/src/app/model-detail/model-detail.component.html

@@ -37,7 +37,7 @@
             <mat-tab label="Validate">
                 <app-model-validate [modelId]=model.id></app-model-validate>
             </mat-tab>
-            <mat-tab label="new thing">
+            <mat-tab label="Application Explorer">
                 <app-shape-validation [modelId]=model.id></app-shape-validation>
             </mat-tab>         
         </mat-tab-group>

buildingmotif-app/src/app/shape-validation/shape-validation.component.css

@@ -49,4 +49,9 @@ mat-card {
 
 mat-card-content{
     white-space: pre-line
+}
+
+.passes{
+    background-color: green;
+    color: white;
 }

buildingmotif-app/src/app/shape-validation/shape-validation.component.html

@@ -36,7 +36,8 @@
             <mat-card-title>{{item.key}}</mat-card-title>
           </mat-card-header>
           <mat-card-content>
-            <div *ngFor="let reason of item.value">{{reason}}</div>
+            <button class="passes" [disableRipple]="true" button mat-button *ngIf="!item.value.length"> Passes</button>
+            <div *ngFor="let reason of item.value"> - {{reason}}</div>
           </mat-card-content>
         </mat-card>
       </mat-list>

buildingmotif/api/views/library.py

@@ -6,7 +6,6 @@
 
 from buildingmotif.api.serializers.library import serialize
 from buildingmotif.dataclasses.shape_collection import ShapeCollection
-from buildingmotif.namespaces import BMOTIF
 
 blueprint = Blueprint("libraries", __name__)
 

buildingmotif/api/views/model.py

@@ -7,7 +7,6 @@
 
 from buildingmotif.api.serializers.model import serialize
 from buildingmotif.dataclasses import Library, Model, ShapeCollection
-from buildingmotif.namespaces import BMOTIF, BRICK, RDFS, SH
 
 blueprint = Blueprint("models", __name__)
 
@@ -55,7 +54,9 @@ def get_model_graph(models_id: int) -> Graph:
     except NoResultFound:
         return {"message": f"No model with id {models_id}"}, status.HTTP_404_NOT_FOUND
 
-    return model.graph.serialize(format="ttl"), status.HTTP_200_OK
+    g = Graph() + model.graph
+
+    return g.serialize(format="ttl"), status.HTTP_200_OK
 
 
 @blueprint.route("/<models_id>/target_nodes", methods=(["GET"]))
@@ -80,6 +81,7 @@ def get_target_nodes(models_id: int) -> Graph:
     """
     )
     result = list({r for r in result})
+    result.sort()
 
     return result, status.HTTP_200_OK
 

buildingmotif/dataclasses/model.py

@@ -277,24 +277,26 @@ def test_model_against_shapes(
             print(target_class)
             print(
                 f"""
-                SELECT ?target 
+                SELECT ?target
                 WHERE {{
                     ?target a {target_class}
 
-                }} 
+                }}
             """
             )
             targets = model_graph.query(
                 f"""
-                SELECT ?target 
+                PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+                PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+                SELECT ?target
                 WHERE {{
-                    ?target a <{target_class}>
+                    ?target rdf:type/rdfs:subClassOf* <{target_class}>
 
-                }} 
+                }}
             """
             )
             temp_model_graph = copy_graph(model_graph)
-            for s in targets:
+            for (s,) in targets:
                 temp_model_graph.add((URIRef(s), A, shape_uri))
 
             temp_model_graph += ontology_graph.cbd(shape_uri)