From 29eed95a270921ceac73180daa453d07f43f1e7d Mon Sep 17 00:00:00 2001 From: Homada Boumedane <homada.boumedane@unige.ch> Date: Wed, 1 Apr 2020 10:55:16 +0200 Subject: [PATCH 1/2] fix(portal): deposit data file fix bug when trying to upload a file of Category `Package` and Type `CustomMetadata` in a new deposit, the list of Metadata Types cannot be loaded. --- .../deposit/stores/data-file/deposit-data-file.state.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts b/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts index e397a22e3..472b1e27f 100644 --- a/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts +++ b/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts @@ -42,7 +42,7 @@ import { CollectionTyped, CompositionState, CompositionStateModel, - defaultCompositionStateInitValue, + defaultCompositionStateInitValue, defaultResourceStateInitValue, isNullOrUndefined, MappingObjectUtil, NotificationService, @@ -59,6 +59,9 @@ export const defaultDepositDataFileValue: () => DepositDataFileStateModel = () = ({ ...defaultCompositionStateInitValue(), deposit_dataFile_statusHistory: defaultStatusHistoryInitValue(), + deposit_dataFile_metadataType: { + ...defaultResourceStateInitValue() + }, currentFolder: "" + DepositDataFileHelper.ROOT, folders: [], foldersWithIntermediateFolders: [], -- GitLab From eb09f8751633e0359a1505d1cbf68926281d9848 Mon Sep 17 00:00:00 2001 From: Florent POITTEVIN <poittevin.florent@gmail.com> Date: Fri, 3 Apr 2020 15:28:11 +0200 Subject: [PATCH 2/2] style: format --- .../deposit/stores/data-file/deposit-data-file.state.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts b/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts index 472b1e27f..8c86d48cf 100644 --- a/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts +++ b/src/app/features/deposit/stores/data-file/deposit-data-file.state.ts @@ -42,7 +42,8 @@ import { CollectionTyped, CompositionState, CompositionStateModel, - defaultCompositionStateInitValue, defaultResourceStateInitValue, + defaultCompositionStateInitValue, + defaultResourceStateInitValue, isNullOrUndefined, MappingObjectUtil, NotificationService, @@ -60,7 +61,7 @@ export const defaultDepositDataFileValue: () => DepositDataFileStateModel = () = ...defaultCompositionStateInitValue(), deposit_dataFile_statusHistory: defaultStatusHistoryInitValue(), deposit_dataFile_metadataType: { - ...defaultResourceStateInitValue() + ...defaultResourceStateInitValue(), }, currentFolder: "" + DepositDataFileHelper.ROOT, folders: [], -- GitLab