LA-1294 Fixed log entries displayed as null

linagora · Jun 4, 2024 · 947721f · 947721f
1 parent 5a0409a
commit 947721f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/data/lib/src/network/linshare_http_client.dart b/data/lib/src/network/linshare_http_client.dart
@@ -200,7 +200,7 @@ class LinShareHttpClient {
   }
 
   AuditLogEntryUserDto? _convertToAuditLogEntryNodeChild(Map<String, dynamic> nodeChildJson) {
-    if (nodeChildJson['type'] == AuditLogEntryType.WORK_GROUP.value) {
+    if (nodeChildJson['type'] == AuditLogEntryType.WORK_GROUP.value || nodeChildJson['type'] == AuditLogEntryType.WORKGROUP.value) {
       return SharedSpaceNodeAuditLogEntryDto.fromJson(nodeChildJson);
     } else if (nodeChildJson['type'] == AuditLogEntryType.WORKGROUP_MEMBER.value) {
       return SharedSpaceMemberAuditLogEntryDto.fromJson(nodeChildJson);

diff --git a/domain/lib/src/extension/audit_log_entry_type.dart b/domain/lib/src/extension/audit_log_entry_type.dart
@@ -37,6 +37,8 @@ extension AuditLogEntryTypeExtension on AuditLogEntryType {
     switch(this) {
       case AuditLogEntryType.WORK_GROUP:
         return 'WORK_GROUP';
+      case AuditLogEntryType.WORKGROUP:
+        return 'WORKGROUP';
       case AuditLogEntryType.WORKGROUP_MEMBER:
         return 'WORKGROUP_MEMBER';
       case AuditLogEntryType.WORKGROUP_FOLDER:
@@ -59,6 +61,7 @@ extension AuditLogEntryTypeExtension on AuditLogEntryType {
   ClientLogAction generateClientLogAction(AuditLogEntry auditLogEntry) {
     switch(this) {
       case AuditLogEntryType.WORK_GROUP:
+      case AuditLogEntryType.WORKGROUP:
         if (auditLogEntry.action == LogAction.CREATE) {
           return ClientLogAction.CREATE;
         } else if (auditLogEntry.action == LogAction.DELETE) {

diff --git a/domain/lib/src/model/audit/audit_log_entry_type.dart b/domain/lib/src/model/audit/audit_log_entry_type.dart
@@ -32,6 +32,7 @@
 
 enum AuditLogEntryType {
   WORK_GROUP,
+  WORKGROUP,
   WORKGROUP_MEMBER,
   WORKGROUP_FOLDER,
   WORKGROUP_DOCUMENT,

diff --git a/lib/presentation/util/extensions/audit_log_entry_type_extension.dart b/lib/presentation/util/extensions/audit_log_entry_type_extension.dart
@@ -41,6 +41,7 @@ extension AuditLogEntryTypeExtension on AuditLogEntryType {
       bool isCurrentUserAuthor) {
     switch (this) {
       case AuditLogEntryType.WORK_GROUP:
+      case AuditLogEntryType.WORKGROUP:
         switch (clientLogAction) {
           case ClientLogAction.CREATE:
             return {

diff --git a/lib/presentation/util/extensions/audit_log_entry_user_extension.dart b/lib/presentation/util/extensions/audit_log_entry_user_extension.dart
@@ -43,6 +43,7 @@ extension AuditLogEntryUserExtension on AuditLogEntryUser {
   String getAuditLogIconPath(AppImagePaths imagePath) {
     switch (type) {
       case AuditLogEntryType.WORK_GROUP:
+      case AuditLogEntryType.WORKGROUP:
         return imagePath.icSharedSpace;
       case AuditLogEntryType.WORKGROUP_MEMBER:
         return imagePath.icAddMember;