Get ontologies by project iri

.gitignore

@@ -6,9 +6,6 @@
 /docs
 .DS_Store
 
-# Do not add package-lock.json of the test app to git because it could lead to problems when some dependency version change in the lib and is not adapted here.
-test-framework/package-lock.json
-
 ############################
 # PhpStorm/WebStorm ignore #
 ############################
@@ -37,7 +34,10 @@ test-framework/package-lock.json
 .idea/**/dbnavigator.xml
 ############################
 
-/test-framework/node_modules
-/test-framework/.yalc
-/test-framework/dist
+# Do not add package-lock.json of the test app to git because it could lead to problems when some dependency version change in the lib and is not adapted here.
+test-framework/package-lock.json
+test-framework/yalc.lock
+test-framework/dist
+test-framework/node_modules
+test-framework/.yalc
 /.tmp

scripts/v2-test-data-config.json

@@ -20,6 +20,14 @@
       "source": "/v2/ontologies/incunabula-ontology.json",
       "destination": "./test/data/api/v2/ontologies/incunabula-ontology.json"
     },
+    {
+      "source": "/v2/ontologies/get-ontologies-project-anything-response.json",
+      "destination": "./test/data/api/v2/ontologies/get-ontologies-project-anything-response.json"
+    },
+    {
+      "source": "/v2/ontologies/get-ontologies-project-incunabula-response.json",
+      "destination": "./test/data/api/v2/ontologies/get-ontologies-project-incunabula-response.json"
+    },
     {
       "source": "/v2/resources/testding.json",
       "destination": "./test/data/api/v2/resources/testding.json"

src/api/v2/ontology/ontologies-endpoint-v2.ts

@@ -2,7 +2,7 @@ import { Observable } from "rxjs";
 import { AjaxResponse } from "rxjs/ajax";
 import { catchError, map, mergeMap } from "rxjs/operators";
 import { ApiResponseError } from "../../../models/api-response-error";
-import { OntologiesMetadata } from "../../../models/v2/ontologies/ontology-metadata";
+import { OntologiesMetadata, OntologyMetadata } from "../../../models/v2/ontologies/ontology-metadata";
 import { OntologyConversionUtil } from "../../../models/v2/ontologies/OntologyConversionUtil";
 import { ReadOntology } from "../../../models/v2/ontologies/read-ontology";
 import { Endpoint } from "../../endpoint";
@@ -27,7 +27,7 @@ export class OntologiesEndpointV2 extends Endpoint {
                 // TODO: adapt getOntologyIriFromEntityIri
                 return jsonld.compact(ajaxResponse.response, {});
             }), map((jsonldobj: object) => {
-                return this.jsonConvert.deserializeObject(jsonldobj, OntologiesMetadata);
+                return OntologyConversionUtil.convertOntologiesList(jsonldobj, this.jsonConvert);
             }),
             catchError(error => {
                 return this.handleError(error);
@@ -58,4 +58,27 @@ export class OntologiesEndpointV2 extends Endpoint {
         );
     }
 
+    /**
+      * Requests metadata about all ontologies from a specific project
+      *
+      * @param projectIri the IRI of the project
+      * @return OntologiesMetadata or an error 
+      */
+     getOntologiesByProjectIri(projectIri: string): Observable<OntologiesMetadata | ApiResponseError> {
+
+        return this.httpGet("/metadata/" + encodeURIComponent(projectIri)).pipe(
+            mergeMap((ajaxResponse: AjaxResponse) => {
+                // TODO: @rosenth Adapt context object
+                // TODO: adapt getOntologyIriFromEntityIri
+                return jsonld.compact(ajaxResponse.response, {});
+            }), map((jsonldobj: object) => {
+                return OntologyConversionUtil.convertOntologiesList(jsonldobj, this.jsonConvert);
+            }),
+            catchError(error => {
+                return this.handleError(error);
+            })
+        );
+
+    }
+
 }

src/api/v2/ontology/ontologies-endpoint.spec.ts

@@ -1,7 +1,7 @@
 import { MockAjaxCall } from "../../../../test/mockajaxcall";
 import { KnoraApiConfig } from "../../../knora-api-config";
 import { KnoraApiConnection } from "../../../knora-api-connection";
-import { OntologiesMetadata } from "../../../models/v2/ontologies/ontology-metadata";
+import { OntologiesMetadata, OntologyMetadata } from "../../../models/v2/ontologies/ontology-metadata";
 import { ReadOntology } from "../../../models/v2/ontologies/read-ontology";
 import { ResourceClassDefinition } from "../../../models/v2/ontologies/resource-class-definition";
 import { ResourcePropertyDefinition } from "../../../models/v2/ontologies/resource-property-definition";
@@ -168,4 +168,55 @@ describe("OntologiesEndpoint", () => {
 
     });
 
+    describe("Method getOntologiesByProjectIri", () => {
+
+        it("should return all ontologies from 'anything' project", done => {
+
+            knoraApiConnection.v2.onto.getOntologiesByProjectIri("http://rdfh.ch/projects/0001").subscribe(
+                (response: OntologiesMetadata) => {
+                    expect(response.ontologies.length).toEqual(3);
+                    expect(response.ontologies[0].id).toEqual("http://0.0.0.0:3333/ontology/0001/anything/v2");
+                    expect(response.ontologies[1].id).toEqual("http://0.0.0.0:3333/ontology/0001/minimal/v2");
+                    expect(response.ontologies[2].id).toEqual("http://0.0.0.0:3333/ontology/0001/something/v2");
+                    done();
+                }
+            );
+
+            const request = jasmine.Ajax.requests.mostRecent();
+
+            const ontoMetadata = require("../../../../test/data/api/v2/ontologies/get-ontologies-project-anything-response.json");
+
+            request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(ontoMetadata)));
+
+            expect(request.url).toBe("http://0.0.0.0:3333/v2/ontologies/metadata/http%3A%2F%2Frdfh.ch%2Fprojects%2F0001");
+
+            expect(request.method).toEqual("GET");
+
+        });
+
+        it("should return all ontologies from 'incunabula' project", done => {
+
+            knoraApiConnection.v2.onto.getOntologiesByProjectIri("http://rdfh.ch/projects/0803").subscribe(
+                (response: OntologiesMetadata) => {
+                    expect(response.ontologies.length).toEqual(1);
+                    expect(response.ontologies[0].id).toEqual("http://0.0.0.0:3333/ontology/0803/incunabula/v2");
+                    done();
+                }
+            );
+
+            const request = jasmine.Ajax.requests.mostRecent();
+
+            const ontoMetadata = require("../../../../test/data/api/v2/ontologies/get-ontologies-project-incunabula-response.json");
+
+            request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(ontoMetadata)));
+
+            expect(request.url).toBe("http://0.0.0.0:3333/v2/ontologies/metadata/http%3A%2F%2Frdfh.ch%2Fprojects%2F0803");
+
+            expect(request.method).toEqual("GET");
+
+        });
+
+    });
+
+
 });

src/models/v2/ontologies/OntologyConversionUtil.ts

@@ -8,6 +8,7 @@ import { ResourceClassDefinition } from "./resource-class-definition";
 import { ResourcePropertyDefinition } from "./resource-property-definition";
 import { StandoffClassDefinition } from "./standoff-class-definition";
 import { SystemPropertyDefinition } from "./system-property-definition";
+import { OntologiesMetadata, OntologyMetadata } from "./ontology-metadata";
 
 export namespace OntologyConversionUtil {
 
@@ -219,4 +220,22 @@ export namespace OntologyConversionUtil {
 
     };
 
+    /**
+     * Converts a list of ontolgies or a single ontology serialized as JSON-LD to an instance of `OntologiesMetadata`
+     * 
+     * @param ontologiesJsonld 
+     * @param jsonConvert 
+     */
+    export const convertOntologiesList = (ontologiesJsonld: object, jsonConvert: JsonConvert): OntologiesMetadata => {
+
+
+        if (ontologiesJsonld.hasOwnProperty("@graph")) {
+            return jsonConvert.deserializeObject(ontologiesJsonld, OntologiesMetadata);
+        } else {
+            const ontologies: OntologiesMetadata = new OntologiesMetadata();
+            ontologies.ontologies = [jsonConvert.deserializeObject(ontologiesJsonld, OntologyMetadata)];
+            return ontologies;
+        }
+    };
+
 }

test-framework/e2e/src/app.e2e-spec.ts

@@ -93,6 +93,35 @@ describe('workspace-project App', () => {
 
   });
 
+
+  it('request the anything project ontologies', () => {
+
+    page.navigateTo();
+
+    const button = page.getEle('div section#ontologymetadata button.anything');
+
+    button.click();
+
+    const result = page.getEle('div section#ontologymetadata span.anything');
+
+    expect(result.getText()).toEqual('3 ontologies');
+
+  });
+
+  it('request the dokubib project ontologies', () => {
+
+    page.navigateTo();
+
+    const button = page.getEle('div section#ontologymetadata button.dokubib');
+
+    button.click();
+
+    const result = page.getEle('div section#ontologymetadata span.dokubib');
+
+    expect(result.getText()).toEqual('1 ontology');
+
+  });
+
   it('request a resource', () => {
 
     page.navigateTo();

test-framework/src/app/app.component.html

@@ -28,6 +28,18 @@ <h3>Ontology Cache</h3>
         </div>
     </section>
 
+    <section id="ontologymetadata">
+        <h3>Project specific ontologies</h3>
+        <button class="anything" (click)="getAnythingOntologies()">Get anything project ontologies</button>
+        <div>
+            Anything project has<br><span class="anything">{{anythingOntologies?.ontologies.length | i18nPlural: itemPluralMapping['ontology']}}</span>
+        </div>        
+        <button class="dokubib" (click)="getDokubibOntologies()">Get dokubib project ontologies</button>
+        <div>
+            Dokubib project has<br><span class="dokubib">{{dokubibOntologies?.ontologies.length | i18nPlural: itemPluralMapping['ontology']}}</span>
+        </div>
+    </section>
+
     <section id="resource">
         <h3>Resource</h3>
         <button class="read" (click)="getResource('http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw')">Get testding</button> <br /><br />

test-framework/src/app/app.component.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import {
     ApiResponseData,
+    ApiResponseError,
     Constants,
     CountQueryResponse,
     CreateBooleanValue,
@@ -14,6 +15,7 @@ import {
     KnoraApiConnection,
     ListNodeV2,
     LoginResponse,
+    OntologiesMetadata,
     ReadOntology,
     ReadResource,
     ReadResourceSequence,
@@ -27,9 +29,10 @@ import {
     UsersResponse,
     WriteValueResponse,
     DeleteResourceResponse,
+    OntologyMetadata,
     MockOntology,
     MockProjects,
-    MockUsers
+    MockUsers,
 } from "@dasch-swiss/dsp-js";
 
 import { map } from "rxjs/operators";
@@ -46,6 +49,8 @@ export class AppComponent implements OnInit {
   userCache: UserCache;
 
   ontologies: Map<string, ReadOntology>;
+  anythingOntologies: OntologiesMetadata;
+  dokubibOntologies: OntologiesMetadata;
 
   resource: ReadResource;
 
@@ -60,6 +65,13 @@ export class AppComponent implements OnInit {
 
   resourceStatus = '';
 
+  itemPluralMapping = {
+    ontology: {
+      '=1': '1 ontology',
+      other: '# ontologies'
+    }
+  };
+
   ngOnInit() {
     const config = new KnoraApiConfig('http', '0.0.0.0', 3333, undefined, undefined, true);
     this.knoraApiConnection = new KnoraApiConnection(config);
@@ -119,6 +131,30 @@ export class AppComponent implements OnInit {
     );
   }
 
+  getAnythingOntologies() {
+    this.knoraApiConnection.v2.onto.getOntologiesByProjectIri('http://rdfh.ch/projects/0001').subscribe(
+      (response: OntologiesMetadata) => {
+        console.log('anythingOntologies ', response);
+        this.anythingOntologies = response;
+      },
+      (error: ApiResponseError) => {
+        console.error('project ontologies error', error);
+      }
+    )
+  }
+  getDokubibOntologies() {
+    this.knoraApiConnection.v2.onto.getOntologiesByProjectIri('http://rdfh.ch/projects/0804').subscribe(
+      (response: OntologiesMetadata) => {
+        console.log('dokubibOntologies ', response);
+        this.dokubibOntologies = response;
+      },
+      (error: ApiResponseError) => {
+        console.error('project ontologies error', error);
+      }
+    )
+  }
+
+
   getResourceClass(iri: string) {
 
     this.knoraApiConnection.v2.ontologyCache.getResourceClassDefinition(iri).subscribe(

test/data/api/v2/ontologies/get-ontologies-project-anything-response-expanded.json

@@ -0,0 +1 @@
+{"@graph":[{"@id":"http://0.0.0.0:3333/ontology/0001/anything/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://api.knora.org/ontology/knora-api/v2#lastModificationDate":{"@type":"http://www.w3.org/2001/XMLSchema#dateTimeStamp","@value":"2017-12-19T15:23:42.166Z"},"http://www.w3.org/2000/01/rdf-schema#label":"The anything ontology"},{"@id":"http://0.0.0.0:3333/ontology/0001/minimal/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://api.knora.org/ontology/knora-api/v2#lastModificationDate":{"@type":"http://www.w3.org/2001/XMLSchema#dateTimeStamp","@value":"2019-09-10T08:57:46.633162Z"},"http://www.w3.org/2000/01/rdf-schema#label":"A minimal ontology"},{"@id":"http://0.0.0.0:3333/ontology/0001/something/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://www.w3.org/2000/01/rdf-schema#label":"The something ontology"}]}

test/data/api/v2/ontologies/get-ontologies-project-anything-response.json

@@ -0,0 +1,38 @@
+{
+  "@graph" : [ {
+    "@id" : "http://0.0.0.0:3333/ontology/0001/anything/v2",
+    "@type" : "owl:Ontology",
+    "knora-api:attachedToProject" : {
+      "@id" : "http://rdfh.ch/projects/0001"
+    },
+    "knora-api:lastModificationDate" : {
+      "@type" : "xsd:dateTimeStamp",
+      "@value" : "2017-12-19T15:23:42.166Z"
+    },
+    "rdfs:label" : "The anything ontology"
+  }, {
+    "@id" : "http://0.0.0.0:3333/ontology/0001/minimal/v2",
+    "@type" : "owl:Ontology",
+    "knora-api:attachedToProject" : {
+      "@id" : "http://rdfh.ch/projects/0001"
+    },
+    "knora-api:lastModificationDate" : {
+      "@type" : "xsd:dateTimeStamp",
+      "@value" : "2019-09-10T08:57:46.633162Z"
+    },
+    "rdfs:label" : "A minimal ontology"
+  }, {
+    "@id" : "http://0.0.0.0:3333/ontology/0001/something/v2",
+    "@type" : "owl:Ontology",
+    "knora-api:attachedToProject" : {
+      "@id" : "http://rdfh.ch/projects/0001"
+    },
+    "rdfs:label" : "The something ontology"
+  } ],
+  "@context" : {
+    "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
+    "xsd" : "http://www.w3.org/2001/XMLSchema#",
+    "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
+    "owl" : "http://www.w3.org/2002/07/owl#"
+  }
+}

test/data/api/v2/ontologies/get-ontologies-project-incunabula-response-expanded.json

@@ -0,0 +1 @@
+{"@id":"http://0.0.0.0:3333/ontology/0803/incunabula/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0803"},"http://www.w3.org/2000/01/rdf-schema#label":"The incunabula ontology"}

test/data/api/v2/ontologies/get-ontologies-project-incunabula-response.json

@@ -0,0 +1,14 @@
+{
+  "@id" : "http://0.0.0.0:3333/ontology/0803/incunabula/v2",
+  "@type" : "owl:Ontology",
+  "knora-api:attachedToProject" : {
+    "@id" : "http://rdfh.ch/projects/0803"
+  },
+  "rdfs:label" : "The incunabula ontology",
+  "@context" : {
+    "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
+    "xsd" : "http://www.w3.org/2001/XMLSchema#",
+    "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
+    "owl" : "http://www.w3.org/2002/07/owl#"
+  }
+}