diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts index 020aeb802..79e5da735 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts @@ -85,8 +85,9 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn this.form = this.dataModel.buildForm(); } this.prepareForm(); - } catch { + } catch (error) { this.logger.error('Could not parse MasterItem: ' + data); + console.log(error) this.uiNotificationService.snackBarNotification(this.language.instant('NOTIFICATIONS.DEFAULT.ERROR'), SnackBarNotificationLevel.Error); } }, diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html index 3c41a0ac4..d8e763960 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html @@ -1,9 +1,10 @@
-
- clear -
+
+ + +

{{'DATASET-LISTING.TEXT-INFO' | translate}} {{'DATASET-LISTING.LINK-PUBLIC-DATASETS' | translate}} {{'DATASET-LISTING.TEXT-INFO-REST' | translate}}

{{'DATASET-LISTING.TEXT-INFO-PAR' | translate}}

@@ -13,7 +14,15 @@
-
+

{{'GENERAL.TITLES.DATASETS' | translate}}

+
+
+ +
+
+
@@ -21,11 +30,11 @@
-
+
{{'DMP-LISTING.SORT-BY' | translate}}: - + {{enumUtils.toRecentActivityOrderString(order.MODIFIED)}} {{enumUtils.toRecentActivityOrderString(order.DATASETPUBLISHED)}} @@ -37,12 +46,12 @@
-
+
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
- + search {{formGroup.get('like').getError('backendError').message}} @@ -59,7 +68,7 @@
-
+
{{'DATASET-LISTING.EMPTY-LIST' | translate}}
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss index 0f3d9beb9..3d3d84403 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss @@ -19,6 +19,14 @@ position: relative; } +.header-title { + text-align: left; + font-size: 1.25rem; + font-weight: 300; + color: #212121; + padding: 0px; +} + .header-text-container { background: rgba(255, 255, 255, 0.7); position: absolute; @@ -146,7 +154,7 @@ font-size: 0.875rem; font-weight: 600; letter-spacing: 0.02rem; - color: #2D72D6; + color: #2d72d6; cursor: pointer; } @@ -179,8 +187,8 @@ } ::ng-deep .sort-form .mat-form-field-wrapper { - background-color: white !important; - padding-bottom: 0 !important; + background-color: white !important; + padding-bottom: 0 !important; } ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index ee6d538fb..e91b0095d 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -46,6 +46,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB totalCount: number; dmpSearchEnabled = true; listingItems: DatasetListingModel[] = []; + hasListingItems = null; isPublic: boolean = false; public isVisible = true @@ -195,6 +196,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB // if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } this.totalCount = result.totalCount; this.listingItems = result.data; + this.hasListingItems = true; }); } @@ -211,6 +213,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB // if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } // this.listingItems = this.listingItems.concat(result.data); this.listingItems = this.listingItems.length > 0 ? this.mergeTwoSortedLists(this.listingItems, result.data, this.formGroup.get('order').value) : result.data; + this.hasListingItems = true; }); } diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html index 4fa8615cf..67c4f1e3f 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html @@ -48,12 +48,12 @@
- + diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts index 12dea9dad..2e2476e77 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts @@ -53,6 +53,6 @@ export class AvailableProfilesComponent extends BaseComponent implements OnInit } isOptionSelected(profile: any) { - return this.formGroup.value.map(x => x.id).indexOf(profile.id) !== -1; + return this.formGroup.value ? this.formGroup.value.map(x => x.id).indexOf(profile.id) !== -1 : null; } } diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html index 3ecdfea2d..6e73039d0 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html @@ -1,14 +1,16 @@
-
- clear -
+
+ + +

{{'DMP-LISTING.TEXT-INFO' | translate}}

{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} {{'DMP-LISTING.LINK-ZENODO' | translate}} {{'DMP-LISTING.GET-IDEA' | translate}}

-
+

{{'GENERAL.TITLES.PLANS' | translate}}

+
@@ -16,11 +18,11 @@
-
+
{{'DMP-LISTING.SORT-BY' | translate}}: - + {{enumUtils.toRecentActivityOrderString(order.MODIFIED)}} {{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}} @@ -32,13 +34,11 @@
-
- {{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }} -
+ +
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
- search {{'GENERAL.ACTIONS.LOAD-MORE' | translate}}
-
+
{{'DMP-LISTING.EMPTY-LIST' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss index efbc38c53..bbc48f591 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss @@ -81,6 +81,14 @@ position: relative; } +.header-title { + text-align: left; + font-size: 1.25rem; + font-weight: 300; + color: #212121; + padding: 0px; +} + .header-text-container { background: rgba(255, 255, 255, 0.7); position: absolute; @@ -133,7 +141,7 @@ letter-spacing: 0px; color: #212121; padding-left: 40px; - padding-top: 36px; + padding-top: 38px; padding-bottom: 36px; padding-right: 55px; opacity: 1; @@ -190,7 +198,7 @@ right: 0px; z-index: 100; width: 37px; - transition: right .3s; + transition: right 0.3s; transition-timing-function: ease-in-out; } @@ -225,7 +233,8 @@ color: black; } -.pointer:hover, .zenodo-link:hover { +.pointer:hover, +.zenodo-link:hover { color: #00b29f; } @@ -235,8 +244,8 @@ } ::ng-deep .sort-form .mat-form-field-wrapper { - background-color: white !important; - padding-bottom: 0 !important; + background-color: white !important; + padding-bottom: 0 !important; } ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { @@ -252,7 +261,7 @@ font-size: 0.875rem; font-weight: 600; letter-spacing: 0.02rem; - color: #2D72D6; + color: #2d72d6; cursor: pointer; } diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts index d113f23db..cc9a945eb 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts @@ -52,6 +52,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread groupLabel: string; isPublic: boolean = false; public isVisible = true + hasListingItems = null; startIndex: number = 0; pageSize: number = 5; @@ -236,6 +237,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread return item; }); this.listingItems = result.data; + this.hasListingItems = true; this.totalCount = result.totalCount; }); } @@ -260,6 +262,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread }); // this.listingItems = this.listingItems.concat(result.data); this.listingItems = this.mergeTwoSortedLists(this.listingItems, result.data, this.formGroup.get('order').value); + this.hasListingItems = true; }); } diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 23345a6ff..f510872ca 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -51,12 +51,12 @@
- + diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts index dc3e4b75e..54c35d4a0 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts @@ -348,9 +348,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit { let stringValue = this.form.get('value').value; stringValue = (stringValue).replace(new RegExp('{', 'g'), '{"').replace(new RegExp('=', 'g'), '":"').replace(new RegExp(',', 'g'), '",').replace(new RegExp(', ', 'g'), ', "').replace(new RegExp('}', 'g'), '"}'); stringValue = stringValue.replace(new RegExp('}"', 'g'), '}').replace(new RegExp('"{', 'g'), '{'); - console.log(stringValue); const tagArray = JSON.parse(stringValue); - console.log(tagArray); this.form.patchValue({'value': tagArray}); }