upgrader + installer models

src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts

@@ -7,7 +7,7 @@ import { rest } from 'msw';
 import { installerContextProvider } from '../shared/utils.story-helpers';
 
 import type { UmbInstallerDatabaseElement } from './installer-database.element';
-import { InstallSettings } from '@umbraco-cms/backend-api';
+import type { InstallSettingsModel } from '@umbraco-cms/backend-api';
 export default {
 	title: 'Apps/Installer/Steps',
 	component: 'umb-installer-database',
@@ -30,7 +30,7 @@ Step3DatabasePreconfigured.parameters = {
 				rest.get('/umbraco/backoffice/install/settings', (_req, res, ctx) => {
 					return res(
 						ctx.status(200),
-						ctx.json<InstallSettings>({
+						ctx.json<InstallSettingsModel>({
 							user: { consentLevels: [], minCharLength: 2, minNonAlphaNumericLength: 2 },
 							databases: [
 								{

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

@@ -1,10 +1,10 @@
 import { Observable } from 'rxjs';
 import {
-	Install,
+	InstallModel,
 	InstallResource,
-	InstallSettings,
+	InstallSettingsModel,
 	ProblemDetailsModel,
-	TelemetryLevel,
+	TelemetryLevelModel,
 } from '@umbraco-cms/backend-api';
 import { tryExecute } from '@umbraco-cms/resources';
 import { UmbContextToken } from '@umbraco-cms/context-api';
@@ -16,17 +16,17 @@ import { ObjectState, NumberState } from '@umbraco-cms/observable-api';
  * @class UmbInstallerContext
  */
 export class UmbInstallerContext {
-	private _data = new ObjectState<Install>({
+	private _data = new ObjectState<InstallModel>({
 		user: { name: '', email: '', password: '', subscribeToNewsletter: false },
 		database: { id: '', providerName: '' },
-		telemetryLevel: TelemetryLevel.BASIC,
+		telemetryLevel: TelemetryLevelModel.BASIC,
 	});
 	public readonly data = this._data.asObservable();
 
 	private _currentStep = new NumberState<number>(1);
 	public readonly currentStep = this._currentStep.asObservable();
 
-	private _settings = new ObjectState<InstallSettings | undefined>(undefined);
+	private _settings = new ObjectState<InstallSettingsModel | undefined>(undefined);
 	public readonly settings = this._settings.asObservable();
 
 	private _installStatus = new ObjectState<ProblemDetailsModel | null>(null);
@@ -90,7 +90,7 @@ export class UmbInstallerContext {
 	 * @param {Partial<PostInstallRequest>} data
 	 * @memberof UmbInstallerContext
 	 */
-	public appendData(data: Partial<Install>): void {
+	public appendData(data: Partial<InstallModel>): void {
 		this._data.next({ ...this.getData(), ...data });
 	}
 
@@ -100,7 +100,7 @@ export class UmbInstallerContext {
 	 * @return {*}  {PostInstallRequest}
 	 * @memberof UmbInstallerContext
 	 */
-	public getData(): Install {
+	public getData(): InstallModel {
 		return this._data.getValue();
 	}
 

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

@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { UpgradeSettings } from '@umbraco-cms/backend-api';
+import { UpgradeSettingsModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-upgrader-view
@@ -32,7 +32,7 @@ export class UmbUpgraderView extends LitElement {
 	errorMessage = '';
 
 	@property({ type: Object, reflect: true })
-	settings?: UpgradeSettings;
+	settings?: UpgradeSettingsModel;
 
 	private _renderLayout() {
 		return html`

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

@@ -3,7 +3,7 @@ import './upgrader-view.element';
 
 import { html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UpgradeResource, UpgradeSettings } from '@umbraco-cms/backend-api';
+import { UpgradeResource, UpgradeSettingsModel } from '@umbraco-cms/backend-api';
 import { tryExecute } from '@umbraco-cms/resources';
 import { UmbLitElement } from '@umbraco-cms/element';
 
@@ -13,7 +13,7 @@ import { UmbLitElement } from '@umbraco-cms/element';
 @customElement('umb-upgrader')
 export class UmbUpgrader extends UmbLitElement {
 	@state()
-	private upgradeSettings?: UpgradeSettings;
+	private upgradeSettings?: UpgradeSettingsModel;
 
 	@state()
 	private fetching = true;