yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrader + installer models

Browse Source
This commit is contained in:
Jacob Overgaard
2023-02-09 17:00:29 +01:00
parent 25081cc8a0
commit 101947c977
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
src/Umbraco.Web.UI.Client/src/installer/installer.context.ts
View File

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

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

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

4
src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts
View File

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