From f12bb20b3914ce878b592a6aada6a526cb1911b6 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Fri, 29 Oct 2021 13:17:27 +0300
Subject: [PATCH] move file upload result to red-domain

---
 .../services/file-upload.service.ts           |  6 ++--
 .../src/lib/files/file-upload-result.ts       | 19 ++++++++++++
 libs/red-domain/src/lib/files/index.ts        |  1 +
 .../src/lib/model/fileUploadResult.ts         | 29 -------------------
 libs/red-ui-http/src/lib/model/models.ts      |  1 -
 5 files changed, 23 insertions(+), 33 deletions(-)
 create mode 100644 libs/red-domain/src/lib/files/file-upload-result.ts
 delete mode 100644 libs/red-ui-http/src/lib/model/fileUploadResult.ts

diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
index a76853ae1..46d233762 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
@@ -6,7 +6,7 @@ import { interval, Subscription } from 'rxjs';
 import { ConfigService } from '@services/config.service';
 import { TranslateService } from '@ngx-translate/core';
 import { UploadDownloadDialogService } from './upload-download-dialog.service';
-import { FileUploadResult } from '@redaction/red-ui-http';
+import { IFileUploadResult } from '@red/domain';
 import { isCsv } from '@utils/file-drop-utils';
 import { ErrorMessageService, GenericService, HeadersConfiguration, RequiredParam, Validate } from '@iqser/common-ui';
 import { DossiersService } from '@services/entity-services/dossiers.service';
@@ -17,7 +17,7 @@ export interface ActiveUpload {
 }
 
 @Injectable()
-export class FileUploadService extends GenericService<FileUploadResult> {
+export class FileUploadService extends GenericService<IFileUploadResult> {
     static readonly MAX_PARALLEL_UPLOADS = 5;
     files: FileUploadModel[] = [];
     groupedFiles: { [key: string]: FileUploadModel[] } = {};
@@ -130,7 +130,7 @@ export class FileUploadService extends GenericService<FileUploadResult> {
 
         const headers = HeadersConfiguration.getHeaders({ contentType: false }).append('ngsw-bypass', 'true');
 
-        return this._http.post<FileUploadResult>(`/${this._defaultModelPath}/${dossierId}`, formParams, {
+        return this._http.post<IFileUploadResult>(`/${this._defaultModelPath}/${dossierId}`, formParams, {
             headers,
             observe: 'events',
             reportProgress: true,
diff --git a/libs/red-domain/src/lib/files/file-upload-result.ts b/libs/red-domain/src/lib/files/file-upload-result.ts
new file mode 100644
index 000000000..ff9182102
--- /dev/null
+++ b/libs/red-domain/src/lib/files/file-upload-result.ts
@@ -0,0 +1,19 @@
+/**
+ * Object containing information about a successfully uploaded file.
+ */
+import { List } from '@iqser/common-ui';
+
+export interface IFileUploadResult {
+    /**
+     * List of fileIds generated for uploaded file(s).
+     */
+    fileIds?: List;
+    /**
+     * List processed file attributes, in case the upload contained a CSV.
+     */
+    processedAttributes?: List;
+    /**
+     * List processed fileIds, in case the upload contained a CSV.
+     */
+    processedFileIds?: List;
+}
diff --git a/libs/red-domain/src/lib/files/index.ts b/libs/red-domain/src/lib/files/index.ts
index 500414c3d..48d54df0c 100644
--- a/libs/red-domain/src/lib/files/index.ts
+++ b/libs/red-domain/src/lib/files/index.ts
@@ -1,3 +1,4 @@
 export * from './file';
 export * from './file.model';
 export * from './types';
+export * from './file-upload-result';
diff --git a/libs/red-ui-http/src/lib/model/fileUploadResult.ts b/libs/red-ui-http/src/lib/model/fileUploadResult.ts
deleted file mode 100644
index 770633614..000000000
--- a/libs/red-ui-http/src/lib/model/fileUploadResult.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * API Documentation for Redaction Gateway
- * Description for redaction
- *
- * OpenAPI spec version: 1.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-/**
- * Object containing information about a successfully uploaded file.
- */
-export interface FileUploadResult {
-    /**
-     * List of fileIds generated for uploaded file(s).
-     */
-    fileIds?: Array<string>;
-    /**
-     * List processed file attributes, in case the upload contained a CSV.
-     */
-    processedAttributes?: Array<string>;
-    /**
-     * List processed fileIds, in case the upload contained a CSV.
-     */
-    processedFileIds?: Array<string>;
-}
diff --git a/libs/red-ui-http/src/lib/model/models.ts b/libs/red-ui-http/src/lib/model/models.ts
index 1a765c1c5..545a18994 100644
--- a/libs/red-ui-http/src/lib/model/models.ts
+++ b/libs/red-ui-http/src/lib/model/models.ts
@@ -7,7 +7,6 @@ export * from './digitalSignatureViewModel';
 export * from './downloadResponse';
 export * from './downloadStatus';
 export * from './downloadStatusResponse';
-export * from './fileUploadResult';
 export * from './generalConfigurationModel';
 export * from './idRemoval';
 export * from './imageRecategorizationRequest';