Merge branch 'release/1.9.14'

backend/src/main/java/ru/micord/ervu/journal/JournalDto.java

@@ -2,6 +2,7 @@ package ru.micord.ervu.journal;
 
 public class JournalDto {
 
+  private String fileId;
   private String departureDateTime;
   private String fileName;
   private Integer filePatternCode;
@@ -19,6 +20,15 @@ public class JournalDto {
     return this;
   }
 
+  public String getFileId() {
+    return fileId;
+  }
+
+  public JournalDto setFileId(String fileId) {
+    this.fileId = fileId;
+    return this;
+  }
+
   public String getFileName() {
     return fileName;
   }

backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java

@@ -14,15 +14,17 @@ public class JournalDtoMapper {
   public static JournalDto mapToJournalDto(JournalFileInfo journalFileInfo) {
     SenderInfo senderInfo = journalFileInfo.getSenderInfo();
     return new JournalDto()
-       .setDepartureDateTime(Timestamp.valueOf(journalFileInfo.getDepartureDateTime()).toString())
+        .setFileId(journalFileInfo.getFileId())
-       .setFileName(journalFileInfo.getFileName())
+        .setDepartureDateTime(Timestamp.valueOf(journalFileInfo.getDepartureDateTime()).toString())
-       .setFilePatternCode(journalFileInfo.getFilePatternCode())
+        .setFileName(journalFileInfo.getFileName())
-       .setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(),
+        .setFilePatternCode(journalFileInfo.getFilePatternCode())
-           senderInfo.getLastName())
+        .setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(),
-       )
+                senderInfo.getLastName()
-       .setStatus(journalFileInfo.getFileStatus().getStatus())
+            )
-       .setFilesSentCount(journalFileInfo.getRowsCount())
+        )
-       .setAcceptedFilesCount(journalFileInfo.getRowsSuccess());
+        .setStatus(journalFileInfo.getFileStatus().getStatus())
+        .setFilesSentCount(journalFileInfo.getRowsCount())
+        .setAcceptedFilesCount(journalFileInfo.getRowsSuccess());
   }
 
   public static JournalDto mapToJournalDto(InteractionLogRecord record) {
@@ -33,6 +35,7 @@ public class JournalDtoMapper {
         .setSenderFio(record.getSender())
         .setStatus(record.getStatus())
         .setFilesSentCount(record.getRecordsSent())
-        .setAcceptedFilesCount(record.getRecordsAccepted());
+        .setAcceptedFilesCount(record.getRecordsAccepted())
+        .setFileId(record.getFileId());
   }
 }

backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java

@@ -3,6 +3,7 @@ package ru.micord.ervu.service.grid.impl;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.HashSet;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -74,7 +75,9 @@ public class JournalInMemoryStaticGridLoadService implements
       throw new JsonParsingException("Failed to parse JournalFileDataResponse.", e);
     }
 
+    HashSet<String> seenFileIds = new HashSet<>();
     return Stream.concat(dbJournalList.stream(), ervuJournalList.stream())
+        .filter(journal -> seenFileIds.add(journal.getFileId()))
         .sorted(Comparator.comparing(JournalDto::getDepartureDateTime))
         .toList();
   }

frontend/src/resources/css/inbox-lkrp.css

@@ -380,8 +380,8 @@ body.webbpm.ervu_lkrp_ul {
 
 .webbpm.ervu_lkrp_ul .loader {
     font-size: 15px;
-    left: calc(50% - 50px);
+    left: calc(50% - 0.4em);
-    top: calc(50% - 50px);    
+    top: calc(50% - 0.4em);
     width: 0.8em;
     height: 0.8em;
     border-radius: 50%;

frontend/src/ts/modules/security/guard/auth.guard.ts

@@ -58,6 +58,7 @@ export abstract class AuthGuard implements CanActivate {
             let consoleError = error + ', error description = ' + errorDescription;
             this.messageService.error(errorMessage);
             console.error(consoleError);
+            return false;
           }
           if (code && state) {
             const params = new HttpParams().set('code', code).set('state', state);