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

fix sorting of databases

Browse Source
This commit is contained in:
Jacob Overgaard
2023-06-02 12:08:15 +02:00
parent 84eac1f944
commit 2b5b7180c2
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,22 +58,20 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
this.observe(this._installerContext.settings, (settings) => {
this._databases = settings?.databases ?? [];
const databases = settings?.databases?.length ? [...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) {
databases.sort((a, b) => {
if (a.sortOrder === undefined) {
return -1;
}
if (b.sortOrder === undefined) {
}
if (b.sortOrder === undefined) {
return 1;
}
return a.sortOrder - b.sortOrder;
});
this._databases = databasesCopy;
}
}
return a.sortOrder - b.sortOrder;
});
this._databases = databases;
// If there is an isConfigured database in the databases array then we can skip the database selection step
// and just use that.