chore: Update dsp-api v30.11.0 (#629)

* update dsp-api to v30.11.0

* fix is isSequenceOf

* fix watermark plugin outcome

* fix isSequence of

* trigger

* fix e2e test

Author: mpro7

src/api/admin/projects/projects-endpoint.spec.ts

@@ -682,7 +682,7 @@ describe("ProjectsEndpoint", () => {
                 (response: ApiResponseData<ProjectRestrictedViewSettingsResponse>) => {
 
                     expect(response.body.settings.size).toEqual("!512,512");
-                    expect(response.body.settings.watermark).toEqual(true);
+                    expect(response.body.settings.watermark).toEqual(false);
 
                     done();
                 });
@@ -705,7 +705,7 @@ describe("ProjectsEndpoint", () => {
                 (response: ApiResponseData<ProjectRestrictedViewSettingsResponse>) => {
 
                     expect(response.body.settings.size).toEqual("!512,512");
-                    expect(response.body.settings.watermark).toEqual(true);
+                    expect(response.body.settings.watermark).toEqual(false);
 
                     done();
                 });
@@ -728,7 +728,7 @@ describe("ProjectsEndpoint", () => {
                 (response: ApiResponseData<ProjectRestrictedViewSettingsResponse>) => {
 
                     expect(response.body.settings.size).toEqual("!512,512");
-                    expect(response.body.settings.watermark).toEqual(true);
+                    expect(response.body.settings.watermark).toEqual(false);
 
                     done();
                 });
@@ -755,7 +755,7 @@ describe("ProjectsEndpoint", () => {
                 (response: ApiResponseData<ProjectRestrictedViewSettingsResponse>) => {
 
                     expect(response.body.settings.size).toEqual("!512,512");
-                    expect(response.body.settings.watermark).toEqual(true);
+                    expect(response.body.settings.watermark).toEqual(false);
 
                     done();
                 });
@@ -781,10 +781,8 @@ describe("ProjectsEndpoint", () => {
             knoraApiConnection.admin.projectsEndpoint.getProjectRestrictedViewSettingByShortname("images").subscribe(
                 (response: ApiResponseData<ProjectRestrictedViewSettingsResponse>) => {
 
-                    console.log(111111, response.body)
-
                     expect(response.body.settings.size).toEqual("!512,512");
-                    expect(response.body.settings.watermark).toEqual(true);
+                    expect(response.body.settings.watermark).toEqual(false);
 
                     done();
                 });
@@ -811,7 +809,7 @@ describe("ProjectsEndpoint", () => {
                 (response: ApiResponseData<ProjectRestrictedViewSettingsResponse>) => {
 
                     expect(response.body.settings.size).toEqual("!512,512");
-                    expect(response.body.settings.watermark).toEqual(true);
+                    expect(response.body.settings.watermark).toEqual(false);
 
                     done();
                 });

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

@@ -126,13 +126,13 @@ describe("OntologiesEndpoint", () => {
                     expect((response.properties["http://0.0.0.0:3333/ontology/0001/anything/v2#hasListItem"] as ResourcePropertyDefinition).guiAttributes).toEqual(["hlist=<http://rdfh.ch/lists/0001/treeList>"]);
 
                     const classDefs = response.getAllClassDefinitions();
-                    expect(classDefs.length).toEqual(13);
+                    expect(classDefs.length).toEqual(11);
                     expect(classDefs[0] instanceof ResourceClassDefinition).toBeTruthy();
-                    expect((classDefs[0] as ResourceClassDefinition).id).toEqual("http://0.0.0.0:3333/ontology/0001/anything/v2#AudioSequenceThing");
+                    expect((classDefs[0] as ResourceClassDefinition).id).toEqual("http://0.0.0.0:3333/ontology/0001/anything/v2#AudioThing");
 
                     const resClassDefs = response.getClassDefinitionsByType(ResourceClassDefinition);
-                    expect(resClassDefs.length).toEqual(12);
-                    expect(resClassDefs[0].id).toEqual("http://0.0.0.0:3333/ontology/0001/anything/v2#AudioSequenceThing");
+                    expect(resClassDefs.length).toEqual(10);
+                    expect(resClassDefs[0].id).toEqual("http://0.0.0.0:3333/ontology/0001/anything/v2#AudioThing");
 
                     const standoffClassDefs = response.getClassDefinitionsByType(StandoffClassDefinition);
                     expect(standoffClassDefs.length).toEqual(1);
@@ -1122,7 +1122,7 @@ describe("OntologiesEndpoint", () => {
             deleteCardinalitiesFromClassRequest.id = "http://0.0.0.0:3333/ontology/0001/freetest/v2";
 
             // update this timestamp after every release of dsp-api
-            deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-03-22T07:45:32.659187465Z";
+            deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-04-05T05:48:43.136018292Z";
 
             const cardinalityToRemove = new UpdateResourceClassCardinality();
 
@@ -1167,7 +1167,7 @@ describe("OntologiesEndpoint", () => {
             deleteCardinalitiesFromClassRequest.id = "http://0.0.0.0:3333/ontology/0001/freetest/v2";
 
             // update this timestamp after every release of dsp-api
-            deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-03-22T07:45:32.659187465Z";
+            deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-04-05T05:48:43.136018292Z";
 
             const cardinalityToRemove = new UpdateResourceClassCardinality();
 

src/api/v2/resource/resources-endpoint.spec.ts

@@ -486,7 +486,7 @@ describe("ResourcesEndpoint", () => {
                     expect(res.hasPermissions).toEqual("CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:ProjectMember");
 
                     // update this timestamp after every release of dsp-api
-                    expect(res.lastModificationDate).toEqual("2024-03-23T07:42:25.299628491Z");
+                    expect(res.lastModificationDate).toEqual("2024-04-06T05:45:38.275882745Z");
                     done();
                 }
             );
@@ -550,7 +550,7 @@ describe("ResourcesEndpoint", () => {
             updateResourceMetadata.lastModificationDate = "2021-09-30T16:41:46.980756Z";
 
             // update this timestamp after every release of dsp-api
-            updateResourceMetadata.newModificationDate = "2024-03-23T07:42:25.844990495Z";
+            updateResourceMetadata.newModificationDate = "2024-04-06T05:45:38.811036647Z";
 
             knoraApiConnection.v2.res.updateResourceMetadata(updateResourceMetadata).subscribe(
                 (res: UpdateResourceMetadataResponse) => {
@@ -560,7 +560,7 @@ describe("ResourcesEndpoint", () => {
                     expect(res.hasPermissions).toEqual("CR knora-admin:ProjectMember|V knora-admin:ProjectMember");
 
                     // update this timestamp after every release of dsp-api
-                    expect(res.lastModificationDate).toEqual("2024-03-23T07:42:25.844990495Z");
+                    expect(res.lastModificationDate).toEqual("2024-04-06T05:45:38.811036647Z");
                     done();
                 }
             );
@@ -578,7 +578,7 @@ describe("ResourcesEndpoint", () => {
             expectedPayload["http://api.knora.org/ontology/knora-api/v2#lastModificationDate"]["@value"] = "2021-09-30T16:41:46.980756Z";
 
             // update this timestamp after every release of dsp-api
-            expectedPayload["http://api.knora.org/ontology/knora-api/v2#newModificationDate"]["@value"] = "2024-03-23T07:42:25.844990495Z";
+            expectedPayload["http://api.knora.org/ontology/knora-api/v2#newModificationDate"]["@value"] = "2024-04-06T05:45:38.811036647Z";
 
             expect(request.data()).toEqual(expectedPayload);
 
@@ -634,7 +634,6 @@ describe("ResourcesEndpoint", () => {
 
             const expectedPayload = require("../../../../test/data/api/v2/resources/delete-resource-request-expanded.json");
 
-            // TODO: remove this bad hack once test data is stable
             expectedPayload["http://api.knora.org/ontology/knora-api/v2#lastModificationDate"]["@value"] = "2020-10-22T23:52:02.920220Z";
 
             expect(request.data()).toEqual(expectedPayload);

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

@@ -406,7 +406,7 @@ describe('workspace-project App', () => {
     button.click();
 
     const result = page.getEle('div section#ontologymetadata span.anything');
-    expect(result.getText()).toEqual('5 ontologies');
+    expect(result.getText()).toEqual('4 ontologies');
 
   });
 

test/data/api/admin/groups/change-group-status-response.json

@@ -1 +1 @@
-{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/DP3UvAPnQvGOfbksUc1eTw","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
+{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/YqZVeRFtSPOS72JbWtSMqQ","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}

test/data/api/admin/groups/create-group-response.json

@@ -1 +1 @@
-{"group":{"descriptions":[{"value":"NewGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/DP3UvAPnQvGOfbksUc1eTw","name":"NewGroup","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
+{"group":{"descriptions":[{"value":"NewGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/YqZVeRFtSPOS72JbWtSMqQ","name":"NewGroup","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}

test/data/api/admin/groups/delete-group-response.json

@@ -1 +1 @@
-{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/DP3UvAPnQvGOfbksUc1eTw","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":false}}
+{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/YqZVeRFtSPOS72JbWtSMqQ","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":false}}

test/data/api/admin/groups/update-group-response.json

@@ -1 +1 @@
-{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/DP3UvAPnQvGOfbksUc1eTw","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
+{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/YqZVeRFtSPOS72JbWtSMqQ","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}

test/data/api/admin/lists/add-child-to-second-child-request.json

@@ -1,5 +1,5 @@
 {
-    "parentNodeIri": "http://rdfh.ch/lists/0001/bMg9yTVcSHetgSd4xRQHAw",
+    "parentNodeIri": "http://rdfh.ch/lists/0001/MmKY-YH1QJGWRx5Gx4LAnQ",
     "projectIri": "http://rdfh.ch/projects/0001",
     "name": "third",
     "labels": [{ "value": "New Third Child List Node Value", "language": "en"}],

test/data/api/admin/lists/add-child-to-second-child-response.json

@@ -1 +1 @@
-{"nodeinfo":{"comments":[{"value":"New Third Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/ePMy89uMT--INFDyIrQyvw","id":"http://rdfh.ch/lists/0001/O3S2bTr7Q5K6gfe9uk7h3w","labels":[{"value":"New Third Child List Node Value","language":"en"}],"name":"third","position":0}}
+{"nodeinfo":{"comments":[{"value":"New Third Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/kLrL7Q-hRiCgU56_MZlU2g","id":"http://rdfh.ch/lists/0001/P2_wI_y4TIWAZ2x8nTZKvQ","labels":[{"value":"New Third Child List Node Value","language":"en"}],"name":"third","position":0}}