Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump dsp-api to v25.0.0 #474

Merged
merged 8 commits into from
Dec 7, 2022
Merged

chore(deps): bump dsp-api to v25.0.0 #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0cfac4a
bump API
mpro7 Dec 6, 2022
c8d17c8
update 00FF project IRI
mpro7 Dec 6, 2022
9f4350e
update 0001 project IRI
mpro7 Dec 6, 2022
a69ab26
fix encoded IRIs
mpro7 Dec 6, 2022
a3df2f5
update dates
mpro7 Dec 6, 2022
696910d
try different port
mpro7 Dec 7, 2022
efa348b
another port fix attempt
mpro7 Dec 7, 2022
e5d40d0
fix 2 more project IRIs
mpro7 Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/admin/groups/groups-endpoint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe("GroupsEndpoint", () => {
const group = new CreateGroupRequest();

group.name = "NewGroup";
group.project = "http://rdfh.ch/projects/00FF";
group.project = "http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA";
group.status = true;
group.selfjoin = false;

Expand Down
16 changes: 8 additions & 8 deletions src/api/admin/lists/lists-endpoint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe("ListsEndpoint", () => {

it("should return a list of lists in a project", done => {

knoraApiConnection.admin.listsEndpoint.getListsInProject("http://rdfh.ch/projects/0001").subscribe(
knoraApiConnection.admin.listsEndpoint.getListsInProject("http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ").subscribe(
(res: ApiResponseData<ListsResponse>) => {
expect(res.body.lists.length).toEqual(9);
done();
Expand All @@ -77,7 +77,7 @@ describe("ListsEndpoint", () => {

request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(listsResponse)));

expect(request.url).toBe("http://localhost:3333/admin/lists?projectIri=http%3A%2F%2Frdfh.ch%2Fprojects%2F0001");
expect(request.url).toBe("http://localhost:3333/admin/lists?projectIri=http%3A%2F%2Frdfh.ch%2Fprojects%2FLw3FC39BSzCwvmdOaTyLqQ");

expect(request.method).toEqual("GET");

Expand All @@ -92,7 +92,7 @@ describe("ListsEndpoint", () => {
const listInfo = new UpdateListInfoRequest();

listInfo.listIri = "http://rdfh.ch/lists/0001/CeiuqMk_R1-lIOKh-fyddA";
listInfo.projectIri = "http://rdfh.ch/projects/0001";
listInfo.projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const label1 = new StringLiteral();
label1.language = "de";
Expand Down Expand Up @@ -154,7 +154,7 @@ describe("ListsEndpoint", () => {

childNode.listIri = "http://rdfh.ch/lists/0001/treeList01";

childNode.projectIri = "http://rdfh.ch/projects/0001";
childNode.projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

childNode.name = "updated third child name";

Expand Down Expand Up @@ -200,7 +200,7 @@ describe("ListsEndpoint", () => {

childNode.listIri = "http://rdfh.ch/lists/0001/a-child-node-with-IRI";

childNode.projectIri = "http://rdfh.ch/projects/0001";
childNode.projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

expect(() =>
knoraApiConnection.admin.listsEndpoint.updateChildNode(childNode)
Expand Down Expand Up @@ -334,7 +334,7 @@ describe("ListsEndpoint", () => {
const childNode = new CreateChildNodeRequest();

childNode.parentNodeIri = "http://rdfh.ch/lists/0001/CeiuqMk_R1-lIOKh-fyddA";
childNode.projectIri = "http://rdfh.ch/projects/0001";
childNode.projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";
childNode.name = "first";

const label1 = new StringLiteral();
Expand Down Expand Up @@ -382,7 +382,7 @@ describe("ListsEndpoint", () => {
const childNode = new CreateChildNodeRequest();

childNode.parentNodeIri = "http://rdfh.ch/lists/0001/CeiuqMk_R1-lIOKh-fyddA";
childNode.projectIri = "http://rdfh.ch/projects/0001";
childNode.projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";
childNode.name = "child with position";

const label1 = new StringLiteral();
Expand Down Expand Up @@ -489,7 +489,7 @@ describe("ListsEndpoint", () => {

list.comments = [comments];

list.projectIri = "http://rdfh.ch/projects/0001";
list.projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const label = new StringLiteral();
label.language = "de";
Expand Down
46 changes: 23 additions & 23 deletions src/api/admin/permissions/permissions-endpoint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe("PermissionsEndpoint", () => {

it("should return all permissions", done => {

const projectIri = "http://rdfh.ch/projects/00FF";
const projectIri = "http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA";

knoraApiConnection.admin.permissionsEndpoint.getProjectPermissions(projectIri).subscribe(
(response: ApiResponseData<ProjectPermissionsResponse>) => {
Expand All @@ -56,7 +56,7 @@ describe("PermissionsEndpoint", () => {

request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(projectPermissionsResponse)));

expect(request.url).toBe("http://localhost:3333/admin/permissions/http%3A%2F%2Frdfh.ch%2Fprojects%2F00FF");
expect(request.url).toBe("http://localhost:3333/admin/permissions/http%3A%2F%2Frdfh.ch%2Fprojects%2FMTvoB0EJRrqovzRkWXqfkA");

expect(request.method).toEqual("GET");

Expand All @@ -68,7 +68,7 @@ describe("PermissionsEndpoint", () => {

it("should return all administrative permissions", done => {

const projectIri = "http://rdfh.ch/projects/00FF";
const projectIri = "http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA";

knoraApiConnection.admin.permissionsEndpoint.getAdministrativePermissions(projectIri).subscribe(
(response: ApiResponseData<AdministrativePermissionsResponse>) => {
Expand All @@ -91,7 +91,7 @@ describe("PermissionsEndpoint", () => {

request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(permissionsResponse)));

expect(request.url).toBe("http://localhost:3333/admin/permissions/ap/http%3A%2F%2Frdfh.ch%2Fprojects%2F00FF");
expect(request.url).toBe("http://localhost:3333/admin/permissions/ap/http%3A%2F%2Frdfh.ch%2Fprojects%2FMTvoB0EJRrqovzRkWXqfkA");

expect(request.method).toEqual("GET");

Expand All @@ -103,7 +103,7 @@ describe("PermissionsEndpoint", () => {

it("should return an administrative permission", done => {

const projectIri = "http://rdfh.ch/projects/00FF";
const projectIri = "http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA";

const groupIri = "http://www.knora.org/ontology/knora-admin#ProjectMember";

Expand All @@ -126,7 +126,7 @@ describe("PermissionsEndpoint", () => {

request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(permissionResponse)));

expect(request.url).toBe("http://localhost:3333/admin/permissions/ap/http%3A%2F%2Frdfh.ch%2Fprojects%2F00FF/http%3A%2F%2Fwww.knora.org%2Fontology%2Fknora-admin%23ProjectMember");
expect(request.url).toBe("http://localhost:3333/admin/permissions/ap/http%3A%2F%2Frdfh.ch%2Fprojects%2FMTvoB0EJRrqovzRkWXqfkA/http%3A%2F%2Fwww.knora.org%2Fontology%2Fknora-admin%23ProjectMember");

expect(request.method).toEqual("GET");

Expand All @@ -142,7 +142,7 @@ describe("PermissionsEndpoint", () => {
permission.name = "ProjectAdminGroupAllPermission";

const groupIri = "http://rdfh.ch/groups/0001/thing-searcher";
const projectIri = "http://rdfh.ch/projects/0001";
const projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const adminPermission = new CreateAdministrativePermission();
adminPermission.forGroup = groupIri;
Expand All @@ -156,7 +156,7 @@ describe("PermissionsEndpoint", () => {
// TODO: remove this bad hack once test data is stable
expect(response.body.administrative_permission.id).toBeDefined(); //.toEqual("http://rdfh.ch/permissions/0001/cYBzgOcHSR6kNocj5osOJA");
expect(response.body.administrative_permission.forGroup).toEqual("http://rdfh.ch/groups/0001/thing-searcher");
expect(response.body.administrative_permission.forProject).toEqual("http://rdfh.ch/projects/0001");
expect(response.body.administrative_permission.forProject).toEqual("http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ");
expect(response.body.administrative_permission.hasPermissions.length).toEqual(1);
expect(response.body.administrative_permission.hasPermissions[0].name).toEqual("ProjectAdminGroupAllPermission");

Expand Down Expand Up @@ -202,7 +202,7 @@ describe("PermissionsEndpoint", () => {
const permission = new CreatePermission();
permission.name = "ProjectAdminGroupAllPermission";

const projectIri = "http://rdfh.ch/projects/0001";
const projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const adminPermission = new CreateAdministrativePermission();
adminPermission.forProject = projectIri;
Expand All @@ -223,7 +223,7 @@ describe("PermissionsEndpoint", () => {
permission.additionalInformation = null;

const groupIri = "http://rdfh.ch/groups/0001/thing-searcher";
const projectIri = "http://rdfh.ch/projects/0001";
const projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const adminPermission = new CreateAdministrativePermission();
adminPermission.forGroup = groupIri;
Expand All @@ -237,7 +237,7 @@ describe("PermissionsEndpoint", () => {

expect(response.body.administrative_permission.id).toEqual("http://rdfh.ch/permissions/0001/u0PRnDl3kgcbrehZnRlEfA");
expect(response.body.administrative_permission.forGroup).toEqual("http://rdfh.ch/groups/0001/thing-searcher");
expect(response.body.administrative_permission.forProject).toEqual("http://rdfh.ch/projects/0001");
expect(response.body.administrative_permission.forProject).toEqual("http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ");
expect(response.body.administrative_permission.hasPermissions.length).toEqual(1);
expect(response.body.administrative_permission.hasPermissions[0].name).toEqual("ProjectAdminGroupAllPermission");

Expand Down Expand Up @@ -337,14 +337,14 @@ describe("PermissionsEndpoint", () => {

it("should return all default project access permissions", done => {

const projectIri = "http://rdfh.ch/projects/00FF";
const projectIri = "http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA";

knoraApiConnection.admin.permissionsEndpoint.getDefaultObjectAccessPermissions(projectIri).subscribe(
(response: ApiResponseData<DefaultObjectAccessPermissionsResponse>) => {

expect(response.body.defaultObjectAccessPermissions.length).toBe(3);

expect(response.body.defaultObjectAccessPermissions[0].forProject).toBe("http://rdfh.ch/projects/00FF");
expect(response.body.defaultObjectAccessPermissions[0].forProject).toBe("http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA");
expect(response.body.defaultObjectAccessPermissions[0].forGroup).toBe("http://www.knora.org/ontology/knora-admin#KnownUser");
expect(response.body.defaultObjectAccessPermissions[0].id).toBe("http://rdfh.ch/permissions/00FF/d2");
expect(response.body.defaultObjectAccessPermissions[0].hasPermissions.length).toBe(3);
Expand All @@ -358,7 +358,7 @@ describe("PermissionsEndpoint", () => {

request.respondWith(MockAjaxCall.mockResponse(JSON.stringify(defaultObjectAccessPermissionsResponse)));

expect(request.url).toBe("http://localhost:3333/admin/permissions/doap/http%3A%2F%2Frdfh.ch%2Fprojects%2F00FF");
expect(request.url).toBe("http://localhost:3333/admin/permissions/doap/http%3A%2F%2Frdfh.ch%2Fprojects%2FMTvoB0EJRrqovzRkWXqfkA");

expect(request.method).toEqual("GET");

Expand All @@ -376,7 +376,7 @@ describe("PermissionsEndpoint", () => {
permission.additionalInformation = "http://www.knora.org/ontology/knora-admin#ProjectMember";

const groupIri = "http://rdfh.ch/groups/0001/thing-searcher";
const projectIri = "http://rdfh.ch/projects/0001";
const projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const defObjAccPermission = new CreateDefaultObjectAccessPermission();
defObjAccPermission.forGroup = groupIri;
Expand All @@ -388,7 +388,7 @@ describe("PermissionsEndpoint", () => {
(response: ApiResponseData<DefaultObjectAccessPermissionResponse>) => {

expect(response.body.defaultObjectAccessPermission.forGroup).toEqual("http://rdfh.ch/groups/0001/thing-searcher");
expect(response.body.defaultObjectAccessPermission.forProject).toEqual("http://rdfh.ch/projects/0001");
expect(response.body.defaultObjectAccessPermission.forProject).toEqual("http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ");
// TODO: remove this bad hack once test data is stable
expect(response.body.defaultObjectAccessPermission.id).toBeDefined(); //.toEqual("http://rdfh.ch/permissions/0001/7fKkJ8DKTdew5x0139W78g");
expect(response.body.defaultObjectAccessPermission.hasPermissions.length).toBe(1);
Expand Down Expand Up @@ -440,7 +440,7 @@ describe("PermissionsEndpoint", () => {
permission.additionalInformation = "http://www.knora.org/ontology/knora-admin#ProjectMember";

const groupIri = "http://rdfh.ch/groups/0001/thing-searcher";
const projectIri = "http://rdfh.ch/projects/0001";
const projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const defObjAccPermission = new CreateDefaultObjectAccessPermission();
defObjAccPermission.forGroup = groupIri;
Expand All @@ -463,7 +463,7 @@ describe("PermissionsEndpoint", () => {
permission.additionalInformation = "http://www.knora.org/ontology/knora-admin#ProjectMember";

const groupIri = "http://rdfh.ch/groups/0001/thing-searcher";
const projectIri = "http://rdfh.ch/projects/0001";
const projectIri = "http://rdfh.ch/projects/Lw3FC39BSzCwvmdOaTyLqQ";

const defObjAccPermission = new CreateDefaultObjectAccessPermission();
defObjAccPermission.forGroup = groupIri;
Expand All @@ -485,7 +485,7 @@ describe("PermissionsEndpoint", () => {
permission.permissionCode = 7;
permission.additionalInformation = "http://www.knora.org/ontology/knora-admin#ProjectMember";

const projectIri = "http://rdfh.ch/projects/00FF";
const projectIri = "http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA";

const defObjAccPermission = new CreateDefaultObjectAccessPermission();
defObjAccPermission.forProject = projectIri;
Expand All @@ -496,7 +496,7 @@ describe("PermissionsEndpoint", () => {
knoraApiConnection.admin.permissionsEndpoint.createDefaultObjectAccessPermission(defObjAccPermission).subscribe(
(response: ApiResponseData<DefaultObjectAccessPermissionResponse>) => {

expect(response.body.defaultObjectAccessPermission.forProject).toEqual("http://rdfh.ch/projects/00FF");
expect(response.body.defaultObjectAccessPermission.forProject).toEqual("http://rdfh.ch/projects/MTvoB0EJRrqovzRkWXqfkA");
expect(response.body.defaultObjectAccessPermission.id).toEqual("http://rdfh.ch/permissions/00FF/zTOK3HlWTLGgTO8ZWVnotg");
expect(response.body.defaultObjectAccessPermission.hasPermissions.length).toBe(1);

Expand Down Expand Up @@ -664,9 +664,9 @@ describe("PermissionsEndpoint", () => {

knoraApiConnection.admin.permissionsEndpoint.deletePermission("http://rdfh.ch/permissions/00FF/a2").subscribe(
(response: ApiResponseData<DeletePermissionResponse>) => {
expect(response.body.deleted).toBeTrue();
done();
}
expect(response.body.deleted).toBeTrue();
done();
}
);

const request = jasmine.Ajax.requests.mostRecent();
Expand Down
Loading