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

Merge pull request #753 from umbraco/sorts-installer-dbtypes

Browse Source 
Sort Database install types by sortOrder int value from server
This commit is contained in:
Jacob Overgaard
2023-06-01 13:37:35 +02:00
committed by GitHub
parent 05dbda7aef 71d8c23697
commit c5e707058a
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,8 +57,24 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
if (!this._installerContext) return;
this.observe(this._installerContext.settings, (settings) => {
this._databases = settings?.databases ?? [];
// Sort the databases array if not empty and by sortOrder if it exists
if (this._databases.length > 0) {
const databasesCopy = [...this._databases];
databasesCopy.sort((a, b) => {
if (a.sortOrder === undefined) {
return -1;
}
if (b.sortOrder === undefined) {
return 1;
}
return a.sortOrder - b.sortOrder;
});
this._databases = databasesCopy;
}
// If there is an isConfigured database in the databases array then we can skip the database selection step
// and just use that.
this._preConfiguredDatabase = this._databases.find((x) => x.isConfigured);