files: fix upload of files with special characters in filename

Co-Authored-by: Valeria Granata <valeria@chaw.com>
rero · Sep 14, 2022 · 841d166 · 841d166
1 parent cae31cb
commit 841d166
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/projects/sonar/src/app/record/document/file/file.component.html b/projects/sonar/src/app/record/document/file/file.component.html
@@ -40,7 +40,7 @@
         </ng-container>
         <ng-template #downloadLink>
           <ng-container *ngIf="showDownload && file.links.download; else noLink">
-            <a href="{{ file.links.download }}?download" *ngIf="showDownload && file.links.download">
+            <a href="{{ file.links.download }}?download">
               <img src="{{ file.thumbnail }}" class="img-fluid" alt="{{ file.label }}">
             </a>
           </ng-container>

diff --git a/projects/sonar/src/app/record/document/file/file.component.ts b/projects/sonar/src/app/record/document/file/file.component.ts
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
 import { DocumentFile } from '../document.interface';
 
 @Component({
   selector: 'sonar-document-file',
   templateUrl: './file.component.html'
 })
-export class FileComponent {
+export class FileComponent implements OnInit {
   // File object.
   @Input()
   file: DocumentFile;
@@ -61,6 +61,26 @@ export class FileComponent {
   @Output()
   previewClicked: EventEmitter<any> = new EventEmitter();
 
+  ngOnInit() {
+    let file = this.file;
+    if (file) {
+      // Unicode normalization form of filename in files.links.
+      Object.keys(file.links).forEach(function(key) {
+        if (['download', 'preview'].includes(key)) {
+          file.links[key] = file.links[key].replace(file.key, file.key.normalize('NFD'));
+        }
+      });
+
+      // Unicode normalization form of thumbnail link.
+      if (file.thumbnail) {
+        file.thumbnail = file.thumbnail.normalize('NFD');
+      }
+
+      this.file = file;
+    }
+  }
+
+
   /**
    * Scroll to target.
    *
@@ -80,4 +100,5 @@ export class FileComponent {
   preview(file: DocumentFile): void {
     this.previewClicked.emit(file);
   }
+
 }