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.

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

Bugfix: Relation types #1474

Merged
merged 60 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ddc2776
generate new server models
madsrasmussen Mar 20, 2024
199aa9f
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 21, 2024
c08e712
add entity types
madsrasmussen Mar 21, 2024
62bfbbb
delete tree
madsrasmussen Mar 21, 2024
e9792fa
setup detail model
madsrasmussen Mar 21, 2024
3575975
add item repo
madsrasmussen Mar 21, 2024
30390e2
add detail repo
madsrasmussen Mar 21, 2024
89c93c5
remove entity actions to create and delete
madsrasmussen Mar 21, 2024
a6ed2f7
add read detail interfaces
madsrasmussen Mar 21, 2024
fbd6822
make relation type workspace context readonly
madsrasmussen Mar 21, 2024
e61096b
update interface name
madsrasmussen Mar 21, 2024
8446f68
remove save workspace action
madsrasmussen Mar 21, 2024
ebc08b6
remove unused imports
madsrasmussen Mar 21, 2024
8c05edd
add workspace alias
madsrasmussen Mar 21, 2024
da1b5b9
add public
madsrasmussen Mar 21, 2024
1ecdf9c
remove deleted import
madsrasmussen Mar 21, 2024
289b619
add collection logic
madsrasmussen Mar 21, 2024
d35cf9f
clean up relation type collection table
madsrasmussen Mar 21, 2024
c979c81
rename menu item to relations
madsrasmussen Mar 21, 2024
988b25d
add link to name
madsrasmussen Mar 21, 2024
105ffef
use correct context alias
madsrasmussen Mar 21, 2024
a3fb0b7
only observe specific parts
madsrasmussen Mar 21, 2024
1a64939
wip repositories
madsrasmussen Mar 22, 2024
f7b8162
deleting mocks - we will add them later
madsrasmussen Mar 22, 2024
0adaa87
update imports
madsrasmussen Mar 22, 2024
3121abf
clean up
madsrasmussen Mar 22, 2024
0501374
correct import
madsrasmussen Mar 22, 2024
1a9d546
remove unused import
madsrasmussen Mar 22, 2024
36b4a4b
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 22, 2024
0100a9e
Update manifests.ts
madsrasmussen Mar 22, 2024
019c32b
remove is deletable from the type
madsrasmussen Mar 22, 2024
cf0418d
render details
madsrasmussen Mar 22, 2024
f9fd492
remove table padding
madsrasmussen Mar 22, 2024
b6fff07
remove table padding hacks
madsrasmussen Mar 22, 2024
794ee67
remove isDeletable
madsrasmussen Mar 22, 2024
92e6db2
wire up pagination
madsrasmussen Mar 22, 2024
1cfae91
set page size to 50
madsrasmussen Mar 22, 2024
17ebdaf
generete server models
madsrasmussen Mar 22, 2024
a414c0a
update to new server models
madsrasmussen Mar 22, 2024
229091c
temp empty state
madsrasmussen Mar 22, 2024
2cb6c52
add detail in name
madsrasmussen Mar 22, 2024
9695073
implement read methods
madsrasmussen Mar 22, 2024
d8e685f
make detail interfaces extend read interface
madsrasmussen Mar 22, 2024
07d1aaa
remove header margin
madsrasmussen Mar 22, 2024
eb8af63
format date
madsrasmussen Mar 22, 2024
ea53fcf
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 22, 2024
eba0502
Update relation-type-detail-workspace-view.element.ts
madsrasmussen Mar 22, 2024
72eb265
Merge branch 'bugfix/relation-types' of https://github.com/umbraco/Um…
madsrasmussen Mar 22, 2024
11409dd
remove unused item repo
madsrasmussen Mar 22, 2024
d601d54
Update package-lock.json
madsrasmussen Mar 22, 2024
d987ea5
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 23, 2024
f78e6d5
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 25, 2024
660ce78
Update relation-type-workspace.context-token.ts
madsrasmussen Mar 25, 2024
6593439
generate server models
madsrasmussen Mar 25, 2024
791837a
remove double registration
madsrasmussen Mar 25, 2024
221bcf7
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 25, 2024
78683cd
manual merge menu items
madsrasmussen Mar 25, 2024
b97c9bf
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 26, 2024
a8ca662
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 26, 2024
f11a0ad
Merge branch 'main' into bugfix/relation-types
madsrasmussen Mar 26, 2024
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/external/backend-api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export type { CreateMemberTypeRequestModel } from './models/CreateMemberTypeRequ
export type { CreatePackageRequestModel } from './models/CreatePackageRequestModel';
export type { CreatePartialViewFolderRequestModel } from './models/CreatePartialViewFolderRequestModel';
export type { CreatePartialViewRequestModel } from './models/CreatePartialViewRequestModel';
export type { CreateRelationTypeRequestModel } from './models/CreateRelationTypeRequestModel';
export type { CreateScriptFolderRequestModel } from './models/CreateScriptFolderRequestModel';
export type { CreateScriptRequestModel } from './models/CreateScriptRequestModel';
export type { CreateStylesheetFolderRequestModel } from './models/CreateStylesheetFolderRequestModel';
Expand Down Expand Up @@ -285,7 +284,7 @@ export type { PagedProblemDetailsModel } from './models/PagedProblemDetailsModel
export type { PagedRedirectUrlResponseModel } from './models/PagedRedirectUrlResponseModel';
export type { PagedRelationItemResponseModel } from './models/PagedRelationItemResponseModel';
export type { PagedRelationResponseModel } from './models/PagedRelationResponseModel';
export type { PagedRelationTypeTreeItemResponseModel } from './models/PagedRelationTypeTreeItemResponseModel';
export type { PagedRelationTypeResponseModel } from './models/PagedRelationTypeResponseModel';
export type { PagedSavedLogSearchResponseModel } from './models/PagedSavedLogSearchResponseModel';
export type { PagedSearcherResponseModel } from './models/PagedSearcherResponseModel';
export type { PagedSearchResultResponseModel } from './models/PagedSearchResultResponseModel';
Expand Down Expand Up @@ -319,6 +318,7 @@ export type { RedirectUrlResponseModel } from './models/RedirectUrlResponseModel
export type { RedirectUrlStatusResponseModel } from './models/RedirectUrlStatusResponseModel';
export type { ReferenceByIdModel } from './models/ReferenceByIdModel';
export type { RelationItemResponseModel } from './models/RelationItemResponseModel';
export type { RelationReferenceModel } from './models/RelationReferenceModel';
export type { RelationResponseModel } from './models/RelationResponseModel';
export type { RelationTypeBaseModel } from './models/RelationTypeBaseModel';
export type { RelationTypeItemResponseModel } from './models/RelationTypeItemResponseModel';
Expand Down Expand Up @@ -409,7 +409,6 @@ export type { UpdateMemberTypePropertyTypeRequestModel } from './models/UpdateMe
export type { UpdateMemberTypeRequestModel } from './models/UpdateMemberTypeRequestModel';
export type { UpdatePackageRequestModel } from './models/UpdatePackageRequestModel';
export type { UpdatePartialViewRequestModel } from './models/UpdatePartialViewRequestModel';
export type { UpdateRelationTypeRequestModel } from './models/UpdateRelationTypeRequestModel';
export type { UpdateScriptRequestModel } from './models/UpdateScriptRequestModel';
export type { UpdateStylesheetRequestModel } from './models/UpdateStylesheetRequestModel';
export type { UpdateTemplateRequestModel } from './models/UpdateTemplateRequestModel';
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { RelationTypeResponseModel } from './RelationTypeResponseModel';

export type PagedRelationTypeResponseModel = {
total: number;
items: Array<RelationTypeResponseModel>;
};

This file was deleted.

10 changes: 10 additions & 0 deletions src/external/backend-api/src/models/RelationReferenceModel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type RelationReferenceModel = {
id: string;
name?: string | null;
};

11 changes: 7 additions & 4 deletions src/external/backend-api/src/models/RelationResponseModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
/* tslint:disable */
/* eslint-disable */

import type { ReferenceByIdModel } from './ReferenceByIdModel';
import type { RelationReferenceModel } from './RelationReferenceModel';

export type RelationResponseModel = {
parentId: string;
parentName?: string | null;
childId: string;
childName?: string | null;
id: string;
relationType: ReferenceByIdModel;
parent: RelationReferenceModel;
child: RelationReferenceModel;
createDate: string;
comment?: string | null;
};
Expand Down
2 changes: 0 additions & 2 deletions src/external/backend-api/src/models/RelationTypeBaseModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
export type RelationTypeBaseModel = {
name: string;
isBidirectional: boolean;
parentObjectType?: string | null;
childObjectType?: string | null;
isDependency: boolean;
};

Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
/* tslint:disable */
/* eslint-disable */

import type { ObjectTypeResponseModel } from './ObjectTypeResponseModel';
import type { RelationTypeBaseModel } from './RelationTypeBaseModel';

export type RelationTypeResponseModel = (RelationTypeBaseModel & {
id: string;
alias?: string | null;
path: string;
isDeletable: boolean;
parentObjectTypeName?: string | null;
childObjectTypeName?: string | null;
parentObject?: ObjectTypeResponseModel | null;
childObject?: ObjectTypeResponseModel | null;
});

This file was deleted.

32 changes: 0 additions & 32 deletions src/external/backend-api/src/services/RelationResource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,6 @@ import { request as __request } from '../core/request';

export class RelationResource {

/**
* @returns PagedRelationResponseModel Success
* @throws ApiError
*/
public static getRelationChildRelationByChildId({
childId,
skip,
take = 100,
relationTypeAlias = '',
}: {
childId: string,
skip?: number,
take?: number,
relationTypeAlias?: string,
}): CancelablePromise<PagedRelationResponseModel> {
return __request(OpenAPI, {
method: 'GET',
url: '/umbraco/management/api/v1/relation/child-relation/{childId}',
path: {
'childId': childId,
},
query: {
'skip': skip,
'take': take,
'relationTypeAlias': relationTypeAlias,
},
errors: {
401: `The resource is protected and requires an authentication token`,
},
});
}

/**
* @returns PagedRelationResponseModel Success
* @throws ApiError
Expand Down
100 changes: 13 additions & 87 deletions src/external/backend-api/src/services/RelationTypeResource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
import type { CreateRelationTypeRequestModel } from '../models/CreateRelationTypeRequestModel';
import type { PagedRelationTypeTreeItemResponseModel } from '../models/PagedRelationTypeTreeItemResponseModel';
import type { PagedRelationTypeResponseModel } from '../models/PagedRelationTypeResponseModel';
import type { RelationTypeItemResponseModel } from '../models/RelationTypeItemResponseModel';
import type { RelationTypeResponseModel } from '../models/RelationTypeResponseModel';
import type { UpdateRelationTypeRequestModel } from '../models/UpdateRelationTypeRequestModel';

import type { CancelablePromise } from '../core/CancelablePromise';
import { OpenAPI } from '../core/OpenAPI';
Expand Down Expand Up @@ -36,22 +34,24 @@ export class RelationTypeResource {
}

/**
* @returns string Created
* @returns PagedRelationTypeResponseModel Success
* @throws ApiError
*/
public static postRelationType({
requestBody,
public static getRelationType({
skip,
take = 100,
}: {
requestBody?: CreateRelationTypeRequestModel,
}): CancelablePromise<string> {
skip?: number,
take?: number,
}): CancelablePromise<PagedRelationTypeResponseModel> {
return __request(OpenAPI, {
method: 'POST',
method: 'GET',
url: '/umbraco/management/api/v1/relation-type',
body: requestBody,
mediaType: 'application/json',
responseHeader: 'Umb-Generated-Resource',
query: {
'skip': skip,
'take': take,
},
errors: {
400: `Bad Request`,
401: `The resource is protected and requires an authentication token`,
},
});
Expand Down Expand Up @@ -79,78 +79,4 @@ export class RelationTypeResource {
});
}

/**
* @returns string Success
* @throws ApiError
*/
public static deleteRelationTypeById({
id,
}: {
id: string,
}): CancelablePromise<string> {
return __request(OpenAPI, {
method: 'DELETE',
url: '/umbraco/management/api/v1/relation-type/{id}',
path: {
'id': id,
},
responseHeader: 'Umb-Notifications',
errors: {
401: `The resource is protected and requires an authentication token`,
404: `Not Found`,
},
});
}

/**
* @returns any Success
* @throws ApiError
*/
public static putRelationTypeById({
id,
requestBody,
}: {
id: string,
requestBody?: UpdateRelationTypeRequestModel,
}): CancelablePromise<RelationTypeResponseModel> {
return __request(OpenAPI, {
method: 'PUT',
url: '/umbraco/management/api/v1/relation-type/{id}',
path: {
'id': id,
},
body: requestBody,
mediaType: 'application/json',
errors: {
400: `Bad Request`,
401: `The resource is protected and requires an authentication token`,
404: `Not Found`,
},
});
}

/**
* @returns PagedRelationTypeTreeItemResponseModel Success
* @throws ApiError
*/
public static getTreeRelationTypeRoot({
skip,
take = 100,
}: {
skip?: number,
take?: number,
}): CancelablePromise<PagedRelationTypeTreeItemResponseModel> {
return __request(OpenAPI, {
method: 'GET',
url: '/umbraco/management/api/v1/tree/relation-type/root',
query: {
'skip': skip,
'take': take,
},
errors: {
401: `The resource is protected and requires an authentication token`,
},
});
}

}
3 changes: 0 additions & 3 deletions src/mocks/browser-handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import { handlers as trackedReferenceHandlers } from './handlers/tracked-referen
import { handlers as upgradeHandlers } from './handlers/upgrade.handlers.js';
import { handlers as userGroupsHandlers } from './handlers/user-group/index.js';
import { handlers as userHandlers } from './handlers/user/index.js';
import { relationHandlers, relationTypeHandlers } from './handlers/relations/index.js';
import * as manifestsHandlers from './handlers/manifests.handlers.js';
import * as serverHandlers from './handlers/server.handlers.js';

Expand Down Expand Up @@ -66,8 +65,6 @@ const handlers = [
...profilingHandlers,
...publishedStatusHandlers,
...redirectManagementHandlers,
...relationHandlers,
...relationTypeHandlers,
...rteEmbedHandlers,
...scriptHandlers,
...staticFileHandlers,
Expand Down
Loading
Loading