Improvement: Model remapping + Part 2

package.json

@@ -61,8 +61,8 @@
 		"./member-type": "./dist-cms/packages/members/member-types/index.js",
 		"./package": "./dist-cms/packages/packages/package/index.js",
 		"./data-type": "./dist-cms/packages/core/data-type/index.js",
+		"./language": "./dist-cms/packages/language/index.js",
 		"./dynamic-root": "./dist-cms/packages/dynamic-root/index.js",
-		"./language": "./dist-cms/packages/settings/languages/index.js",
 		"./logviewer": "./dist-cms/packages/settings/logviewer/index.js",
 		"./relation-type": "./dist-cms/packages/relations/relation-types/index.js",
 		"./relation": "./dist-cms/packages/relations/relations/index.js",

src/apps/backoffice/backoffice.element.ts

@@ -13,19 +13,25 @@ import './components/index.js';
 // TODO: temp solution to load core packages
 const CORE_PACKAGES = [
 	import('../../packages/audit-log/umbraco-package.js'),
+	import('../../packages/block/umbraco-package.js'),
 	import('../../packages/core/umbraco-package.js'),
-	import('../../packages/settings/umbraco-package.js'),
+	import('../../packages/dictionary/umbraco-package.js'),
 	import('../../packages/documents/umbraco-package.js'),
-	import('../../packages/relations/umbraco-package.js'),
+	import('../../packages/health-check/umbraco-package.js'),
+	import('../../packages/language/umbraco-package.js'),
+	import('../../packages/log-viewer/umbraco-package.js'),
 	import('../../packages/media/umbraco-package.js'),
 	import('../../packages/members/umbraco-package.js'),
-	import('../../packages/block/umbraco-package.js'),
-	import('../../packages/dictionary/umbraco-package.js'),
-	import('../../packages/user/umbraco-package.js'),
 	import('../../packages/packages/umbraco-package.js'),
+	import('../../packages/relations/umbraco-package.js'),
 	import('../../packages/search/umbraco-package.js'),
+	import('../../packages/settings/umbraco-package.js'),
+	import('../../packages/static-file/umbraco-package.js'),
+	import('../../packages/tags/umbraco-package.js'),
 	import('../../packages/templating/umbraco-package.js'),
 	import('../../packages/umbraco-news/umbraco-package.js'),
+	import('../../packages/user/umbraco-package.js'),
+	import('../../packages/models-builder/umbraco-package.js'),
 	import('../../packages/tags/umbraco-package.js'),
 	import('../../packages/log-viewer/umbraco-package.js'),
 	import('../../packages/health-check/umbraco-package.js'),

src/apps/installer/database/installer-database.element.ts

@@ -1,26 +1,15 @@
-import type { UmbInstallerContext} from '../installer.context.js';
+import type { UmbInstallerContext } from '../installer.context.js';
 import { UMB_INSTALLER_CONTEXT } from '../installer.context.js';
 import type { UUIButtonElement } from '@umbraco-cms/backoffice/external/uui';
-import type {
-	CSSResultGroup} from '@umbraco-cms/backoffice/external/lit';
-import {
-	css,
-	html,
-	nothing,
-	customElement,
-	property,
-	query,
-	state,
-} from '@umbraco-cms/backoffice/external/lit';
+import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, nothing, customElement, property, query, state } from '@umbraco-cms/backoffice/external/lit';
 
 import type {
-	DatabaseInstallResponseModel,
+	DatabaseInstallRequestModel,
 	DatabaseSettingsPresentationModel,
-	ProblemDetails} from '@umbraco-cms/backoffice/backend-api';
-import {
-	ApiError,
-	InstallResource
+	ProblemDetails,
 } from '@umbraco-cms/backoffice/backend-api';
+import { ApiError, InstallResource } from '@umbraco-cms/backoffice/backend-api';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
 
@@ -30,7 +19,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 	private _installButton!: UUIButtonElement;
 
 	@property({ attribute: false })
-	public databaseFormData!: DatabaseInstallResponseModel;
+	public databaseFormData!: DatabaseInstallRequestModel;
 
 	@state()
 	private _options: Option[] = [];
@@ -119,12 +108,12 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 			providerName: '',
 			...this._installerContext?.getData().database,
 			...value,
-		} as DatabaseInstallResponseModel;
+		} as DatabaseInstallRequestModel;
 
 		this._setDatabase(database);
 	}
 
-	private _setDatabase(database: DatabaseInstallResponseModel) {
+	private _setDatabase(database: DatabaseInstallRequestModel) {
 		this._installerContext?.appendData({ database });
 	}
 
@@ -162,7 +151,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 			}
 
 			if (selectedDatabase.requiresConnectionTest) {
-				const databaseDetails: DatabaseInstallResponseModel = {
+				const databaseDetails: DatabaseInstallRequestModel = {
 					id,
 					username,
 					password,
@@ -187,7 +176,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 				}
 			}
 
-			const database: DatabaseInstallResponseModel = {
+			const database: DatabaseInstallRequestModel = {
 				...this._installerContext?.getData().database,
 				id,
 				username,

src/apps/installer/installer.context.ts

@@ -1,12 +1,10 @@
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import type {
-	InstallVResponseModel,
 	InstallSettingsResponseModel,
-	ProblemDetails} from '@umbraco-cms/backoffice/backend-api';
-import {
-	InstallResource,
-	TelemetryLevelModel,
+	ProblemDetails,
+	InstallRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
+import { InstallResource, TelemetryLevelModel } from '@umbraco-cms/backoffice/backend-api';
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbObjectState, UmbNumberState } from '@umbraco-cms/backoffice/observable-api';
@@ -17,7 +15,7 @@ import { UmbObjectState, UmbNumberState } from '@umbraco-cms/backoffice/observab
  * @class UmbInstallerContext
  */
 export class UmbInstallerContext {
-	private _data = new UmbObjectState<InstallVResponseModel>({
+	private _data = new UmbObjectState<InstallRequestModel>({
 		user: { name: '', email: '', password: '', subscribeToNewsletter: false },
 		database: { id: '', providerName: '', useIntegratedAuthentication: false, trustServerCertificate: false },
 		telemetryLevel: TelemetryLevelModel.BASIC,
@@ -91,7 +89,7 @@ export class UmbInstallerContext {
 	 * @param {Partial<PostInstallRequest>} data
 	 * @memberof UmbInstallerContext
 	 */
-	public appendData(data: Partial<InstallVResponseModel>): void {
+	public appendData(data: Partial<InstallRequestModel>): void {
 		this._data.setValue({ ...this.getData(), ...data });
 	}
 
@@ -101,7 +99,7 @@ export class UmbInstallerContext {
 	 * @return {*}  {PostInstallRequest}
 	 * @memberof UmbInstallerContext
 	 */
-	public getData(): InstallVResponseModel {
+	public getData(): InstallRequestModel {
 		return this._data.getValue();
 	}