Merge branch 'release/v1.16.3-1'

Author: kahoona77

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.16.3-1] - 2024-09-30
+### Changed
+- Sort import result translations by line number [#168]
+
 ## [v1.16.2-1] - 2024-09-27
 ### Fixed
 - Fix typo in translations 

Dockerfile

@@ -75,7 +75,7 @@ FROM registry.cloudogu.com/official/java:8u402-6
 ARG TOMCAT_VERSION
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.16.2-1" \
+   VERSION="1.16.3-1" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.16.2-1
+VERSION=1.16.3-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

app/src/main/ui/src/services/ImportUsers.ts

@@ -72,6 +72,11 @@ export interface ImportSummary extends Omit<ImportSummaryDto, "timestamp"> {
 
 export type SummariesModel = PaginationResponse<ImportSummary>
 
+function sortImportResult(summary: ImportUsersResponseDto): ImportUsersResponseDto {
+    summary.errors = summary.errors.sort((a, b) => a.lineNumber - b.lineNumber);
+    return summary;
+}
+
 export const ImportUsersService = {
     async query(signal?: AbortSignal, opts?: QueryOptions): Promise<PaginationResponse<ImportSummary>> {
         const summariesResponse = await Axios.get<SummariesModel>("/users/import/summaries", {
@@ -101,7 +106,7 @@ export const ImportUsersService = {
         return {
             ...result,
             data: {
-                ...result.data,
+                ...sortImportResult(result.data),
                 timestamp: new Date(result.data.timestamp),
             },
         };
@@ -119,7 +124,7 @@ export const ImportUsersService = {
             return {
                 ...result,
                 data: {
-                    ...result.data,
+                    ...sortImportResult(result.data),
                     timestamp: new Date(result.data.timestamp),
                 },
             };
@@ -136,5 +141,6 @@ export const ImportUsersService = {
             }
             throw new Error(t("usersImport.notification.genericError", {file: file.name}));
         }
+
     }
 };

app/src/main/ui/yarn.lock

@@ -4621,7 +4621,16 @@ string-similarity@^4.0.3:
   resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b"
   integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4681,7 +4690,14 @@ string.prototype.trimstart@^1.0.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5106,7 +5122,16 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

docs/gui/release_notes_de.md

@@ -4,6 +4,9 @@ Im Folgenden finden Sie die Release Notes für das User Management.
 
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/usermgt/CHANGELOG/).
 
+## Release 1.16.3-1
+* Die Fehler der Nutzer-Importergebnisse sind jetzt korrekt aufsteigend nach der Zeilennummer sortiert.
+
 ## Release 1.16.2-1
 * Behebung eines Rechtschreibfehlers in den Fehlernachrichten des Imports
 

docs/gui/release_notes_en.md

@@ -4,6 +4,9 @@ Below you will find the release notes for User Management.
 
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/usermgt/CHANGELOG/).
 
+## Release 1.16.3-1
+* The errors of the user import results are now correctly sorted in ascending order by line number.
+
 ## Release 1.16.2-1
 * Correction of a spelling error in the error messages of the import
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.16.2-1",
+  "Version": "1.16.3-1",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",