Skip to content

Commit 1bd9583

Browse files
authored
V16: Bump @hey-api/openapi-ts to 0.81.1 (#19982)
* build(deps): bump @hey-api/openapi-ts to 0.81.1 and pin the version to ensure compatibility between backoffice and extensions * chore: regenerate api types and replace where necessary * feat: pin version of @hey-api/openapi-ts and regenerate umbraco-extension files * chore: removes unused 'client' field * build(deps-dev): bump @hey-api/openapi-ts to 0.81.1 for the login app
1 parent a0cea4b commit 1bd9583

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+5267
-1301
lines changed

src/Umbraco.Web.UI.Client/package-lock.json

Lines changed: 153 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
2-
import type {
3-
InstallSettingsResponseModel,
4-
InstallRequestModelReadable,
5-
} from '@umbraco-cms/backoffice/external/backend-api';
2+
import type { InstallSettingsResponseModel, InstallRequestModel } from '@umbraco-cms/backoffice/external/backend-api';
63
import { InstallService, TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api';
74
import { tryExecute, UmbApiError, type UmbProblemDetails } from '@umbraco-cms/backoffice/resources';
85
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
@@ -15,7 +12,7 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
1512
* @class UmbInstallerContext
1613
*/
1714
export class UmbInstallerContext extends UmbContextBase {
18-
private _data = new UmbObjectState<InstallRequestModelReadable>({
15+
private _data = new UmbObjectState<InstallRequestModel>({
1916
user: { name: '', email: '', password: '', subscribeToNewsletter: false },
2017
database: { id: '', providerName: '', useIntegratedAuthentication: false, trustServerCertificate: false },
2118
telemetryLevel: TelemetryLevelModel.DETAILED,
@@ -90,7 +87,7 @@ export class UmbInstallerContext extends UmbContextBase {
9087
* @param {Partial<InstallRequestModel>} data The data to set
9188
* @memberof UmbInstallerContext
9289
*/
93-
public appendData(data: Partial<InstallRequestModelReadable>): void {
90+
public appendData(data: Partial<InstallRequestModel>): void {
9491
this._data.setValue({ ...this.getData(), ...data });
9592
}
9693

@@ -100,7 +97,7 @@ export class UmbInstallerContext extends UmbContextBase {
10097
* @returns {*} {PostInstallRequest}
10198
* @memberof UmbInstallerContext
10299
*/
103-
public getData(): InstallRequestModelReadable {
100+
public getData(): InstallRequestModel {
104101
return this._data.getValue();
105102
}
106103

src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader-view.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
22
import { css, html, LitElement, customElement, property, ifDefined } from '@umbraco-cms/backoffice/external/lit';
3-
import type { UpgradeSettingsResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
3+
import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
44

55
/**
66
* @element umb-upgrader-view
@@ -18,7 +18,7 @@ export class UmbUpgraderViewElement extends LitElement {
1818
errorMessage = '';
1919

2020
@property({ type: Object, reflect: true })
21-
settings?: UpgradeSettingsResponseModelReadable;
21+
settings?: UpgradeSettingsResponseModel;
2222

2323
private _renderLayout() {
2424
return html`

src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
2-
import type { UpgradeSettingsResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
2+
import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
33
import { UpgradeService } from '@umbraco-cms/backoffice/external/backend-api';
44
import { tryExecute, UmbApiError } from '@umbraco-cms/backoffice/resources';
55
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -13,7 +13,7 @@ import './upgrader-view.element.js';
1313
@customElement('umb-upgrader')
1414
export class UmbUpgraderElement extends UmbLitElement {
1515
@state()
16-
private _upgradeSettings?: UpgradeSettingsResponseModelReadable;
16+
private _upgradeSettings?: UpgradeSettingsResponseModel;
1717

1818
@state()
1919
private _fetching = true;

src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {
22
IndexResponseModel,
33
PagedIndexResponseModel,
4-
SearchResultResponseModelReadable,
4+
SearchResultResponseModel,
55
} from '@umbraco-cms/backoffice/external/backend-api';
66
import { HealthStatusModel } from '@umbraco-cms/backoffice/external/backend-api';
77

@@ -19,7 +19,7 @@ export function getIndexByName(indexName: string) {
1919
/**
2020
*
2121
*/
22-
export function getSearchResultsMockData(): SearchResultResponseModelReadable[] {
22+
export function getSearchResultsMockData(): SearchResultResponseModel[] {
2323
return searchResultMockData;
2424
}
2525

@@ -91,7 +91,7 @@ export const PagedIndexers: PagedIndexResponseModel = {
9191
total: 0,
9292
};
9393

94-
export const searchResultMockData: SearchResultResponseModelReadable[] = [
94+
export const searchResultMockData: SearchResultResponseModel[] = [
9595
{
9696
id: '1',
9797
score: 1,

src/Umbraco.Web.UI.Client/src/mocks/data/relation/relation.data.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import type {
2-
RelationResponseModelReadable,
3-
RelationReferenceModel,
4-
} from '@umbraco-cms/backoffice/external/backend-api';
1+
import type { RelationResponseModel, RelationReferenceModel } from '@umbraco-cms/backoffice/external/backend-api';
52

6-
export type UmbMockRelationModel = RelationResponseModelReadable;
3+
export type UmbMockRelationModel = RelationResponseModel;
74
export type UmbMockRelationReferenceModel = RelationReferenceModel;
85

96
export const data: Array<UmbMockRelationModel> = [

src/Umbraco.Web.UI.Client/src/mocks/data/relation/relation.db.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UmbMockEntityDetailManager } from '../utils/entity/entity-detail.manage
22
import { UmbEntityMockDbBase } from '../utils/entity/entity-base.js';
33
import type { UmbMockRelationModel } from './relation.data.js';
44
import { data } from './relation.data.js';
5-
import type { RelationResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
5+
import type { RelationResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
66

77
class UmbRelationMockDB extends UmbEntityMockDbBase<UmbMockRelationModel> {
88
item = new UmbMockEntityDetailManager<UmbMockRelationModel>(this, itemResponseMapper, createDetailMockMapper);
@@ -16,7 +16,7 @@ const createDetailMockMapper = (): UmbMockRelationModel => {
1616
throw new Error('Not possible to create a relation');
1717
};
1818

19-
const itemResponseMapper = (item: UmbMockRelationModel): RelationResponseModelReadable => {
19+
const itemResponseMapper = (item: UmbMockRelationModel): RelationResponseModel => {
2020
return {
2121
id: item.id,
2222
child: item.child,

src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type {
66
IndexResponseModel,
77
PagedIndexResponseModel,
88
PagedSearcherResponseModel,
9-
PagedSearchResultResponseModelReadable,
9+
PagedSearchResultResponseModel,
1010
} from '@umbraco-cms/backoffice/external/backend-api';
1111

1212
export const handlers = [
@@ -65,7 +65,7 @@ export const handlers = [
6565
if (searcherName) {
6666
return res(
6767
ctx.status(200),
68-
ctx.json<PagedSearchResultResponseModelReadable>({
68+
ctx.json<PagedSearchResultResponseModel>({
6969
total: 0,
7070
items: searchResultMockData,
7171
}),

src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { rest } = window.MockServiceWorker;
22
import type {
33
DatabaseInstallRequestModel,
4-
InstallRequestModelReadable,
4+
InstallRequestModel,
55
InstallSettingsResponseModel,
66
ProblemDetails,
77
} from '@umbraco-cms/backoffice/external/backend-api';
@@ -99,7 +99,7 @@ export const handlers = [
9999
}),
100100

101101
rest.post(umbracoPath('/install/setup'), async (req, res, ctx) => {
102-
const body = await req.json<InstallRequestModelReadable>();
102+
const body = await req.json<InstallRequestModel>();
103103

104104
if (body.database?.name === 'fail') {
105105
return res(

src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import type {
66
PagedPackageMigrationStatusResponseModel,
77
CreatePackageRequestModel,
88
GetPackageConfigurationResponse,
9-
PagedPackageDefinitionResponseModelReadable,
10-
PackageDefinitionResponseModelReadable,
9+
PagedPackageDefinitionResponseModel,
10+
PackageDefinitionResponseModel,
1111
} from '@umbraco-cms/backoffice/external/backend-api';
1212

1313
export const handlers = [
@@ -55,7 +55,7 @@ export const handlers = [
5555
// read all
5656
return res(
5757
ctx.status(200),
58-
ctx.json<PagedPackageDefinitionResponseModelReadable>({
58+
ctx.json<PagedPackageDefinitionResponseModel>({
5959
total: packageArray.length,
6060
items: packageArray,
6161
}),
@@ -65,9 +65,9 @@ export const handlers = [
6565
rest.post(umbracoPath('/package/created'), async (_req, res, ctx) => {
6666
//save
6767
const data: CreatePackageRequestModel = await _req.json();
68-
const newPackage: PackageDefinitionResponseModelReadable = { ...data, id: UmbId.new(), packagePath: '' };
68+
const newPackage: PackageDefinitionResponseModel = { ...data, id: UmbId.new(), packagePath: '' };
6969
packageArray.push(newPackage);
70-
return res(ctx.status(200), ctx.json<PackageDefinitionResponseModelReadable>(newPackage));
70+
return res(ctx.status(200), ctx.json<PackageDefinitionResponseModel>(newPackage));
7171
}),
7272

7373
rest.get(umbracoPath('/package/created/:id'), (_req, res, ctx) => {
@@ -76,12 +76,12 @@ export const handlers = [
7676
if (!id) return res(ctx.status(404));
7777
const found = packageArray.find((p) => p.id == id);
7878
if (!found) return res(ctx.status(404));
79-
return res(ctx.status(200), ctx.json<PackageDefinitionResponseModelReadable>(found));
79+
return res(ctx.status(200), ctx.json<PackageDefinitionResponseModel>(found));
8080
}),
8181

8282
rest.put(umbracoPath('/package/created/:id'), async (_req, res, ctx) => {
8383
//update
84-
const data: PackageDefinitionResponseModelReadable = await _req.json();
84+
const data: PackageDefinitionResponseModel = await _req.json();
8585
if (!data.id) return;
8686
const index = packageArray.findIndex((x) => x.id === data.id);
8787
packageArray[index] = data;
@@ -104,7 +104,7 @@ export const handlers = [
104104
}),
105105
];
106106

107-
const packageArray: PackageDefinitionResponseModelReadable[] = [
107+
const packageArray: PackageDefinitionResponseModel[] = [
108108
{
109109
id: '2a0181ec-244b-4068-a1d7-2f95ed7e6da6',
110110
packagePath: '',

0 commit comments

Comments
 (0)