From fec4aa6df1bd6c5ea1ca9eeb10e4bc643a16d39e Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Tue, 1 Oct 2024 17:15:53 -0300
Subject: [PATCH 1/6] Changing the bitstream title in the submission form to
use the view component title, avoiding disappearance with changes to the form
---
.../sections/upload/file/section-upload-file.component.html | 3 +--
.../upload/file/view/section-upload-file-view.component.html | 5 +++--
.../upload/file/view/section-upload-file-view.component.ts | 4 +++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index da83e3f9a02..4698fdf68a6 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -18,7 +18,7 @@
-
{{fileName}} ({{fileData?.sizeBytes | dsFileSize}})
+
@@ -43,7 +43,6 @@ {{fileName}} ({{fileData?.sizeBytes | dsFileSize}})
-
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index cc12b5dea63..dc72fbdad01 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -2,9 +2,10 @@
-
+
{{entry.value}}
-
+ ({{fileData?.sizeBytes | dsFileSize}})
+
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 0630a28a76b..7ab21fb85bd 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -18,6 +18,7 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submis
import { isNotEmpty } from '../../../../../shared/empty.util';
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
+import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
/**
* This component allow to show bitstream's metadata
@@ -31,7 +32,8 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
TruncatePipe,
NgIf,
NgForOf,
- ],
+ FileSizePipe
+],
standalone: true,
})
export class SubmissionSectionUploadFileViewComponent implements OnInit {
From df24a63a464c3f88adedf982cdf540241414a86a Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:38:42 -0300
Subject: [PATCH 2/6] Adjusting spacing and good rules
---
.../upload/file/view/section-upload-file-view.component.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 7ab21fb85bd..378753a1e6b 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -18,7 +18,7 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submis
import { isNotEmpty } from '../../../../../shared/empty.util';
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
-import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
+import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
/**
* This component allow to show bitstream's metadata
@@ -32,8 +32,8 @@ import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
TruncatePipe,
NgIf,
NgForOf,
- FileSizePipe
-],
+ FileSizePipe,
+ ],
standalone: true,
})
export class SubmissionSectionUploadFileViewComponent implements OnInit {
From 762bc8ce8c5a87a1dc7ba9763916addaabe06398 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:46:37 -0300
Subject: [PATCH 3/6] Adjusting spacing
---
.../upload/file/view/section-upload-file-view.component.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 378753a1e6b..7b8e8704004 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -54,13 +54,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
* The bitstream's title key
* @type {string}
*/
- public fileTitleKey = 'Title';
+ public fileTitleKey: string = 'Title';
/**
* The bitstream's description key
* @type {string}
*/
- public fileDescrKey = 'Description';
+ public fileDescrKey: string = 'Description';
public fileFormat!: string;
From 62006c00cacf7e74661d6cc3dd4b5a53f47aeb72 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:01:56 -0300
Subject: [PATCH 4/6] Fix last commit
---
.../upload/file/view/section-upload-file-view.component.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 7b8e8704004..378753a1e6b 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -54,13 +54,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
* The bitstream's title key
* @type {string}
*/
- public fileTitleKey: string = 'Title';
+ public fileTitleKey = 'Title';
/**
* The bitstream's description key
* @type {string}
*/
- public fileDescrKey: string = 'Description';
+ public fileDescrKey = 'Description';
public fileFormat!: string;
From eeaac8965b8b82e8d21f712350781c3e7f627157 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:10:48 -0300
Subject: [PATCH 5/6] Import order adjustment
---
.../upload/file/view/section-upload-file-view.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 378753a1e6b..20e86a492dd 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -17,8 +17,8 @@ import { Metadata } from '../../../../../core/shared/metadata.utils';
import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
import { isNotEmpty } from '../../../../../shared/empty.util';
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
+import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
/**
* This component allow to show bitstream's metadata
From 2643a459b6a1213b4edb16f245732ba0a1b32bcb Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:24:46 -0300
Subject: [PATCH 6/6] Import order adjustment
---
.../upload/file/view/section-upload-file-view.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 20e86a492dd..f065fc9e190 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -16,8 +16,8 @@ import {
import { Metadata } from '../../../../../core/shared/metadata.utils';
import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
import { isNotEmpty } from '../../../../../shared/empty.util';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
/**