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

rename installer store to installer context

Browse Source
This commit is contained in:
Mads Rasmussen
2022-09-05 22:32:37 +02:00
parent 440f5a5c37
commit 5af37b72ef
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts
View File

@@ -52,7 +52,7 @@ export class UmbInstallerConsentElement extends UmbContextConsumerMixin(LitEleme
private _telemetryFormData?: TelemetryModel['level'];
@state()
private _installerStore?: UmbInstallerContext;
private _installerContext?: UmbInstallerContext;
private storeDataSubscription?: Subscription;
private storeSettingsSubscription?: Subscription;
@@ -60,16 +60,16 @@ export class UmbInstallerConsentElement extends UmbContextConsumerMixin(LitEleme
constructor() {
super();
this.consumeContext('umbInstallerContext', (installerStore: UmbInstallerContext) => {
this._installerStore = installerStore;
this.consumeContext('umbInstallerContext', (installerContext: UmbInstallerContext) => {
this._installerContext = installerContext;
this.storeSettingsSubscription?.unsubscribe();
this.storeSettingsSubscription = installerStore.settings.subscribe((settings) => {
this.storeSettingsSubscription = installerContext.settings.subscribe((settings) => {
this._telemetryLevels = settings.user.consentLevels;
});
this.storeDataSubscription?.unsubscribe();
this.storeDataSubscription = installerStore.data.subscribe((data) => {
this.storeDataSubscription = installerContext.data.subscribe((data) => {
this._telemetryFormData = data.telemetryLevel;
});
});
@@ -86,15 +86,15 @@ export class UmbInstallerConsentElement extends UmbContextConsumerMixin(LitEleme
const value: { [key: string]: string } = {};
value[target.name] = this._telemetryLevels[parseInt(target.value) - 1].level;
this._installerStore?.appendData(value);
this._installerContext?.appendData(value);
}
private _onNext() {
this._installerStore?.nextStep();
this._installerContext?.nextStep();
}
private _onBack() {
this._installerStore?.prevStep();
this._installerContext?.prevStep();
}
private get _selectedTelemetryIndex() {

32
src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts
View File

@@ -94,7 +94,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
private _preConfiguredDatabase?: UmbracoInstallerDatabaseModel;
@state()
private _installerStore?: UmbInstallerContext;
private _installerContext?: UmbInstallerContext;
@state()
private _validationErrorMessage = '';
@@ -105,11 +105,11 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
constructor() {
super();
this.consumeContext('umbInstallerContext', (installerStore: UmbInstallerContext) => {
this._installerStore = installerStore;
this.consumeContext('umbInstallerContext', (installerContext: UmbInstallerContext) => {
this._installerContext = installerContext;
this.storeSettingsSubscription?.unsubscribe();
this.storeSettingsSubscription = installerStore.settings.subscribe((settings) => {
this.storeSettingsSubscription = installerContext.settings.subscribe((settings) => {
this._databases = settings.databases;
// If there is an isConfigured database in the databases array then we can skip the database selection step
@@ -121,7 +121,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
});
this.storeDataSubscription?.unsubscribe();
this.storeDataSubscription = installerStore.data.subscribe((data) => {
this.storeDataSubscription = installerContext.data.subscribe((data) => {
this.databaseFormData = data.database ?? {};
this._options.forEach((x, i) => (x.selected = data.database?.id === x.value || i === 0));
});
@@ -140,9 +140,9 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
const value: { [key: string]: string | boolean } = {};
value[target.name] = target.checked ?? target.value; // handle boolean and text inputs
const database = { ...this._installerStore?.getData().database, ...value };
const database = { ...this._installerContext?.getData().database, ...value };
this._installerStore?.appendData({ database });
this._installerContext?.appendData({ database });
}
private _handleSubmit = async (evt: SubmitEvent) => {
@@ -154,7 +154,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
const isValid = form.checkValidity();
if (!isValid) return;
if (!this._installerStore) return;
if (!this._installerContext) return;
this._installButton.state = 'waiting';
@@ -202,7 +202,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
}
const database = {
...this._installerStore?.getData().database,
...this._installerContext?.getData().database,
id,
username,
password,
@@ -212,11 +212,11 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
connectionString,
} as UmbracoPerformInstallDatabaseConfiguration;
this._installerStore?.appendData({ database });
this._installerContext?.appendData({ database });
}
this._installerStore?.nextStep();
this._installerStore
this._installerContext?.nextStep();
this._installerContext
.requestInstall()
.then(() => this._handleFulfilled())
.catch((error) => this._handleRejected(error));
@@ -232,18 +232,18 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(LitElem
if (e instanceof postInstallSetup.Error) {
const error = e.getActualType();
if (error.status === 400) {
this._installerStore?.setInstallStatus(error.data);
this._installerContext?.setInstallStatus(error.data);
}
}
this._installerStore?.nextStep();
this._installerContext?.nextStep();
}
private _onBack() {
this._installerStore?.prevStep();
this._installerContext?.prevStep();
}
private get selectedDatabase() {
const id = this._installerStore?.getData().database?.id;
const id = this._installerContext?.getData().database?.id;
return this._databases.find((x) => x.id === id) ?? this._databases[0];
}

18
src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts
View File

@@ -61,17 +61,17 @@ export class UmbInstallerUserElement extends UmbContextConsumerMixin(LitElement)
private _userFormData?: { name: string; password: string; email: string; subscribeToNewsletter: boolean };
@state()
private _installerStore?: UmbInstallerContext;
private _installerContext?: UmbInstallerContext;
private installerStoreSubscription?: Subscription;
private installerContextSubscription?: Subscription;
constructor() {
super();
this.consumeContext('umbInstallerContext', (installerStore: UmbInstallerContext) => {
this._installerStore = installerStore;
this.installerStoreSubscription?.unsubscribe();
this.installerStoreSubscription = installerStore.data.subscribe(({ user }) => {
this.consumeContext('umbInstallerContext', (installerContext: UmbInstallerContext) => {
this._installerContext = installerContext;
this.installerContextSubscription?.unsubscribe();
this.installerContextSubscription = installerContext.data.subscribe(({ user }) => {
this._userFormData = {
name: user.name,
password: user.password,
@@ -84,7 +84,7 @@ export class UmbInstallerUserElement extends UmbContextConsumerMixin(LitElement)
disconnectedCallback(): void {
super.disconnectedCallback();
this.installerStoreSubscription?.unsubscribe();
this.installerContextSubscription?.unsubscribe();
}
private _handleSubmit = (e: SubmitEvent) => {
@@ -102,8 +102,8 @@ export class UmbInstallerUserElement extends UmbContextConsumerMixin(LitElement)
const email = formData.get('email');
const subscribeToNewsletter = formData.has('subscribeToNewsletter');
this._installerStore?.appendData({ user: { name, password, email, subscribeToNewsletter } });
this._installerStore?.nextStep();
this._installerContext?.appendData({ user: { name, password, email, subscribeToNewsletter } });
this._installerContext?.nextStep();
};
render() {