Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
223 changes: 153 additions & 70 deletions src/Umbraco.Web.UI.Client/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
import type {
InstallSettingsResponseModel,
InstallRequestModelReadable,
} from '@umbraco-cms/backoffice/external/backend-api';
import type { InstallSettingsResponseModel, InstallRequestModel } from '@umbraco-cms/backoffice/external/backend-api';
import { InstallService, TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api';
import { tryExecute, UmbApiError, type UmbProblemDetails } from '@umbraco-cms/backoffice/resources';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
Expand All @@ -15,7 +12,7 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
* @class UmbInstallerContext
*/
export class UmbInstallerContext extends UmbContextBase {
private _data = new UmbObjectState<InstallRequestModelReadable>({
private _data = new UmbObjectState<InstallRequestModel>({
user: { name: '', email: '', password: '', subscribeToNewsletter: false },
database: { id: '', providerName: '', useIntegratedAuthentication: false, trustServerCertificate: false },
telemetryLevel: TelemetryLevelModel.DETAILED,
Expand Down Expand Up @@ -90,7 +87,7 @@ export class UmbInstallerContext extends UmbContextBase {
* @param {Partial<InstallRequestModel>} data The data to set
* @memberof UmbInstallerContext
*/
public appendData(data: Partial<InstallRequestModelReadable>): void {
public appendData(data: Partial<InstallRequestModel>): void {
this._data.setValue({ ...this.getData(), ...data });
}

Expand All @@ -100,7 +97,7 @@ export class UmbInstallerContext extends UmbContextBase {
* @returns {*} {PostInstallRequest}
* @memberof UmbInstallerContext
*/
public getData(): InstallRequestModelReadable {
public getData(): InstallRequestModel {
return this._data.getValue();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
import { css, html, LitElement, customElement, property, ifDefined } from '@umbraco-cms/backoffice/external/lit';
import type { UpgradeSettingsResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api';

/**
* @element umb-upgrader-view
Expand All @@ -18,7 +18,7 @@ export class UmbUpgraderViewElement extends LitElement {
errorMessage = '';

@property({ type: Object, reflect: true })
settings?: UpgradeSettingsResponseModelReadable;
settings?: UpgradeSettingsResponseModel;

private _renderLayout() {
return html`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import type { UpgradeSettingsResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
import { UpgradeService } from '@umbraco-cms/backoffice/external/backend-api';
import { tryExecute, UmbApiError } from '@umbraco-cms/backoffice/resources';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
Expand All @@ -13,7 +13,7 @@ import './upgrader-view.element.js';
@customElement('umb-upgrader')
export class UmbUpgraderElement extends UmbLitElement {
@state()
private _upgradeSettings?: UpgradeSettingsResponseModelReadable;
private _upgradeSettings?: UpgradeSettingsResponseModel;

@state()
private _fetching = true;
Expand Down
6 changes: 3 additions & 3 deletions src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {
IndexResponseModel,
PagedIndexResponseModel,
SearchResultResponseModelReadable,
SearchResultResponseModel,
} from '@umbraco-cms/backoffice/external/backend-api';
import { HealthStatusModel } from '@umbraco-cms/backoffice/external/backend-api';

Expand All @@ -19,7 +19,7 @@ export function getIndexByName(indexName: string) {
/**
*
*/
export function getSearchResultsMockData(): SearchResultResponseModelReadable[] {
export function getSearchResultsMockData(): SearchResultResponseModel[] {
return searchResultMockData;
}

Expand Down Expand Up @@ -91,7 +91,7 @@ export const PagedIndexers: PagedIndexResponseModel = {
total: 0,
};

export const searchResultMockData: SearchResultResponseModelReadable[] = [
export const searchResultMockData: SearchResultResponseModel[] = [
{
id: '1',
score: 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import type {
RelationResponseModelReadable,
RelationReferenceModel,
} from '@umbraco-cms/backoffice/external/backend-api';
import type { RelationResponseModel, RelationReferenceModel } from '@umbraco-cms/backoffice/external/backend-api';

export type UmbMockRelationModel = RelationResponseModelReadable;
export type UmbMockRelationModel = RelationResponseModel;
export type UmbMockRelationReferenceModel = RelationReferenceModel;

export const data: Array<UmbMockRelationModel> = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { UmbMockEntityDetailManager } from '../utils/entity/entity-detail.manage
import { UmbEntityMockDbBase } from '../utils/entity/entity-base.js';
import type { UmbMockRelationModel } from './relation.data.js';
import { data } from './relation.data.js';
import type { RelationResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
import type { RelationResponseModel } from '@umbraco-cms/backoffice/external/backend-api';

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

const itemResponseMapper = (item: UmbMockRelationModel): RelationResponseModelReadable => {
const itemResponseMapper = (item: UmbMockRelationModel): RelationResponseModel => {
return {
id: item.id,
child: item.child,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type {
IndexResponseModel,
PagedIndexResponseModel,
PagedSearcherResponseModel,
PagedSearchResultResponseModelReadable,
PagedSearchResultResponseModel,
} from '@umbraco-cms/backoffice/external/backend-api';

export const handlers = [
Expand Down Expand Up @@ -65,7 +65,7 @@ export const handlers = [
if (searcherName) {
return res(
ctx.status(200),
ctx.json<PagedSearchResultResponseModelReadable>({
ctx.json<PagedSearchResultResponseModel>({
total: 0,
items: searchResultMockData,
}),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { rest } = window.MockServiceWorker;
import type {
DatabaseInstallRequestModel,
InstallRequestModelReadable,
InstallRequestModel,
InstallSettingsResponseModel,
ProblemDetails,
} from '@umbraco-cms/backoffice/external/backend-api';
Expand Down Expand Up @@ -99,7 +99,7 @@ export const handlers = [
}),

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

if (body.database?.name === 'fail') {
return res(
Expand Down
16 changes: 8 additions & 8 deletions src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import type {
PagedPackageMigrationStatusResponseModel,
CreatePackageRequestModel,
GetPackageConfigurationResponse,
PagedPackageDefinitionResponseModelReadable,
PackageDefinitionResponseModelReadable,
PagedPackageDefinitionResponseModel,
PackageDefinitionResponseModel,
} from '@umbraco-cms/backoffice/external/backend-api';

export const handlers = [
Expand Down Expand Up @@ -55,7 +55,7 @@ export const handlers = [
// read all
return res(
ctx.status(200),
ctx.json<PagedPackageDefinitionResponseModelReadable>({
ctx.json<PagedPackageDefinitionResponseModel>({
total: packageArray.length,
items: packageArray,
}),
Expand All @@ -65,9 +65,9 @@ export const handlers = [
rest.post(umbracoPath('/package/created'), async (_req, res, ctx) => {
//save
const data: CreatePackageRequestModel = await _req.json();
const newPackage: PackageDefinitionResponseModelReadable = { ...data, id: UmbId.new(), packagePath: '' };
const newPackage: PackageDefinitionResponseModel = { ...data, id: UmbId.new(), packagePath: '' };
packageArray.push(newPackage);
return res(ctx.status(200), ctx.json<PackageDefinitionResponseModelReadable>(newPackage));
return res(ctx.status(200), ctx.json<PackageDefinitionResponseModel>(newPackage));
}),

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

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

const packageArray: PackageDefinitionResponseModelReadable[] = [
const packageArray: PackageDefinitionResponseModel[] = [
{
id: '2a0181ec-244b-4068-a1d7-2f95ed7e6da6',
packagePath: '',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const { rest } = window.MockServiceWorker;

import { umbracoPath } from '@umbraco-cms/backoffice/utils';
import type { UpgradeSettingsResponseModelReadable } from '@umbraco-cms/backoffice/external/backend-api';
import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api';

export const handlers = [
rest.get(umbracoPath('/upgrade/settings'), (_req, res, ctx) => {
return res(
// Respond with a 200 status code
ctx.status(200),
ctx.json<UpgradeSettingsResponseModelReadable>({
ctx.json<UpgradeSettingsResponseModel>({
currentState: '2b20c6e7',
newState: '2b20c6e8',
oldVersion: '13.0.0',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is auto-generated by @hey-api/openapi-ts

import type { ClientOptions } from './types.gen';
import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from '@hey-api/client-fetch';
import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from './client';

/**
* The `createClientConfig()` function will be called on client initialization
Expand Down
Loading
Loading