From 26f27f3d6db45c5fd564ef55cde01d83d0819f39 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 18 Sep 2019 13:28:02 +0300 Subject: [PATCH 001/161] Fixes DMP export bug including Dataset Descriptions with Canceled or Deleted status. (Issue #159) --- .../eudat/logic/managers/DataManagementPlanManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index 094169e14..4b28a7fbf 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -194,13 +194,13 @@ public class DataManagementPlanManager { wordBuilder.addParagraphContent("Organisations", document, ParagraphStyle.HEADER2, BigInteger.ZERO); if (dmpEntity.getOrganisations().size() > 0) { - wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(x -> x.getLabel()).collect(Collectors.joining(", ")) + wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(Organisation::getLabel).collect(Collectors.joining(", ")) , document, ParagraphStyle.TEXT, BigInteger.ZERO); } wordBuilder.addParagraphContent("Researchers", document, ParagraphStyle.HEADER2, BigInteger.ZERO); if (dmpEntity.getResearchers().size() > 0) { - wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(x -> x.getLabel()).collect(Collectors.joining(", ")) + wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(Researcher::getLabel).collect(Collectors.joining(", ")) , document, ParagraphStyle.TEXT, BigInteger.ZERO); } @@ -214,7 +214,10 @@ public class DataManagementPlanManager { parBreakDMP.setPageBreak(true); wordBuilder.addParagraphContent("Datasets", document, ParagraphStyle.TITLE, BigInteger.ZERO); - dmpEntity.getDataset().stream().forEach(datasetEntity -> { + dmpEntity.getDataset().stream() + .filter(item -> item.getStatus() != Dataset.Status.CANCELED.getValue()) + .filter(item -> item.getStatus() != Dataset.Status.DELETED.getValue()) + .forEach(datasetEntity -> { Map properties = new HashMap<>(); if (datasetEntity.getProperties() != null) { JSONObject jobject = new JSONObject(datasetEntity.getProperties()); From e50875c9880bb48edbb22887e78ee4f8b341b698 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 18 Sep 2019 14:35:51 +0300 Subject: [PATCH 002/161] Fixes styling issue in multi field set - (Issue #156) --- .../form-section/form-section.component.html | 16 ++++++++++++---- .../form-section/form-section.component.ts | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html index b7bf93f40..eecf3ab27 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html @@ -14,14 +14,22 @@
- - +
+
+ +
+ +
+
+
-
+
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts index 2d17c1c31..3587177c0 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts @@ -39,6 +39,12 @@ export class FormSectionComponent implements OnInit { ((this.form.get('compositeFields').get('' + fieldsetIndex).get('multiplicityItems'))).push(compositeField.buildForm()); } + deleteCompositeFieldFormGroup(compositeFildIndex: number) { + const firstMultiplicityItem = this.form.get('compositeFields').get('' + compositeFildIndex).get('multiplicityItems').get('' + 0).get('fields').get('' + 0).value; + this.form.get('compositeFields').get('' + compositeFildIndex).get('fields').get('' + 0).patchValue(firstMultiplicityItem); + ((this.form.get('compositeFields').get('' + compositeFildIndex).get('multiplicityItems'))).removeAt(0); + } + deleteMultipeFieldFromCompositeFormGroup(compositeFildIndex: number, fildIndex: number) { ((this.form.get('compositeFields').get('' + compositeFildIndex).get('multiplicityItems'))).removeAt(fildIndex); } From 2008986daf5b81041d45242848e1215bcd769cdc Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 18 Sep 2019 16:16:14 +0300 Subject: [PATCH 003/161] Fixes bug on public dashboard counting non public entities. (Issue #157) --- .../logic/managers/DashBoardManager.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java index c1f7ac711..42746c11c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java @@ -8,6 +8,9 @@ import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.dao.entities.OrganisationDao; import eu.eudat.data.dao.entities.GrantDao; +import eu.eudat.data.entities.DMP; +import eu.eudat.data.entities.Dataset; +import eu.eudat.data.entities.Grant; import eu.eudat.data.entities.UserInfo; import eu.eudat.logic.builders.model.models.RecentActivityDataBuilder; import eu.eudat.logic.services.ApiContext; @@ -40,23 +43,26 @@ public class DashBoardManager { public DashBoardStatistics getStatistics() { DashBoardStatistics statistics = new DashBoardStatistics(); - DatasetCriteria datasetCriteria = new DatasetCriteria(); DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria(); OrganisationCriteria organisationCriteria = new OrganisationCriteria(); - datasetCriteria.setAllVersions(false); dataManagementPlanCriteria.setAllVersions(false); - organisationCriteria.setPublic(false); + dataManagementPlanCriteria.setIsPublic(true); + organisationCriteria.setPublic(true); - CompletableFuture dmpFuture = databaseRepository.getDmpDao().getWithCriteria(dataManagementPlanCriteria).countAsync() - .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats)); - CompletableFuture datasetFuture = databaseRepository.getDatasetDao().getWithCriteria(datasetCriteria).countAsync() - .whenComplete((datasetsStats, throwable) -> statistics.setTotalDataSetCount(datasetsStats)); - CompletableFuture grantFuture = databaseRepository.getGrantDao().asQueryable().countAsync() - .whenComplete((grantsStats, throwable) -> statistics.setTotalGrantCount(grantsStats)); - CompletableFuture organisationFuture = databaseRepository.getOrganisationDao().getWithCriteria(organisationCriteria).countAsync() - .whenComplete((organisationStats, throwable) -> statistics.setTotalOrganisationCount(organisationStats)); + List dmps = databaseRepository.getDmpDao().getWithCriteria(dataManagementPlanCriteria).toList(); + long numberOfDatasets = 0; + LinkedList grants = new LinkedList<>(); + for (DMP dmp : dmps) { + numberOfDatasets = numberOfDatasets + dmp.getDataset().stream() + .filter(item -> item.getStatus() == Dataset.Status.FINALISED.getValue()).count(); + grants.add(dmp.getGrant()); + } + + statistics.setTotalDataManagementPlanCount((long) dmps.size()); + statistics.setTotalDataSetCount(numberOfDatasets); + statistics.setTotalGrantCount(grants.stream().distinct().count()); + statistics.setTotalOrganisationCount(databaseRepository.getOrganisationDao().getWithCriteria(organisationCriteria).count()); - CompletableFuture.allOf(dmpFuture, datasetFuture, grantFuture, organisationFuture).join(); return statistics; } From 0c27746465405a3b44d90891954e0f937a147dbd Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 19 Sep 2019 13:00:00 +0300 Subject: [PATCH 004/161] Changes color palette --- .../export-method-dialog.component.scss | 2 +- .../dataset-profile-listing.component.scss | 3 +- .../editor/dmp-profile-editor.component.scss | 3 +- .../dmp-profile-listing.component.scss | 3 +- .../user/listing/user-listing.component.scss | 3 +- .../dataset-info-counter.component.css | 6 +- .../dmp-info-counter.component.css | 3 +- .../recent-edited-activity.component.css | 9 +-- .../recent-visited-activity.component.css | 6 +- .../dataset-wizard.component.scss | 16 +++-- .../criteria/dataset-criteria.component.scss | 4 +- .../listing/dataset-listing.component.scss | 6 +- .../dataset-listing-item.component.scss | 6 +- .../app/ui/dmp/clone/dmp-clone.component.scss | 7 +- .../datasets-tab/datasets-tab.component.scss | 10 +-- .../ui/dmp/editor/dmp-editor.component.scss | 5 +- .../dmp-finalize-dialog.component.scss | 7 +- .../general-tab/general-tab.component.scss | 4 +- .../editor/grant-tab/grant-tab.component.scss | 5 +- .../people-tab/people-tab.component.scss | 3 +- .../criteria/dmp-criteria.component.scss | 16 ++--- .../dmp-listing-item.component.scss | 7 +- .../dmp/overview/dmp-overview.component.scss | 17 ++--- .../editor/dmp-wizard-editor.component.scss | 2 +- .../dmp-wizard-dataset-listing.component.scss | 29 ++++---- .../explore-dataset-filters.component.scss | 16 ++--- ...xplore-dataset-listing-item.component.scss | 3 +- .../explore-dmp-filters.component.scss | 16 ++--- .../explore-dmp-listing-item.component.scss | 8 ++- .../criteria/grant-criteria.component.scss | 16 ++--- .../misc/breadcrumb/breadcrumb.component.scss | 2 +- .../sidebar-footer.component.css | 2 +- dmp-frontend/src/assets/css/demo.css | 7 +- dmp-frontend/src/assets/scss/blue-theme.scss | 30 ++++---- .../assets/scss/core/variables/_brand.scss | 2 +- .../assets/scss/core/variables/_colors.scss | 28 ++++---- .../src/assets/scss/material-dashboard.scss | 70 +++++++++++-------- dmp-frontend/src/styles.scss | 34 +++++---- 38 files changed, 228 insertions(+), 188 deletions(-) diff --git a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss index 953b1843e..df9136d68 100644 --- a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss +++ b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.scss @@ -10,7 +10,7 @@ button { // background-color: #aaaaaa; - background-color: #4687f0; + background-color: #00b29f; color: #ffffff; } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss index 6bf311012..2eb955561 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss @@ -33,7 +33,8 @@ mat-row:hover { // } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } ::ng-deep .mat-paginator-container { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss index 25d42604c..b0459dd25 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss @@ -16,7 +16,8 @@ } ::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background, .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background { - background-color: #0070c0; + background-color: #00b29f; + // background-color: #0070c0; } ::ng-deep .mat-checkbox-disabled.mat-checkbox-checked .mat-checkbox-background, .mat-checkbox-disabled.mat-checkbox-indeterminate .mat-checkbox-background { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss index 772182938..fe822c9c8 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss @@ -16,7 +16,8 @@ } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } .mat-fab-bottom-right { diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss index ed359a1d6..4f28a0670 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss @@ -12,7 +12,8 @@ } mat-row:nth-child(odd) { - background-color: #eef0fb; + background-color: #0c748914; + // background-color: #eef0fb; } } diff --git a/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css index 69a97ae21..17d724e05 100644 --- a/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css +++ b/dmp-frontend/src/app/ui/dashboard/dataset-info-counter/dataset-info-counter.component.css @@ -38,7 +38,8 @@ } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + /* color: #089dbb; */ } .about-item .title { @@ -53,7 +54,8 @@ } .icon { - color: #92d050; + color: #08bd63; + /* color: #92d050; */ } hr { diff --git a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css index ee94cbfe9..23ba20a1a 100644 --- a/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css +++ b/dmp-frontend/src/app/ui/dashboard/dmp-info-counter/dmp-info-counter.component.css @@ -4,7 +4,8 @@ .icon { /* color: rgb(112, 173, 71); */ - color: #92d050; + color: #08bd63; + /* color: #92d050; */ } .gray-container { diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index bb91d4d54..c08c9a9f6 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -5,9 +5,9 @@ th { .is-public { padding-left: 5px; padding-right: 5px; - border: 1px solid rgb(197, 224, 180); - color: rgb(131, 184, 95); - background-color: rgb(240, 247, 236); + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; border-radius: 10em; text-align: center; } @@ -31,7 +31,8 @@ th { margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + /* background-color: rgba(0, 112, 192, 1); */ /* background-color: #007bff; */ color: #fff; text-transform: uppercase; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css index 8402448b8..e79187de7 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-visited-activity/recent-visited-activity.component.css @@ -5,9 +5,9 @@ th { .is-public { padding-left: 5px; padding-right: 5px; - border: 1px solid rgb(197, 224, 180); - color: rgb(131, 184, 95); - background-color: rgb(240, 247, 236); + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; border-radius: 10em; text-align: center; } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index b2049965d..02de9b7fe 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -9,7 +9,8 @@ .description-action-row { margin-top: 1em; } - .deleteButton, .reverseButton { + .deleteButton, + .reverseButton { margin-top: 15px; margin-bottom: 15px; margin-right: 15px; @@ -30,13 +31,13 @@ .saveAndFinalizeButton { margin-top: 15px; margin-bottom: 15px; - margin-right: 15px; + margin-right: 15px; } .finalizeButton { - margin-top: 15px; + margin-top: 15px; margin-bottom: 15px; - margin-right: 15px; - text-transform: uppercase; + margin-right: 15px; + text-transform: uppercase; } .downloadPDF { margin-top: 15px; @@ -76,7 +77,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } .new-dataset { @@ -97,5 +98,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss index f4822491e..28c634a3a 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss @@ -3,7 +3,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -20,7 +20,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; 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 d60d77eee..bcd3a0235 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 @@ -43,12 +43,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index cdaa2558f..21a58f334 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -18,7 +18,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } h4 { @@ -45,11 +45,11 @@ h4 > span { } .links :hover { - color: #4687e6; + color: #00b29f; } .about-item .length { - color: #4687f0; + color: #00b29f; } .about-item .title { diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss index 0917e88e2..13ef5d884 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss @@ -14,7 +14,7 @@ .clone-mode { // line-height: 2em; text-transform: uppercase; - color: #4687e6; + color: #089dbb; font-weight: 400; align-self: center; } @@ -25,7 +25,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } ::ng-deep .mat-tab-labels { @@ -37,5 +37,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss index b6edcaa28..a7116bf01 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss @@ -7,7 +7,8 @@ } .finalized-bookmark { - color: #92d050; + color: #08bd63; + // color: #92d050; display: inline; position: absolute; margin-top: 0.5em; @@ -38,7 +39,7 @@ .show-more { background-color: #ffffff00; - color: #4687f0; + color: #00b29f; font-weight: 700; justify-self: center; } @@ -50,7 +51,8 @@ margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: #0070c0; + background-color: #0d7489; + // background-color: #0070c0; // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; @@ -71,7 +73,7 @@ } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; text-transform: uppercase; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index c5aeb2373..ffe46cacf 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -12,7 +12,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } ::ng-deep .mat-tab-labels { @@ -24,5 +24,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #0070c0 !important; + background-color: #00b29f !important; + // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss index 8fdc4177f..59445cc23 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.scss @@ -49,7 +49,8 @@ } .finalized-bookmark { - color: #92d050; + color: #08bd63; + // color: #92d050; display: inline; padding: 0; } @@ -65,10 +66,10 @@ } .datasets span { - color: #4687f0; + color: #00b29f; } .emptyList { font-style: italic; - color:rgba(0, 0, 0, 0.26); + color: rgba(0, 0, 0, 0.26); } diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss index 1a08fab65..05d8ae793 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss @@ -6,7 +6,7 @@ } .input-btn :hover { - color: #4687f0 !important; + color: #00b29f !important; } // .icon-btn { @@ -31,7 +31,7 @@ } .version-menu mat-icon { - color: #4687f0; + color: #00b29f; } ::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper { diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss index 0ee135a89..7c7d1acda 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.scss @@ -5,7 +5,7 @@ align-self: center; padding-bottom: 1em; cursor: pointer; - color: #0070c0; + color: #00b29f; } .add-entity:after { @@ -16,7 +16,8 @@ height: 2px; left: 50%; position: absolute; - background: #0070c0; + background: #00b29f; + // background: #0070c0; transition: width 0.3s ease 0s, left 0.3s ease 0s; width: 0; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss index 2e0aea0f9..35fc52eda 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.scss @@ -1,6 +1,7 @@ .table-header { background-color: #eeeeee; - color: #0070c0; + color: #0c7489; + // color: #0070c0; height: 2em; } diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss index 02e99ec24..18df2a5f4 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss @@ -22,7 +22,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -39,7 +39,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -56,7 +56,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -64,7 +64,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -81,7 +81,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -98,12 +98,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index 7b4733d6d..9a230fbba 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -17,7 +17,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } h4 { @@ -44,7 +44,7 @@ h4 > span { } .datasets-counter :hover { - color: #4687e6 !important; + color: #089dbb !important; } .about-item .title { @@ -70,5 +70,6 @@ h4 > span { .published-icon { padding-top: 1px; - color: #92d050; + color: #08bd63;; + // color: #92d050; } diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 324ddea63..f17cab739 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -14,7 +14,7 @@ } .more-icon :hover { - color: #4687e6; + color: #00b29f; } .menu-item { @@ -54,7 +54,7 @@ .researchers-title { width: 120px; - color: #4687e6; + color: #089dbb; background-color: white; padding: 0px 10px; margin-top: -16px; @@ -78,7 +78,7 @@ } .container-header :hover { - color: #4687e6; + color: #00b29f; } .dataset-card { @@ -105,13 +105,13 @@ .show-more { background-color: #ffffff00; - color: #4687f0; + color: #00b29f; font-weight: 700; justify-self: center; } .visit-website { - background-color: #4687f0; + background-color: #00b29f; color: #ffffff; } @@ -132,7 +132,7 @@ } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; text-transform: uppercase; } @@ -144,7 +144,8 @@ h4 span { margin-left: 2.5em; margin-right: 2.5em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + // background-color: rgba(0, 112, 192, 1); // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; @@ -173,7 +174,7 @@ h4 span { } .datasets-counter :hover { - color: #4687e6 !important; + color: #00b29f !important; } .total-info { diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss index e8c0f3ca1..d7df7678d 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.scss @@ -14,7 +14,7 @@ } .input-btn :hover { - color: #4687f0 !important; + color: #00b29f !important; } .table-card .mat-grid-tile { diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss index 9070df5a0..83bae944c 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.scss @@ -1,36 +1,37 @@ .mat-table { - margin: 24px; + margin: 24px; } .mat-fab-bottom-right { - // top: auto !important; - // right: 20px !important; - // bottom: 10px !important; - // left: auto !important; - // position: fixed !important; - float: right; + // top: auto !important; + // right: 20px !important; + // bottom: 10px !important; + // left: auto !important; + // position: fixed !important; + float: right; } .full-width { - width: 100%; + width: 100%; } .mat-card { - margin: 16px 0; + margin: 16px 0; } .mat-row { - cursor: pointer; + cursor: pointer; } mat-row:hover { - background-color: lightgray; + background-color: lightgray; } // mat-row:nth-child(even){ // background-color:red; // } -mat-row:nth-child(odd){ - background-color:#eef0fb; - } +mat-row:nth-child(odd) { + background-color: #0c748914; + // background-color:#eef0fb; +} diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss index 7eb7d69a8..1bab477e4 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss @@ -13,7 +13,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -30,7 +30,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -47,7 +47,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -55,7 +55,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -72,7 +72,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -89,12 +89,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss index ac562eae6..07ecdd307 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.scss @@ -33,7 +33,8 @@ h4 { } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + // color: #089dbb; } .about-item .title { diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss index 7eb7d69a8..1bab477e4 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss @@ -13,7 +13,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -30,7 +30,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -47,7 +47,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -55,7 +55,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -72,7 +72,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -89,12 +89,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss index 0476c1cea..0ee1f4e12 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss @@ -22,7 +22,8 @@ } .about-item .length { - color: rgb(70, 135, 240); + color: #00b29f; + // color: #089dbb; } .about-item .title { @@ -46,8 +47,9 @@ } .published-icon { - padding-top: 1px; - color: #92d050; + padding-top: 1px; + color: #08bd63; + // color: #92d050; } // .explore-dmp-listing-item { diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss index eea90799c..c2156e6b9 100644 --- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss +++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss @@ -27,7 +27,7 @@ } .category-title { - color: #2e75b6; + color: #089dbb; margin-top: 8px; margin-bottom: 12px; } @@ -44,7 +44,7 @@ .filters-title { width: 90px; - color: #2e75b6; + color: #089dbb; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -61,7 +61,7 @@ } ::ng-deep .mat-focused .mat-form-field-label { - color: #2e75b6 !important; + color: #00b29f !important; } ::ng-deep.mat-form-field-underline { @@ -69,7 +69,7 @@ } ::ng-deep.mat-form-field-ripple { - background-color: #2e75b6 !important; + background-color: #00b29f !important; } // ::ng-deep .mat-checkbox { @@ -86,7 +86,7 @@ .mat-accent .mat-pseudo-checkbox-indeterminate, .mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate { - background-color: #2e75b6; + background-color: #00b29f; } ::ng-deep .mat-ripple-element { @@ -103,12 +103,12 @@ } ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; + border-color: #00b29f; } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; + color: #00b29f; + background-color: #00b29f; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss index c80112f1a..543dc4cc3 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.scss @@ -44,7 +44,7 @@ } .active { - color: #4687f0; + color: #00b29f; } .icon { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css index f1fb4aa11..faab6bfae 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css @@ -17,7 +17,7 @@ } .sidebar-footer :hover { - color: #4687e6; + color: #00b29f; } .sidebar-footer .vl { diff --git a/dmp-frontend/src/assets/css/demo.css b/dmp-frontend/src/assets/css/demo.css index 040ac2225..699bbba8f 100644 --- a/dmp-frontend/src/assets/css/demo.css +++ b/dmp-frontend/src/assets/css/demo.css @@ -78,7 +78,7 @@ h6 { } .sidebar[data-color="danger"] li.active>a { - background-color: #4687e6; + background-color: rgb(0, 178, 159); /* -webkit-box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ box-shadow: none; @@ -174,7 +174,8 @@ h6 { } .card .card-header-blue .card-icon, .card .card-header-blue .card-text, .card .card-header-blue:not(.card-header-icon):not(.card-header-text), .card.bg-warning, .card.card-rotate.bg-warning .front, .card.card-rotate.bg-warning .back { - background: linear-gradient(60deg, rgb(0, 112, 192), rgb(0, 112, 192)); + /* background: linear-gradient(60deg, rgb(0, 112, 192), rgb(0, 112, 192)); */ + background: linear-gradient(60deg, rgb(12, 116, 137), rgb(12, 116, 137)); } .card .card-header-blue .card-icon, .card .card-header-blue:not(.card-header-icon):not(.card-header-text), .card .card-header-blue .card-text { @@ -347,5 +348,5 @@ table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, . } .attach-file :hover { - color: #667eff + color: #00b29f } diff --git a/dmp-frontend/src/assets/scss/blue-theme.scss b/dmp-frontend/src/assets/scss/blue-theme.scss index 9e72e7d71..d3a21dbd4 100644 --- a/dmp-frontend/src/assets/scss/blue-theme.scss +++ b/dmp-frontend/src/assets/scss/blue-theme.scss @@ -1,21 +1,21 @@ @import 'app/ui/misc/navigation/navigation.component.scss'; -@import '../node_modules/@angular/material/theming'; +@import '~@angular/material/theming'; // @import '../../../node_modules/@angular/material/theming'; $app-blue-theme-primary-palette: ( - 50: #e8eaf6, - 100: #c5cae9, - 200: #9fa8da, - 300: #7986cb, - 400: #5c6bc0, - 500: #3f51b5, - 600: #3949ab, - 700: #303f9f, - 800: #283593, - 900: #1a237e, - A100: #8c9eff, - A200: #536dfe, - A400: #3d5afe, - A700: #304ffe, + 50: #e2eef1, + 100: #b6d5dc, + 200: #86bac4, + 300: #559eac, + 400: #30899b, + 500: #0c7489, + 600: #0a6c81, + 700: #086176, + 800: #06576c, + 900: #034459, + A100: #8bddff, + A200: #58cfff, + A400: #25c0ff, + A700: #0bb9ff, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, diff --git a/dmp-frontend/src/assets/scss/core/variables/_brand.scss b/dmp-frontend/src/assets/scss/core/variables/_brand.scss index 4a9a39cfe..14113fb30 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_brand.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_brand.scss @@ -3,7 +3,7 @@ /* brand Colors */ -$brand-primary: $purple-500 !default; +$brand-primary: $indigo-500 !default; $brand-info: $cyan-500 !default; $brand-success: $green-500 !default; $brand-warning: $orange-500 !default; diff --git a/dmp-frontend/src/assets/scss/core/variables/_colors.scss b/dmp-frontend/src/assets/scss/core/variables/_colors.scss index db0c1986a..05404a310 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_colors.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_colors.scss @@ -62,20 +62,20 @@ $deep-purple-a400: #651fff !default; $deep-purple-a700: #6200ea !default; $deep-purple: $deep-purple-500 !default; -$indigo-50: #e8eaf6 !default; -$indigo-100: #c5cae9 !default; -$indigo-200: #9fa8da !default; -$indigo-300: #7986cb !default; -$indigo-400: #5c6bc0 !default; -$indigo-500: #3f51b5 !default; -$indigo-600: #3949ab !default; -$indigo-700: #303f9f !default; -$indigo-800: #283593 !default; -$indigo-900: #1a237e !default; -$indigo-a100: #8c9eff !default; -$indigo-a200: #536dfe !default; -$indigo-a400: #3d5afe !default; -$indigo-a700: #304ffe !default; +$indigo-50: #e2eef1 !default; +$indigo-100: #b6d5dc !default; +$indigo-200: #86bac4 !default; +$indigo-300: #559eac !default; +$indigo-400: #30899b !default; +$indigo-500: #0c7489 !default; +$indigo-600: #0a6c81 !default; +$indigo-700: #086176 !default; +$indigo-800: #06576c !default; +$indigo-900: #034459 !default; +$indigo-a100: #8bddff !default; +$indigo-a200: #58cfff !default; +$indigo-a400: #25c0ff !default; +$indigo-a700: #0bb9ff !default; $indigo: $indigo-500 !default; $blue-50: #e3f2fd !default; diff --git a/dmp-frontend/src/assets/scss/material-dashboard.scss b/dmp-frontend/src/assets/scss/material-dashboard.scss index 94856c0dd..03d5f6943 100644 --- a/dmp-frontend/src/assets/scss/material-dashboard.scss +++ b/dmp-frontend/src/assets/scss/material-dashboard.scss @@ -14,43 +14,53 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ - @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@angular/material/theming"; // @import '../../../node_modules/@angular/material/theming'; +@import "./blue-theme.scss"; - @import "core/variables"; - @import "core/mixins"; - @import "~bootstrap/scss/bootstrap"; +@include mat-core(); +// Define a theme. +$custom-theme-primary: mat-palette($app-blue-theme-primary-palette, 900); +$custom-theme-accent: mat-palette($mat-pink, A200, A100, A400); +$custom-theme-warn: mat-palette($mat-red); +$custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn); +@include angular-material-theme($custom-theme); - // Core Components - @import "core/buttons"; - @import "core/checkboxes"; - @import "core/radios"; - @import "core/forms"; - @import "core/input-group"; - @import "core/images"; - @import "core/navbar"; - @import "core/alerts"; - @import "core/type"; - @import "core/tabs"; - @import "core/tooltip"; - @import "core/popover"; - @import "core/dropdown"; - @import "core/togglebutton"; - @import "core/ripples"; - @import "core/footers"; - @import "core/sidebar-and-main-panel"; - @import "core/fixed-plugin"; - @import "core/tables"; - @import "core/misc"; +@import "core/variables"; +@import "core/mixins"; +@import "~bootstrap/scss/bootstrap"; + +// Core Components +@import "core/buttons"; +@import "core/checkboxes"; +@import "core/radios"; +@import "core/forms"; +@import "core/input-group"; +@import "core/images"; +@import "core/navbar"; +@import "core/alerts"; +@import "core/type"; +@import "core/tabs"; +@import "core/tooltip"; +@import "core/popover"; +@import "core/dropdown"; +@import "core/togglebutton"; +@import "core/ripples"; +@import "core/footers"; +@import "core/sidebar-and-main-panel"; +@import "core/fixed-plugin"; +@import "core/tables"; +@import "core/misc"; @import "core/cards"; @import "core/cards/card-stats"; @import "core/cards/card-profile"; @import "core/cards/card-plain"; - //plugin scss - @import "core/plugins/animate"; - @import "core/plugins/chartist"; - @import "core/plugins/perfect-scrollbar"; +//plugin scss +@import "core/plugins/animate"; +@import "core/plugins/chartist"; +@import "core/plugins/perfect-scrollbar"; - @import "core/responsive"; +@import "core/responsive"; diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 107299ff2..6a8886290 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -1,18 +1,20 @@ +// @import "~@covalent/core/theming/all-theme"; +@import "~@angular/material/theming"; // @import '../node_modules/@angular/material/theming'; @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +// Material-Bootstrap configuration @import "~bootstrap/scss/bootstrap"; -//Material-Bootstrap configuration -@import "assets/scss/bootstrap-material"; -@import "~@angular/material/theming"; -// @import "~@covalent/core/theming/all-theme"; -@include mat-core(); +// Custom Theme +// @import "./assets/scss/blue-theme.scss"; + // Define a theme. -$primary: mat-palette($mat-indigo); -$accent: mat-palette($mat-pink, A200, A100, A400); -$theme: mat-light-theme($primary, $accent); +// $primary: mat-palette($app-blue-theme-primary-palette); +// $accent: mat-palette($mat-pink, A200, A100, A400); +// $theme: mat-light-theme($primary, $accent); + // Include all theme styles for the components. -@include angular-material-theme($theme); +// @include angular-material-theme($theme); // @include covalent-theme($theme); .snackbar-warning { @@ -31,7 +33,8 @@ $theme: mat-light-theme($primary, $accent); } .lightblue-btn { - background-color: rgba(0, 112, 192, 1) !important; + background-color: rgb(0, 178, 159) !important; + // background-color: rgba(0, 112, 192, 1) !important; } .listing-item { @@ -55,7 +58,8 @@ $theme: mat-light-theme($primary, $accent); .chip { padding: 0.1em 1em; border-radius: 10em; - background-color: rgba(0, 112, 192, 1); + background-color: #0d7489; + // background-color: rgba(0, 112, 192, 1); color: #fff; text-transform: uppercase; font-weight: 500; @@ -70,7 +74,8 @@ $theme: mat-light-theme($primary, $accent); border: 0.1em solid rgb(218, 227, 243); border-radius: 10em; background-color: rgb(236, 241, 249); - color: rgba(0, 112, 192, 1); + color: rgb(0, 178, 159); + // color: rgba(0, 112, 192, 1); // color: rgb(68, 114, 196); text-transform: uppercase; font-weight: 500; @@ -125,14 +130,15 @@ $theme: mat-light-theme($primary, $accent); } .finalized-bookmark { - color: #92d050; + color: #08bd63;; + // color: #92d050; display: inline; position: absolute; padding-top: 3px; } h4 span { - color: #619ce3; + color: #089dbb; font-weight: 600; } } From 860801bb89a90646f3fbb2bfd2217b3c7701fb5b Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 19 Sep 2019 13:59:25 +0300 Subject: [PATCH 005/161] Fixes bug on Dataset Description creation caused by Data Repository External Reference. (Issue #160) --- .../eu/eudat/logic/managers/DatasetManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index b361cb96a..1bc7bc3de 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -402,11 +402,8 @@ public class DatasetManager { } private void createDataRepositoriesIfTheyDontExist(DataRepositoryDao dataRepositoryDao, eu.eudat.data.entities.Dataset dataset) { - Set datasetDataRepositories = dataset.getDatasetDataRepositories(); - dataset.setDatasetDataRepositories(new HashSet<>()); - - if (datasetDataRepositories != null && !datasetDataRepositories.isEmpty()) { - for (eu.eudat.data.entities.DatasetDataRepository datasetDataRepository : datasetDataRepositories) { + if (dataset.getDatasetDataRepositories() != null && !dataset.getDatasetDataRepositories().isEmpty()) { + for (eu.eudat.data.entities.DatasetDataRepository datasetDataRepository : dataset.getDatasetDataRepositories()) { DataRepositoryCriteria criteria = new DataRepositoryCriteria(); criteria.setLike(datasetDataRepository.getDataRepository().getReference()); List entries = dataRepositoryDao.getWithCriteria(criteria).toList(); @@ -415,10 +412,8 @@ public class DatasetManager { datasetDataRepository.setDataset(dataset); dataset.getDatasetDataRepositories().add(datasetDataRepository); } else { - //datasetDataRepository.getDataRepository().setId(UUID.randomUUID()); - DataRepository dataRepository = dataRepositoryDao.createOrUpdate(datasetDataRepository.getDataRepository()); - datasetDataRepository.setDataRepository(dataRepository); - dataset.getDatasetDataRepositories().add(datasetDataRepository); + dataRepositoryDao.createOrUpdate(datasetDataRepository.getDataRepository()); + datasetDataRepository.setDataset(dataset); } } } From e853c8c44ac194163945e15fb29d04e7f81e02f6 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 19 Sep 2019 18:05:20 +0300 Subject: [PATCH 006/161] Adds clear autocomplete when you select value functionality at External References. (Issue #155) --- .../single/single-auto-complete-configuration.ts | 2 ++ .../auto-complete/single/single-auto-complete.component.ts | 7 +++++++ .../dataset-external-references-editor.component.ts | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts index d90d89a58..6628279f6 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts @@ -8,6 +8,8 @@ export interface SingleAutoCompleteConfiguration { minFilteringChars?: number; // Load and present items from start, without user query. Default: true. loadDataOnStart?: boolean; + // Remove item after selection. + removeAfterSelection?: boolean; // Static or initial items. initialItems?: (data?: any) => Observable; // Data retrieval function diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 1d740aefb..7acfe607f 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -153,6 +153,13 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< //this._inputValue = " "; this.stateChanges.next(); this.optionSelected.emit(event.option.value); + if (this.configuration.removeAfterSelection) { + this.clearAutocomplete() + } + } + + private clearAutocomplete() { + this._setValue(null); } private _setValue(value: any) { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index d4894cf99..d68a70254 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -66,6 +66,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl this.dataRepositoriesAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalDataRepositories.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalDataRepositories('', type), displayFn: (item) => item ? item.name : null, titleFn: (item) => item ? item.name : null, @@ -74,6 +75,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl this.externalDatasetAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalDatasets.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalDatasets('', type),//.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1), displayFn: (item) => item ? item.label : null, titleFn: (item) => item ? item.label : null, @@ -82,6 +84,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl this.registriesAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalRegistries.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalRegistries('', type), displayFn: (item) => item ? item.label : null, titleFn: (item) => item ? item.label: null, @@ -90,6 +93,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl this.servicesAutoCompleteConfiguration = { filterFn: this.searchDatasetExternalServices.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetExternalServices('', type), displayFn: (item) => item ? item.label : null, titleFn: (item) => item ? item.label : null, @@ -98,6 +102,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl this.tagsAutoCompleteConfiguration = { filterFn: this.searchDatasetTags.bind(this), + removeAfterSelection: true, initialItems: (type) => this.searchDatasetTags('', type), displayFn: (item) => item ? item.name : null, titleFn: (item) => item ? item.name : null, From 302a22e20acfa7eebe2c4eecac1a0552a4021cf0 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 20 Sep 2019 13:54:37 +0300 Subject: [PATCH 007/161] Fixes home page redirect bug and links of 'VIEW ALL' button - (Issue #161) --- .../app/ui/dashboard/dashboard.component.html | 35 ++++++------------- .../app/ui/dashboard/dashboard.component.ts | 6 +++- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html index de1c123b3..7eec343f1 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html @@ -8,37 +8,27 @@
- +
- +
- +
- +
- +
- +
@@ -56,21 +46,16 @@
- +
- +
- +
- +
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index c489236cf..7d7a429f4 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -162,7 +162,11 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC } dmpClicked(dmp: DmpListingModel) { - this.router.navigate(['/plans/publicEdit/' + dmp.id]); + if (!this.isAuthenticated()) { + this.router.navigate(['../explore-plans/overview', dmp.id], { relativeTo: this.route }); + } else { + this.router.navigate(['/plans/publicEdit/' + dmp.id]); + } } datasetClicked(dataset: DatasetListingModel) { From 68cb9846bb6cdb70e566fd8b296709799d080cd0 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 20 Sep 2019 17:51:13 +0300 Subject: [PATCH 008/161] Fixes bug on External References not updating values. --- .../java/eu/eudat/data/entities/Dataset.java | 35 ++++++++----------- .../eudat/logic/managers/DatasetManager.java | 34 ++++++++---------- 2 files changed, 28 insertions(+), 41 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java index 3763b6de6..fe38a22cb 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java @@ -276,32 +276,25 @@ public class Dataset implements DataEntity { @Override public void update(Dataset entity) { - this.setRegistries(entity.getRegistries()); - if (this.getDatasetDataRepositories() == null) this.setDatasetDataRepositories(new HashSet<>()); - if (!this.getDatasetDataRepositories().containsAll(entity.getDatasetDataRepositories())) { - this.getDatasetDataRepositories().removeAll(this.getDatasetDataRepositories()); - this.getDatasetDataRepositories().addAll(entity.getDatasetDataRepositories().stream().map(item -> { - item.setDataset(this); - return item; - }).collect(Collectors.toList())); - } this.setUri(entity.getUri()); this.setDescription(entity.getDescription()); this.setLabel(entity.getLabel()); this.setProperties(entity.getProperties()); - if (this.getDatasetExternalDatasets() == null) this.setDatasetExternalDatasets(new HashSet<>()); - if (!this.getDatasetExternalDatasets().containsAll(entity.getDatasetExternalDatasets())) { - this.getDatasetExternalDatasets().removeAll(this.getDatasetExternalDatasets()); - this.getDatasetExternalDatasets().addAll(entity.getDatasetExternalDatasets().stream().map(item -> { - item.setDataset(this); - return item; - }).collect(Collectors.toList())); - } - if (this.getServices() == null) this.setServices(new HashSet<>()); - if(!this.getServices().containsAll(entity.getServices())) { - this.getServices().removeAll(this.getServices()); + + this.getDatasetDataRepositories().removeAll(this.getDatasetDataRepositories()); + if (entity.getDatasetDataRepositories() != null) + this.getDatasetDataRepositories().addAll(entity.getDatasetDataRepositories()); + + this.getDatasetExternalDatasets().removeAll(this.getDatasetExternalDatasets()); + if (entity.getDatasetExternalDatasets() != null) + this.getDatasetExternalDatasets().addAll(entity.getDatasetExternalDatasets()); + + this.setRegistries(entity.getRegistries()); + + this.getServices().removeAll(this.getServices()); + if (entity.getServices() != null) this.getServices().addAll(entity.getServices()); - } + this.setDmp(entity.getDmp()); this.setStatus(entity.getStatus()); this.setProfile(entity.getProfile()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index 1bc7bc3de..6ba300157 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -412,41 +412,35 @@ public class DatasetManager { datasetDataRepository.setDataset(dataset); dataset.getDatasetDataRepositories().add(datasetDataRepository); } else { - dataRepositoryDao.createOrUpdate(datasetDataRepository.getDataRepository()); + DataRepository dataRepository = dataRepositoryDao.createOrUpdate(datasetDataRepository.getDataRepository()); datasetDataRepository.setDataset(dataset); + datasetDataRepository.setDataRepository(dataRepository); + dataset.getDatasetDataRepositories().add(datasetDataRepository); } } } } private void createServicesIfTheyDontExist(eu.eudat.data.entities.Dataset dataset) { - Set services = dataset.getServices(); - dataset.setServices(new HashSet<>()); - if (services != null && !services.isEmpty()) { - for (eu.eudat.data.entities.DatasetService datasetService : services) { + if (dataset.getServices() != null && !dataset.getServices().isEmpty()) { + for (DatasetService service : dataset.getServices()) { ServiceCriteria criteria = new ServiceCriteria(); - criteria.setLike(datasetService.getService().getLabel()); + criteria.setLike(service.getService().getLabel()); List entries = databaseRepository.getServiceDao().getWithCriteria(criteria).toList(); - if (entries != null && !entries.isEmpty()) { - datasetService.getService().setId(entries.get(0).getId()); - datasetService.setDataset(dataset); - dataset.getServices().add(datasetService); - } else { - datasetService.getService().setCreated(new Date()); - Service service = databaseRepository.getServiceDao().createOrUpdate(datasetService.getService()); - datasetService.setService(service); - datasetService.setDataset(dataset); - dataset.getServices().add(datasetService); + if (entries != null && entries.isEmpty()) { + service.setDataset(dataset); + service.getService().setCreated(new Date()); + service.setService(service.getService()); + this.databaseRepository.getServiceDao().createOrUpdate(service.getService()); + dataset.getServices().add(service); } } } } private void createExternalDatasetsIfTheyDontExist(eu.eudat.data.entities.Dataset dataset) { - Set externalDatasets = dataset.getDatasetExternalDatasets(); - dataset.setDatasetExternalDatasets(new HashSet<>()); - if (externalDatasets != null && !externalDatasets.isEmpty()) { - for (eu.eudat.data.entities.DatasetExternalDataset datasetExternalDataset : externalDatasets) { + if (dataset.getDatasetExternalDatasets() != null && !dataset.getDatasetExternalDatasets().isEmpty()) { + for (eu.eudat.data.entities.DatasetExternalDataset datasetExternalDataset : dataset.getDatasetExternalDatasets()) { ExternalDatasetCriteria criteria = new ExternalDatasetCriteria(); criteria.setLike(datasetExternalDataset.getExternalDataset().getLabel()); List entries = databaseRepository.getExternalDatasetDao().getWithCriteria(criteria).toList(); From 0bf062292d7d781feac4dcd622a02f11ebaf927a Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 20 Sep 2019 18:27:54 +0300 Subject: [PATCH 009/161] Add confirmation dialogue on DMP's overview "Publish" button. - (Issue #158) --- .../dmp/overview/dmp-overview.component.html | 2 +- .../dmp/overview/dmp-overview.component.scss | 3 +- .../ui/dmp/overview/dmp-overview.component.ts | 47 ++++++++++++------- dmp-frontend/src/assets/i18n/en.json | 1 + dmp-frontend/src/styles.scss | 1 + 5 files changed, 34 insertions(+), 20 deletions(-) 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 26a71ecfd..53c8db754 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 @@ -44,7 +44,7 @@ -
+
+ {{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS-DESCRIPTION' | translate}} +
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index fa06a21eb..889bc55ef 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -729,7 +729,8 @@ "DATAREPOSITORIES": "Data Repositories", "REGISTRIES": "Registries", "SERVICES": "Services", - "EXTERNAL-DATASETS": "External Dataset", + "EXTERNAL-DATASETS": "External Datasets", + "EXTERNAL-DATASETS-DESCRIPTION": "Datasets related to the one being described in the DMP, either utilized for its production or being a derivative or byproduct of its utilization", "EXTERNAL-DATASET-TYPE": "External Dataset Type", "EXTERNAL-DATASET-INFO": "External Dataset Info", "DATAREPOSITORIES-INFO": "Data Repositories Info", From e6891861e5363253ed0af0a81242ff08f4b02782 Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Mon, 23 Sep 2019 11:17:03 +0300 Subject: [PATCH 011/161] angular update to version 8 --- dmp-frontend/browserslist | 12 ++ dmp-frontend/package.json | 117 +++++++++--------- dmp-frontend/src/app/app-routing.module.ts | 32 ++--- dmp-frontend/src/app/app.component.ts | 20 +-- dmp-frontend/src/app/app.module.ts | 2 +- .../common/date/moment-utc-date-adapter.ts | 2 +- .../response-payload.interceptor.ts | 2 +- .../interceptors/status-code.interceptor.ts | 6 +- .../app/common/material/material.module.ts | 64 +++++----- .../dmp-create-wizard-form.model.ts | 14 +-- .../app/core/services/auth/auth.service.ts | 46 +++---- .../dataset-wizard/dataset-wizard.service.ts | 13 +- .../src/app/core/services/dmp/dmp.service.ts | 17 ++- .../email-confirmation.service.ts | 6 +- .../help-content/help-content.service.ts | 78 ++++++------ .../core/services/http/base-http.service.ts | 8 +- .../multiple-auto-complete.component.ts | 8 +- .../single/single-auto-complete.component.ts | 3 +- .../confirmation-dialog.component.ts | 2 +- .../contact-dialog.component.ts | 2 +- .../export-method-dialog.component.ts | 2 +- .../notification/notification.component.ts | 3 +- .../popup/popup-notification.component.ts | 2 +- .../snack-bar-notification.component.ts | 2 +- .../dataset-profile-editor.component.ts | 12 +- .../criteria/dataset-profile.component.ts | 2 +- ...-confirmation-upload-profiles.component.ts | 2 +- .../dataset-profile-listing.component.ts | 35 +++--- .../dataset-profile-preview.component.ts | 2 +- .../editor/dmp-profile-editor.component.ts | 12 +- ...-confirmation-upload-profiles.component.ts | 2 +- .../dmp-profile-criteria.component.ts | 2 +- .../listing/dmp-profile-listing.component.ts | 34 ++--- .../user/listing/user-listing.component.ts | 39 +++--- .../app/ui/dashboard/dashboard.component.ts | 12 +- .../quick-wizard-create-add.component.ts | 2 +- .../recent-edited-activity.component.ts | 2 +- .../dataset-create-wizard.component.ts | 12 +- .../dataset-dmp-selector.component.ts | 42 +++---- .../dataset-copy-dialogue.component.ts | 12 +- .../dataset-wizard.component.ts | 40 +++--- ...et-external-references-editor.component.ts | 2 +- ...data-repository-dialog-editor.component.ts | 2 +- ...xternal-dataset-dialog-editor.component.ts | 2 +- ...ternal-registry-dialog-editor.component.ts | 2 +- ...xternal-service-dialog-editor.component.ts | 2 +- .../criteria/dataset-criteria.component.ts | 89 +++++++------ .../dataset-upload-dialogue.component.ts | 9 +- .../listing/dataset-listing.component.ts | 16 +-- .../app/ui/dmp/clone/dmp-clone.component.ts | 10 +- .../add-researcher.component.ts | 2 +- .../available-profiles.component.ts | 2 +- .../app/ui/dmp/editor/dmp-editor.component.ts | 23 ++-- .../dmp-finalize-dialog.component.ts | 2 +- .../general-tab/general-tab.component.ts | 13 +- .../editor/people-tab/people-tab.component.ts | 2 +- .../invitation/dmp-invitation.component.ts | 8 +- .../criteria/dmp-criteria.component.ts | 21 ++-- .../dmp-upload-dialogue.component.ts | 2 +- .../ui/dmp/listing/dmp-listing.component.ts | 17 +-- .../dmp-listing-item.component.ts | 2 +- .../ui/dmp/overview/dmp-overview.component.ts | 9 +- .../app/ui/dmp/wizard/dmp-wizard.component.ts | 12 +- .../editor/dmp-wizard-editor.component.ts | 11 +- .../dmp-wizard-dataset-listing.component.ts | 10 +- .../explore-dataset-listing.component.ts | 12 +- .../explore-dataset-filter-item.component.ts | 16 +-- .../explore-dataset-filters.component.ts | 44 +++---- .../explore-dmp-filter-item.component.ts | 16 +-- .../explore-dmp-filters.component.ts | 44 ++++--- .../explore-dmp-listing.component.ts | 12 +- .../ui/grant/editor/grant-editor.component.ts | 17 +-- .../criteria/grant-criteria.component.ts | 2 +- .../grant/listing/grant-listing.component.ts | 14 ++- .../misc/breadcrumb/breadcrumb.component.ts | 19 +-- .../breadcrumb/service/breadcrumb.service.ts | 9 +- .../form-field/form-field.component.ts | 7 +- .../dataset-description-form.component.ts | 6 +- .../help-content/help-content.component.ts | 10 +- .../misc/navigation/navigation.component.ts | 9 +- .../user-dialog/user-dialog.component.ts | 2 +- .../app/ui/misc/search/search.component.ts | 6 +- .../src/app/ui/navbar/navbar.component.ts | 2 +- .../dmp-editor/dmp-editor-wizard.component.ts | 9 +- .../grant-editor-wizard.component.ts | 9 +- .../quick-wizard-editor.component.ts | 15 ++- .../faq/faq-dialog.component.ts | 2 +- .../glossary/glossary-dialog.component.ts | 2 +- .../sidebar-footer.component.ts | 2 +- .../src/app/ui/sidebar/sidebar.component.ts | 2 +- .../ui/user-profile/user-profile.component.ts | 20 +-- dmp-frontend/src/polyfills.ts | 24 +--- dmp-frontend/src/tsconfig.spec.json | 2 - dmp-frontend/tsconfig.json | 6 +- dmp-frontend/tslint.json | 8 +- 95 files changed, 708 insertions(+), 637 deletions(-) create mode 100644 dmp-frontend/browserslist diff --git a/dmp-frontend/browserslist b/dmp-frontend/browserslist new file mode 100644 index 000000000..80848532e --- /dev/null +++ b/dmp-frontend/browserslist @@ -0,0 +1,12 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +> 0.5% +last 2 versions +Firefox ESR +not dead +not IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index 8b88cd0a1..2a69526d8 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -1,63 +1,58 @@ { - "name": "dmp-frontend2", - "version": "0.0.0", - "license": "MIT", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build --prod", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "^6.1.7", - "@angular/common": "^6.1.7", - "@angular/compiler": "^6.1.7", - "@angular/core": "^6.1.7", - "@angular/flex-layout": "6.0.0-beta.18", - "@angular/forms": "^6.1.7", - "@angular/material-moment-adapter": "^6.4.7", - "@angular/platform-browser": "^6.1.7", - "@ngx-translate/core": "^10.0.2", - "@ngx-translate/http-loader": "^3.0.1", - "@swimlane/ngx-datatable": "^13.1.0", - "bootstrap": "^4.1.3", - "core-js": "^2.5.5", - "file-saver": "^2.0.0-rc.3", - "moment": "^2.22.2", - "moment-timezone": "^0.5.23", - "ngx-cookie-service": "^1.0.10", - "rxjs": "^6.3.2", - "rxjs-compat": "^6.3.2", - "web-animations-js": "^2.3.1", - "zone.js": "^0.8.26" - }, - "devDependencies": { - "@angular-devkit/build-angular": "^0.8.5", - "@angular/cdk": "^6.3.0", - "@angular/material": "^6.4.7", - "@angular/cli": "6.2.5", - "@angular/compiler-cli": "^6.1.10", - "@angular/http": "^6.1.10", - "@angular/platform-browser-dynamic": "^6.1.10", - "@angular/router": "^6.1.10", - "@angular/language-service": "^6.1.10", - "@types/facebook-js-sdk": "^2.8.4", - "@types/file-saver": "^1.3.1", - "@types/gapi": "^0.0.36", - "@types/gapi.auth2": "^0.0.47", - "@types/jasmine": "~2.8.9", - "@types/jasminewd2": "~2.0.5", - "@types/moment-timezone": "^0.5.4", - "@types/node": "^10.11.7", - "codelyzer": "~4.5.0", - "jasmine-core": "^3.2.1", - "jasmine-spec-reporter": "^4.2.1", - "protractor": "~5.4.1", - "ts-node": "~7.0.1", - "tslint": "~5.11.0", - "typescript": "2.9.1" - } + "name": "dmp-frontend2", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build --prod", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "^8.2.7", + "@angular/common": "^8.2.7", + "@angular/compiler": "^8.2.7", + "@angular/core": "^8.2.7", + "@angular/forms": "^8.2.7", + "@angular/material-moment-adapter": "^8.2.0", + "@angular/platform-browser": "^8.2.7", + "@ngx-translate/core": "^11.0.1", + "@ngx-translate/http-loader": "^4.0.0", + "@swimlane/ngx-datatable": "^16.0.2", + "bootstrap": "^4.3.1", + "core-js": "^2.5.5", + "file-saver": "^2.0.2", + "moment": "^2.24.0", + "moment-timezone": "^0.5.26", + "ngx-cookie-service": "^2.2.0", + "rxjs": "^6.3.2", + "tslib": "^1.10.0", + "web-animations-js": "^2.3.2", + "zone.js": "~0.9.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.803.5", + "@angular/cdk": "^8.2.0", + "@angular/material": "^8.2.0", + "@angular/cli": "8.3.5", + "@angular/compiler-cli": "^8.2.7", + "@angular/platform-browser-dynamic": "^8.2.7", + "@angular/router": "^8.2.7", + "@angular/language-service": "^8.2.7", + "@types/facebook-js-sdk": "^3.3.0", + "@types/file-saver": "^2.0.1", + "@types/gapi": "^0.0.39", + "@types/gapi.auth2": "^0.0.50", + "@types/jasmine": "~3.4.0", + "@types/jasminewd2": "~2.0.6", + "@types/moment-timezone": "^0.5.12", + "@types/node": "^10.11.7", + "codelyzer": "^5.1.1", + "ts-node": "~8.4.1", + "tslint": "~5.20.0", + "typescript": "3.5.3" + } } diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 6e0f16745..5a6f0109c 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -14,7 +14,7 @@ const appRoutes: Routes = [ }, { path: 'datasetcreatewizard', - loadChildren: './ui/dataset-create-wizard/dataset-create-wizard.module#DatasetCreateWizardModule', + loadChildren: () => import('./ui/dataset-create-wizard/dataset-create-wizard.module').then(m => m.DatasetCreateWizardModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DATASETCREATEWIZARD' @@ -22,7 +22,7 @@ const appRoutes: Routes = [ }, { path: 'explore', - loadChildren: './ui/explore-dataset/explore-dataset.module#ExploreDatasetModule', + loadChildren: () => import('./ui/explore-dataset/explore-dataset.module').then(m => m.ExploreDatasetModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.EXPLORE' @@ -30,7 +30,7 @@ const appRoutes: Routes = [ }, { path: 'explore-plans', - loadChildren: './ui/explore-dmp/explore-dmp.module#ExploreDmpModule', + loadChildren: () => import('./ui/explore-dmp/explore-dmp.module').then(m => m.ExploreDmpModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.EXPLORE-PLANS' @@ -38,7 +38,7 @@ const appRoutes: Routes = [ }, { path: 'datasets', - loadChildren: './ui/dataset/dataset.module#DatasetModule', + loadChildren: () => import('./ui/dataset/dataset.module').then(m => m.DatasetModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DATASETS' @@ -46,7 +46,7 @@ const appRoutes: Routes = [ }, { path: 'about', - loadChildren: './ui/about/about.module#AboutModule', + loadChildren: () => import('./ui/about/about.module').then(m => m.AboutModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.ABOUT' @@ -54,7 +54,7 @@ const appRoutes: Routes = [ }, { path: 'grants', - loadChildren: './ui/grant/grant.module#GrantModule', + loadChildren: () => import('./ui/grant/grant.module').then(m => m.GrantModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.GRANTS' @@ -62,7 +62,7 @@ const appRoutes: Routes = [ }, { path: 'plans', - loadChildren: './ui/dmp/dmp.module#DmpModule', + loadChildren: () => import('./ui/dmp/dmp.module').then(m => m.DmpModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.PLANS' @@ -70,7 +70,7 @@ const appRoutes: Routes = [ }, { path: 'dmp-profiles', - loadChildren: './ui/admin/dmp-profile/dmp-profile.module#DmpProfileModule', + loadChildren: () => import('./ui/admin/dmp-profile/dmp-profile.module').then(m => m.DmpProfileModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DMP-PROFILES' @@ -78,7 +78,7 @@ const appRoutes: Routes = [ }, { path: 'quick-wizard', - loadChildren: './ui/quick-wizard/quick-wizard.module#OuickWizardModule', + loadChildren: () => import('./ui/quick-wizard/quick-wizard.module').then(m => m.OuickWizardModule), data: { breadcrumb: true, title: "GENERAL.TITLES.QUICK-WIZARD" @@ -86,7 +86,7 @@ const appRoutes: Routes = [ }, { path: 'dataset-profiles', - loadChildren: './ui/admin/dataset-profile/dataset-profile.module#DatasetProfileModule', + loadChildren: () => import('./ui/admin/dataset-profile/dataset-profile.module').then(m => m.DatasetProfileModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.DATASET-PROFILES' @@ -94,21 +94,21 @@ const appRoutes: Routes = [ }, { path: 'home', - loadChildren: './ui/dashboard/dashboard.module#DashboardModule', + loadChildren: () => import('./ui/dashboard/dashboard.module').then(m => m.DashboardModule), data: { breadcrumb: true } }, { path: 'unauthorized', - loadChildren: './ui/misc/unauthorized/unauthorized.module#UnauthorizedModule', + loadChildren: () => import('./ui/misc/unauthorized/unauthorized.module').then(m => m.UnauthorizedModule), data: { breadcrumb: true }, }, { path: 'users', - loadChildren: './ui/admin/user/user.module#UserModule', + loadChildren: () => import('./ui/admin/user/user.module').then(m => m.UserModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.USERS' @@ -116,7 +116,7 @@ const appRoutes: Routes = [ }, { path: 'profile', - loadChildren: './ui/user-profile/user-profile.module#UserProfileModule', + loadChildren: () => import('./ui/user-profile/user-profile.module').then(m => m.UserProfileModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.PROFILE' @@ -124,14 +124,14 @@ const appRoutes: Routes = [ }, { path: 'login/admin', - loadChildren: './ui/auth/admin-login/admin-login.module#AdminLoginModule', + loadChildren: () => import('./ui/auth/admin-login/admin-login.module').then(m => m.AdminLoginModule), data: { breadcrumb: true }, }, { path: 'login', - loadChildren: './ui/auth/login/login.module#LoginModule', + loadChildren: () => import('./ui/auth/login/login.module').then(m => m.LoginModule), data: { breadcrumb: true, title: 'GENERAL.TITLES.LOGIN' diff --git a/dmp-frontend/src/app/app.component.ts b/dmp-frontend/src/app/app.component.ts index 4c0a5ade9..170f52cde 100644 --- a/dmp-frontend/src/app/app.component.ts +++ b/dmp-frontend/src/app/app.component.ts @@ -1,12 +1,14 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {switchMap, filter, map } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { environment } from '../environments/environment'; import { AuthService } from './core/services/auth/auth.service'; import { CultureService } from './core/services/culture/culture-service'; import { BreadCrumbResolverService } from './ui/misc/breadcrumb/service/breadcrumb.service'; -import { filter, map } from 'rxjs/operators'; import { Title } from '@angular/platform-browser'; @@ -20,7 +22,7 @@ declare var $: any; }) export class AppComponent implements OnInit { - hasBreadCrumb = Observable.of(false); + hasBreadCrumb = observableOf(false); sideNavOpen = false; helpContentEnabled = environment.HelpService.Enabled; @@ -46,12 +48,12 @@ export class AppComponent implements OnInit { } ngOnInit() { - this.hasBreadCrumb = this.router.events - .filter(event => event instanceof NavigationEnd) - .map(() => this.route) - .map(route => route.firstChild) - .switchMap(route => route.data) - .map(data => data['breadcrumb']); + this.hasBreadCrumb = this.router.events.pipe( + filter(event => event instanceof NavigationEnd), + map(() => this.route), + map(route => route.firstChild), + switchMap(route => route.data), + map(data => data['breadcrumb']),); const appTitle = this.titleService.getTitle(); this.router diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 7d4640e5e..aa65a7c4e 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -1,7 +1,7 @@ import { OverlayModule } from '@angular/cdk/overlay'; import { HttpClient, HttpClientModule } from '@angular/common/http'; import { LOCALE_ID, NgModule } from '@angular/core'; -import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; import { MatMomentDateModule, MAT_MOMENT_DATE_FORMATS } from '@angular/material-moment-adapter'; import { BrowserModule, Title } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts b/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts index 722f3ae2f..659926878 100644 --- a/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts +++ b/dmp-frontend/src/app/common/date/moment-utc-date-adapter.ts @@ -1,5 +1,5 @@ import { Inject, Injectable, Optional } from '@angular/core'; -import { MAT_DATE_LOCALE } from '@angular/material'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; import { MomentDateAdapter } from '@angular/material-moment-adapter'; import * as moment from 'moment'; import { Moment } from 'moment'; diff --git a/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts b/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts index 125ac38ce..f34b273d4 100644 --- a/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts +++ b/dmp-frontend/src/app/common/http/interceptors/response-payload.interceptor.ts @@ -1,6 +1,6 @@ import { HttpHandler, HttpHeaderResponse, HttpProgressEvent, HttpRequest, HttpResponse, HttpSentEvent, HttpUserEvent } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { BaseInterceptor } from './base.interceptor'; diff --git a/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts b/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts index 78a4aa331..867889a96 100644 --- a/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts +++ b/dmp-frontend/src/app/common/http/interceptors/status-code.interceptor.ts @@ -1,3 +1,5 @@ + +import {tap} from 'rxjs/operators'; import { Injectable } from "@angular/core"; import { BaseInterceptor } from "./base.interceptor"; import { InterceptorType } from "./interceptor-type"; @@ -10,11 +12,11 @@ export class StatusCodeInterceptor extends BaseInterceptor { type: InterceptorType; interceptRequest(req: HttpRequest, next: HttpHandler): Observable> { - return next.handle(req).do(event => { }, err => { + return next.handle(req).pipe(tap(event => { }, err => { if (err.status === 480) { this.router.navigate(['confirmation']); } - }); + })); } constructor( diff --git a/dmp-frontend/src/app/common/material/material.module.ts b/dmp-frontend/src/app/common/material/material.module.ts index 909d1ea8e..c450d3ea2 100644 --- a/dmp-frontend/src/app/common/material/material.module.ts +++ b/dmp-frontend/src/app/common/material/material.module.ts @@ -1,37 +1,35 @@ import { NgModule } from '@angular/core'; -import { - MatButtonModule, - MatToolbarModule, - MatIconModule, - MatCardModule, - MatGridListModule, - MatSnackBarModule, - MatSidenavModule, - MatListModule, - MatChipsModule, - MatFormFieldModule, - MatSelectModule, - MatOptionModule, - MatInputModule, - MatExpansionModule, - MatAutocompleteModule, - MatProgressSpinnerModule, - MatTabsModule, - MatDialogModule, - MatMenuModule, - MatRadioModule, - MatStepperModule, - MatTooltipModule, - MatProgressBarModule, - MatCheckboxModule, - MatDatepickerModule, - MatButtonToggleModule, - MatSliderModule, - MatSlideToggleModule, - MatTableModule, - MatPaginatorModule, - MatSortModule, -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatOptionModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatGridListModule } from '@angular/material/grid-list'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSliderModule } from '@angular/material/slider'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSortModule } from '@angular/material/sort'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { CdkTableModule } from '@angular/cdk/table'; @NgModule({ diff --git a/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts b/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts index f53ef7d9c..a3303ccac 100644 --- a/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts +++ b/dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts @@ -1,10 +1,9 @@ -import { DmpModel } from "../dmp" -import { DatasetProfileModel } from "../../dataset/dataset-profile"; -import { FormGroup } from "@angular/forms/src/model"; -import { ValidationContext } from "../../../../common/forms/validation/validation-context"; -import { Validators, FormBuilder } from "@angular/forms"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { BackendErrorValidator } from "../../../../common/forms/validation/custom-validator"; import { ValidationErrorModel } from "../../../../common/forms/validation/error-model/validation-error-model"; +import { ValidationContext } from "../../../../common/forms/validation/validation-context"; +import { DatasetProfileModel } from "../../dataset/dataset-profile"; +import { DmpModel } from "../dmp"; export class DmpCreateWizardFormModel { dmp: DmpModel; @@ -18,7 +17,7 @@ export class DmpCreateWizardFormModel { return this; } - buildForm(context: ValidationContext = null): FormGroup{ + buildForm(context: ValidationContext = null): FormGroup { if (context == null) { context = this.createValidationContext(); } const formBuilder = new FormBuilder(); const formGroup = formBuilder.group({ @@ -37,6 +36,3 @@ export class DmpCreateWizardFormModel { return baseContext; } } - - - diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts index b08921e01..8f0ef3f5a 100644 --- a/dmp-frontend/src/app/core/services/auth/auth.service.ts +++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts @@ -1,10 +1,12 @@ + +import {of as observableOf, throwError as observableThrowError, Observable } from 'rxjs'; + +import {map, catchError, takeUntil } from 'rxjs/operators'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { takeUntil } from 'rxjs/operators'; -import { Observable } from 'rxjs/Rx'; import { environment } from '../../../../environments/environment'; import { SnackBarNotificationComponent } from '../../../library/notification/snack-bar/snack-bar-notification.component'; import { BaseService } from '../../common/base/base.service'; @@ -67,31 +69,31 @@ export class AuthService extends BaseService { public login(loginInfo: LoginInfo): Observable { const url = this.actionUrl + 'externallogin'; - return this.http.post(url, loginInfo, { headers: this.headers }) - .map((res: any) => { + return this.http.post(url, loginInfo, { headers: this.headers }).pipe( + map((res: any) => { const principal = this.current(res.payload); //this.loginContextSubject.next(true); return principal; - }) - .catch((error: any) => { + }), + catchError((error: any) => { //this.loginContextSubject.next(false); - return Observable.throw(error); - }); + return observableThrowError(error); + }),); } public nativeLogin(credentials: Credential): Observable { const url = this.actionUrl + 'nativelogin'; - return this.http.post(url, credentials, { headers: this.headers }) - .map((res: any) => { + return this.http.post(url, credentials, { headers: this.headers }).pipe( + map((res: any) => { const principal = this.current(res.payload); //this.loginContextSubject.next(true); return principal; - }) - .catch((error: any) => { + }), + catchError((error: any) => { //this.loginContextSubject.next(false); - return Observable.throw(error); - }); + return observableThrowError(error); + }),); } @@ -116,22 +118,22 @@ export class AuthService extends BaseService { const principal = this.current(); if (!principal) { this.clear(); - return Observable.of(); + return observableOf(); } let headers = this.headers; headers = headers.set('AuthToken', principal.token); - return this.http.post(url, null, { headers: headers }) - .map((res: any) => { + return this.http.post(url, null, { headers: headers }).pipe( + map((res: any) => { const princ = this.current(res.payload); return princ; - }) - .catch((error: any) => { + }), + catchError((error: any) => { //console.warn('could not retrieve me info:\n', error); this.clear(); const princ = this.current(); this.router.navigate(['/login']); - return Observable.of(princ); - }); + return observableOf(princ); + }),); } public onLogOutSuccess(logoutMessage: any) { diff --git a/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts b/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts index b08009aad..e11802ccd 100644 --- a/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts +++ b/dmp-frontend/src/app/core/services/dataset-wizard/dataset-wizard.service.ts @@ -2,17 +2,14 @@ import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { environment } from '../../../../environments/environment'; -import { RequestItem } from '../../query/request-item'; +import { BaseHttpParams } from '../../../common/http/base-http-params'; +import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; import { DatasetProfileDefinitionModel } from '../../model/dataset-profile-definition/dataset-profile-definition'; import { DatasetProfileModel } from '../../model/dataset/dataset-profile'; import { DatasetWizardModel } from '../../model/dataset/dataset-wizard'; -import { DmpModel } from '../../model/dmp/dmp'; import { DatasetProfileCriteria } from '../../query/dataset-profile/dataset-profile-criteria'; -import { DmpCriteria } from '../../query/dmp/dmp-criteria'; +import { RequestItem } from '../../query/request-item'; import { BaseHttpService } from '../http/base-http.service'; -import { ContentType } from '@angular/http/src/enums'; -import { BaseHttpParams } from '../../../common/http/base-http-params'; -import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; @Injectable() export class DatasetWizardService { @@ -70,7 +67,7 @@ export class DatasetWizardService { return this.http.get(this.actionUrl + id + '/unlock', { headers: this.headers }); } - public uploadXml(fileList: FileList, datasetTitle: string, dmpId: string, datasetProfileId: string): Observable { + public uploadXml(fileList: FileList, datasetTitle: string, dmpId: string, datasetProfileId: string): Observable { const formData: FormData = new FormData(); if (fileList instanceof FileList) { for (let i = 0; i < fileList.length; i++) { @@ -90,6 +87,6 @@ export class DatasetWizardService { } public updateDatasetProfile(id: String): Observable { - return this.http.get(this.actionUrl + "profile/"+ id, { headers: this.headers }); + return this.http.get(this.actionUrl + "profile/" + id, { headers: this.headers }); } } diff --git a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts index 4cb45c308..2df142252 100644 --- a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts +++ b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts @@ -2,23 +2,22 @@ import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { environment } from '../../../../environments/environment'; +import { BaseHttpParams } from '../../../common/http/base-http-params'; +import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; import { DynamicFieldGrantCriteria } from '../../../models/dynamic-field-grant/DynamicFieldGrantCriteria'; import { DataTableData } from '../../model/data-table/data-table-data'; import { DataTableRequest } from '../../model/data-table/data-table-request'; +import { DatasetListingModel } from '../../model/dataset/dataset-listing'; import { DatasetProfileModel } from '../../model/dataset/dataset-profile'; +import { DatasetsToBeFinalized } from '../../model/dataset/datasets-toBeFinalized'; import { DmpModel } from '../../model/dmp/dmp'; import { DmpListingModel } from '../../model/dmp/dmp-listing'; +import { DmpOverviewModel } from '../../model/dmp/dmp-overview'; import { DatasetProfileCriteria } from '../../query/dataset-profile/dataset-profile-criteria'; import { DmpCriteria } from '../../query/dmp/dmp-criteria'; +import { ExploreDmpCriteriaModel } from '../../query/explore-dmp/explore-dmp-criteria'; import { RequestItem } from '../../query/request-item'; import { BaseHttpService } from '../http/base-http.service'; -import { ContentType } from '@angular/http/src/enums'; -import { BaseHttpParams } from '../../../common/http/base-http-params'; -import { InterceptorType } from '../../../common/http/interceptors/interceptor-type'; -import { ExploreDmpCriteriaModel } from '../../query/explore-dmp/explore-dmp-criteria'; -import { DmpOverviewModel } from '../../model/dmp/dmp-overview'; -import { DatasetListingModel } from '../../model/dataset/dataset-listing'; -import { DatasetsToBeFinalized } from '../../model/dataset/datasets-toBeFinalized'; @Injectable() export class DmpService { @@ -93,7 +92,7 @@ export class DmpService { } getDoi(id: string): Observable { - return this.http.post(this.actionUrl + 'createZenodoDoi/' + id, {headers: this.headers}); + return this.http.post(this.actionUrl + 'createZenodoDoi/' + id, { headers: this.headers }); } getDynamicField(requestItem: RequestItem): any { @@ -119,7 +118,7 @@ export class DmpService { return this.httpClient.get(this.actionUrl + 'rda/' + id, { responseType: 'blob', observe: 'response' }); } - public uploadXml(fileList: FileList, dmpTitle: string): Observable { + public uploadXml(fileList: FileList, dmpTitle: string): Observable { const formData: FormData = new FormData(); if (fileList instanceof FileList) { for (let i = 0; i < fileList.length; i++) { diff --git a/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts b/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts index fc7673568..29433964f 100644 --- a/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts +++ b/dmp-frontend/src/app/core/services/email-confirmation/email-confirmation.service.ts @@ -1,7 +1,7 @@ +import { HttpHeaders } from '@angular/common/http'; import { Injectable } from "@angular/core"; -import { HttpHeaders } from "@angular/common/http/src/headers"; -import { BaseHttpService } from "../http/base-http.service"; import { environment } from "../../../../environments/environment"; +import { BaseHttpService } from "../http/base-http.service"; @Injectable() export class EmailConfirmationService { @@ -17,6 +17,6 @@ export class EmailConfirmationService { } public sendConfirmationEmail(email: string) { - return this.http.post(this.actioUrl, email, {headers: this.headers}); + return this.http.post(this.actioUrl, email, { headers: this.headers }); } } diff --git a/dmp-frontend/src/app/core/services/help-content/help-content.service.ts b/dmp-frontend/src/app/core/services/help-content/help-content.service.ts index 638e289c9..f0397b5b6 100644 --- a/dmp-frontend/src/app/core/services/help-content/help-content.service.ts +++ b/dmp-frontend/src/app/core/services/help-content/help-content.service.ts @@ -1,55 +1,57 @@ +import { HttpClient } from '@angular/common/http'; /** * Created by stefania on 7/17/17. */ import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; -import { Observable } from 'rxjs/Rx'; +import { Observable, throwError as observableThrowError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; import { PageHelpContent } from '../../model/help-content/page-help-content'; import { CachedContentItem } from './cached-content-item'; + @Injectable() export class HelpContentService { private _helpServiceUrl = environment.HelpService.Url; cache = new Map(); - constructor(private http: Http) { + constructor(private http: HttpClient) { } - getActivePageContent(route: string) { - if (!this.cache.get(route) || !this.isValidCachedItem(route)) { - return this.http.get(this._helpServiceUrl + '/page/route?q=' + route) - .map(res => { - this.cache.set(route, { timestamp: Date.now(), content: res.json() }); - return res.json(); - }) - .catch(this.handleError); - } - return Observable.create(observer => observer.next(this.cache.get(route).content)); - } - private extractData(res: Response) { - const body = res.json(); - return body.data || {}; - } - private handleError(error: Response | any) { - // In a real world app, we might use a remote logging infrastructure - // We'd also dig deeper into the error to get a better message - let errMsg = ''; - if (error instanceof Response) { - const body = error.text() || ''; - //const err = body.error || JSON.stringify(body); - errMsg = `${error.status} - ${error.statusText || ''} ${body}`; - } else { - errMsg = (error.message) ? error.message : - error.status ? `${error.status} - ${error.statusText}` : 'Server error'; - console.error(errMsg); // log to console instead - } - return Observable.throw(errMsg); - } + // getActivePageContent(route: string) { + // if (!this.cache.get(route) || !this.isValidCachedItem(route)) { + // return this.http.get(this._helpServiceUrl + '/page/route?q=' + route).pipe( + // map((res: Response) => { + // this.cache.set(route, { timestamp: Date.now(), content: res.json() as PageHelpContent }); + // return res.json(); + // }), + // catchError(this.handleError)); + // } + // return Observable.create(observer => observer.next(this.cache.get(route).content)); + // } + // private extractData(res: Response) { + // const body = res.json(); + // return body. || {}; + // } + // private handleError(error: Response | any) { + // // In a real world app, we might use a remote logging infrastructure + // // We'd also dig deeper into the error to get a better message + // let errMsg = ''; + // if (error instanceof Response) { + // const body = error.text() || ''; + // //const err = body.error || JSON.stringify(body); + // errMsg = `${error.status} - ${error.statusText || ''} ${body}`; + // } else { + // errMsg = (error.message) ? error.message : + // error.status ? `${error.status} - ${error.statusText}` : 'Server error'; + // console.error(errMsg); // log to console instead + // } + // return observableThrowError(errMsg); + // } - isValidCachedItem(route) { - const cachedTimestamp = this.cache.get(route).timestamp; - const currentTimestamp = Date.now(); - if (currentTimestamp - cachedTimestamp > 30000) { return false; } else { return true; } - } + // isValidCachedItem(route) { + // const cachedTimestamp = this.cache.get(route).timestamp; + // const currentTimestamp = Date.now(); + // if (currentTimestamp - cachedTimestamp > 30000) { return false; } else { return true; } + // } } diff --git a/dmp-frontend/src/app/core/services/http/base-http.service.ts b/dmp-frontend/src/app/core/services/http/base-http.service.ts index a3e0aca26..7fe8f473d 100644 --- a/dmp-frontend/src/app/core/services/http/base-http.service.ts +++ b/dmp-frontend/src/app/core/services/http/base-http.service.ts @@ -1,3 +1,5 @@ + +import {map} from 'rxjs/operators'; import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; @@ -39,7 +41,7 @@ export class BaseHttpService { } private interceptRepsonse(observable: Observable): Observable { - return observable + return observable.pipe( // .catch((errorResponse) => { // if (errorResponse.status === 401) { // this.snackBar.openFromComponent(SnackBarNotificationComponent, { @@ -69,7 +71,7 @@ export class BaseHttpService { // } // } // }) - .map(response => { + map(response => { if (response instanceof Blob) { return response; } if (response['statusCode'] === ApiMessageCode.SUCCESS_MESSAGE) { //throw new Error('Request failed'); @@ -83,6 +85,6 @@ export class BaseHttpService { } else { return response['payload']; } - }); + })); } } diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts index 73763d3e5..a19d1c55d 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts @@ -2,7 +2,9 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Optional, Output, Self, ViewChild } from '@angular/core'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger, MatChipInputEvent, MatFormFieldControl } from '@angular/material'; +import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete'; +import { MatChipInputEvent } from '@angular/material/chips'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { Observable, of as observableOf, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, mergeMap, startWith, tap } from 'rxjs/operators'; import { AutoCompleteGroup } from '../auto-complete-group'; @@ -87,8 +89,8 @@ export class MultipleAutoCompleteComponent implements OnInit, MatFormFieldContro } private _selectedValue; - @ViewChild('textInput') textInput: ElementRef; - @ViewChild(MatAutocompleteTrigger) autocomplete: MatAutocompleteTrigger; + @ViewChild('textInput', { static: true }) textInput: ElementRef; + @ViewChild(MatAutocompleteTrigger, { static: true }) autocomplete: MatAutocompleteTrigger; constructor( private fm: FocusMonitor, diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 7acfe607f..1a49d15c1 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -2,7 +2,8 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Optional, Output, Self } from '@angular/core'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { MatAutocompleteSelectedEvent, MatFormFieldControl } from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { Observable, of as observableOf, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, mergeMap, startWith, tap } from 'rxjs/operators'; import { AutoCompleteGroup } from '../auto-complete-group'; diff --git a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts index 26e1e63f3..55b8ddf8c 100644 --- a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts +++ b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-confirmation-dialog', diff --git a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts b/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts index c886ad48f..d3cbb2ef5 100644 --- a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts +++ b/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { FormGroup } from '@angular/forms'; @Component({ diff --git a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts index 2658b3ba7..37406942a 100644 --- a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts +++ b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ diff --git a/dmp-frontend/src/app/library/notification/notification.component.ts b/dmp-frontend/src/app/library/notification/notification.component.ts index a42d08a62..20527fe02 100644 --- a/dmp-frontend/src/app/library/notification/notification.component.ts +++ b/dmp-frontend/src/app/library/notification/notification.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialog, MatSnackBar } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; import { UiNotificationService, UiNotificationType, PopupNotification, SnackBarNotification, SnackBarNotificationLevel } from '../../core/services/notification/ui-notification-service'; diff --git a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts index 84a11666a..b672e34f6 100644 --- a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts +++ b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { PopupNotification } from '../../../core/services/notification/ui-notification-service'; @Component({ diff --git a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts index 2af227f3c..c3c4c97e6 100644 --- a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts +++ b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MAT_SNACK_BAR_DATA } from '@angular/material'; +import { MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar'; import { SnackBarNotification } from '../../../core/services/notification/ui-notification-service'; @Component({ 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 0f3b1ece8..00840c555 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 @@ -1,7 +1,10 @@ -import { HttpErrorResponse } from '@angular/common/http'; + +import {of as observableOf, Observable } from 'rxjs'; +import { HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatHorizontalStepper, MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatHorizontalStepper } from '@angular/material/stepper'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; @@ -18,7 +21,6 @@ import { ConfirmationDialogComponent } from '../../../../library/confirmation-di import { DatasetProfileEnum } from '../../../../core/common/enum/dataset-profile'; import * as FileSaver from 'file-saver'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; -import { Observable } from 'rxjs'; import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; //import * as data from 'src/assets/resources/skipDisable.json'; @@ -42,7 +44,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn newVersionId: string; dataWizardModel: DatasetWizardModel; breadCrumbs: Observable; - @ViewChild('stepper') stepper: MatHorizontalStepper; + @ViewChild('stepper', { static: false }) stepper: MatHorizontalStepper; viewOnly = false; constructor( @@ -88,7 +90,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn }, error => this.onCallbackError(error) ); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DatasetProfileListingComponent', label: this.language.instant('NAV-BAR.TEMPLATE'), url: '/dataset-profiles/' + this.datasetProfileId diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts index 645bbf351..162937600 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../../../common/forms/validation/error-model/validation-error-model'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts index e72e64e55..8db9791c4 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts @@ -1,4 +1,4 @@ -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Inject, Component } from '@angular/core'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts index 5b6db04b5..b7c05c29f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts @@ -1,9 +1,12 @@ + +import {merge as observableMerge, of as observableOf, Observable } from 'rxjs'; + +import {switchMap, startWith, map, takeUntil } from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort, PageEvent } from '@angular/material'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { DatasetListingModel } from '../../../../core/model/dataset/dataset-listing'; @@ -24,9 +27,9 @@ import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-i }) export class DatasetProfileListingComponent extends BaseComponent implements OnInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DatasetProfileCriteriaComponent) criteria: DatasetProfileCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; + @ViewChild(DatasetProfileCriteriaComponent, { static: true }) criteria: DatasetProfileCriteriaComponent; breadCrumbs: Observable; dataSource: DatasetDataSource | null; @@ -70,7 +73,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI this.criteria.setCriteria(this.getDefaultCriteria()); this.refresh(); this.criteria.setRefreshCallback(() => this.refresh()); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.language.instant('NAV-BAR.DATASET-TEMPLATES'), url: '/dataset-profiles' @@ -80,7 +83,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI } setDmpTitle(dmpId: String) { - this.dmpService.getSingle(dmpId).map(data => data as DmpModel) + this.dmpService.getSingle(dmpId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.titlePrefix = data.label; @@ -140,9 +143,9 @@ export class DatasetDataSource extends DataSource { //this._sort.matSortChange ]; - return Observable.merge(...displayDataChanges) - .startWith(null) - .switchMap(() => { + return observableMerge(...displayDataChanges).pipe( + startWith(null), + switchMap(() => { const startIndex = this._paginator.pageIndex * this._paginator.pageSize; let fields: Array = new Array(); if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; } @@ -153,7 +156,7 @@ export class DatasetDataSource extends DataSource { request.criteria.allVersions = true; } return this._service.getPaged(request); - }) + }), /*.catch((error: any) => { this._snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, @@ -163,14 +166,14 @@ export class DatasetDataSource extends DataSource { //this._criteria.criteria.onCallbackError(error); return Observable.of(null); })*/ - .map(result => { + map(result => { return result; - }) - .map(result => { + }), + map(result => { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } return result.data; - }); + }),); } disconnect() { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts index a8daf5820..97ea7d06d 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileService } from '../../../../core/services/dataset-profile/dataset-profile.service'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts index 0254b95a0..f56b1843f 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts @@ -1,9 +1,12 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { AfterViewInit, Component, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { takeUntil } from 'rxjs/operators'; import { environment } from '../../../../../environments/environment'; import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../../core/common/base/base.component'; @@ -16,7 +19,6 @@ import { SnackBarNotificationLevel, UiNotificationService } from '../../../../co import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service'; import { DmpProfileEditorModel, DmpProfileFieldEditorModel } from './dmp-profile-editor.model'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; -import { Observable } from 'rxjs'; import { DmpProfileExternalAutoCompleteFieldDataEditorModel } from './external-autocomplete/dmp-profile-external-autocomplete-field-editor.model'; @Component({ @@ -53,7 +55,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie if (this.dmpProfileId != null) { this.isNew = false; - this.dmpProfileService.getSingle(this.dmpProfileId).map(data => data as DmpProfile) + this.dmpProfileService.getSingle(this.dmpProfileId).pipe(map(data => data as DmpProfile)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.dmpProfileModel = new DmpProfileEditorModel().fromModel(data); @@ -62,7 +64,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie this.formGroup.disable(); this.viewOnly = true } - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DmpProfileListingComponent', label: this.language.instant('NAV-BAR.TEMPLATE'), url: '/dmp-profiles/' + this.dmpProfileId @@ -74,7 +76,7 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie this.formGroup = this.dmpProfileModel.buildForm(); this.addField(); }); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DmpProfileListingComponent', label: this.language.instant('NAV-BAR.TEMPLATE'), url: '/dmp-profiles/' + this.dmpProfileId diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts index 0846e2896..42a7dfa61 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts @@ -1,4 +1,4 @@ -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Inject, Component } from '@angular/core'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts index 466097b9e..ee81e6432 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts @@ -5,7 +5,7 @@ import { DmpCriteria } from '../../../../../core/query/dmp/dmp-criteria'; import { DmpProfileCriteria } from '../../../../../core/query/dmp/dmp-profile-criteria'; import { BaseCriteriaComponent } from '../../../../misc/criteria/base-criteria.component'; import { DialodConfirmationUploadDmpProfiles } from './dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { DmpProfileService } from '../../../../../core/services/dmp/dmp-profile.service'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts index 4353d5e7f..856548bc0 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts @@ -1,10 +1,14 @@ + +import {merge as observableMerge, of as observableOf, Observable } from 'rxjs'; + +import {map, switchMap, startWith, takeUntil } from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSnackBar, MatSort, PageEvent } from '@angular/material'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DmpProfileListing } from '../../../../core/model/dmp-profile/dmp-profile-listing'; import { DmpProfileCriteria } from '../../../../core/query/dmp/dmp-profile-criteria'; @@ -20,9 +24,9 @@ import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-i }) export class DmpProfileListingComponent extends BaseComponent implements OnInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DmpProfileCriteriaComponent) criteria: DmpProfileCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; + @ViewChild(DmpProfileCriteriaComponent, { static: true }) criteria: DmpProfileCriteriaComponent; dataSource: DatasetDataSource | null; displayedColumns: String[] = ['label', 'status', 'created']; @@ -54,7 +58,7 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit this.criteria.setCriteria(this.getDefaultCriteria()); this.refresh(); this.criteria.setRefreshCallback(() => this.refresh()); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.languageService.instant('NAV-BAR.DMP-TEMPLATES'), url: '/dmp-profiles' @@ -101,16 +105,16 @@ export class DatasetDataSource extends DataSource { //this._sort.matSortChange ]; - return Observable.merge(...displayDataChanges) - .startWith(null) - .switchMap(() => { + return observableMerge(...displayDataChanges).pipe( + startWith(null), + switchMap(() => { const startIndex = this._paginator.pageIndex * this._paginator.pageSize; let fields: Array = new Array(); if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; } const request = new DataTableRequest(startIndex, this._paginator.pageSize, { fields: fields }); request.criteria = this._criteria.criteria; return this._service.getPaged(request); - }) + }), /*.catch((error: any) => { this._snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, @@ -120,14 +124,14 @@ export class DatasetDataSource extends DataSource { //this._criteria.criteria.onCallbackError(error); return Observable.of(null); })*/ - .map(result => { + map(result => { return result; - }) - .map(result => { + }), + map(result => { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } return result.data; - }); + }),); } disconnect() { diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts index 13b8e43bd..36e12bdad 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts @@ -1,8 +1,13 @@ + +import {of as observableOf, merge as observableMerge, Observable } from 'rxjs'; + +import {map, catchError, switchMap, startWith} from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSnackBar, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSort } from '@angular/material/sort'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { UserListingModel } from '../../../../core/model/user/user-listing'; import { UserCriteria } from '../../../../core/query/user/user-criteria'; import { UserService } from '../../../../core/services/user/user.service'; @@ -41,28 +46,28 @@ export class UsersDataSource extends DataSource { // this._paginator.pageIndex = 0; //}) - return Observable.merge(...displayDataChanges) - .startWith(null) - .switchMap(() => { + return observableMerge(...displayDataChanges).pipe( + startWith(null), + switchMap(() => { const startIndex = this._paginator.pageIndex * this._paginator.pageSize; let fields: Array = new Array(); if (this._sort.active) { fields = this._sort.direction === 'asc' ? ['+' + this._sort.active] : ['-' + this._sort.active]; } const request = new DataTableRequest(startIndex, this._paginator.pageSize, { fields: fields }); request.criteria = this._criteria.getFormData(); return this._service.getPaged(request); - }) - .catch((error: any) => { + }), + catchError((error: any) => { this._snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, duration: 3000, }); this._criteria.onCallbackError(error); - return Observable.of(null); - }) - .map(result => { + return observableOf(null); + }), + map(result => { return result; - }) - .map(result => { + }), + map(result => { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } //result.data.forEach((element: any) => { @@ -75,7 +80,7 @@ export class UsersDataSource extends DataSource { // element.roles = roles; //}); return result.data; - }); + }),); } disconnect() { @@ -90,9 +95,9 @@ export class UsersDataSource extends DataSource { }) export class UserListingComponent implements OnInit, AfterViewInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(UserCriteriaComponent) criteria: UserCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; + @ViewChild(UserCriteriaComponent, { static: true }) criteria: UserCriteriaComponent; breadCrumbs: Observable; dataSource: UsersDataSource | null; @@ -107,7 +112,7 @@ export class UserListingComponent implements OnInit, AfterViewInit { } ngOnInit() { - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.languageService.instant('NAV-BAR.USERS-BREADCRUMB'), url: "/users" diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index 7d7a429f4..a6d966ea7 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -1,7 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {mergeMap, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; import { RecentActivityType } from '../../core/common/enum/recent-activity-type'; import { DashboardStatisticsModel } from '../../core/model/dashboard/dashboard-statistics-model'; @@ -24,7 +27,6 @@ import { DatasetService } from '../../core/services/dataset/dataset.service'; import { ExploreDatasetCriteriaModel } from '../../core/query/explore-dataset/explore-dataset-criteria'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; -import { Observable } from 'rxjs'; @Component({ selector: 'app-dashboard', @@ -90,7 +92,7 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC // }; const breadCrumbs = []; - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); if (!this.isAuthenticated()) { this.dashboardService.getStatistics() @@ -109,9 +111,9 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC }); } - this.filteredOptions = this.searchControl.valueChanges.flatMap(x => { + this.filteredOptions = this.searchControl.valueChanges.pipe(mergeMap(x => { return this.searchBarService.search(x); - }); + })); } public isAuthenticated(): boolean { diff --git a/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts b/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts index 74b8cde91..b0a82ffca 100644 --- a/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts @@ -2,7 +2,7 @@ import { BaseComponent } from "../../../core/common/base/base.component"; import { OnInit, Component } from "@angular/core"; import { Router, ActivatedRoute } from "@angular/router"; import { TranslateService } from "@ngx-translate/core"; -import { MatSnackBar } from "@angular/material"; +import { MatSnackBar } from "@angular/material/snack-bar"; @Component({ selector: 'app-quick-wizard-create-add-component', diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index b0c2f0250..5ff771ebb 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -10,7 +10,7 @@ import { Router } from '@angular/router'; import { Principal } from '../../../core/model/auth/Principal'; import { TranslateService } from '@ngx-translate/core'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { BaseComponent } from '../../../core/common/base/base.component'; import { UiNotificationService, SnackBarNotificationLevel } from '../../../core/services/notification/ui-notification-service'; diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts index f20537d92..573e0ef20 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts @@ -1,12 +1,14 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, FormArray } from '@angular/forms'; -import { MatStepper, MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatStepper } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { BaseComponent } from '../../core/common/base/base.component'; import { QuickWizardService } from '../../core/services/quick-wizard/quick-wizard.service'; import { DatasetCreateWizardModel } from './dataset-create-wizard.model'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { SnackBarNotificationLevel, UiNotificationService } from '../../core/services/notification/ui-notification-service'; @@ -22,14 +24,14 @@ import { ConfirmationDialogComponent } from '../../library/confirmation-dialog/c }) export class DatasetCreateWizard extends BaseComponent implements OnInit, IBreadCrumbComponent { breadCrumbs: Observable; - @ViewChild(DatasetEditorWizardComponent) datasetEditorWizardComponent: DatasetEditorWizardComponent; + @ViewChild(DatasetEditorWizardComponent, { static: false }) datasetEditorWizardComponent: DatasetEditorWizardComponent; isLinear = false; isNew = true; formGroup: FormGroup; datasetCreateWizardModel: DatasetCreateWizardModel; - @ViewChild('stepper') stepper: MatStepper; + @ViewChild('stepper', { static: true }) stepper: MatStepper; constructor( private router: Router, @@ -46,7 +48,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit, IBread this.datasetCreateWizardModel = new DatasetCreateWizardModel(); this.formGroup = this.datasetCreateWizardModel.buildForm(); this.language.get('NAV-BAR.DATASET-DESCRIPTION-WIZARD').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: 'Dashboard', label: x, diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts index 9736f9d4b..5cd431fe7 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dmp-selector/dataset-dmp-selector.component.ts @@ -1,25 +1,23 @@ -import { Component, OnInit, ViewChild, Input } from '@angular/core'; -import { BaseComponent } from '../../../core/common/base/base.component'; -import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; + +import { Component, Input, OnInit } from '@angular/core'; +import { FormArray, FormControl, FormGroup } from '@angular/forms'; +import { MatStepper } from '@angular/material/stepper'; +import { ActivatedRoute, Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; -import { MatStepper, MatSnackBar } from '@angular/material'; -import { FormGroup, FormArray } from '@angular/forms'; -import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; -import { takeUntil } from 'rxjs/operators'; -import { RequestItem } from '../../../core/query/request-item'; -import { DmpCriteria } from '../../../core/query/dmp/dmp-criteria'; -import { Params, ActivatedRoute, Router } from '@angular/router'; -import { DatasetProfileCriteria } from '../../../core/query/dataset-profile/dataset-profile-criteria'; -import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; -import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; -import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; -import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; -import { DatasetWizardService } from '../../../core/services/dataset-wizard/dataset-wizard.service'; -import { TranslateService } from '@ngx-translate/core'; -import { DmpService } from '../../../core/services/dmp/dmp.service'; -import { FormControl } from '@angular/forms/src/model'; +import { map, takeUntil } from 'rxjs/operators'; +import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpStatus } from '../../../core/common/enum/dmp-status'; +import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; +import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; +import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; +import { DatasetProfileCriteria } from '../../../core/query/dataset-profile/dataset-profile-criteria'; +import { DmpCriteria } from '../../../core/query/dmp/dmp-criteria'; +import { RequestItem } from '../../../core/query/request-item'; +import { DatasetWizardService } from '../../../core/services/dataset-wizard/dataset-wizard.service'; +import { DmpService } from '../../../core/services/dmp/dmp.service'; +import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; +import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; +import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; @Component({ selector: 'dataset-dmp-selector-component', @@ -79,8 +77,8 @@ export class DatasetDmpSelector extends BaseComponent implements OnInit, IBreadC dmpDataTableRequest.criteria.status = DmpStatus.Draft; dmpDataTableRequest.criteria.like = query; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete") - .map(y => y.data); + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").pipe( + map(y => y.data)); } loadDatasetProfiles() { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts index 6ac820ac8..8457cd3e6 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts @@ -1,5 +1,7 @@ + +import {map} from 'rxjs/operators'; import { Component } from "@angular/core"; -import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { SingleAutoCompleteConfiguration } from "../../../../library/auto-complete/single/single-auto-complete-configuration"; import { Observable } from "rxjs"; import { DataTableRequest } from "../../../../core/model/data-table/data-table-request"; @@ -57,19 +59,19 @@ export class DatasetCopyDialogueComponent { const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = query; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").map(x => x.data); + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").pipe(map(x => x.data)); } datasetProfileValidate() { - return this.dmpService.getSingle(this.data.formControl.value.id).map(result => result as DmpModel) - .map(result => { + return this.dmpService.getSingle(this.data.formControl.value.id).pipe(map(result => result as DmpModel), + map(result => { this.dmpModel = result this.dmpModel.profiles.forEach((element) => { if (element.id == this.data.datasetProfileId) { this.data.datasetProfileExist = true; } }) - }); + }),); } getErrorMessage() { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 8653f846d..4d0433a42 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -1,11 +1,15 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, catchError, takeUntil } from 'rxjs/operators'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { MatDialog, MatSnackBar, MatStepper } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @@ -40,7 +44,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr breadCrumbs: Observable; viewOnly = false; - @ViewChild('stepper') stepper: MatStepper; + @ViewChild('stepper', { static: false }) stepper: MatStepper; editMode = false; publicMode = false; @@ -109,7 +113,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr .subscribe(data => { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.needsUpdate(); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.datasetWizardModel.label, @@ -140,11 +144,11 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr error => { this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.MESSAGES.DATAESET-NOT-FOUND'), SnackBarNotificationLevel.Error); this.router.navigate(['/plans']); - return Observable.of(null); + return observableOf(null); }); } else if (dmpId != null) { this.isNew = true; - this.dmpService.getSingle(dmpId).map(data => data as DmpModel) + this.dmpService.getSingle(dmpId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.datasetWizardModel = new DatasetWizardEditorModel(); @@ -158,7 +162,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.registerFormListeners(); // this.availableProfiles = data.profiles; - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), @@ -186,7 +190,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.formGroup = this.datasetWizardModel.buildForm(); this.formGroup.get('id').setValue(null); - this.dmpService.getSingle(newDmpId).map(data => data as DmpModel) + this.dmpService.getSingle(newDmpId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { setTimeout(() => { @@ -194,7 +198,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.formGroup.get('dmp').setValue(this.datasetWizardModel.dmp); this.loadDatasetProfiles(); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), @@ -226,12 +230,12 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr } else if (this.publicId != null) { // For Finalized -> Public Datasets this.isNew = false; this.datasetWizardService.getSinglePublic(this.publicId) - .pipe(takeUntil(this._destroyed)) - .catch((error: any) => { + .pipe(takeUntil(this._destroyed)).pipe( + catchError((error: any) => { this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error); this.router.navigate(['/explore']); - return Observable.of(null); - }) + return observableOf(null); + })) .subscribe(data => { if (data) { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); @@ -246,7 +250,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr const breadcrumbs = []; breadcrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: '/explore' }); breadcrumbs.push({ parentComponentName: null, label: this.datasetWizardModel.label, url: '/datasets/publicEdit/' + this.datasetWizardModel.id }); - this.breadCrumbs = Observable.of(breadcrumbs); + this.breadCrumbs = observableOf(breadcrumbs); } }); this.publicMode = true; @@ -256,7 +260,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr .subscribe(data => { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.needsUpdate(); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), @@ -294,7 +298,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr //if (this.viewOnly) { this.formGroup.disable(); } // For future use, to make Dataset edit like DMP. this.registerFormListeners(); this.dmpValueChanged(null); - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('DATASET-LISTING.ACTIONS.CREATE-NEW').toUpperCase(), @@ -349,7 +353,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = query; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").map(x => x.data); + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete").pipe(map(x => x.data)); } loadDatasetProfiles() { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index d68a70254..a3c3f31c9 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormArray, FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts index 450c3fb39..dc1f802b1 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalDataRepositoryService } from '../../../../../../core/services/external-sources/data-repository/extternal-data-repository.service'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts index 2f9a97d9e..7d91c8498 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalDatasetService } from '../../../../../../core/services/external-sources/dataset/external-dataset.service'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts index bfdb4e797..32341d400 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalRegistryService } from '../../../../../../core/services/external-sources/registry/external-registry.service'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts index ac12d5369..7f9d22ace 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../../core/common/base/base.component'; import { ExternalServiceService } from '../../../../../../core/services/external-sources/service/external-service.service'; diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts index c25d3a896..cfcee2add 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts @@ -1,39 +1,38 @@ -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; -import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; -import { ExternalSourceItemModel } from '../../../../core/model/external-sources/external-source-item'; -import { DatasetCriteria } from '../../../../core/query/dataset/dataset-criteria'; -import { TagCriteria } from '../../../../core/query/tag/tag-criteria'; -import { ExternalSourcesService } from '../../../../core/services/external-sources/external-sources.service'; -import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service'; -import { RequestItem } from '../../../../core/query/request-item'; -import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component'; -import { DmpCriteria } from '../../../../core/query/dmp/dmp-criteria'; -import { DmpService } from '../../../../core/services/dmp/dmp.service'; -import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; -import { DataTableData } from '../../../../core/model/data-table/data-table-data'; -import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; -import { Input } from '@angular/core'; -import { MatDialog, MatSnackBar } from '@angular/material'; -import { DatasetUploadDialogue } from './dataset-upload-dialogue/dataset-upload-dialogue.component'; -import { takeUntil } from 'rxjs/operators'; -import { reserveSlots } from '@angular/core/src/render3/instructions'; -import { DatasetWizardService } from '../../../../core/services/dataset-wizard/dataset-wizard.service'; -import { ViewChild } from '@angular/core'; -import { UiNotificationService, SnackBarNotificationLevel } from '../../../../core/services/notification/ui-notification-service'; + +import { Component, Input, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; -import { MultipleAutoCompleteConfiguration } from '../../../../library/auto-complete/multiple/multiple-auto-complete-configuration'; -import { OrganisationCriteria } from '../../../../core/query/organisation/organisation-criteria'; -import { OrganisationService } from '../../../../core/services/organisation/organisation.service'; -import { GrantCriteria } from '../../../../core/query/grant/grant-criteria'; -import { GrantService } from '../../../../core/services/grant/grant.service'; -import { UserCriteria } from '../../../../core/query/user/user-criteria'; -import { UserService } from '../../../../core/services/user/user.service'; +import { Observable } from 'rxjs'; +import { map, takeUntil } from 'rxjs/operators'; +import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; +import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; +import { DataTableData } from '../../../../core/model/data-table/data-table-data'; +import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; +import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; +import { ExternalSourceItemModel } from '../../../../core/model/external-sources/external-source-item'; import { DatasetProfileCriteria } from '../../../../core/query/dataset-profile/dataset-profile-criteria'; +import { DatasetCriteria } from '../../../../core/query/dataset/dataset-criteria'; +import { DmpCriteria } from '../../../../core/query/dmp/dmp-criteria'; +import { GrantCriteria } from '../../../../core/query/grant/grant-criteria'; +import { OrganisationCriteria } from '../../../../core/query/organisation/organisation-criteria'; +import { RequestItem } from '../../../../core/query/request-item'; +import { TagCriteria } from '../../../../core/query/tag/tag-criteria'; +import { UserCriteria } from '../../../../core/query/user/user-criteria'; +import { DatasetWizardService } from '../../../../core/services/dataset-wizard/dataset-wizard.service'; import { DatasetService } from '../../../../core/services/dataset/dataset.service'; +import { DmpService } from '../../../../core/services/dmp/dmp.service'; +import { ExternalSourcesService } from '../../../../core/services/external-sources/external-sources.service'; +import { GrantService } from '../../../../core/services/grant/grant.service'; +import { SnackBarNotificationLevel, UiNotificationService } from '../../../../core/services/notification/ui-notification-service'; +import { OrganisationService } from '../../../../core/services/organisation/organisation.service'; +import { UserService } from '../../../../core/services/user/user.service'; +import { EnumUtils } from '../../../../core/services/utilities/enum-utils.service'; +import { MultipleAutoCompleteConfiguration } from '../../../../library/auto-complete/multiple/multiple-auto-complete-configuration'; +import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component'; +import { DatasetUploadDialogue } from './dataset-upload-dialogue/dataset-upload-dialogue.component'; @Component({ selector: 'app-dataset-criteria-component', @@ -65,43 +64,43 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O tagsAutoCompleteConfiguration = { filterFn: this.filterTags.bind(this), - initialItems: (excludedItems: any[]) => this.filterTags('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterTags('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; datasetTemplateAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterDatasetTemplate.bind(this), - initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['description'] }; dmpAutoCompleteConfiguration = { - filterFn: (x, excluded) => this.filterDmps(x).map(x => x.data), - initialItems: (extraData) => this.filterDmps('').map(x => x.data), + filterFn: (x, excluded) => this.filterDmps(x).pipe(map(x => x.data)), + initialItems: (extraData) => this.filterDmps('').pipe(map(x => x.data)), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterCollaborators.bind(this), - initialItems: (excludedItems: any[]) => this.filterCollaborators('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterCollaborators('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), - initialItems: (excludedItems: any[]) => this.filterGrant('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterGrant('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; organisationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -200,7 +199,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const datasetTemplateRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); datasetTemplateRequestItem.criteria = new DatasetProfileCriteria(); datasetTemplateRequestItem.criteria.like = query; - return this.datasetService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data); + return this.datasetService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).pipe(map(x => x.data)); } filterDmps(value: string): Observable> { @@ -218,7 +217,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPaged(grantRequestItem, "autocomplete").map(x => x.data); + return this.grantService.getPaged(grantRequestItem, "autocomplete").pipe(map(x => x.data)); } filterOrganisations(value: string) { @@ -227,7 +226,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchInternalOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchInternalOrganisations(dataTableRequest).pipe(map(x => x.data)); } filterCollaborators(query: string) { @@ -236,7 +235,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const collaboratorsRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); collaboratorsRequestItem.criteria = new UserCriteria(); collaboratorsRequestItem.criteria.collaboratorLike = query; - return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).map(x => x.data); + return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).pipe(map(x => x.data)); } fileImport(event) { @@ -256,8 +255,8 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O this.datasetWizardService.uploadXml(result.fileList, result.datasetTitle, result.dmpId, result.datasetProfileId) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => this.onCallbackSuccess(), - error => this.onCallbackError(error) + complete => this.onCallbackSuccess(), + error => this.onCallbackError(error) ); } }) diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts index eb3d34ed1..d4aeef786 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts @@ -1,5 +1,7 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Inject, OnInit } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Observable } from 'rxjs'; import { DataTableData } from '../../../../../core/model/data-table/data-table-data'; import { DmpListingModel } from '../../../../../core/model/dmp/dmp-listing'; @@ -10,7 +12,6 @@ import { ValidationErrorModel } from '../../../../../common/forms/validation/err import { BaseCriteriaComponent } from '../../../../misc/criteria/base-criteria.component'; import { DmpModel } from '../../../../../core/model/dmp/dmp'; import { DatasetProfileModel } from '../../../../../core/model/dataset/dataset-profile'; -import { takeUntil } from 'rxjs/operators'; import { DatasetWizardService } from '../../../../../core/services/dataset-wizard/dataset-wizard.service'; import { RequestItem } from '../../../../../core/query/request-item'; import { DatasetProfileCriteria } from '../../../../../core/query/dataset-profile/dataset-profile-criteria'; @@ -31,8 +32,8 @@ export class DatasetUploadDialogue extends BaseCriteriaComponent implements OnIn availableProfiles: DatasetProfileModel[] = []; dmpAutoCompleteConfiguration = { - filterFn: (x, excluded) => this.filterDmps(x).map(x => x.data), - initialItems: (extraData) => this.filterDmps('').map(x => x.data), + filterFn: (x, excluded) => this.filterDmps(x).pipe(map(x => x.data)), + initialItems: (extraData) => this.filterDmps('').pipe(map(x => x.data)), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; 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 0cd581f27..2092b99ae 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 @@ -1,7 +1,9 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort, PageEvent } from '@angular/material'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; @@ -22,9 +24,9 @@ import { DatasetStatus } from '../../../core/common/enum/dataset-status'; }) export class DatasetListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(DatasetCriteriaComponent, { static: true }) criteria: DatasetCriteriaComponent; breadCrumbs: Observable; @@ -60,7 +62,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB this.criteria.setCriteria(this.getDefaultCriteria(dmp)); this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'DmpEditorComponent', label: dmp.label, url: '/plans/edit/' + this.dmpId @@ -72,7 +74,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB this.criteria.setCriteria(this.getDefaultCriteria()); this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: "/datasets" diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts index 4629561db..f9c8bd81d 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts @@ -1,13 +1,15 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { DmpWizardEditorModel } from '../wizard/dmp-wizard-editor.model'; import { FormGroup } from '@angular/forms'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DmpModel } from '../../../core/model/dmp/dmp'; import { TranslateService } from '@ngx-translate/core'; import { DmpService } from '../../../core/services/dmp/dmp.service'; -import { Observable } from 'rxjs'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { UiNotificationService, SnackBarNotificationLevel } from '../../../core/services/notification/ui-notification-service'; @@ -48,7 +50,7 @@ export class DmpCloneComponent extends BaseComponent implements OnInit { .pipe(takeUntil(this._destroyed)) .subscribe((params: Params) => { this.itemId = params['id']; - this.dmpService.getSingle(this.itemId).map(data => data as DmpModel) + this.dmpService.getSingle(this.itemId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.dmp = new DmpWizardEditorModel(); @@ -72,7 +74,7 @@ export class DmpCloneComponent extends BaseComponent implements OnInit { const breadCrumbs = []; breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DMPS'), url: "/plans" }); breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/plans/clone/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); }); } diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts index 1647a569d..08d3940aa 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { ExternalResearcherService } from '../../../../core/services/external-sources/researcher/external-researcher.service'; 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 bb653a32d..98272ef85 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 @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileModel } from '../../../../core/model/dataset/dataset-profile'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index f0b415685..cf0edf5d4 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -1,11 +1,14 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit, ViewContainerRef } from '@angular/core'; import { FormGroup, FormControl, FormArray, AbstractControl } from '@angular/forms'; -import { MatDialog, MatSnackBar } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpStatus } from '../../../core/common/enum/dmp-status'; @@ -102,7 +105,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC if (itemId != null) { this.isNew = false; if (tabToNav == "datasetDescriptions") this.selectedTab = 2 - this.dmpService.getSingle(itemId).map(data => data as DmpModel) + this.dmpService.getSingle(itemId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(async data => { this.dmp = new DmpEditorModel(); @@ -131,7 +134,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC // notFoundResolver: [await this.grantService.getSingle(this.dmp.grant.id).map(x => ({ label: x.label, url: '/grants/edit/' + x.id }) as BreadcrumbItem).toPromise()] } ); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); } this.associatedUsers = data.associatedUsers; this.people = data.users; @@ -139,7 +142,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC } else if (publicId != null) { this.isNew = false; this.isPublic = true; - this.dmpService.getSinglePublic(publicId).map(data => data as DmpModel) + this.dmpService.getSinglePublic(publicId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(async data => { this.dmp = new DmpEditorModel(); @@ -154,7 +157,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC const breadcrumbs = []; breadcrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC-DMPS').toUpperCase(), url: '/plans' }); breadcrumbs.push({ parentComponentName: null, label: this.dmp.label, url: '/plans/publicEdit/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadcrumbs); + this.breadCrumbs = observableOf(breadcrumbs); // this.breadCrumbs = Observable.of([ // { // parentComponentName: 'DmpListingComponent', @@ -175,7 +178,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC this.registerFormEventsForNewItem(); if (this.isAuthenticated) { this.language.get('NAV-BAR.MY-DMPS').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: x, @@ -205,7 +208,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC } registerFormEventsForNewItem() { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: 'DmpListingComponent', label: this.language.instant('NAV-BAR.MY-DMPS'), @@ -218,7 +221,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC let fields: Array = new Array(); var request = new DataTableRequest(0, 10, { fields: fields }); request.criteria = new DmpProfileCriteria(); - return this.dmpProfileService.getPaged(request).map(x => x.data); + return this.dmpProfileService.getPaged(request).pipe(map(x => x.data)); } // searchGrant(query: string) { diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts index 1e52540cd..9708fff9a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetStatus } from '../../../../core/common/enum/dataset-status'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts index d5dcb8a95..dff382cfd 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts @@ -1,8 +1,9 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { DatasetProfileModel } from '../../../../core/model/dataset/dataset-profile'; @@ -72,7 +73,7 @@ export class GeneralTabComponent extends BaseComponent implements OnInit { this.profilesAutoCompleteConfiguration = { filterFn: this.filterProfiles.bind(this), - initialItems: (excludedItems: any[]) => this.filterProfiles('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['description'] @@ -80,7 +81,7 @@ export class GeneralTabComponent extends BaseComponent implements OnInit { this.organisationsAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'], subtitleFn: (item) => item ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['tag'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') @@ -88,7 +89,7 @@ export class GeneralTabComponent extends BaseComponent implements OnInit { this.researchersAutoCompleteConfiguration = { filterFn: this.filterResearchers.bind(this), - initialItems: (excludedItems: any[]) => this.filterResearchers('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterResearchers('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'], subtitleFn: (item) => item ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['tag'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') @@ -118,7 +119,7 @@ export class GeneralTabComponent extends BaseComponent implements OnInit { let fields: Array = new Array(); var request = new DataTableRequest(0, 10, { fields: fields }); request.criteria = new DmpProfileCriteria(); - return this.dmpProfileService.getPaged(request).map(x => x.data); + return this.dmpProfileService.getPaged(request).pipe(map(x => x.data)); } // onCallbackSuccess(): void { diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts index 941bb915d..33678428f 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Principal } from '../../../../core/model/auth/Principal'; import { UserInfoListingModel } from '../../../../core/model/user/user-info-listing'; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts index 1f72b3798..ed144faf8 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts @@ -1,10 +1,12 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatChipInputEvent, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatChipInputEvent } from '@angular/material/chips'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpInvitation } from '../../../core/model/dmp/invitation/dmp-invitation'; import { DmpInvitationUser } from '../../../core/model/dmp/invitation/dmp-invitation-user'; @@ -36,7 +38,7 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni usersAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterUsers.bind(this), - initialItems: (excludedItems: any[]) => this.filterUsers('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterUsers('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item.name, titleFn: (item) => item.name }; diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts index 482edba58..88b4a0940 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts @@ -1,8 +1,9 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; -import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../../common/forms/validation/error-model/validation-error-model'; import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { GrantListingModel } from '../../../../core/model/grant/grant-listing'; @@ -46,14 +47,14 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni collaboratorsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterCollaborators.bind(this), - initialItems: (excludedItems: any[]) => this.filterCollaborators('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterCollaborators('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; datasetTemplateAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterDatasetTemplate.bind(this), - initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['description'] @@ -61,14 +62,14 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), - initialItems: (excludedItems: any[]) => this.filterGrant('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterGrant('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; organisationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -140,7 +141,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPaged(grantRequestItem, "autocomplete").map(x => x.data); + return this.grantService.getPaged(grantRequestItem, "autocomplete").pipe(map(x => x.data)); } filterOrganisations(value: string) { @@ -151,7 +152,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchInternalOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchInternalOrganisations(dataTableRequest).pipe(map(x => x.data)); } filterCollaborators(query: string) { @@ -160,7 +161,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni const collaboratorsRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); collaboratorsRequestItem.criteria = new UserCriteria(); collaboratorsRequestItem.criteria.collaboratorLike = query; - return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).map(x => x.data); + return this.userService.getCollaboratorsPaged(collaboratorsRequestItem).pipe(map(x => x.data)); } filterDatasetTemplate(query: string) { @@ -169,7 +170,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni const datasetTemplateRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); datasetTemplateRequestItem.criteria = new DatasetProfileCriteria(); datasetTemplateRequestItem.criteria.like = query; - return this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data); + return this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).pipe(map(x => x.data)); } fileSave(event) { diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts index 6e6101276..9a9dd31ad 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DmpService } from '../../../../../core/services/dmp/dmp.service'; @Component({ 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 8ab68e0a3..c12a22c0d 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 @@ -1,7 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatDialog, MatPaginator, MatSort } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; @@ -23,11 +26,11 @@ import { TranslateService } from '@ngx-translate/core'; }) export class DmpListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DmpCriteriaComponent) criteria: DmpCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(DmpCriteriaComponent, { static: true }) criteria: DmpCriteriaComponent; - breadCrumbs: Observable = Observable.of([{ parentComponentName: null, label: 'DMPs', url: "/plans" }]); + breadCrumbs: Observable = observableOf([{ parentComponentName: null, label: 'DMPs', url: "/plans" }]); itemId: string; grantId: string; showGrant: boolean; @@ -78,7 +81,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread // else this.language.get('NAV-BAR.MY-DMPS').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: x, diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts index e1069718b..d0bd76246 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component'; import { Router, ActivatedRoute } from '@angular/router'; import { GrantListingModel } from '../../../../core/model/grant/grant-listing'; diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index 9e0f1d821..ff15a9094 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -1,9 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DatasetStatus } from '../../../core/common/enum/dataset-status'; @@ -33,7 +34,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { isFinalized = false; isPublicView = true; hasPublishButton: boolean = true; - breadCrumbs: Observable = Observable.of(); + breadCrumbs: Observable = observableOf(); constructor( private route: ActivatedRoute, @@ -65,7 +66,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { const breadCrumbs = []; breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DMPS'), url: "/plans" }); breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/plans/overview/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }) } else if (publicId != null) { @@ -79,7 +80,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { const breadCrumbs = []; breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC-DMPS'), url: "/explore-plans" }); breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/plans/publicOverview/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); } }); diff --git a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts index edef9da14..10d9901b8 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts @@ -1,10 +1,12 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DmpModel } from '../../../core/model/dmp/dmp'; @@ -46,7 +48,7 @@ export class DmpWizardComponent extends BaseComponent implements OnInit, IBreadC .pipe(takeUntil(this._destroyed)) .subscribe((params: Params) => { this.itemId = params['id']; - this.dmpService.getSingle(this.itemId).map(data => data as DmpModel) + this.dmpService.getSingle(this.itemId).pipe(map(data => data as DmpModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.dmp = new DmpWizardEditorModel(); @@ -68,7 +70,7 @@ export class DmpWizardComponent extends BaseComponent implements OnInit, IBreadC const breadCrumbs = []; breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DMPS'), url: "/plans" }); breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/plans/clone/' + this.dmp.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); }); } diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts index 550487887..f62972f4e 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts @@ -1,10 +1,11 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileModel } from '../../../../core/model/dataset/dataset-profile'; import { ExternalSourceItemModel } from '../../../../core/model/external-sources/external-source-item'; @@ -72,21 +73,21 @@ export class DmpWizardEditorComponent extends BaseComponent implements OnInit { this.profilesAutoCompleteConfiguration = { filterFn: this.filterProfiles.bind(this), - initialItems: (excludedItems: any[]) => this.filterProfiles('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; this.organisationsAutoCompleteConfiguration = { filterFn: this.filterOrganisations.bind(this), - initialItems: (excludedItems: any[]) => this.filterOrganisations('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterOrganisations('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; this.researchersAutoCompleteConfiguration = { filterFn: this.filterResearchers.bind(this), - initialItems: (excludedItems: any[]) => this.filterResearchers('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterResearchers('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts index 196132600..5d1d7c131 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts @@ -1,7 +1,9 @@ import { SelectionModel } from '@angular/cdk/collections'; import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms'; -import { MatPaginator, MatSnackBar, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @@ -20,9 +22,9 @@ import { DatasetCriteriaComponent } from '../../../dataset/listing/criteria/data }) export class DmpWizardDatasetListingComponent extends BaseComponent implements OnInit { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent; + @ViewChild(MatPaginator, { static: false }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(DatasetCriteriaComponent, { static: false }) criteria: DatasetCriteriaComponent; titlePrefix: String; diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts index 07cf35a9f..8dd78e956 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts @@ -1,5 +1,8 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild, ɵConsole } from '@angular/core'; -import { MatPaginator, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { Router, ActivatedRoute, Params } from '@angular/router'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; @@ -9,7 +12,6 @@ import { ExploreDatasetCriteriaModel } from '../../core/query/explore-dataset/ex import { DatasetService } from '../../core/services/dataset/dataset.service'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; -import { Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { DmpService } from '../../core/services/dmp/dmp.service'; import { DatasetCriteriaComponent } from '../dataset/listing/criteria/dataset-criteria.component'; @@ -24,8 +26,8 @@ import { DatasetCriteria } from '../../core/query/dataset/dataset-criteria'; }) export class ExploreDatasetListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; totalCount: number; listingItems: DatasetListingModel[] = []; @@ -78,7 +80,7 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" }) - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); } refresh(resetPages = false) { diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts index d50a69234..718f7baea 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filter-item/explore-dataset-filter-item.component.ts @@ -1,9 +1,11 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {distinctUntilChanged, debounceTime, takeUntil } from 'rxjs/operators'; import { SelectionModel } from '@angular/cdk/collections'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatListOption, MatSelectionList } from '@angular/material'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { MatListOption, MatSelectionList } from '@angular/material/list'; import { BaseComponent } from '../../../../core/common/base/base.component'; @Component({ @@ -26,7 +28,7 @@ export class ExploreDatasetFilterItemComponent extends BaseComponent implements filterOptions: (value) => Observable; @Input() - options: Observable = Observable.of([]); + options: Observable = observableOf([]); @Input() displayTitleFunc: (value) => string; @@ -44,14 +46,14 @@ export class ExploreDatasetFilterItemComponent extends BaseComponent implements private selectedOptions: any[] = []; - @ViewChild('optionsList') selectionList: MatSelectionList; + @ViewChild('optionsList', { static: true }) selectionList: MatSelectionList; constructor() { super(); } ngOnInit(): void { if (!this.multipleSelect) { this.selectionList.selectedOptions = new SelectionModel(this.multipleSelect); } - this.optionSearchControl.valueChanges.debounceTime(this.requestDelay) - .distinctUntilChanged() + this.optionSearchControl.valueChanges.pipe(debounceTime(this.requestDelay), + distinctUntilChanged(),) .pipe(takeUntil(this._destroyed)) .subscribe(x => { if (this.filterOptions) { this.options = this.filterOptions(x); } }); } diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts index 0b167651b..3b4115f32 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts @@ -1,8 +1,11 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { MatAccordion } from '@angular/material'; +import { MatAccordion } from '@angular/material/expansion'; import { ActivatedRoute, Params } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { BaseComponent } from '../../../core/common/base/base.component'; import { GrantStateType } from '../../../core/common/enum/grant-state-type'; import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; @@ -28,7 +31,6 @@ import { ExploreDmpCriteriaModel } from '../../../core/query/explore-dmp/explore import { DmpModel } from '../../../core/model/dmp/dmp'; import { BaseCriteriaComponent } from '../../misc/criteria/base-criteria.component'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; -import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'app-explore-dataset-filters-component', @@ -49,7 +51,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI grantOptions: Observable; grantStateOptions: Observable; filteringOrganisationsAsync = false; - @ViewChild('facetAccordion') accordion: MatAccordion; + @ViewChild('facetAccordion', { static: false }) accordion: MatAccordion; displayGrantStateValue = (option) => option['value']; displayGrantStateLabel = (option) => option['label']; @@ -65,14 +67,14 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI tagsAutoCompleteConfiguration = { filterFn: this.filterTags.bind(this), - initialItems: (excludedItems: any[]) => this.filterTags('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + initialItems: (excludedItems: any[]) => this.filterTags('').pipe(map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] }; dmpAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { - filterFn: (x, excluded) => this.filterDmps(x).map(x => x.data), - initialItems: (extraData) => this.filterDmps('').map(x => x.data), + filterFn: (x, excluded) => this.filterDmps(x).pipe(map(x => x.data)), + initialItems: (extraData) => this.filterDmps('').pipe(map(x => x.data)), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; @@ -80,8 +82,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), initialItems: (excludedItems: any[]) => - this.filterGrant('') - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.filterGrant('').pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] } @@ -89,8 +91,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI profileAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterProfile.bind(this), initialItems: (excludedItems: any[]) => - this.getProfiles() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.getProfiles().pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; @@ -98,8 +100,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI organizationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisation.bind(this), initialItems: (excludedItems: any[]) => - this.getOrganisations() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.getOrganisations().pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -117,7 +119,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI ngOnInit() { setTimeout(x => { - this.grantStateOptions = Observable.of( + this.grantStateOptions = observableOf( [ { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE'), value: GrantStateType.Finished }, { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE'), value: GrantStateType.OnGoing }, @@ -135,7 +137,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI this.facetCriteria.grantStatus = event.value; if (event.value === 'null') { this.facetCriteria.grantStatus = null; - this.grants = Observable.of([]); + this.grants = observableOf([]); this.facetCriteria.grants = []; } // if (event.option.selected) { @@ -151,7 +153,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria.grantStateType = this.facetCriteria.grantStatus; dataTableRequest.criteria['length'] = 10; - this.grants = this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + this.grants = this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); this.facetCriteria.grants = []; } this.facetCriteriaChange.emit(this.facetCriteria); @@ -199,7 +201,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = ''; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } public dmpOrganisationChanged(event: any) { @@ -226,7 +228,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria = grantCriteria; //const dataTableRequest: RequestItem = { criteria: grantCriteria }; //return this.grantService.getPaged(dataTableRequest, "autocomplete").map(x => x.data); - return this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + return this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); } public dmpOrganisationSearch(value: string): Observable { @@ -331,7 +333,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPublicPaged(grantRequestItem).map(x => x.data); + return this.grantService.getPublicPaged(grantRequestItem).pipe(map(x => x.data)); } filterProfile(query: string) { @@ -341,7 +343,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI profileRequestItem.criteria = new ExploreDatasetCriteriaModel(); profileRequestItem.criteria.like = query; - return this.dmpService.getPublicPaged(profileRequestItem, "listing").map(x => x.data); + return this.dmpService.getPublicPaged(profileRequestItem, "listing").pipe(map(x => x.data)); } filterOrganisation(value: string) { @@ -352,6 +354,6 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } } diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts index 505b5bd24..5be70ac9f 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts @@ -1,9 +1,11 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {distinctUntilChanged, debounceTime, takeUntil } from 'rxjs/operators'; import { SelectionModel } from '@angular/cdk/collections'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatListOption, MatSelectionList } from '@angular/material'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { MatListOption, MatSelectionList } from '@angular/material/list'; import { BaseComponent } from '../../../../core/common/base/base.component'; @Component({ @@ -21,7 +23,7 @@ export class ExploreDmpFilterItemComponent extends BaseComponent implements OnIn @Input() filterOptions: (value) => Observable; @Input() - options: Observable = Observable.of([]); + options: Observable = observableOf([]); @Input() displayTitleFunc: (value) => string; @Input() @@ -35,14 +37,14 @@ export class ExploreDmpFilterItemComponent extends BaseComponent implements OnIn optionSearchControl = new FormControl(''); private selectedOptions: any[] = []; - @ViewChild('optionsList') selectionList: MatSelectionList; + @ViewChild('optionsList', { static: true }) selectionList: MatSelectionList; constructor() { super(); } ngOnInit(): void { if (!this.multipleSelect) { this.selectionList.selectedOptions = new SelectionModel(this.multipleSelect); } - this.optionSearchControl.valueChanges.debounceTime(this.requestDelay) - .distinctUntilChanged() + this.optionSearchControl.valueChanges.pipe(debounceTime(this.requestDelay), + distinctUntilChanged(),) .pipe(takeUntil(this._destroyed)) .subscribe(x => { if (this.filterOptions) { this.options = this.filterOptions(x); } }); } diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts index 657872315..fa7b3abfa 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts @@ -1,10 +1,14 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core"; import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; -import { MatAccordion, fadeInItems, MatGridTileHeaderCssMatStyler } from "@angular/material"; +import { MatAccordion } from "@angular/material/expansion"; +import { MatGridTileHeaderCssMatStyler } from "@angular/material/grid-list"; +import { fadeInItems } from "@angular/material/menu"; import { ActivatedRoute } from "@angular/router"; import { TranslateService } from "@ngx-translate/core"; -import { Observable } from "rxjs"; -import { takeUntil } from "rxjs/operators"; import { ValidationErrorModel } from "../../../common/forms/validation/error-model/validation-error-model"; import { GrantStateType } from '../../../core/common/enum/grant-state-type'; import { DataTableRequest } from "../../../core/model/data-table/data-table-request"; @@ -50,7 +54,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements Active: string; Inactive: string; - @ViewChild('facetAccordion') accordion: MatAccordion; + @ViewChild('facetAccordion', { static: false }) accordion: MatAccordion; displayGrantStateValue = (option) => option['value']; displayGrantStateLabel = (option) => option['label']; @@ -67,8 +71,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements profileAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterProfile.bind(this), initialItems: (excludedItems: any[]) => - this.getProfiles() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.getProfiles().pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] }; @@ -76,8 +80,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements organizationAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterOrganisation.bind(this), initialItems: (excludedItems: any[]) => - this.getOrganisations() - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.getOrganisations().pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['name'], titleFn: (item) => item['name'] } @@ -85,8 +89,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements grantAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterGrant.bind(this), initialItems: (excludedItems: any[]) => - this.filterGrant('') - .map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), + this.filterGrant('').pipe( + map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] } @@ -111,7 +115,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements ngOnInit() { setTimeout(x => { - this.grantStateOptions = Observable.of( + this.grantStateOptions = observableOf( [ { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE'), value: GrantStateType.Finished }, { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE'), value: GrantStateType.OnGoing }, @@ -120,7 +124,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements this.profiles = this.datasetProfileService.getDatasetProfiles(); const fields: Array = new Array(); fields.push('asc'); - this.dmpOrganisations = this.organisationService.searchPublicOrganisations(new DataTableRequest(0, null, { fields: fields })).map(x => x.data); + this.dmpOrganisations = this.organisationService.searchPublicOrganisations(new DataTableRequest(0, null, { fields: fields })).pipe(map(x => x.data)); } ngAfterViewInit(): void { @@ -150,7 +154,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = grantCriteria; - return this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + return this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); } grantStatusChanged(event) { @@ -160,7 +164,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements // if (!event.source.checked) { if (event.value === 'null') { this.facetCriteria.grantStatus = null; - this.grants = Observable.of([]); + this.grants = observableOf([]); this.facetCriteria.grants = []; } // if (event.checked) { @@ -174,7 +178,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements dataTableRequest.criteria.grantStateType = this.facetCriteria.grantStatus; dataTableRequest.criteria['length'] = 10; - this.grants = this.grantService.getPublicPaged(dataTableRequest).map(x => x.data); + this.grants = this.grantService.getPublicPaged(dataTableRequest).pipe(map(x => x.data)); this.facetCriteria.grants = []; } this.facetCriteriaChange.emit(this.facetCriteria); @@ -274,7 +278,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } removeOrganisation(organisation) { @@ -292,7 +296,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const dataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = ''; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } filterGrant(query: string) { @@ -301,7 +305,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements const grantRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; - return this.grantService.getPublicPaged(grantRequestItem).map(x => x.data); + return this.grantService.getPublicPaged(grantRequestItem).pipe(map(x => x.data)); } filterProfile(query: string) { @@ -311,7 +315,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements profileRequestItem.criteria = new ExploreDatasetCriteriaModel(); profileRequestItem.criteria.like = query; - return this.dmpService.getPublicPaged(profileRequestItem, "listing").map(x => x.data); + return this.dmpService.getPublicPaged(profileRequestItem, "listing").pipe(map(x => x.data)); } filterOrganisation(value: string) { @@ -322,7 +326,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements dataTableRequest.criteria = new OrganisationCriteria(); dataTableRequest.criteria.labelLike = value; - return this.organisationService.searchPublicOrganisations(dataTableRequest).map(x => x.data); + return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } displayLabel(value) { diff --git a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts index 1e32b2e17..6a3068e67 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts @@ -1,5 +1,8 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from "@angular/core"; -import { MatPaginator, MatSort } from "@angular/material"; +import { MatPaginator } from "@angular/material/paginator"; +import { MatSort } from "@angular/material/sort"; import { Router, ActivatedRoute } from "@angular/router"; import { takeUntil } from "rxjs/operators"; import { BaseComponent } from "../../core/common/base/base.component"; @@ -7,7 +10,6 @@ import { DataTableRequest } from "../../core/model/data-table/data-table-request import { DmpListingModel } from "../../core/model/dmp/dmp-listing"; import { ExploreDmpCriteriaModel } from "../../core/query/explore-dmp/explore-dmp-criteria"; import { DmpService } from "../../core/services/dmp/dmp.service"; -import { Observable } from "rxjs"; import { IBreadCrumbComponent } from "../misc/breadcrumb/definition/IBreadCrumbComponent"; import { BreadcrumbItem } from "../misc/breadcrumb/definition/breadcrumb-item"; import { TranslateService } from "@ngx-translate/core"; @@ -19,8 +21,8 @@ import { TranslateService } from "@ngx-translate/core"; }) export class ExploreDmpListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; exploreDmpCriteriaModel: ExploreDmpCriteriaModel; titlePrefix: string; @@ -46,7 +48,7 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit, label: this.language.instant('NAV-BAR.PUBLIC-DMPS'), url: "/explore-plans" }) - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); } refresh() { diff --git a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts index a893eb3d7..04358f8b7 100644 --- a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts +++ b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts @@ -1,10 +1,13 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {map, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatDialog, MatSnackBar } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from '../../../core/common/base/base.component'; @@ -26,7 +29,7 @@ import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/ }) export class GrantEditorComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); + breadCrumbs: Observable = observableOf([]); isNew = true; grant: GrantEditorModel; formGroup: FormGroup = null; @@ -55,7 +58,7 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea if (itemId != null) { this.isNew = false; - this.grantService.getSingle(itemId).map(data => data as GrantListingModel) + this.grantService.getSingle(itemId).pipe(map(data => data as GrantListingModel)) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.grant = new GrantEditorModel().fromModel(data); @@ -71,11 +74,11 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea label: this.grant.label, url: '/grants/edit/' + this.grant.id }); - this.breadCrumbs = Observable.of(breadCrumbs); + this.breadCrumbs = observableOf(breadCrumbs); }); } else { this.language.get('QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.CREATE-NEW-GRANT').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: null, label: this.language.instant('NAV-BAR.GRANTS').toUpperCase(), diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts index 2e6906705..7f960926a 100644 --- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts +++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.ts @@ -5,7 +5,7 @@ import { ValidationErrorModel } from '../../../../common/forms/validation/error- import { GrantStateType } from '../../../../core/common/enum/grant-state-type'; import { GrantCriteria } from '../../../../core/query/grant/grant-criteria'; import { BaseCriteriaComponent } from '../../../misc/criteria/base-criteria.component'; -import { ErrorStateMatcher } from '@angular/material'; +import { ErrorStateMatcher } from '@angular/material/core'; @Component({ selector: 'app-grant-criteria-component', diff --git a/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts b/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts index 966bbb642..75716efba 100644 --- a/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts +++ b/dmp-frontend/src/app/ui/grant/listing/grant-listing.component.ts @@ -1,7 +1,9 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort } from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import { Router, ActivatedRoute, Params } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; @@ -20,9 +22,9 @@ import { TranslateService } from '@ngx-translate/core'; }) export class GrantListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - @ViewChild(MatPaginator) _paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(GrantCriteriaComponent) criteria: GrantCriteriaComponent; + @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; + @ViewChild(MatSort, { static: false }) sort: MatSort; + @ViewChild(GrantCriteriaComponent, { static: true }) criteria: GrantCriteriaComponent; breadCrumbs: Observable; totalCount: number; @@ -43,7 +45,7 @@ export class GrantListingComponent extends BaseComponent implements OnInit, IBre this.refresh(); this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages)); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: null, label: this.language.instant('NAV-BAR.GRANTS').toUpperCase(), url: '/grants' diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts index c0cff89a4..b84757738 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts @@ -1,6 +1,9 @@ + +import {of as observableOf, Observable } from 'rxjs'; + +import {filter, mergeMap, distinctUntilChanged, map} from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { BreadcrumbItem } from './definition/breadcrumb-item'; import { BreadCrumbResolverService } from './service/breadcrumb.service'; import { TranslateService } from '@ngx-translate/core'; @@ -11,10 +14,10 @@ import { TranslateService } from '@ngx-translate/core'; styleUrls: ['./breadcrumb.component.scss'] }) export class BreadcrumbComponent implements OnInit { - breadcrumbs$ = this.router.events - .filter(event => event instanceof NavigationEnd) - .distinctUntilChanged() - .flatMap(event => this.buildBreadCrumb(this.activatedRoute.root)); + breadcrumbs$ = this.router.events.pipe( + filter(event => event instanceof NavigationEnd), + distinctUntilChanged(), + mergeMap(event => this.buildBreadCrumb(this.activatedRoute.root)),); constructor( @@ -30,15 +33,15 @@ export class BreadcrumbComponent implements OnInit { buildBreadCrumb(route: ActivatedRoute): Observable { if (this.breadCrumbService.resolve(route)) { - return this.breadCrumbService.resolve(route).map(x => { + return this.breadCrumbService.resolve(route).pipe(map(x => { x.unshift({ label: this.language.instant('NAV-BAR.HOME'), url: '/home', icon: 'dashboard' }); return x; - }); + })); } - return Observable.of([]); + return observableOf([]); } navigate(url, params) { diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts b/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts index ed6071b93..184a50a6a 100644 --- a/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts +++ b/dmp-frontend/src/app/ui/misc/breadcrumb/service/breadcrumb.service.ts @@ -1,6 +1,7 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Injectable, NgZone } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseService } from '../../../../core/common/base/base.service'; import { BreadcrumbItem } from '../definition/breadcrumb-item'; @@ -11,7 +12,7 @@ export class BreadCrumbResolverService extends BaseService { private activeComponents = []; private parentComponents = []; - private breadCrumbs: Observable = Observable.of([]); + private breadCrumbs: Observable = observableOf([]); constructor( private router: Router, private zone: NgZone @@ -25,7 +26,7 @@ export class BreadCrumbResolverService extends BaseService { public clear() { this.activeComponents.length = 0; - this.breadCrumbs = Observable.of([]); + this.breadCrumbs = observableOf([]); } public resolve(activatedRoute: ActivatedRoute): Observable { @@ -34,7 +35,7 @@ export class BreadCrumbResolverService extends BaseService { this.activeComponents.filter(x => routeComponents.indexOf(x.constructor.name) !== -1).forEach(x => { if (x.hasOwnProperty('breadCrumbs')) { const componentItems = this.resolveDependentComponents((x).breadCrumbs, []); - this.breadCrumbs = Observable.of(componentItems); + this.breadCrumbs = observableOf(componentItems); } }); return this.breadCrumbs; 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 160955cb6..95c618d6a 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 @@ -1,6 +1,7 @@ + +import {map, takeUntil } from 'rxjs/operators'; import { Component, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../../core/common/base/base.component'; import { DatasetProfileComboBoxType } from '../../../../../core/common/enum/dataset-profile-combo-box-type'; import { DatasetProfileFieldViewStyle } from '../../../../../core/common/enum/dataset-profile-field-view-style'; @@ -137,7 +138,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit { const datasetsAutocompleteRequestItem: DataTableRequest = new DataTableRequest(0, 25, { fields: fields }); datasetsAutocompleteRequestItem.criteria = new DatasetCriteria(); datasetsAutocompleteRequestItem.criteria.like = query; - return this.datasetService.getPaged(datasetsAutocompleteRequestItem).map(item => item.data); + return this.datasetService.getPaged(datasetsAutocompleteRequestItem).pipe(map(item => item.data)); } searchDmps(query: string) { @@ -145,7 +146,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit { const dmpsAutocompleteRequestItem: DataTableRequest = new DataTableRequest(0, 25, { fields: fields }); dmpsAutocompleteRequestItem.criteria = new DmpCriteria(); dmpsAutocompleteRequestItem.criteria.like = query; - return this.dmpService.getPaged(dmpsAutocompleteRequestItem).map(item => item.data); + return this.dmpService.getPaged(dmpsAutocompleteRequestItem).pipe(map(item => item.data)); } makeAutocompleteConfiguration(myfunc: Function, title: string, subtitle?: string): void { diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts index 0b873b888..771943929 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts @@ -1,8 +1,8 @@ -import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatStepper } from '@angular/material'; +import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute, Router } from '@angular/router'; -import 'rxjs/add/operator/switchMap'; + import { takeUntil } from 'rxjs/operators'; import { Pair } from '../../../common/types/pair'; import { BaseComponent } from '../../../core/common/base/base.component'; diff --git a/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts b/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts index bb566812a..fa4aa9f41 100644 --- a/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts +++ b/dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts @@ -32,11 +32,11 @@ export class HelpContentComponent extends BaseComponent implements OnInit { .pipe(takeUntil(this._destroyed)) .subscribe(event => { if (event instanceof NavigationStart) { - this._helpContentService.getActivePageContent(event['url']) - .pipe(takeUntil(this._destroyed)) - .subscribe( - pageContent => this.shiftThroughContent(pageContent), - error => this.handleError(error)); + // this._helpContentService.getActivePageContent(event['url']) + // .pipe(takeUntil(this._destroyed)) + // .subscribe( + // pageContent => this.shiftThroughContent(pageContent), + // error => this.handleError(error)); } }); } diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts index 50799203a..f3a288b66 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts @@ -1,9 +1,10 @@ + +import {mergeMap, distinctUntilChanged, debounceTime, takeUntil } from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../core/common/base/base.component'; import { AppRole } from '../../../core/common/enum/app-role'; import { SearchBarItem } from '../../../core/model/dashboard/search-bar-item'; @@ -59,9 +60,9 @@ export class NavigationComponent extends BaseComponent implements OnInit { titleFn: (item) => item['label'] }; - this.filteredOptions = this.searchControl.valueChanges.debounceTime(500).distinctUntilChanged().flatMap(x => { + this.filteredOptions = this.searchControl.valueChanges.pipe(debounceTime(500),distinctUntilChanged(),mergeMap(x => { return this.searchBarService.search(x); - }); + }),); } searchGrant(query: string) { diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts index cef11698d..1486663fa 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Principal } from '../../../../core/model/auth/Principal'; import { AuthService } from '../../../../core/services/auth/auth.service'; diff --git a/dmp-frontend/src/app/ui/misc/search/search.component.ts b/dmp-frontend/src/app/ui/misc/search/search.component.ts index 137eaf4d0..f12184af2 100644 --- a/dmp-frontend/src/app/ui/misc/search/search.component.ts +++ b/dmp-frontend/src/app/ui/misc/search/search.component.ts @@ -1,3 +1,5 @@ + +import {mergeMap, distinctUntilChanged, debounceTime} from 'rxjs/operators'; import { Component, OnInit } from "@angular/core"; import { AuthService } from '../../../core/services/auth/auth.service'; import { FormControl } from "@angular/forms"; @@ -25,9 +27,9 @@ export class SearchComponent implements OnInit { constructor(private authentication: AuthService, private router: Router, private searchBarService: SearchBarService) {} ngOnInit() { - this.filteredOptions = this.searchControl.valueChanges.debounceTime(500).distinctUntilChanged().flatMap(x => { + this.filteredOptions = this.searchControl.valueChanges.pipe(debounceTime(500),distinctUntilChanged(),mergeMap(x => { return this.searchBarService.search(x); - }); + }),); } public isAuthenticated(): boolean { diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts index 7a746226c..4bb6d9652 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts @@ -4,7 +4,7 @@ import { GENERAL_ROUTES, DMP_ROUTES, DATASETS_ROUTES } from '../sidebar/sidebar. import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common'; import { Router } from '@angular/router'; import { AuthService } from '../../core/services/auth/auth.service'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { UserDialogComponent } from '../misc/navigation/user-dialog/user-dialog.component'; import { AppRole } from '../../core/common/enum/app-role'; import { ProgressIndicationService } from '../../core/services/progress-indication/progress-indication-service'; diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts index 244c44097..7f4fbea97 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts @@ -1,9 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, Input, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from "../../../core/common/base/base.component"; import { DatasetProfileModel } from '../../../core/model/dataset/dataset-profile'; @@ -24,7 +25,7 @@ import { DmpEditorWizardModel } from './dmp-editor-wizard-model'; }) export class DmpEditorWizardComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); + breadCrumbs: Observable = observableOf([]); isNew = true; dmp: DmpEditorWizardModel; @@ -65,7 +66,7 @@ export class DmpEditorWizardComponent extends BaseComponent implements OnInit, I this.formGroup.get('label').setValue(this.language.instant('QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.SECOND-STEP.DMP-NAME') + this.dmpLabel); this.formGroup.get('label').setValue(this.language.instant('QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.SECOND-STEP.DMP-NAME') + this.dmpLabel); - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'grant', label: this.language.instant('NAV-BAR.DMP'), url: '/quick-wizard/dmp' diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts index 338a5b98e..cdfa6e73b 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts @@ -1,9 +1,10 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, Input, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatSnackBar } from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from "../../../core/common/base/base.component"; import { GrantCriteria } from '../../../core/query/grant/grant-criteria'; @@ -21,7 +22,7 @@ import { GrantEditorWizardModel } from './grant-editor-wizard-model'; styleUrls: ['./grant-editor-wizard.component.scss'] }) export class GrantEditorWizardComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); + breadCrumbs: Observable = observableOf([]); isNew = false; grant: GrantEditorWizardModel; @@ -42,7 +43,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, } ngOnInit() { - this.breadCrumbs = Observable.of([{ + this.breadCrumbs = observableOf([{ parentComponentName: 'QuickCreate', label: this.language.instant('NAV-BAR.GRANT'), url: '/quick-wizard/grant' diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index fcaddc47f..2edef3209 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -1,9 +1,12 @@ + +import {of as observableOf, Observable } from 'rxjs'; import { Component, OnInit, ViewChild } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatDialog, MatSnackBar, MatStepper } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { BaseComponent } from "../../../core/common/base/base.component"; @@ -29,9 +32,9 @@ import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model' }) export class QuickWizardEditorComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { - breadCrumbs: Observable = Observable.of([]); - @ViewChild('stepper') stepper: MatStepper; - @ViewChild(DatasetEditorWizardComponent) datasetEditorWizardComponent: DatasetEditorWizardComponent; + breadCrumbs: Observable = observableOf([]); + @ViewChild('stepper', { static: true }) stepper: MatStepper; + @ViewChild(DatasetEditorWizardComponent, { static: false }) datasetEditorWizardComponent: DatasetEditorWizardComponent; isNew = true; quickWizard: QuickWizardEditorWizardModel; allDatasets: DmpFinalizeDialogDataset[] = []; @@ -57,7 +60,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, this.quickWizard.project = new ProjectFormModel(); this.formGroup = this.quickWizard.buildForm(); this.language.get('NAV-BAR.DMP-WIZARD').pipe(takeUntil(this._destroyed)).subscribe(x => { - this.breadCrumbs = Observable.of([ + this.breadCrumbs = observableOf([ { parentComponentName: 'Dashboard', label: x, diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts index 8b680044f..4a0795f26 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-faq-dialog', diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts index b2d7c36e1..cdd4c3967 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-glossary-dialog', diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts index b3e69608a..ecc9546cf 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index bc45ba34f..4b7e6c281 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatDialog } from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { AuthService } from '../../core/services/auth/auth.service'; import { UserDialogComponent } from '../misc/navigation/user-dialog/user-dialog.component'; diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts index a25e82b14..a5e847417 100644 --- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts +++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts @@ -3,15 +3,15 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as moment from 'moment-timezone'; -import { takeUntil } from 'rxjs/operators'; -import { Observable } from 'rxjs/Rx'; +import { Observable, of } from 'rxjs'; +import { map, takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../core/common/base/base.component'; import { CultureInfo } from '../../core/model/culture-info'; +import { DmpModel } from '../../core/model/dmp/dmp'; import { UserListingModel } from '../../core/model/user/user-listing'; import { AuthService } from '../../core/services/auth/auth.service'; import { CultureService } from '../../core/services/culture/culture-service'; import { UserService } from '../../core/services/user/user.service'; -import { DmpModel } from '../../core/model/dmp/dmp'; const availableLanguages: any[] = require('../../../assets/resources/language.json'); @@ -47,7 +47,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes .subscribe((params: Params) => { this.currentUserId = this.authService.current().id; const userId = !params['id'] ? 'me' : params['id']; - this.user = this.userService.getUser(userId).map(result => { + this.user = this.userService.getUser(userId).pipe(map(result => { result['additionalinfo'] = JSON.parse(result['additionalinfo']); this.formGroup = new FormBuilder().group({ language: new FormControl(result['additionalinfo']['language'] ? availableLanguages.filter(x => x.value === result['additionalinfo']['language']['value']).pop() : '', [Validators.required]), @@ -63,7 +63,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes .subscribe(x => { if (x) { this.cultures = this._filterCulture(x); } }); this.formGroup.disable(); return result; - }); + })); }); } @@ -91,18 +91,18 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes private _filterTimezone(value: string): Observable { if (value && typeof value === 'string') { const filterValue = value.toLowerCase(); - return Observable.of(moment.tz.names().filter(option => option.toLowerCase().includes(filterValue))); + return of(moment.tz.names().filter(option => option.toLowerCase().includes(filterValue))); } else { - return Observable.of(moment.tz.names()); + return of(moment.tz.names()); } } private _filterCulture(value: string): Observable { if (value && typeof value === 'string') { const filterValue = value.toLowerCase(); - return Observable.of(this.cultureService.getCultureValues().filter(option => option.displayName.toLowerCase().includes(filterValue))); + return of(this.cultureService.getCultureValues().filter(option => option.displayName.toLowerCase().includes(filterValue))); } else { - return Observable.of(this.cultureService.getCultureValues()); + return of(this.cultureService.getCultureValues()); } } @@ -132,7 +132,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes this.authService.me() .pipe(takeUntil(this._destroyed)) .subscribe(result => this.router.navigate(['/profile'])); - // .subscribe(result => window.location.reload()); + // .subscribe(result => window.location.reload()); }, error => { console.log(error); diff --git a/dmp-frontend/src/polyfills.ts b/dmp-frontend/src/polyfills.ts index 1c0925f52..fa3cd0117 100644 --- a/dmp-frontend/src/polyfills.ts +++ b/dmp-frontend/src/polyfills.ts @@ -11,36 +11,20 @@ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. * - * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html + * Learn more in https://angular.io/guide/browser-support */ /*************************************************************************************************** - * BROWSER POLYFILLS - */ +* BROWSER POLYFILLS +*/ -/** IE9, IE10 and IE11 requires all of the following polyfills. **/ -import 'core-js/es6/symbol'; -import 'core-js/es6/object'; -import 'core-js/es6/function'; -import 'core-js/es6/parse-int'; -import 'core-js/es6/parse-float'; -import 'core-js/es6/number'; -import 'core-js/es6/math'; -import 'core-js/es6/string'; -import 'core-js/es6/date'; -import 'core-js/es6/array'; -import 'core-js/es7/array'; //for array.includes -import 'core-js/es6/regexp'; -import 'core-js/es6/map'; -import 'core-js/es6/weak-map'; -import 'core-js/es6/set'; +import 'core-js/es7/array'; /** IE10 and IE11 requires the following for NgClass support on SVG elements */ //import 'classlist.js'; // Run `npm install --save classlist.js`. /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; /** diff --git a/dmp-frontend/src/tsconfig.spec.json b/dmp-frontend/src/tsconfig.spec.json index 18bad40ed..c89454bef 100644 --- a/dmp-frontend/src/tsconfig.spec.json +++ b/dmp-frontend/src/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "outDir": "../out-tsc/spec", "baseUrl": "./", - "module": "commonjs", - "target": "es5", "types": [ "jasmine", "node" diff --git a/dmp-frontend/tsconfig.json b/dmp-frontend/tsconfig.json index c670a34f6..bfd2e9604 100644 --- a/dmp-frontend/tsconfig.json +++ b/dmp-frontend/tsconfig.json @@ -1,7 +1,9 @@ { "compilerOptions": { - "target": "es5", - "module": "commonjs", + "downlevelIteration": true, + "importHelpers": true, + "target": "es2015", + "module": "esnext", "moduleResolution": "node", "sourceMap": true, "emitDecoratorMetadata": true, diff --git a/dmp-frontend/tslint.json b/dmp-frontend/tslint.json index 4d352749b..b82bc955a 100644 --- a/dmp-frontend/tslint.json +++ b/dmp-frontend/tslint.json @@ -136,12 +136,12 @@ "app", "kebab-case" ], - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, + "no-inputs-metadata-property": true, + "no-outputs-metadata-property": true, + "no-host-metadata-property": true, "no-input-rename": true, "no-output-rename": true, - "use-life-cycle-interface": true, + "use-lifecycle-interface": true, "use-pipe-transform-interface": true, "component-class-suffix": true, "directive-class-suffix": true From 47f939af8146df3db722d1accf8331ad29d875fc Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Mon, 23 Sep 2019 11:22:27 +0300 Subject: [PATCH 012/161] minor fix --- .../listing/dataset-profile-listing.component.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts index b7c05c29f..ffa8c646b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts @@ -1,12 +1,11 @@ - -import {merge as observableMerge, of as observableOf, Observable } from 'rxjs'; - -import {switchMap, startWith, map, takeUntil } from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; import { Component, OnInit, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; +import { TranslateService } from '@ngx-translate/core'; +import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; +import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { DatasetListingModel } from '../../../../core/model/dataset/dataset-listing'; @@ -14,11 +13,9 @@ import { DmpModel } from '../../../../core/model/dmp/dmp'; import { DatasetProfileCriteria } from '../../../../core/query/dataset-profile/dataset-profile-criteria'; import { DatasetProfileService } from '../../../../core/services/dataset-profile/dataset-profile.service'; import { DmpService } from '../../../../core/services/dmp/dmp.service'; -import { DatasetProfileCriteriaComponent } from './criteria/dataset-profile.component'; -import { error } from 'selenium-webdriver'; -import { UiNotificationService, SnackBarNotificationLevel } from '../../../../core/services/notification/ui-notification-service'; -import { TranslateService } from '@ngx-translate/core'; +import { UiNotificationService } from '../../../../core/services/notification/ui-notification-service'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; +import { DatasetProfileCriteriaComponent } from './criteria/dataset-profile.component'; @Component({ selector: 'app-dataset-profile-listing-component', @@ -173,7 +170,7 @@ export class DatasetDataSource extends DataSource { if (!result) { return []; } if (this._paginator.pageIndex === 0) { this.totalCount = result.totalCount; } return result.data; - }),); + })); } disconnect() { From d0c464cb311b5e1c0530752f0c6460c65fa885b0 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Mon, 23 Sep 2019 12:11:00 +0300 Subject: [PATCH 013/161] Fixes various code missteps. --- .../eudat/data/dao/entities/DMPDaoImpl.java | 4 +- .../data/dao/entities/DatasetDaoImpl.java | 6 +-- .../dataset-wizard.component.ts | 40 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java index 9684373a5..5e527ebf7 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java @@ -70,14 +70,14 @@ public class DMPDaoImpl extends DatabaseAccess implements DMPDao { query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); } if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) { - query.where(((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()))); + query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates())); } query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue())); return query; } public QueryableList getAuthenticated(QueryableList query, UUID principal) { - query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user").get("id"), principal)); + query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal)); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java index fec0ab7cb..4d1fde4e6 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java @@ -52,9 +52,9 @@ public class DatasetDaoImpl extends DatabaseAccess implements DatasetDa if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) query.where((builder, root) -> root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) - query.where(((builder, root) -> root.get("profile").get("id").in(criteria.getDatasetTemplates()))); - query.where(((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue()))); - query.where(((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.CANCELED.getValue()))); + query.where((builder, root) -> root.get("profile").get("id").in(criteria.getDatasetTemplates())); + query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue())); + query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.CANCELED.getValue())); return query; } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 4d0433a42..08ca18cc3 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -1,7 +1,7 @@ -import {of as observableOf, Observable } from 'rxjs'; +import { of as observableOf, Observable } from 'rxjs'; -import {map, catchError, takeUntil } from 'rxjs/operators'; +import { map, catchError, takeUntil } from 'rxjs/operators'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; @@ -231,11 +231,11 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.isNew = false; this.datasetWizardService.getSinglePublic(this.publicId) .pipe(takeUntil(this._destroyed)).pipe( - catchError((error: any) => { - this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error); - this.router.navigate(['/explore']); - return observableOf(null); - })) + catchError((error: any) => { + this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error); + this.router.navigate(['/explore']); + return observableOf(null); + })) .subscribe(data => { if (data) { this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); @@ -407,17 +407,17 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardService.createDataset(this.formGroup.value) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { - this.datasetWizardService.getSingle(complete.id) - .pipe(takeUntil(this._destroyed)) - .subscribe( - result => { - this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(result); - } - ); - this.onCallbackSuccess(); - }, - error => this.onCallbackError(error) + complete => { + this.datasetWizardService.getSingle(complete.id) + .pipe(takeUntil(this._destroyed)) + .subscribe( + result => { + this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(result); + } + ); + this.onCallbackSuccess(); + }, + error => this.onCallbackError(error) ); } @@ -600,8 +600,8 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.datasetWizardService.delete(id) .pipe(takeUntil(this._destroyed)) .subscribe( - complete => { this.onCallbackSuccess(); this.router.navigateByUrl('/datasets') }, - error => this.onCallbackError(error) + complete => { this.onCallbackSuccess(); this.router.navigateByUrl('/datasets') }, + error => this.onCallbackError(error) ); } }); From 74ae77edbc9fd15e588a7d1458c1b7346f64f746 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 23 Sep 2019 14:06:58 +0300 Subject: [PATCH 014/161] Fixes bug on External References undo finalize. (Issue #162) --- .../single-auto-complete-configuration.ts | 2 + .../single-auto-complete.component.html | 1 + .../single/single-auto-complete.component.ts | 5 +++ .../dataset-wizard.component.html | 41 ++++++------------ .../dataset-wizard.component.ts | 25 ++++++----- .../dmp-listing-item.component.html | 2 +- dmp-frontend/src/assets/i18n/en.json | 1 + dmp-frontend/src/assets/scss/blue-theme.scss | 42 ++++++++++++------- .../src/assets/scss/material-dashboard.scss | 3 +- 9 files changed, 67 insertions(+), 55 deletions(-) diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts index 6628279f6..b893bfe9b 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete-configuration.ts @@ -22,6 +22,8 @@ export interface SingleAutoCompleteConfiguration { titleFn?: (item: any) => string; // Property formating for dropdown subtitleFn?: (item: any) => string; + // Property formating for icon on chip + iconFn?: (item: any) => string; //Extra data passed to query function extraData?: any; // Callback to intercept value assignment based on item selection diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html index 46fd53fe5..fb886bd5f 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.html @@ -1,6 +1,7 @@
+ {{_iconFn(value)}} {{_displayFn(value)}} cancel diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 1a49d15c1..0650c290f 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -137,6 +137,11 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< return null; } + _iconFn(item: any): string { + if (this.configuration.iconFn && item) { return this.configuration.iconFn(item); } + return null; + } + _requestDelay(): number { return this.configuration.requestDelay || this.requestDelay; } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index e402503ab..92394f152 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -12,27 +12,22 @@
- - - + -
@@ -47,14 +42,11 @@
- + - + {{profile.label}} @@ -71,8 +63,7 @@ {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.EXTERNAL-REFERENCES' | translate}} - + @@ -82,27 +73,21 @@ {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}} - +
+ info_outlined +
{{'DATASET-WIZARD.ACTIONS.INFO' | translate}}
- - + +
- +
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 4d0433a42..635f0bed9 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -1,7 +1,5 @@ - -import {of as observableOf, Observable } from 'rxjs'; - -import {map, catchError, takeUntil } from 'rxjs/operators'; +import { of as observableOf, Observable } from 'rxjs'; +import { map, catchError, takeUntil } from 'rxjs/operators'; import { Component, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; @@ -63,7 +61,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr profileUpdateId: string; downloadDocumentId: string; isLinear = false; - hasReversableStatus: boolean = false; constructor( private datasetWizardService: DatasetWizardService, @@ -92,8 +89,9 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.dmpAutoCompleteConfiguration = { filterFn: this.searchDmp.bind(this), initialItems: (extraData) => this.searchDmp(''), - displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + displayFn: (item) => (item['status'] ? this.language.instant('TYPES.DATASET-STATUS.FINALISED').toUpperCase() : this.language.instant('TYPES.DATASET-STATUS.DRAFT').toUpperCase()) + ': ' + item['label'], + titleFn: (item) => item['label'], + iconFn: (item) => item['status'] ? 'lock' : 'lock_open' }; const params = this.route.snapshot.params; @@ -137,9 +135,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.registerFormListeners(); // this.availableProfiles = this.datasetWizardModel.dmp.profiles; - if (this.formGroup.get('dmp').value.status == DmpStatus.Draft && this.formGroup.get('status').value == DatasetStatus.Finalized) { - this.hasReversableStatus = true; - } }, error => { this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.MESSAGES.DATAESET-NOT-FOUND'), SnackBarNotificationLevel.Error); @@ -433,8 +428,16 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr this.submit(); } + hasReversableStatus(): boolean { + return (this.formGroup.get('dmp').value.status == DmpStatus.Draft && this.formGroup.get('status').value == DatasetStatus.Finalized); + } + + hasNotReversableStatus(): boolean { + return (this.formGroup.get('dmp').value.status == DmpStatus.Finalized && this.formGroup.get('status').value == DatasetStatus.Finalized); + } + reverse() { - this.hasReversableStatus = false; + this.viewOnly = false; this.datasetWizardModel.status = DatasetStatus.Draft; setTimeout(x => { this.formGroup = null; }); setTimeout(x => { diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html index 2bdffd51c..e0ff36982 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html @@ -29,7 +29,7 @@
- lock + lock_open lock diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 889bc55ef..4125c87d7 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -415,6 +415,7 @@ "SAVE-AND-FINALISE": "Save and Finalize", "FINALIZE": "Finalize", "REVERSE": "Undo Finalization", + "INFO": "Datasets of finalized DMPs can't revert to unfinalized", "DOWNLOAD-PDF": "Download PDF", "DOWNLOAD-XML": "Download XML", "DOWNLOAD-DOCX": "Download DOCX", diff --git a/dmp-frontend/src/assets/scss/blue-theme.scss b/dmp-frontend/src/assets/scss/blue-theme.scss index d3a21dbd4..52e4e8d81 100644 --- a/dmp-frontend/src/assets/scss/blue-theme.scss +++ b/dmp-frontend/src/assets/scss/blue-theme.scss @@ -35,20 +35,34 @@ $app-blue-theme-primary-palette: ( ); $app-blue-theme-accent-palette: ( - 50: #fce4ec, - 100: #f8bbd0, - 200: #f48fb1, - 300: #f06292, - 400: #ec407a, - 500: #e91e63, - 600: #d81b60, - 700: #c2185b, - 800: #ad1457, - 900: #880e4f, - A100: #ff80ab, - A200: #ff4081, - A400: #f50057, - A700: #c51162, + 50 : #e0f6f3, + 100 : #b3e8e2, + 200 : #80d9cf, + 300 : #4dc9bc, + 400 : #26bead, + 500 : #00b29f, + 600 : #00ab97, + 700 : #00a28d, + 800 : #009983, + 900 : #008a72, + A100 : #b6fff0, + A200 : #83ffe6, + A400 : #50ffdc, + A700 : #36ffd7, + // 50: #fce4ec, + // 100: #f8bbd0, + // 200: #f48fb1, + // 300: #f06292, + // 400: #ec407a, + // 500: #e91e63, + // 600: #d81b60, + // 700: #c2185b, + // 800: #ad1457, + // 900: #880e4f, + // A100: #ff80ab, + // A200: #ff4081, + // A400: #f50057, + // A700: #c51162, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, diff --git a/dmp-frontend/src/assets/scss/material-dashboard.scss b/dmp-frontend/src/assets/scss/material-dashboard.scss index 03d5f6943..3ca0d9f37 100644 --- a/dmp-frontend/src/assets/scss/material-dashboard.scss +++ b/dmp-frontend/src/assets/scss/material-dashboard.scss @@ -22,7 +22,8 @@ // Define a theme. $custom-theme-primary: mat-palette($app-blue-theme-primary-palette, 900); -$custom-theme-accent: mat-palette($mat-pink, A200, A100, A400); +$custom-theme-accent: mat-palette($app-blue-theme-accent-palette); +// $custom-theme-accent: mat-palette($mat-pink, A200, A100, A400); $custom-theme-warn: mat-palette($mat-red); $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn); @include angular-material-theme($custom-theme); From 8a653ec198b34a03b97e0860754ed776bda3c846 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 23 Sep 2019 16:39:13 +0300 Subject: [PATCH 015/161] Fixes Dashboard bug on column status. (Issue #164) --- .../recent-edited-activity.component.html | 24 ++++++++++--------- .../recent-edited-activity.component.ts | 16 ++++++------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index fbadad74e..d509a1c6e 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -24,30 +24,32 @@ - + {{ activity.label }} -
- {{ dmpProfileDisplay(activity.profile) }} +
+ {{ activity.profile }}
+
--
{{ activity.grant }} - {{roleDisplay(activity.users)}} + {{ roleDisplay(activity.users)}} {{ activity.organisations }} - +
- {{ enumUtils.toDmpStatusString(activity.status) }} + {{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}}
- + {{ enumUtils.toDmpStatusString(activity.status) }} - {{ activity.modifiedTime | date: "shortDate" }} + + {{ enumUtils.toDmpStatusString(activity.status) }} + + {{ activity.modifiedTime | date: "shortDate" }} - diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 5ff771ebb..7599cb273 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -164,14 +164,14 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } } - dmpProfileDisplay(value: any) { - if (value != null) { - return value; - } - else { - return "--"; - } - } + // dmpProfileDisplay(value: any) { + // if (value != null) { + // return value; + // } + // else { + // return "--"; + // } + // } downloadXml(id: string) { this.dmpService.downloadXML(id) From 3f117d4a0f7173ecdd2d19ef40f7d3efb876fb0e Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 23 Sep 2019 17:17:31 +0300 Subject: [PATCH 016/161] Fixes dmp overview bug: makes clone and add new version and list all versions available when DMP in Finalized or Published state. (Issue #165) --- .../dmp/overview/dmp-overview.component.html | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) 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 53c8db754..22230de4e 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 @@ -9,35 +9,31 @@
- - - - - - - - - + + From 26f28bca5509f93080b03e2993413554841dc290 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Mon, 23 Sep 2019 18:11:29 +0300 Subject: [PATCH 017/161] Adds descending ordering and sorting by finalized date where published DMP is requested. --- dmp-frontend/src/app/ui/dashboard/dashboard.component.ts | 2 +- .../filters/explore-dataset-filters.component.ts | 2 +- .../src/app/ui/explore-dmp/explore-dmp-listing.component.ts | 4 +++- .../listing-item/explore-dmp-listing-item.component.html | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index a6d966ea7..545171545 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -148,7 +148,7 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC getPublicDmps() { const dmpCriteria = new ExploreDmpCriteriaModel(); const fields: Array = new Array(); - fields.push('asc'); + fields.push('-finalizedAt'); const dataTableRequest: DataTableRequest = new DataTableRequest(0, 2, { fields: fields }); dataTableRequest.criteria = dmpCriteria; return this.dmpService.getPublicPaged(dataTableRequest, "listing").pipe(takeUntil(this._destroyed)).subscribe(result => { this.dmpListingItems = result.data; }); diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts index 3b4115f32..bbf1867c4 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts @@ -306,7 +306,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI filterDmps(value: string): Observable> { const fields: Array = new Array(); - fields.push('asc'); + fields.push('-finalizedAt'); const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new ExploreDatasetCriteriaModel(); dmpDataTableRequest.criteria.like = value; diff --git a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts index 6a3068e67..1b1637f43 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.ts @@ -22,7 +22,7 @@ import { TranslateService } from "@ngx-translate/core"; export class ExploreDmpListingComponent extends BaseComponent implements OnInit, IBreadCrumbComponent { @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; - @ViewChild(MatSort, { static: false }) sort: MatSort; + sort = new MatSort(); exploreDmpCriteriaModel: ExploreDmpCriteriaModel; titlePrefix: string; @@ -37,6 +37,8 @@ export class ExploreDmpListingComponent extends BaseComponent implements OnInit, private language: TranslateService, ) { super(); + this.sort.direction = 'desc'; + this.sort.active = "publishedAt"; } ngOnInit() { diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html index 09001a03f..905d71de2 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html @@ -28,7 +28,7 @@
{{profile.label}}
-

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.creationTime | date: "shortDate"}}

+

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}

From 812891fed127a7db3ce91ace82bbae868a230b4b Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 24 Sep 2019 11:25:16 +0300 Subject: [PATCH 018/161] Fixes bug of Published DMP and Published Dataet Descriptions on filter "Dataset Specification" not searching properly. --- .../DataManagmentPlanPublicTableRequest.java | 8 ++-- .../eu/eudat/controllers/DatasetProfiles.java | 12 ++---- .../logic/managers/DatasetProfileManager.java | 5 +-- .../core/services/dataset/dataset.service.ts | 4 +- .../available-profiles.component.ts | 10 ++++- .../explore-dataset-filters.component.ts | 37 +++++++++---------- .../explore-dmp-filters.component.ts | 32 +++++++--------- 7 files changed, 51 insertions(+), 57 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java index bb2d08333..5e6a82bc8 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java @@ -29,10 +29,10 @@ public class DataManagmentPlanPublicTableRequest extends TableQuery root.get("profile").get("id").in(this.getCriteria().datasetProfile))); - if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty()) query - .where(((builder, root) -> root.join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations()))); + if (this.getCriteria().datasetProfile != null && !this.getCriteria().datasetProfile.isEmpty()) + query.where(((builder, root) -> root.get("profile").get("id").in(this.getCriteria().datasetProfile))); + if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty()) + query.where(((builder, root) -> root.join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations()))); return query; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java index 35375e148..372ad6b1d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java @@ -1,25 +1,19 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.DMP; import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; -import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException; import eu.eudat.logic.managers.DatasetProfileManager; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem; import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel; -import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.UUID; @RestController @@ -42,10 +36,10 @@ public class DatasetProfiles extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileAutocompleteItems)); } - @RequestMapping(method = RequestMethod.GET, value = {"/datasetprofiles/getAll"}, produces = "application/json") + @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/getAll"}, produces = "application/json") public @ResponseBody - ResponseEntity>> getAll() throws InstantiationException, IllegalAccessException { - List datasetProfileTableData = this.datasetProfileManager.getAll(); + ResponseEntity>> getAll(@RequestBody DatasetProfileTableRequestItem tableRequestItem) throws InstantiationException, IllegalAccessException { + List datasetProfileTableData = this.datasetProfileManager.getAll(tableRequestItem); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData)); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java index 32888ab1e..4d79f00c5 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java @@ -81,9 +81,8 @@ public class DatasetProfileManager { return apiContext.getOperationsContext().getBuilderFactory().getBuilder(DataTableDataBuilder.class).data(datasetProfiles).totalCount(items.count()).build(); } - public List getAll() throws IllegalAccessException, InstantiationException { - DatasetProfileCriteria criteria = new DatasetProfileCriteria(); - QueryableList items = databaseRepository.getDatasetProfileDao().getWithCriteria(criteria); + public List getAll(DatasetProfileTableRequestItem tableRequestItem) throws IllegalAccessException, InstantiationException { + QueryableList items = databaseRepository.getDatasetProfileDao().getWithCriteria(tableRequestItem.getCriteria()); List datasetProfiles = items.select(item -> new DatasetProfileListingModel().fromDataModel(item)); return datasetProfiles; } diff --git a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts index 920b644ba..d1b59d588 100644 --- a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts +++ b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts @@ -31,8 +31,8 @@ export class DatasetService { return this.http.get(this.actionUrl + 'makepublic/' + id); } - getDatasetProfiles(): Observable { - return this.http.get(environment.Server + 'datasetprofiles/getAll'); + getDatasetProfiles(dataTableRequest: DataTableRequest): Observable { + return this.http.post(environment.Server + 'datasetprofiles/getAll', dataTableRequest); } getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest) { 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 98272ef85..8045b1195 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 @@ -5,6 +5,8 @@ import { takeUntil } from 'rxjs/operators'; import { BaseComponent } from '../../../../core/common/base/base.component'; import { DatasetProfileModel } from '../../../../core/model/dataset/dataset-profile'; import { DatasetService } from '../../../../core/services/dataset/dataset.service'; +import { DataTableRequest } from "../../../../core/model/data-table/data-table-request"; +import { DatasetProfileCriteria } from "../../../../core/query/dataset-profile/dataset-profile-criteria"; @Component({ selector: 'app-available-profiles-component', @@ -24,7 +26,13 @@ export class AvailableProfilesComponent extends BaseComponent implements OnInit ngOnInit(): void { this.formGroup = this.data['profiles']; - this.datasetService.getDatasetProfiles() + const fields: Array = new Array(); + fields.push('asc'); + const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + profileRequestItem.criteria = new DatasetProfileCriteria(); + profileRequestItem.criteria.like = ''; + + this.datasetService.getDatasetProfiles(profileRequestItem) .pipe(takeUntil(this._destroyed)) .subscribe(data => { this.profiles = data; diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts index bbf1867c4..210461e33 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts @@ -1,10 +1,10 @@ -import {of as observableOf, Observable } from 'rxjs'; +import { of as observableOf, Observable } from 'rxjs'; -import {map, takeUntil } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { MatAccordion } from '@angular/material/expansion'; -import { ActivatedRoute, Params } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { BaseComponent } from '../../../core/common/base/base.component'; import { GrantStateType } from '../../../core/common/enum/grant-state-type'; @@ -19,7 +19,6 @@ import { ExternalSourcesService } from '../../../core/services/external-sources/ import { GrantService } from '../../../core/services/grant/grant.service'; import { RequestItem } from '../../../core/query/request-item'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; -import { AuthService } from '../../../core/services/auth/auth.service'; import { MultipleAutoCompleteConfiguration } from '../../../library/auto-complete/multiple/multiple-auto-complete-configuration'; import { DmpService } from '../../../core/services/dmp/dmp.service'; import { OrganisationCriteria } from '../../../core/query/organisation/organisation-criteria'; @@ -28,9 +27,7 @@ import { OrganizationModel } from '../../../core/model/organisation/organization import { DataTableData } from '../../../core/model/data-table/data-table-data'; import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; import { ExploreDmpCriteriaModel } from '../../../core/query/explore-dmp/explore-dmp-criteria'; -import { DmpModel } from '../../../core/model/dmp/dmp'; -import { BaseCriteriaComponent } from '../../misc/criteria/base-criteria.component'; -import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; +import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria"; @Component({ selector: 'app-explore-dataset-filters-component', @@ -91,7 +88,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI profileAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterProfile.bind(this), initialItems: (excludedItems: any[]) => - this.getProfiles().pipe( + this.filterProfile('').pipe( map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] @@ -114,18 +111,17 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI public languageService: TranslateService, public datasetProfileService: DatasetService, public externalSourcesService: ExternalSourcesService, - private authentication: AuthService, ) { super(); } ngOnInit() { - setTimeout(x => { + setTimeout(() => { this.grantStateOptions = observableOf( [ { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE'), value: GrantStateType.Finished }, { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE'), value: GrantStateType.OnGoing }, ]); }); - this.profiles = this.datasetProfileService.getDatasetProfiles(); + // this.profiles = this.datasetProfileService.getDatasetProfiles(); this.dmpOrganisations = this.externalSourcesService.searchDMPOrganizations(''); } @@ -186,9 +182,9 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI this.facetCriteriaChange.emit(this.facetCriteria); } - getProfiles() { - return this.datasetProfileService.getDatasetProfiles(); - } + // getProfiles() { + // return this.datasetProfileService.getDatasetProfiles(); + // } removeProfile(profile) { this.facetCriteria.datasetProfile.splice(this.facetCriteria.datasetProfile.indexOf(profile), 1); @@ -240,9 +236,9 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI this.facetCriteriaChange.emit(this.facetCriteria); } - public profileSearch(value: string) { - return this.datasetProfileService.getDatasetProfiles(); - } + // public profileSearch(value: string) { + // return this.datasetProfileService.getDatasetProfiles(); + // } public controlModified() { this.facetCriteriaChange.emit(this.facetCriteria); @@ -339,11 +335,12 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI filterProfile(query: string) { const fields: Array = new Array(); fields.push('asc'); - const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); - profileRequestItem.criteria = new ExploreDatasetCriteriaModel(); + const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + profileRequestItem.criteria = new DatasetProfileCriteria(); profileRequestItem.criteria.like = query; - return this.dmpService.getPublicPaged(profileRequestItem, "listing").pipe(map(x => x.data)); + return this.datasetProfileService.getDatasetProfiles(profileRequestItem); + // this.dmpService.getPublicPaged(profileRequestItem, "listing").pipe(map(x => x.data)); } filterOrganisation(value: string) { diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts index fa7b3abfa..791beda34 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts @@ -1,21 +1,16 @@ -import {of as observableOf, Observable } from 'rxjs'; +import { of as observableOf, Observable } from 'rxjs'; -import {map, takeUntil } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core"; -import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; import { MatAccordion } from "@angular/material/expansion"; -import { MatGridTileHeaderCssMatStyler } from "@angular/material/grid-list"; -import { fadeInItems } from "@angular/material/menu"; import { ActivatedRoute } from "@angular/router"; import { TranslateService } from "@ngx-translate/core"; import { ValidationErrorModel } from "../../../common/forms/validation/error-model/validation-error-model"; import { GrantStateType } from '../../../core/common/enum/grant-state-type'; import { DataTableRequest } from "../../../core/model/data-table/data-table-request"; import { DatasetProfileModel } from "../../../core/model/dataset/dataset-profile"; -import { ExternalSourceItemModel } from "../../../core/model/external-sources/external-source-item"; import { GrantListingModel } from "../../../core/model/grant/grant-listing"; -import { ExploreDatasetCriteriaModel } from "../../../core/query/explore-dataset/explore-dataset-criteria"; import { ExploreDmpCriteriaModel } from "../../../core/query/explore-dmp/explore-dmp-criteria"; import { GrantCriteria } from "../../../core/query/grant/grant-criteria"; import { DatasetService } from "../../../core/services/dataset/dataset.service"; @@ -27,6 +22,7 @@ import { BaseCriteriaComponent } from "../../misc/criteria/base-criteria.compone import { OrganizationModel } from "../../../core/model/organisation/organization"; import { OrganisationCriteria } from "../../../core/query/organisation/organisation-criteria"; import { OrganisationService } from "../../../core/services/organisation/organisation.service"; +import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria"; @Component({ selector: 'app-explore-dmp-filters-component', @@ -71,7 +67,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements profileAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterProfile.bind(this), initialItems: (excludedItems: any[]) => - this.getProfiles().pipe( + this.filterProfile('').pipe( map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1))), displayFn: (item) => item['label'], titleFn: (item) => item['label'] @@ -121,7 +117,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements { label: this.languageService.instant('FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE'), value: GrantStateType.OnGoing }, ]); }); - this.profiles = this.datasetProfileService.getDatasetProfiles(); + //this.profiles = this.datasetProfileService.getDatasetProfiles(); const fields: Array = new Array(); fields.push('asc'); this.dmpOrganisations = this.organisationService.searchPublicOrganisations(new DataTableRequest(0, null, { fields: fields })).pipe(map(x => x.data)); @@ -268,9 +264,9 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements this.facetCriteriaChange.emit(this.facetCriteria); } - profileSearch(value: string) { - return this.datasetProfileService.getDatasetProfiles(); - } + // profileSearch(value: string) { + // return this.datasetProfileService.getDatasetProfiles(); + // } dmpOrganisationSearch(value: string): Observable { const fields: Array = new Array(); @@ -286,9 +282,9 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements this.facetCriteriaChange.emit(this.facetCriteria); } - getProfiles() { - return this.datasetProfileService.getDatasetProfiles(); - } + // getProfiles() { + // return this.datasetProfileService.getDatasetProfiles(); + // } getOrganisations() { const fields: Array = new Array(); @@ -311,11 +307,11 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements filterProfile(query: string) { const fields: Array = new Array(); fields.push('asc'); - const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); - profileRequestItem.criteria = new ExploreDatasetCriteriaModel(); + const profileRequestItem: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + profileRequestItem.criteria = new DatasetProfileCriteria(); profileRequestItem.criteria.like = query; - return this.dmpService.getPublicPaged(profileRequestItem, "listing").pipe(map(x => x.data)); + return this.datasetProfileService.getDatasetProfiles(profileRequestItem); } filterOrganisation(value: string) { From f93b6103e98eb7fbb73060b110bde6b3bc8031c4 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 24 Sep 2019 12:28:13 +0300 Subject: [PATCH 019/161] Adds ordering on Published Dataset Descriptions listing (descending by published date). (Issue #174) --- .../java/eu/eudat/logic/managers/DatasetManager.java | 3 +++ .../models/data/listingmodels/DatasetListingModel.java | 9 +++++++++ .../src/app/core/model/dataset/dataset-listing.ts | 1 + .../explore-dataset-listing-item.component.html | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index 6ba300157..ab7ff1f5e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -141,6 +141,9 @@ public class DatasetManager { } else items.where((builder, root) -> root.get("id").in(new UUID[]{UUID.randomUUID()})); } + String[] strings = new String[1]; + strings[0] = "-dmp:publishedAt|join|"; + datasetTableRequest.getOrderings().setFields(strings); QueryableList pagedItems = PaginationManager.applyPaging(items, datasetTableRequest); DataTableData dataTable = new DataTableData<>(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java index 6aac4b997..d1cd16647 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java @@ -27,6 +27,7 @@ public class DatasetListingModel implements DataModel new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList())); this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList())); this.finalizedAt = entity.getFinalizedAt(); + this.dmpPublishedAt = entity.getDmp().getPublishedAt(); return this; } diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts index 80e0f931e..1776ab9be 100644 --- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts +++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts @@ -15,4 +15,5 @@ export interface DatasetListingModel { created: Date; modified: Date; finalizedAt: Date; + dmpPublishedAt?: Date; } diff --git a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html index 1c8b1ac04..4be537f20 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/listing-item/explore-dataset-listing-item.component.html @@ -32,7 +32,7 @@
{{ dataset.profile }}
-

{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{dataset.created | date: "shortDate"}}

+

{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{dataset.dmpPublishedAt | date: "shortDate"}}

- - +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index 4481729a3..e686e9644 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -128,7 +128,7 @@ export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent imp } hasDatasets() { - return (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0; + return this.formGroup.get('datasets').get('datasetsList').valid; } public isFormValid() { From 446717da97a283f777138c0289f080030c1123ce Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 25 Sep 2019 13:43:17 +0300 Subject: [PATCH 026/161] Adds "Creation User" on DataRepository, ExternalDataset, Registry, Service. (Issue #168) --- .../eudat/data/entities/DataRepository.java | 29 +++++++---------- .../eudat/data/entities/ExternalDataset.java | 20 +++++++----- .../java/eu/eudat/data/entities/Registry.java | 29 ++++++----------- .../java/eu/eudat/data/entities/Service.java | 31 +++++++------------ .../eudat/controllers/DataRepositories.java | 2 +- .../eudat/controllers/ExternalDatasets.java | 2 +- .../java/eu/eudat/controllers/Registries.java | 2 +- .../java/eu/eudat/controllers/Services.java | 2 +- .../logic/managers/DataRepositoryManager.java | 6 ++-- .../managers/ExternalDatasetManager.java | 5 +-- .../eudat/logic/managers/RegistryManager.java | 6 ++-- .../eudat/logic/managers/ServiceManager.java | 6 ++-- .../datarepository/DataRepositoryModel.java | 8 ++--- .../externaldataset/ExternalDatasetModel.java | 2 ++ .../models/data/registries/RegistryModel.java | 8 ++--- .../models/data/services/ServiceModel.java | 2 ++ ...itory_ExternalDataset_Registry_Service.sql | 11 +++++++ 17 files changed, 80 insertions(+), 91 deletions(-) create mode 100644 dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java index 9559d0490..0d9d7a893 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java @@ -36,11 +36,9 @@ public class DataRepository implements Serializable, DataEntity datasetDataRepositories; - @Column(name = "\"Status\"", nullable = false) private Short status; @@ -50,41 +48,35 @@ public class DataRepository implements Serializable, DataEntity getDatasetDataRepositories() { return datasetDataRepositories; } - public void setDatasetDataRepositories(Set datasetDataRepositories) { this.datasetDataRepositories = datasetDataRepositories; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(DataRepository entity) { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java index 51d5e474e..199bacff3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java @@ -40,10 +40,14 @@ public class ExternalDataset implements DataEntity { @OneToMany(mappedBy = "externalDataset", cascade = CascadeType.ALL, orphanRemoval = true) private Set datasets; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + + public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -51,7 +55,6 @@ public class ExternalDataset implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -59,7 +62,6 @@ public class ExternalDataset implements DataEntity { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -67,7 +69,6 @@ public class ExternalDataset implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -75,7 +76,6 @@ public class ExternalDataset implements DataEntity { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -83,7 +83,6 @@ public class ExternalDataset implements DataEntity { public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } @@ -91,16 +90,23 @@ public class ExternalDataset implements DataEntity { public Set getDatasets() { return datasets; } - public void setDatasets(Set datasets) { this.datasets = datasets; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(ExternalDataset entity) { this.label = entity.getLabel(); this.abbreviation = entity.getAbbreviation(); this.modified = new Date(); + this.creationUser = entity.getCreationUser(); } @Override diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java index dafef8ad0..6a40378cd 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java @@ -17,7 +17,6 @@ import java.util.UUID; @Table(name = "\"Registry\"") public class Registry implements DataEntity { - @Id @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") private UUID id; @@ -38,7 +37,6 @@ public class Registry implements DataEntity { @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; - @OneToMany(fetch = FetchType.LAZY) @JoinTable(name = "\"DatasetRegistry\"", joinColumns = {@JoinColumn(name = "\"Registry\"", referencedColumnName = "\"ID\"")}, @@ -46,11 +44,9 @@ public class Registry implements DataEntity { ) private Set datasets; - @Column(name = "\"Status\"", nullable = false) private Short status; - @Column(name = "\"Created\"") @Convert(converter = DateToUTCConverter.class) private Date created = null; @@ -59,32 +55,28 @@ public class Registry implements DataEntity { @Convert(converter = DateToUTCConverter.class) private Date modified = new Date(); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + public Short getStatus() { return status; } - - public void setStatus(Short status) { this.status = status; } - public Date getCreated() { return created; } - - public void setCreated(Date created) { this.created = created; } - public Date getModified() { return modified; } - - public void setModified(Date modified) { this.modified = modified; } @@ -92,7 +84,6 @@ public class Registry implements DataEntity { public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -100,7 +91,6 @@ public class Registry implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -108,7 +98,6 @@ public class Registry implements DataEntity { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -116,7 +105,6 @@ public class Registry implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -124,7 +112,6 @@ public class Registry implements DataEntity { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -132,7 +119,6 @@ public class Registry implements DataEntity { public String getDefinition() { return definition; } - public void setDefinition(String definition) { this.definition = definition; } @@ -140,11 +126,16 @@ public class Registry implements DataEntity { public Set getDatasets() { return datasets; } - public void setDatasets(Set datasets) { this.datasets = datasets; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } @Override public void update(Registry entity) { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java index 14ca76f60..c71977292 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java @@ -20,7 +20,6 @@ public class Service implements DataEntity { @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") private UUID id; - @Column(name = "\"Label\"") private String label; @@ -37,15 +36,12 @@ public class Service implements DataEntity { @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) private String definition; - @OneToMany(mappedBy = "service", cascade = CascadeType.ALL, orphanRemoval = true) private Set services; - @Column(name = "\"Status\"", nullable = false) private Short status; - @Column(name = "\"Created\"") @Convert(converter = DateToUTCConverter.class) private Date created = null; @@ -54,41 +50,35 @@ public class Service implements DataEntity { @Convert(converter = DateToUTCConverter.class) private Date modified = new Date(); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "\"CreationUser\"", nullable = true) + private UserInfo creationUser; + public Short getStatus() { return status; } - - public void setStatus(Short status) { this.status = status; } - public Date getCreated() { return created; } - - public void setCreated(Date created) { this.created = created; } - public Date getModified() { return modified; } - - public void setModified(Date modified) { this.modified = modified; } - public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -96,7 +86,6 @@ public class Service implements DataEntity { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -104,7 +93,6 @@ public class Service implements DataEntity { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -112,7 +100,6 @@ public class Service implements DataEntity { public String getReference() { return reference; } - public void setReference(String reference) { this.reference = reference; } @@ -120,7 +107,6 @@ public class Service implements DataEntity { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -128,7 +114,6 @@ public class Service implements DataEntity { public String getDefinition() { return definition; } - public void setDefinition(String definition) { this.definition = definition; } @@ -136,11 +121,17 @@ public class Service implements DataEntity { public Set getServices() { return services; } - public void setServices(Set services) { this.services = services; } + public UserInfo getCreationUser() { + return creationUser; + } + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + @Override public void update(Service entity) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java index 68e0d87f6..783d26a83 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -47,7 +47,7 @@ public class DataRepositories extends BaseController { @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody eu.eudat.models.data.datarepository.DataRepositoryModel dataRepositoryModel, Principal principal) throws Exception { - DataRepository dataRepository = this.dataRepositoryManager.create(dataRepositoryModel); + DataRepository dataRepository = this.dataRepositoryManager.create(dataRepositoryModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(dataRepository).status(ApiMessageCode.SUCCESS_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java index c118de055..040823492 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -63,7 +63,7 @@ public class ExternalDatasets extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody eu.eudat.models.data.externaldataset.ExternalDatasetModel externalDatasetModel, Principal principal) throws Exception { - ExternalDataset externalDataset = this.externalDatasetManager.create(externalDatasetModel); + ExternalDataset externalDataset = this.externalDatasetManager.create(externalDatasetModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(externalDataset).status(ApiMessageCode.SUCCESS_MESSAGE)); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java index 1134d4317..ead80898b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java @@ -45,7 +45,7 @@ public class Registries extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/registries"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody RegistryModel registryModel, Principal principal) throws Exception { - Registry registry = this.registryManager.create(registryModel); + Registry registry = this.registryManager.create(registryModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(registry).status(ApiMessageCode.SUCCESS_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java index 36b2703cb..2a40b6f37 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java @@ -45,7 +45,7 @@ public class Services extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/services"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> create(@RequestBody ServiceModel serviceModel, Principal principal) throws Exception { - Service service = serviceManager.create(serviceModel); + Service service = serviceManager.create(serviceModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(service).status(ApiMessageCode.SUCCESS_MESSAGE)); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java index 53d46bc1a..dc8a7b0f8 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java @@ -1,9 +1,8 @@ package eu.eudat.logic.managers; import eu.eudat.data.entities.DataRepository; -import eu.eudat.data.entities.Researcher; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.datarepository.DataRepositoryModel; +import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -19,8 +18,9 @@ public class DataRepositoryManager { this.apiContext = apiContext; } - public DataRepository create(eu.eudat.models.data.datarepository.DataRepositoryModel dataRepositoryModel) throws Exception { + public DataRepository create(eu.eudat.models.data.datarepository.DataRepositoryModel dataRepositoryModel, Principal principal) throws Exception { DataRepository dataRepository = dataRepositoryModel.toDataModel(); + dataRepository.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().createOrUpdate(dataRepository); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java index cab3d39b4..8c6417c20 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java @@ -2,7 +2,6 @@ package eu.eudat.logic.managers; import eu.eudat.logic.builders.model.criteria.ExternalDatasetCriteriaBuilder; import eu.eudat.logic.builders.model.models.DataTableDataBuilder; -import eu.eudat.data.dao.entities.ExternalDatasetDao; import eu.eudat.data.entities.ExternalDataset; import eu.eudat.data.dao.criteria.ExternalDatasetCriteria; import eu.eudat.logic.services.operations.DatabaseRepository; @@ -12,6 +11,7 @@ import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.proxy.fetching.RemoteFetcher; +import eu.eudat.models.data.security.Principal; import eu.eudat.queryable.QueryableList; import eu.eudat.logic.services.ApiContext; import org.springframework.beans.factory.annotation.Autowired; @@ -54,8 +54,9 @@ public class ExternalDatasetManager { return externalDatasetModel; } - public ExternalDataset create(eu.eudat.models.data.externaldataset.ExternalDatasetModel externalDatasetModel) throws Exception { + public ExternalDataset create(eu.eudat.models.data.externaldataset.ExternalDatasetModel externalDatasetModel, Principal principal) throws Exception { ExternalDataset externalDataset = externalDatasetModel.toDataModel(); + externalDataset.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getExternalDatasetDao().createOrUpdate(externalDataset); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java index 33016f094..e31d08813 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java @@ -1,10 +1,9 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.DataRepository; import eu.eudat.data.entities.Registry; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.datarepository.DataRepositoryModel; import eu.eudat.models.data.registries.RegistryModel; +import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -18,8 +17,9 @@ public class RegistryManager { this.apiContext = apiContext; } - public Registry create(RegistryModel registryModel) throws Exception { + public Registry create(RegistryModel registryModel, Principal principal) throws Exception { Registry registry = registryModel.toDataModel(); + registry.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().createOrUpdate(registry); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java index 109c972a8..e86b45b74 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java @@ -1,9 +1,8 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.Registry; import eu.eudat.data.entities.Service; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.registries.RegistryModel; +import eu.eudat.models.data.security.Principal; import eu.eudat.models.data.services.ServiceModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -21,8 +20,9 @@ public class ServiceManager { this.apiContext = apiContext; } - public Service create(ServiceModel serviceModel) throws Exception { + public Service create(ServiceModel serviceModel, Principal principal) throws Exception { Service service = serviceModel.toDataModel(); + service.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().createOrUpdate(service); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java index 6a5984ed9..dee16ecbd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java @@ -1,6 +1,7 @@ package eu.eudat.models.data.datarepository; import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; import java.util.Date; @@ -20,7 +21,6 @@ public class DataRepositoryModel implements DataModel { public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -28,7 +28,6 @@ public class RegistryModel implements DataModel { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -36,7 +35,6 @@ public class RegistryModel implements DataModel { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -44,7 +42,6 @@ public class RegistryModel implements DataModel { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -52,7 +49,6 @@ public class RegistryModel implements DataModel { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -60,7 +56,6 @@ public class RegistryModel implements DataModel { public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } @@ -87,6 +82,7 @@ public class RegistryModel implements DataModel { registry.setModified(new Date()); registry.setReference("dmpdata/" + registry.getId()); registry.setStatus((short)0); + registry.setCreationUser(new UserInfo()); return registry; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java index d518ac8eb..66e913202 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java @@ -1,6 +1,7 @@ package eu.eudat.models.data.services; import eu.eudat.data.entities.Service; +import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; import java.util.Date; @@ -88,6 +89,7 @@ public class ServiceModel implements DataModel { service.setReference("innerdata/" + service.getId()); service.setModified(new Date()); service.setStatus((short)0); + service.setCreationUser(new UserInfo()); return service; } diff --git a/dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql b/dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql new file mode 100644 index 000000000..4cc036bdb --- /dev/null +++ b/dmp-db-scema/updates/04/Add_creationUser_on_DataRepository_ExternalDataset_Registry_Service.sql @@ -0,0 +1,11 @@ +ALTER TABLE "DataRepository" +ADD COLUMN "CreationUser" uuid + +ALTER TABLE "ExternalDataset" +ADD COLUMN "CreationUser" uuid + +ALTER TABLE "Registry" +ADD COLUMN "CreationUser" uuid + +ALTER TABLE "Service" +ADD COLUMN "CreationUser" uuid \ No newline at end of file From 94550ce0c4958ebbd0ac600663247204cb25a932 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 25 Sep 2019 17:09:19 +0300 Subject: [PATCH 027/161] DMP wizard improvement. (Issue #170) --- .../dataset-description-form.component.html | 2 +- .../dataset-description-form.component.ts | 23 ++++++++++--------- .../dataset-editor-wizard.component.ts | 10 +++++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html index 4780ce4c1..bc6e67bb8 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html @@ -9,7 +9,7 @@ {{pageFormGroup.get('title').value}} -
+
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts index 771943929..1dd3ab9a2 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts @@ -1,16 +1,9 @@ -import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { MatStepper } from '@angular/material/stepper'; +import { MatHorizontalStepper } from '@angular/material/stepper'; import { ActivatedRoute, Router } from '@angular/router'; - -import { takeUntil } from 'rxjs/operators'; -import { Pair } from '../../../common/types/pair'; import { BaseComponent } from '../../../core/common/base/base.component'; -import { CompositeField } from '../../../core/model/dataset-profile-definition/composite-field'; -import { DatasetProfileDefinitionModel } from '../../../core/model/dataset-profile-definition/dataset-profile-definition'; import { Rule } from '../../../core/model/dataset-profile-definition/rule'; -import { Section } from '../../../core/model/dataset-profile-definition/section'; -import { DatasetDescriptionFormEditorModel } from './dataset-description-form.model'; import { FormFocusService } from './form-focus/form-focus.service'; import { VisibilityRulesService } from './visibility-rules/visibility-rules.service'; @@ -19,7 +12,7 @@ import { VisibilityRulesService } from './visibility-rules/visibility-rules.serv templateUrl: './dataset-description-form.component.html', styleUrls: ['./dataset-description-form.component.scss'] }) -export class DatasetDescriptionFormComponent extends BaseComponent implements OnInit, AfterViewInit { +export class DatasetDescriptionFormComponent extends BaseComponent implements OnInit, AfterViewInit, OnChanges { // pathName: string; // pages: Array; @@ -27,7 +20,7 @@ export class DatasetDescriptionFormComponent extends BaseComponent implements On // visibleSidebar = false; // datasetProfileDefinitionModel: DatasetDescriptionFormEditorModel; // private currentPageIndex = 0; - // @ViewChild('stepper') stepper: MatStepper; + @ViewChild('stepper', { static: false }) stepper: MatHorizontalStepper; // //@Input() dataModel: DatasetProfileDefinitionModel; @Input() path: string; @@ -78,6 +71,14 @@ export class DatasetDescriptionFormComponent extends BaseComponent implements On // }); } + ngOnChanges(changes: SimpleChanges) { + + // When the form is changed set stepper index to 0. + if (changes['form'] && !changes['form'].isFirstChange()) { + this.stepper.selectedIndex = 0; + } + } + ngAfterViewInit() { //this.visibilityRulesService.triggerVisibilityEvaluation(); // this.route.queryParams diff --git a/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts index 20cdcca30..0251024f0 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/dataset-editor/dataset-editor-wizard.component.ts @@ -88,7 +88,7 @@ export class DatasetEditorWizardComponent extends BaseComponent implements OnIni let dataset = new QuickWizardDatasetDescriptionModel().fromModel(this.datasetProfileDefinition); let formGroup = dataset.buildForm(); - if(isFirst) { + if (isFirst) { formGroup.get('datasetLabel').setValue( this.datasetProfile.value["label"] + " " + this.language.instant('GENERAL.NAMES.DATASET') @@ -106,9 +106,17 @@ export class DatasetEditorWizardComponent extends BaseComponent implements OnIni formArray.push(formGroup); this.lastIndexOfDataset = formArray.length - 1; this.editedDataset = true; + this.scrollToTop(); } listingMode() { if (this.toggleButton === 0) return true; } + + scrollToTop() { + var currentScroll = document.documentElement.scrollTop || document.body.scrollTop; + if (currentScroll > 0) { + window.scrollTo(0, 0); + } + } } From f45e41a625987f95e7277385736794a0652df83f Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 25 Sep 2019 18:02:26 +0300 Subject: [PATCH 028/161] Fixes autocomplete scaling chip bug. (Issue #176) --- .../multiple/multiple-auto-complete.component.html | 2 +- .../multiple/multiple-auto-complete.component.scss | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html index 80447c971..0442fe3c2 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html @@ -1,6 +1,6 @@
- + {{this._displayFn(selectedItem)}} cancel diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss index 59bdf7561..75dda6c21 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss @@ -4,6 +4,12 @@ .multi-chip-list { padding-left: 0; + + .chip { + border-radius: 2em !important; + height: auto !important; + min-width: fit-content !important; + } } .multi-loading-bar { From ebd53e95137920a1965a6534e0316b04af3d5076 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 25 Sep 2019 18:31:41 +0300 Subject: [PATCH 029/161] External References fetching now also include entities created by user. (Issue #168) --- .../dao/criteria/DataRepositoryCriteria.java | 10 +++++++ .../data/dao/criteria/RegistryCriteria.java | 10 +++++++ .../data/dao/criteria/ServiceCriteria.java | 10 +++++++ .../dao/entities/DataRepositoryDaoImpl.java | 6 ++++- .../data/dao/entities/RegistryDaoImpl.java | 7 ++++- .../data/dao/entities/ServiceDaoImpl.java | 6 ++++- .../eudat/controllers/DataRepositories.java | 11 +++----- .../java/eu/eudat/controllers/Registries.java | 10 +++---- .../java/eu/eudat/controllers/Services.java | 9 +++---- .../logic/managers/DataRepositoryManager.java | 25 +++++++++++++++++ .../eudat/logic/managers/DatasetManager.java | 6 +++-- .../eudat/logic/managers/RegistryManager.java | 24 +++++++++++++++++ .../eudat/logic/managers/ServiceManager.java | 24 +++++++++++++++++ .../datarepository/DataRepositoryModel.java | 23 +++++++++++----- .../models/data/dataset/DataRepository.java | 2 +- .../models/data/registries/RegistryModel.java | 22 ++++++++++----- .../models/data/services/ServiceModel.java | 27 ++++++++++--------- 17 files changed, 184 insertions(+), 48 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java index f66eb8b3e..ecd577308 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java @@ -2,6 +2,16 @@ package eu.eudat.data.dao.criteria; import eu.eudat.data.entities.DataRepository; +import java.util.UUID; + public class DataRepositoryCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java index 44b890887..186f5e281 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java @@ -2,6 +2,16 @@ package eu.eudat.data.dao.criteria; import eu.eudat.data.entities.Registry; +import java.util.UUID; + public class RegistryCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java index d7aeccac4..715511fb3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java @@ -2,6 +2,16 @@ package eu.eudat.data.dao.criteria; import eu.eudat.data.entities.Service; +import java.util.UUID; + public class ServiceCriteria extends Criteria { + private UUID creationUserId; + + public UUID getCreationUserId() { + return creationUserId; + } + public void setCreationUserId(UUID creationUserId) { + this.creationUserId = creationUserId; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java index c74a997d6..505cf40d6 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java @@ -24,7 +24,11 @@ public class DataRepositoryDaoImpl extends DatabaseAccess implem public QueryableList getWithCriteria(DataRepositoryCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(DataRepository.class); if (criteria.getLike() != null) - query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), criteria.getCreationUserId())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java index c7ed94b75..679f1ef4a 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java @@ -24,7 +24,12 @@ public class RegistryDaoImpl extends DatabaseAccess implements Registr public QueryableList getWithCriteria(RegistryCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(Registry.class); if (criteria.getLike() != null) - query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + if (criteria.getLike() != null) + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), criteria.getCreationUserId())); return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java index 00406ab91..78ce36944 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java @@ -24,7 +24,11 @@ public class ServiceDaoImpl extends DatabaseAccess implements ServiceDa public QueryableList getWithCriteria(ServiceCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(Service.class); if (criteria.getLike() != null) - query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("reference")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.equal(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"))); + if (criteria.getCreationUserId() != null) + query.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), criteria.getCreationUserId())); return query; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java index 783d26a83..cd9589615 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -2,12 +2,10 @@ package eu.eudat.controllers; import eu.eudat.data.entities.DataRepository; import eu.eudat.logic.managers.DataRepositoryManager; -import eu.eudat.logic.managers.ResearcherManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.datarepository.DataRepositoryModel; -import eu.eudat.models.data.dmp.Researcher; import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; @@ -18,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -36,11 +33,11 @@ public class DataRepositories extends BaseController { @RequestMapping(method = RequestMethod.GET, produces = "application/json") public @ResponseBody - ResponseEntity>>> listExternalDataRepositories( - @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type + ResponseEntity>> listExternalDataRepositories( + @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal ) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getRepositories(query, type); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().status(ApiMessageCode.NO_MESSAGE).payload(remoteRepos)); + List dataRepositoryModels = this.dataRepositoryManager.getDataRepositories(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataRepositoryModels)); } @Transactional diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java index ead80898b..6289d4f0f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java @@ -9,7 +9,6 @@ import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.registries.RegistryModel; import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; -import org.apache.regexp.RE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -35,10 +33,10 @@ public class Registries extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/external/registries"}, produces = "application/json") public @ResponseBody - ResponseEntity>>> listExternalRegistries(@RequestParam(value = "query", required = false) String query - , @RequestParam(value = "type", required = false) String type) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getRegistries(query, type); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().payload(remoteRepos).status(ApiMessageCode.NO_MESSAGE)); + ResponseEntity>> listExternalRegistries(@RequestParam(value = "query", required = false) String query + , @RequestParam(value = "type", required = false) String type, Principal principal) throws HugeResultSet, NoURLFound { + List registryModels = this.registryManager.getRegistries(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(registryModels).status(ApiMessageCode.NO_MESSAGE)); } @Transactional diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java index 2a40b6f37..02bfd279e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java @@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -34,11 +33,11 @@ public class Services extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/external/services"}, produces = "application/json") public @ResponseBody - ResponseEntity>>> listExternalServices( - @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type + ResponseEntity>> listExternalServices( + @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal ) throws HugeResultSet, NoURLFound { - List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getServices(query, type); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().payload(remoteRepos).status(ApiMessageCode.NO_MESSAGE)); + List serviceModels = this.serviceManager.getServices(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(serviceModels).status(ApiMessageCode.NO_MESSAGE)); } @Transactional diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java index dc8a7b0f8..852d12a63 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java @@ -1,11 +1,21 @@ package eu.eudat.logic.managers; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.DataRepositoryCriteria; import eu.eudat.data.entities.DataRepository; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; +import eu.eudat.models.data.datarepository.DataRepositoryModel; import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * Created by ikalyvas on 9/3/2018. */ @@ -23,4 +33,19 @@ public class DataRepositoryManager { dataRepository.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().createOrUpdate(dataRepository); } + + public List getDataRepositories(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRepositories(query, type); + + DataRepositoryCriteria criteria = new DataRepositoryCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + List dataRepositoryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().getWithCriteria(criteria)).toList(); + + List dataRepositoryModels = dataRepositoryList.stream().map(item -> new DataRepositoryModel().fromDataModel(item)).collect(Collectors.toList()); + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + dataRepositoryModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, DataRepositoryModel.class)).collect(Collectors.toList())); + + return dataRepositoryModels; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index ab7ff1f5e..f7eb51898 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -338,10 +338,11 @@ public class DatasetManager { UserInfo userInfo = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build(); dataset.setCreator(userInfo); - createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset); createDataRepositoriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao(), dataset); - createServicesIfTheyDontExist(dataset); createExternalDatasetsIfTheyDontExist(dataset); + createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset); + createServicesIfTheyDontExist(dataset); + Dataset dataset1 = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); datasetWizardModel.setId(dataset1.getId()); updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel); @@ -415,6 +416,7 @@ public class DatasetManager { datasetDataRepository.setDataset(dataset); dataset.getDatasetDataRepositories().add(datasetDataRepository); } else { + datasetDataRepository.getDataRepository().setId(UUID.randomUUID()); DataRepository dataRepository = dataRepositoryDao.createOrUpdate(datasetDataRepository.getDataRepository()); datasetDataRepository.setDataset(dataset); datasetDataRepository.setDataRepository(dataRepository); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java index e31d08813..5fe697bbc 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java @@ -1,12 +1,21 @@ package eu.eudat.logic.managers; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.RegistryCriteria; import eu.eudat.data.entities.Registry; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.registries.RegistryModel; import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Component public class RegistryManager { @@ -22,4 +31,19 @@ public class RegistryManager { registry.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().createOrUpdate(registry); } + + public List getRegistries(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRegistries(query, type); + + RegistryCriteria criteria = new RegistryCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + List registryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().getWithCriteria(criteria)).toList(); + + List registryModels = registryList.stream().map(item -> new RegistryModel().fromDataModel(item)).collect(Collectors.toList()); + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + registryModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, RegistryModel.class)).collect(Collectors.toList())); + + return registryModels; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java index e86b45b74..503bfb007 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java @@ -1,12 +1,21 @@ package eu.eudat.logic.managers; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.ServiceCriteria; import eu.eudat.data.entities.Service; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.security.Principal; import eu.eudat.models.data.services.ServiceModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * Created by ikalyvas on 9/3/2018. */ @@ -25,4 +34,19 @@ public class ServiceManager { service.getCreationUser().setId(principal.getId()); return apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().createOrUpdate(service); } + + public List getServices(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getServices(query, type); + + ServiceCriteria criteria = new ServiceCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + List serviceList = (this.apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().getWithCriteria(criteria)).toList(); + + List serviceModels = serviceList.stream().map(item -> new ServiceModel().fromDataModel(item)).collect(Collectors.toList()); + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + serviceModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ServiceModel.class)).collect(Collectors.toList())); + + return serviceModels; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java index dee16ecbd..a9167421b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java @@ -1,5 +1,6 @@ package eu.eudat.models.data.datarepository; +import com.fasterxml.jackson.annotation.JsonProperty; import eu.eudat.data.entities.DataRepository; import eu.eudat.data.entities.UserInfo; import eu.eudat.models.DataModel; @@ -11,12 +12,14 @@ import java.util.UUID; * Created by ikalyvas on 9/3/2018. */ public class DataRepositoryModel implements DataModel { - public UUID id; - public String label; - public String abbreviation; - public String uri; - public Date created; - public Date modified; + private UUID id; + @JsonProperty("name") + private String label; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String tag; public UUID getId() { return id; @@ -60,12 +63,20 @@ public class DataRepositoryModel implements DataModel { - public UUID id; - public String label; - public String abbreviation; - public String uri; - public Date created; - public Date modified; + private UUID id; + private String label; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String tag; public UUID getId() { return id; @@ -60,6 +62,13 @@ public class RegistryModel implements DataModel { this.modified = modified; } + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } + @Override public RegistryModel fromDataModel(Registry entity) { this.id = entity.getId(); @@ -68,6 +77,7 @@ public class RegistryModel implements DataModel { this.label = entity.getLabel(); this.modified = entity.getModified(); this.uri = entity.getUri(); + this.tag = "Internal"; return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java index 66e913202..9d08f402d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/services/ServiceModel.java @@ -11,17 +11,17 @@ import java.util.UUID; * Created by ikalyvas on 9/3/2018. */ public class ServiceModel implements DataModel { - public UUID id; - public String label; - public String abbreviation; - public String uri; - public Date created; - public Date modified; + private UUID id; + private String label; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String tag; public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -29,7 +29,6 @@ public class ServiceModel implements DataModel { public String getLabel() { return label; } - public void setLabel(String label) { this.label = label; } @@ -37,7 +36,6 @@ public class ServiceModel implements DataModel { public String getAbbreviation() { return abbreviation; } - public void setAbbreviation(String abbreviation) { this.abbreviation = abbreviation; } @@ -45,7 +43,6 @@ public class ServiceModel implements DataModel { public String getUri() { return uri; } - public void setUri(String uri) { this.uri = uri; } @@ -53,7 +50,6 @@ public class ServiceModel implements DataModel { public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } @@ -61,11 +57,17 @@ public class ServiceModel implements DataModel { public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } + @Override public ServiceModel fromDataModel(Service entity) { this.abbreviation = entity.getAbbreviation(); @@ -74,6 +76,7 @@ public class ServiceModel implements DataModel { this.label = entity.getLabel(); this.modified = entity.getModified(); this.uri = entity.getUri(); + this.tag = "Internal"; return this; } From ccb96aeb1375dd8bfdd84824ff28785ff5f6f039 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 26 Sep 2019 12:44:39 +0300 Subject: [PATCH 030/161] Fixes bug on DMP's filter Role. --- .../eu/eudat/data/dao/entities/DMPDao.java | 3 +- .../eudat/data/dao/entities/DMPDaoImpl.java | 178 +++++++++--------- .../logic/managers/DashBoardManager.java | 15 +- .../managers/DataManagementPlanManager.java | 7 +- .../eu/eudat/logic/managers/UserManager.java | 9 +- 5 files changed, 111 insertions(+), 101 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java index 03cf68d74..3073e1857 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java @@ -8,6 +8,7 @@ import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.queryable.QueryableList; +import java.util.List; import java.util.UUID; public interface DMPDao extends DatabaseAccessLayer { @@ -16,6 +17,6 @@ public interface DMPDao extends DatabaseAccessLayer { QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardAutocompleteRequest, UserInfo userInfo); - QueryableList getAuthenticated(QueryableList query, UUID principalId); + QueryableList getAuthenticated(QueryableList query, UUID principalId, List roles); } \ No newline at end of file diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java index 5e527ebf7..e1c92d6d8 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java @@ -5,7 +5,6 @@ import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; @@ -14,110 +13,119 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; import java.util.Arrays; +import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; @Component("dMPDao") public class DMPDaoImpl extends DatabaseAccess implements DMPDao { + @Autowired + public DMPDaoImpl(DatabaseService databaseService) { + super(databaseService); + } - @Autowired - public DMPDaoImpl(DatabaseService databaseService) { - super(databaseService); - } - - @Override - public QueryableList getWithCriteria(DataManagementPlanCriteria criteria) { - QueryableList query = getDatabaseService().getQueryable(DMP.getHints(), DMP.class); - if (criteria.getLike() != null && !criteria.getLike().isEmpty()) - query.where((builder, root) -> builder.or( - builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"), - builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%"))); - if (criteria.getPeriodEnd() != null) - query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd())); - if (criteria.getPeriodStart() != null) - query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart())); - if (criteria.getGrants() != null && !criteria.getGrants().isEmpty()) - query.where(((builder, root) -> root.get("grant").in(criteria.getGrants()))); - if (!criteria.getAllVersions()) - query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"), - query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"), - nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class))); - if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty()) - query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds())); - if (criteria.getStatus() != null) { - if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) { - query.where((builder, root) -> builder.and(builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()), builder.notEqual(root.get("isPublic"), true))); - } else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) { - query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue())); - } - } - if (criteria.getIsPublic()) - query.where(((builder, root) -> builder.equal(root.get("isPublic"), true))); - if (criteria.getRole() != null) { + @Override + public QueryableList getWithCriteria(DataManagementPlanCriteria criteria) { + QueryableList query = getDatabaseService().getQueryable(DMP.getHints(), DMP.class); + if (criteria.getLike() != null && !criteria.getLike().isEmpty()) + query.where((builder, root) -> builder.or( + builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"), + builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%"))); + if (criteria.getPeriodEnd() != null) + query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd())); + if (criteria.getPeriodStart() != null) + query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart())); + if (criteria.getGrants() != null && !criteria.getGrants().isEmpty()) + query.where(((builder, root) -> root.get("grant").in(criteria.getGrants()))); + if (!criteria.getAllVersions()) + query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"), + query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"), + nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class))); + if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty()) + query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds())); + if (criteria.getStatus() != null) { + if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) { + query.where((builder, root) -> builder.and(builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()), builder.notEqual(root.get("isPublic"), true))); + } else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) { + query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue())); + } + } + if (criteria.getIsPublic()) + query.where(((builder, root) -> builder.equal(root.get("isPublic"), true))); + /*if (criteria.getRole() != null) { if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())) { query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue())); } else if (criteria.getRole().equals(UserDMP.UserDMPRoles.USER.getValue())) { query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.USER.getValue())); } - } - if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) { - query.where((builder, root) -> root.join("organisations").get("reference").in(criteria.getOrganisations())); - } - if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) { - query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); - } - if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) { - query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates())); - } - query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue())); - return query; - } + }*/ + if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) { + query.where((builder, root) -> root.join("organisations").get("reference").in(criteria.getOrganisations())); + } + if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) { + query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators())); + } + if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) { + query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates())); + } + query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue())); + return query; + } - public QueryableList getAuthenticated(QueryableList query, UUID principal) { - query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal)); - return query; - } + public QueryableList getAuthenticated(QueryableList query, UUID principal, List roles) { + if (roles != null && !roles.isEmpty()) { + query.where((builder, root) -> { + Join userJoin = root.join("users", JoinType.LEFT); + return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal), userJoin.get("role").in(roles)); + }); + } else { + query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal)); + } - @Override - public DMP createOrUpdate(DMP item) { - return this.getDatabaseService().createOrUpdate(item, DMP.class); - } + return query; + } - @Override - public DMP find(UUID id) { - return getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle(); - } + @Override + public DMP createOrUpdate(DMP item) { + return this.getDatabaseService().createOrUpdate(item, DMP.class); + } - @Override - public QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) { - QueryableList query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users")))); - if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) { - query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%")); - } - return query; - } + @Override + public DMP find(UUID id) { + return getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle(); + } - @Override - public void delete(DMP item) { - this.getDatabaseService().delete(item); - } + @Override + public QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) { + QueryableList query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users")))); + if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) { + query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%")); + } + return query; + } - @Override - public QueryableList asQueryable() { - return this.getDatabaseService().getQueryable(DMP.class); - } + @Override + public void delete(DMP item) { + this.getDatabaseService().delete(item); + } - @Async - @Override - public CompletableFuture createOrUpdateAsync(DMP item) { - return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item)); - } + @Override + public QueryableList asQueryable() { + return this.getDatabaseService().getQueryable(DMP.class); + } - @Override - public DMP find(UUID id, String hint) { - throw new UnsupportedOperationException(); - } + @Async + @Override + public CompletableFuture createOrUpdateAsync(DMP item) { + return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item)); + } + + @Override + public DMP find(UUID id, String hint) { + throw new UnsupportedOperationException(); + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java index 42746c11c..d351e492b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java @@ -8,10 +8,7 @@ import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.dao.entities.OrganisationDao; import eu.eudat.data.dao.entities.GrantDao; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.entities.*; import eu.eudat.logic.builders.model.models.RecentActivityDataBuilder; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.DatabaseRepository; @@ -79,9 +76,9 @@ public class DashBoardManager { DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria(); dataManagementPlanCriteria.setAllVersions(false); GrantCriteria grantCriteria = new GrantCriteria(); - OrganisationCriteria organisationCriteria = new OrganisationCriteria(); - CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId()).countAsync() + List roles = new LinkedList<>(); + CompletableFuture dmpFuture = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles).countAsync() .whenComplete((dmpsStats, throwable) -> statistics.setTotalDataManagementPlanCount(dmpsStats)); CompletableFuture datasetFuture = datasetRepository.getAuthenticated(datasetRepository.getWithCriteria(datasetCriteria), user).countAsync() .whenComplete((datasetsStats, throwable) -> statistics.setTotalDataSetCount(datasetsStats)); @@ -108,7 +105,8 @@ public class DashBoardManager { GrantCriteria grantCriteria = new GrantCriteria(); RecentActivityDataBuilder recentActivityDataBuilder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(RecentActivityDataBuilder.class); - CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId()) + List roles = new LinkedList<>(); + CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.getWithCriteria(dataManagementPlanCriteria), principal.getId(), roles) .withHint("dmpRecentActivity") .orderBy((builder, root) -> builder.desc(root.get("modified"))) .take(numberofactivities) @@ -141,8 +139,9 @@ public class DashBoardManager { DatasetDao datasetRepository = databaseRepository.getDatasetDao(); GrantDao grantRepository = databaseRepository.getGrantDao(); + List roles = new LinkedList<>(); List searchBarItems = new LinkedList<>(); - CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.asQueryable(), principal.getId()) + CompletableFuture> dmps = dataManagementPlanRepository.getAuthenticated(dataManagementPlanRepository.asQueryable(), principal.getId(), roles) .withHint("dmpRecentActivity") .where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + like.toUpperCase() + "%")) .orderBy((builder, root) -> builder.desc(root.get("modified"))) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index d2fc9acc1..7a195f05a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -92,7 +92,9 @@ public class DataManagementPlanManager { public DataTableData getPaged(DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal, String fieldsGroup) throws Exception { UUID principalID = principal.getId(); QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getWithCriteria(dataManagementPlanTableRequest.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(items, principalID); + List roles = new LinkedList<>(); + if (dataManagementPlanTableRequest.getCriteria().getRole() != null) roles.add(dataManagementPlanTableRequest.getCriteria().getRole()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(items, principalID, roles); QueryableList pagedItems = PaginationManager.applyPaging(authItems, dataManagementPlanTableRequest); DataTableData dataTable = new DataTableData<>(); @@ -363,7 +365,8 @@ public class DataManagementPlanManager { public List getWithCriteria(DMPDao dmpsRepository, DataManagementPlanCriteriaRequest dataManagementPlanCriteria, Principal principal) throws IllegalAccessException, InstantiationException { UUID principalID = principal.getId(); QueryableList items = dmpsRepository.getWithCriteria(dataManagementPlanCriteria.getCriteria()).withHint(HintedModelFactory.getHint(DataManagementPlan.class)); - QueryableList authenticatedItems = dmpsRepository.getAuthenticated(items, principalID); + List roles = new LinkedList<>(); + QueryableList authenticatedItems = dmpsRepository.getAuthenticated(items, principalID, roles); List datamanagementPlans = authenticatedItems.select(item -> new DataManagementPlan().fromDataModel(item)); return datamanagementPlans; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java index 364723317..564568ad5 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java @@ -3,6 +3,7 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.dao.entities.UserInfoDao; import eu.eudat.data.entities.DMP; +import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.data.entities.UserRole; import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem; @@ -28,10 +29,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; @Component @@ -66,7 +64,8 @@ public class UserManager { public UserProfile getSingle(UUID userId) throws Exception { eu.eudat.data.entities.UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId); UserProfile profile = new UserProfile().fromDataModel(user); - List dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable(), userId).take(5).toList(); + List roles = new LinkedList<>(); + List dmps = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().getAuthenticated(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().asQueryable(), userId, roles).take(5).toList(); profile.setAssociatedDmps(dmps.stream().map(x -> new DataManagementPlan().fromDataModel(x)).collect(Collectors.toList())); return profile; } From c886b9ec0711ade4fdcd9ea31afbcb74b0d1afdb Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 26 Sep 2019 13:59:47 +0300 Subject: [PATCH 031/161] Fixes Dataset Description's listing filter "Role" not fetching all Datasets when "Any" was selected. --- .../java/eu/eudat/data/dao/entities/DatasetDaoImpl.java | 9 ++++++--- .../src/main/java/eu/eudat/data/entities/UserDMP.java | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java index 4d1fde4e6..1a68dcead 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java @@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DatasetCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMP; import eu.eudat.data.entities.Dataset; +import eu.eudat.data.entities.UserDMP; import eu.eudat.data.entities.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; @@ -43,8 +43,11 @@ public class DatasetDaoImpl extends DatabaseAccess implements DatasetDa query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("dmp").get("version"), query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("dmp").get("groupId"), nestedRoot.get("dmp").get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.COMPOSITE_FIELD, "dmp:version")), String.class))); if (criteria.getDmpIds() != null && !criteria.getDmpIds().isEmpty()) query.where((builder, root) -> root.get("dmp").get("id").in(criteria.getDmpIds())); - if (criteria.getRole() != null) + if (criteria.getRole() != null) { query.where((builder, root) -> builder.equal(root.join("dmp").join("users").get("role"), criteria.getRole())); + } else { + query.where((builder, root) -> root.join("dmp").join("users").get("role").in(UserDMP.UserDMPRoles.getAllValues())); + } if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) query.where((builder, root) -> root.join("dmp").join("organisations").get("reference").in(criteria.getOrganisations())); if (criteria.getGrants() != null && !criteria.getGrants().isEmpty()) @@ -87,7 +90,7 @@ public class DatasetDaoImpl extends DatabaseAccess implements DatasetDa public QueryableList getAuthenticated(QueryableList query, UserInfo principal) { if (principal.getId() == null) query.where((builder, root) -> builder.equal(root.get("isPublic"), true)); else { - query.where((builder, root) -> builder.or(builder.equal(root.get("dmp").get("creator"), principal), builder.equal(root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal.getId()))); + query.where((builder, root) -> builder.equal(root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal.getId())); } return query; } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java index 6e000136d..217b81821 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java @@ -5,6 +5,7 @@ import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; +import java.util.LinkedList; import java.util.List; import java.util.UUID; @@ -25,6 +26,14 @@ public class UserDMP implements DataEntity { return value; } + public static List getAllValues() { + List list = new LinkedList<>(); + for (Enum en : UserDMP.UserDMPRoles.values()) { + list.add(((UserDMPRoles) en).value); + } + return list; + } + public static UserDMPRoles fromInteger(Integer value) { switch (value) { case 0: From 0c4c818acd4cd16a3b7fbbde8a029ff5cde954fb Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 26 Sep 2019 18:08:04 +0300 Subject: [PATCH 032/161] Fixes responsiveness issues when using the app within a mobile phone. (Issue #178) --- .../listing/dataset-listing.component.html | 17 ++++++----- .../listing/dataset-listing.component.scss | 16 +++++++++- .../dataset-listing-item.component.html | 24 ++++++++++----- .../dataset-listing-item.component.scss | 4 --- .../ui/dmp/listing/dmp-listing.component.html | 18 ++++++----- .../ui/dmp/listing/dmp-listing.component.scss | 16 +++++++++- .../dmp-listing-item.component.html | 30 ++++++++++++------- .../explore-dataset-listing.component.html | 14 +++++---- .../explore-dataset-listing.component.scss | 16 +++++++++- ...xplore-dataset-listing-item.component.html | 22 +++++++++----- .../explore-dmp-listing.component.html | 10 +++---- .../explore-dmp-listing.component.scss | 16 +++++++++- .../explore-dmp-listing-item.component.html | 15 ++++++---- .../explore-dmp-listing-item.component.scss | 10 +++++++ 14 files changed, 166 insertions(+), 62 deletions(-) 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 e92a69879..fca09e794 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,28 +1,31 @@
-
+

{{'DASHBOARD.DATASETS' | translate}} {{titlePrefix}}

-
+
-
-
+
+
-
+
- +
+
+
+
+
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 bcd3a0235..98ca3d541 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 @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + ::ng-deep .mat-paginator-container { flex-direction: row-reverse !important; justify-content: space-between !important; @@ -20,7 +33,8 @@ } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html index f750d5108..ac7bb310b 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html @@ -28,26 +28,34 @@
-
-
- +
+
+ storage -

{{ dataset.dmp }}

+

{{ dataset.dmp }}

+
+
- +
+
+ work_outline -

{{ dataset.grant }}

+

{{ dataset.grant }}

+
+ +
assignment
{{ dataset.profile }}
+
+ +

{{'DATASET-LISTING.COLUMNS.LAST-EDITED' | translate}} {{ dataset.modified | date: "shortDate"}}

{{'DATASET-LISTING.COLUMNS.FINALIZED' | translate}} {{ dataset.finalizedAt | date: "shortDate"}}

diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index 21a58f334..d812c7bd4 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -40,10 +40,6 @@ h4 > span { flex-wrap: wrap; } -.links { - display: flex; -} - .links :hover { color: #00b29f; } 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 5793ec346..b93090db7 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,30 +1,34 @@
-
+

{{'DMP-LISTING.TITLE' | translate}} {{titlePrefix}}

-
- -
-
-
+
+
-
+
+
+
+
+
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 b3f82ac86..4def11f1b 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 @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + ::ng-deep .mat-paginator-container { flex-direction: row-reverse !important; justify-content: space-between !important; @@ -20,7 +33,8 @@ } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html index e0ff36982..acffde993 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html @@ -26,8 +26,9 @@
-
-
+
+ +
lock_open @@ -37,10 +38,14 @@ radio_button_checked -

- {{ 'TYPES.DMP.DRAFT' | translate }}: {{dmp.label}}

-

{{dmp.label}}

+
+

+ {{ 'TYPES.DMP.DRAFT' | translate }}: {{dmp.label}} +

+

{{dmp.label}}

+
+
@@ -48,12 +53,13 @@
-
+
settings

{{roleDisplay(dmp.users).toUpperCase()}}

- +
+
storage @@ -61,16 +67,20 @@

{{dmp.datasets.length}}

- - assignment -
+
+
+ assignment +
{{profile.label}}
+
+

{{'DMP-PROFILE-LISTING.COLUMNS.LAST-EDITED' | translate}} {{dmp.modifiedTime | date: "shortDate"}}

{{'TYPES.DMP.FINALISED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.publishedAt | date: "shortDate"}}

+
-
-
- +
+
+
diff --git a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss index 13d6d81db..d56c694f6 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/explore-dmp-listing.component.scss @@ -1,3 +1,16 @@ +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/variables"; +@import "node_modules/bootstrap/scss/mixins/_breakpoints"; + +@include media-breakpoint-down(sm) { + .lightblue-btn { + font-size: 12px; + } + ::ng-deep .mat-paginator-container { + height: auto !important; + } +} + text-center { text-align: center; } @@ -54,7 +67,8 @@ text-center { } ::ng-deep .mat-paginator-range-actions { - width: 55% !important; + width: auto !important; + min-width: 55% !important; min-height: 43px !important; justify-content: space-between; } diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html index 905d71de2..6e8179f19 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.html @@ -5,10 +5,12 @@ {{dmp.grantAbbreviation}}
-
-
+
+
radio_button_checked -

{{dmp.label}}

+
+
+

{{dmp.label}}

@@ -17,17 +19,20 @@
-
+
storage

{{dmp.datasets.length}}

- +
+
assignment
{{profile.label}}
+
+

{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}

diff --git a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss index 0ee1f4e12..134e0fecd 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/listing-item/explore-dmp-listing-item.component.scss @@ -52,6 +52,16 @@ // color: #92d050; } +h4 { + display: inline; + padding-left: 1em; + line-height: 1.7em; +} + +h4 > span { + text-transform: uppercase; +} + // .explore-dmp-listing-item { // margin-top: 2em; // margin-bottom: 2em; From f00633ea718b02e1ae6f3404f2ea4f5c4bae4420 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 26 Sep 2019 18:33:41 +0300 Subject: [PATCH 033/161] Adds "Role" filter on Published DMPs and Published Dataset Description on backend. (Issue #175) --- .../criteria/DataManagementPlanPublicCriteria.java | 8 ++++++++ .../data/dao/criteria/DatasetPublicCriteria.java | 8 ++++++++ .../table/dataset/DatasetPublicTableRequest.java | 1 + .../web/src/main/java/eu/eudat/controllers/DMPs.java | 6 ++++-- .../src/main/java/eu/eudat/controllers/Datasets.java | 3 ++- .../logic/handlers/PrincipalArgumentResolver.java | 8 ++++++-- .../logic/managers/DataManagementPlanManager.java | 11 ++++++++++- .../java/eu/eudat/logic/managers/DatasetManager.java | 9 +++++++++ 8 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java index bd3d049bf..edc1ffa9f 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java @@ -11,6 +11,7 @@ public class DataManagementPlanPublicCriteria extends Criteria { private List grants; public List datasetProfile; private List dmpOrganisations; + private Integer role; public GrantStateType getGrantStatus() { return grantStatus; @@ -39,4 +40,11 @@ public class DataManagementPlanPublicCriteria extends Criteria { public void setDmpOrganisations(List dmpOrganisations) { this.dmpOrganisations = dmpOrganisations; } + + public Integer getRole() { + return role; + } + public void setRole(Integer role) { + this.role = role; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java index fd4934d7a..9554ed5b4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java @@ -17,6 +17,7 @@ public class DatasetPublicCriteria extends Criteria{ private List dmpOrganisations; private List tags; private List dmpIds; + private Integer role; public GrantStateType getGrantStatus() { return grantStatus; @@ -59,4 +60,11 @@ public class DatasetPublicCriteria extends Criteria{ public void setDmpIds(List dmpIds) { this.dmpIds = dmpIds; } + + public Integer getRole() { + return role; + } + public void setRole(Integer role) { + this.role = role; + } } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java index ccaef9eaf..6aa363095 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java @@ -45,6 +45,7 @@ public class DatasetPublicTableRequest extends TableQuery root.get("profile").get("id").in(this.getCriteria().getDatasetProfile()))); if (this.getCriteria().getDmpOrganisations() != null && !this.getCriteria().getDmpOrganisations().isEmpty()) query .where(((builder, root) -> root.join("dmp").join("organisations").get("reference").in(this.getCriteria().getDmpOrganisations()))); + query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue())); return query; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java index f7323b650..ffd45ed08 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java @@ -218,8 +218,10 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/public/paged"}, consumes = "application/json", produces = "application/json") public @ResponseBody - ResponseEntity>> getPublicPaged(@RequestBody DataManagmentPlanPublicTableRequest dmpTableRequest, @RequestParam String fieldsGroup) throws Exception { - DataTableData dmp = this.dataManagementPlanManager.getPaged(dmpTableRequest, fieldsGroup); + ResponseEntity>> getPublicPaged(@RequestBody DataManagmentPlanPublicTableRequest dmpTableRequest, + @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal, + @RequestParam String fieldsGroup) throws Exception { + DataTableData dmp = this.dataManagementPlanManager.getPublicPaged(dmpTableRequest, fieldsGroup, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dmp)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java index 02d56eca6..067cee359 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java @@ -46,7 +46,8 @@ public class Datasets extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/public/paged"}, consumes = "application/json", produces = "application/json") public @ResponseBody - ResponseEntity>> getPublicPaged(@RequestBody DatasetPublicTableRequest datasetTableRequest, @ClaimedAuthorities(claims = {Authorities.ANONYMOUS}) Principal principal) throws Exception { + ResponseEntity>> getPublicPaged(@RequestBody DatasetPublicTableRequest datasetTableRequest, + @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception { DataTableData dataTable = this.datasetManager.getPaged(datasetTableRequest, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java b/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java index 7e304042f..ebc287b72 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/handlers/PrincipalArgumentResolver.java @@ -37,13 +37,17 @@ public final class PrincipalArgumentResolver implements HandlerMethodArgumentRes public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer modelAndViewContainer, NativeWebRequest nativeWebRequest, WebDataBinderFactory webDataBinderFactory) throws Exception { String token = nativeWebRequest.getHeader("AuthToken"); - Boolean checkMailNull = ((ServletWebRequest) nativeWebRequest).getRequest().getRequestURI().startsWith("/api/emailConfirmation"); + boolean checkMailNull = ((ServletWebRequest) nativeWebRequest).getRequest().getRequestURI().startsWith("/api/emailConfirmation"); AuthenticationService authenticationService = checkMailNull ? this.nonVerifiedUserAuthenticationService : this.verifiedUserAuthenticationService; Optional claimsAnnotation = Arrays.stream(methodParameter.getParameterAnnotations()).filter(annotation -> annotation.annotationType().equals(ClaimedAuthorities.class)).findAny(); List claimList = claimsAnnotation.map(annotation -> Arrays.asList(((ClaimedAuthorities) annotation).claims())).orElse(Authorities.all()); - if (claimList.size() == 1 && claimList.get(0).equals(Authorities.ANONYMOUS)) + if (claimList.size() == 1 && claimList.get(0).equals(Authorities.ANONYMOUS)) { return new Principal(); + } else if (claimList.contains(Authorities.ANONYMOUS) && token == null) { + return new Principal(); + } + if (token == null) throw new UnauthorisedException("Authentication Information Is Missing"); UUID authToken; try { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index 7a195f05a..eb395ff15 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -59,6 +59,8 @@ import org.springframework.web.multipart.MultipartFile; import org.w3c.dom.Document; import org.w3c.dom.Element; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; @@ -128,9 +130,16 @@ public class DataManagementPlanManager { return dataTable; } - public DataTableData getPaged(DataManagmentPlanPublicTableRequest dataManagementPlanPublicTableRequest, String fieldsGroup) throws Exception { + public DataTableData getPublicPaged(DataManagmentPlanPublicTableRequest dataManagementPlanPublicTableRequest, String fieldsGroup, Principal principal) throws Exception { dataManagementPlanPublicTableRequest.setQuery(databaseRepository.getDmpDao().asQueryable().withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))); QueryableList items = dataManagementPlanPublicTableRequest.applyCriteria(); + + if (principal.getId() != null && dataManagementPlanPublicTableRequest.getCriteria().getRole() != null) { + items.where((builder, root) -> { + Join userJoin = root.join("users", JoinType.LEFT); + return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal.getId()), builder.equal(userJoin.get("role"), dataManagementPlanPublicTableRequest.getCriteria().getRole())); + }); + } QueryableList pagedItems = PaginationManager.applyPaging(items, dataManagementPlanPublicTableRequest); DataTableData dataTable = new DataTableData<>(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index f7eb51898..87866285a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -46,6 +46,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import javax.activation.MimetypesFileTypeMap; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; @@ -141,6 +143,13 @@ public class DatasetManager { } else items.where((builder, root) -> root.get("id").in(new UUID[]{UUID.randomUUID()})); } + + if (principal.getId() != null && datasetTableRequest.getCriteria().getRole() != null) { + items.where((builder, root) -> { + Join userJoin = root.join("dmp", JoinType.LEFT).join("users", JoinType.LEFT); + return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal.getId()), builder.equal(userJoin.get("role"), datasetTableRequest.getCriteria().getRole())); + }); + } String[] strings = new String[1]; strings[0] = "-dmp:publishedAt|join|"; datasetTableRequest.getOrderings().setFields(strings); From 586e6c2f6454988e65c61e1647b1ff982862f23b Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 27 Sep 2019 11:09:29 +0300 Subject: [PATCH 034/161] Removes focus of button that opens dialog after close it. --- .../dataset-profile-editor.component.ts | 1 + .../criteria/dataset-profile.component.ts | 1 + .../dmp-profile-criteria.component.ts | 1 + .../recent-edited-activity.component.ts | 1 + .../dataset-create-wizard.component.ts | 1 + .../dataset-wizard.component.ts | 4 ++++ ...et-external-references-editor.component.ts | 20 ++++++++----------- .../app/ui/dmp/editor/dmp-editor.component.ts | 3 +++ .../dmp-listing-item.component.ts | 1 + .../ui/dmp/overview/dmp-overview.component.ts | 4 +++- .../ui/grant/editor/grant-editor.component.ts | 1 + .../quick-wizard-editor.component.ts | 2 ++ 12 files changed, 27 insertions(+), 13 deletions(-) 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 00840c555..2683c5384 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 @@ -248,6 +248,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn public delete(): void { if (this.datasetProfileId && !this.isNew) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts index 162937600..ff1ffd11b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts @@ -49,6 +49,7 @@ export class DatasetProfileCriteriaComponent extends BaseCriteriaComponent imple openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDatasetProfiles, { + restoreFocus: false, data: { message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'), confirmButton: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML'), diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts index ee81e6432..def43eae6 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts @@ -55,6 +55,7 @@ export class DmpProfileCriteriaComponent extends BaseCriteriaComponent implement openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDmpProfiles, { + restoreFocus: false, data: { message: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-FILE-TITLE'), confirmButton: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML'), diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 0f53c85a7..c50e079d4 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -67,6 +67,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn deleteClicked(dmp: DmpListingModel) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts index fb2d1dd29..8a233b321 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts @@ -82,6 +82,7 @@ export class DatasetCreateWizard extends CheckDeactivateBaseComponent implements saveFinalize() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 51d46b635..2001fab15 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -457,6 +457,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr saveFinalize() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), confirmButton: this.language.instant('QUICKWIZARD.SAVE-DIALOG.ACTIONS.AFFIRMATIVE'), @@ -599,6 +600,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openConfirm(dmpLabel, id): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), @@ -621,6 +623,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openDmpSearchDialogue() { const formControl = new FormControl(); const dialogRef = this.dialog.open(DatasetCopyDialogueComponent, { + restoreFocus: false, data: { formControl: formControl, datasetId: this.formGroup.value.id, @@ -652,6 +655,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr openUpdateDatasetProfileDialogue() { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('DATASET-EDITOR.VERSION-DIALOG.QUESTION'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index a3c3f31c9..c4be05b57 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -142,9 +142,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addDataRepository() { const dialogRef = this.dialog.open(DatasetExternalDataRepositoryDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -157,9 +156,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addRegistry() { const dialogRef = this.dialog.open(DatasetExternalRegistryDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -172,9 +170,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addExternalDataset() { const dialogRef = this.dialog.open(DatasetExternalDatasetDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) @@ -187,9 +184,8 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addService() { const dialogRef = this.dialog.open(DatasetExternalServiceDialogEditorComponent, { - data: { - - } + restoreFocus: false, + data: {} }); dialogRef.afterClosed() .pipe(takeUntil(this._destroyed)) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index b82dc6e9e..a02769c44 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -291,6 +291,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC public delete(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.DELETE'), @@ -424,6 +425,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC addDatasetOpenDialog(id: String) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ADD-DATASET'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -452,6 +454,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts index d0bd76246..ebcda0318 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts @@ -57,6 +57,7 @@ export class DmpListingItemComponent implements OnInit { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { // height: '250px', // width: '700px', + restoreFocus: false, data: { dmpId: rowId, dmpName: rowName diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index 703c8e437..2f8f48f1c 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -17,7 +17,6 @@ import { AuthService } from '../../../core/services/auth/auth.service'; import { DmpService } from '../../../core/services/dmp/dmp.service'; import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { DmpFinalizeDialogComponent, DmpFinalizeDialogInput, DmpFinalizeDialogOutput } from '../editor/dmp-finalize-dialog/dmp-finalize-dialog.component'; import { DatasetsToBeFinalized } from '../../../core/model/dataset/datasets-toBeFinalized'; @@ -253,6 +252,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { getDoi(dmp: DmpOverviewModel) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '600px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ZENODO-DOI'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -289,6 +289,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { publish(dmpId: String) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), @@ -317,6 +318,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.FINALIZE-ITEM'), diff --git a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts index 04358f8b7..baaafb63d 100644 --- a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts +++ b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts @@ -142,6 +142,7 @@ export class GrantEditorComponent extends BaseComponent implements OnInit, IBrea public delete(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { maxWidth: '300px', + restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'), confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'), diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index e686e9644..8c755bb9d 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -108,6 +108,7 @@ export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent imp const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, { maxWidth: '500px', + restoreFocus: false, data: { dialogInputModel: dialogInputModel, confirmButton: this.language.instant('DMP-FINALISE-DIALOG.SUBMIT'), @@ -162,6 +163,7 @@ export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent imp onSubmitSave(): void { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { + restoreFocus: false, data: { message: this.language.instant('QUICKWIZARD.SAVE-DIALOG.TITLE'), confirmButton: this.language.instant('QUICKWIZARD.SAVE-DIALOG.ACTIONS.AFFIRMATIVE'), From 85c9022a906afadbcb0fb3ba1a33b5415168b9f6 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 27 Sep 2019 11:20:54 +0300 Subject: [PATCH 035/161] Fixes style of button "Export" --- .../app/ui/dataset/dataset-wizard/dataset-wizard.component.html | 2 +- dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html | 2 +- .../src/app/ui/dmp/overview/dmp-overview.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index 5715d2eac..535db7c8e 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -26,7 +26,7 @@
- {{'NAV-BAR.GRANTS' | translate}} + + {{'NAV-BAR.DMPS' | translate}} {{'NAV-BAR.DATASETS' | translate}} {{'NAV-BAR.USERS' | translate}} diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.spec.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.spec.ts deleted file mode 100644 index 9032ad2ca..000000000 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NavbarComponent } from './navbar.component'; - -describe('NavbarComponent', () => { - let component: NavbarComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ NavbarComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(NavbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index 4b7e6c281..3ecc0de2b 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -43,13 +43,10 @@ export const PUBLIC_ROUTES: RouteInfo[] = [ { path: '/explore', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'public' } ]; -export const GRANTS_ROUTES: RouteInfo[] = [ - { path: '/grants', title: 'SIDE-BAR.MY-GRANTS', icon: 'work_outline' } -]; - // export const GRANTS_ROUTES: RouteInfo[] = [ // { path: '/grants', title: 'SIDE-BAR.MY-GRANTS', icon: 'work_outline' } // ]; + export const ADMIN_ROUTES: RouteInfo[] = [ { path: '/dmp-profiles', title: 'SIDE-BAR.DMP-TEMPLATES', icon: 'library_books' }, { path: '/dataset-profiles', title: 'SIDE-BAR.DATASET-TEMPLATES', icon: 'library_books' }, @@ -113,14 +110,15 @@ export class SidebarComponent implements OnInit { } this.groupMenuItems.push(this.datasetItems); - this.grantItems = { - title: 'SIDE-BAR.GRANTS', - routes: GRANTS_ROUTES, - requiresAuthentication: true, - requiresAdmin: false, - isGeneral: false - } - this.groupMenuItems.push(this.grantItems); + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // this.grantItems = { + // title: 'SIDE-BAR.GRANTS', + // routes: GRANTS_ROUTES, + // requiresAuthentication: true, + // requiresAdmin: false, + // isGeneral: false + // } + // this.groupMenuItems.push(this.grantItems); this.adminItems = { title: 'SIDE-BAR.ADMIN', From 2a1eeb92d3a0421a064befdf10b844f9f5db3f26 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 4 Oct 2019 11:02:36 +0300 Subject: [PATCH 046/161] Fixes bug on removing /grants --- .../src/app/ui/grant/grant.routing.ts | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/dmp-frontend/src/app/ui/grant/grant.routing.ts b/dmp-frontend/src/app/ui/grant/grant.routing.ts index 66670909c..9c715987d 100644 --- a/dmp-frontend/src/app/ui/grant/grant.routing.ts +++ b/dmp-frontend/src/app/ui/grant/grant.routing.ts @@ -1,36 +1,37 @@ -// import { NgModule } from '@angular/core'; -// import { RouterModule, Routes } from '@angular/router'; -// import { GrantEditorComponent } from './editor/grant-editor.component'; -// import { GrantListingComponent } from './listing/grant-listing.component'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { GrantEditorComponent } from './editor/grant-editor.component'; +import { GrantListingComponent } from './listing/grant-listing.component'; -// const routes: Routes = [ -// { -// path: '', -// component: GrantListingComponent, -// data: { -// breadcrumb: true -// }, -// }, -// { -// path: 'edit/:id', -// component: GrantEditorComponent, -// data: { -// breadcrumb: true, -// title: 'GENERAL.TITLES.GRANT-EDIT' -// } -// }, -// { -// path: 'new', -// component: GrantEditorComponent, -// data: { -// breadcrumb: true, -// title: 'GENERAL.TITLES.GRANT-NEW' -// }, -// } -// ]; +// ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- +const routes: Routes = [ + // { + // path: '', + // component: GrantListingComponent, + // data: { + // breadcrumb: true + // }, + // }, + // { + // path: 'edit/:id', + // component: GrantEditorComponent, + // data: { + // breadcrumb: true, + // title: 'GENERAL.TITLES.GRANT-EDIT' + // } + // }, + // { + // path: 'new', + // component: GrantEditorComponent, + // data: { + // breadcrumb: true, + // title: 'GENERAL.TITLES.GRANT-NEW' + // }, + // } +]; -// @NgModule({ -// imports: [RouterModule.forChild(routes)], -// exports: [RouterModule] -// }) -// export class GrantRoutingModule { } +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class GrantRoutingModule { } From 5fab3fb9d1872a8a3e49f3e92180d685580c06ef Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 4 Oct 2019 11:53:30 +0300 Subject: [PATCH 047/161] Fixes bug on removing /grants --- .../listing-item/dataset-listing-item.component.ts | 8 ++++---- .../listing/listing-item/dmp-listing-item.component.ts | 8 ++++---- .../src/app/ui/dmp/overview/dmp-overview.component.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts index a0a5f7d8c..7c5297dd3 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts @@ -27,10 +27,10 @@ export class DatasetListingItemComponent implements OnInit { this.onClick.emit(this.dataset); } - // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- - // grantClicked(dataset: DatasetListingModel) { - // this.router.navigate(['/grants/edit/' + dataset.grantId]); - // } + grantClicked(dataset: DatasetListingModel) { + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // this.router.navigate(['/grants/edit/' + dataset.grantId]); + } datasetClicked(dataset: DatasetListingModel) { this.router.navigate(['/plans/edit/' + dataset.dmpId]) diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts index f2a690463..a8d1694da 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts @@ -85,10 +85,10 @@ export class DmpListingItemComponent implements OnInit { this.onClick.emit(this.dmp); } - // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- - // grantClicked(grantId: String) { - // this.router.navigate(['/grants/edit/' + grantId]); - // } + grantClicked(grantId: String) { + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // this.router.navigate(['/grants/edit/' + grantId]); + } datasetClicked(dmpId: string) { this.router.navigate(['/plans/edit/' + dmpId], { queryParams: { tab: "datasetDescriptions" } }); diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index 5dc0ced86..de98724b3 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -93,10 +93,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { this.router.navigate(['/plans/clone/' + dmp.id]); } - // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- - // grantClicked(grantId: String) { - // this.router.navigate(['/grants/edit/' + grantId]); - // } + grantClicked(grantId: String) { + // ----------- UNCOMMENT TO ADD AGAIN GRANTS -------- + // this.router.navigate(['/grants/edit/' + grantId]); + } datasetClicked(datasetId: String) { if (this.isPublicView) { From cf1677901045188cdf6d24fb50d1e5b5f152b567 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 4 Oct 2019 11:57:43 +0300 Subject: [PATCH 048/161] Removes obsolete services Grant direct create or update and Grant delete. --- .../web/src/main/java/eu/eudat/controllers/Grants.java | 8 ++++---- .../main/java/eu/eudat/logic/managers/GrantManager.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java index 0ba69119f..8e8bbb56e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java @@ -60,21 +60,21 @@ public class Grants extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(grant).status(ApiMessageCode.NO_MESSAGE)); } - @Transactional + /*@Transactional @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> addGrant(@Valid @RequestBody eu.eudat.models.data.grant.Grant grant, Principal principal) throws IOException, ParseException { this.grantManager.createOrUpdate(grant, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); - } + }*/ - @Transactional + /*@Transactional @RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> inactivate(@PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException { this.grantManager.inactivate(id); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); - } + }*/ @RequestMapping(method = RequestMethod.POST, value = {"/external"}, consumes = "application/json", produces = "application/json") public @ResponseBody diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java index d1eb90c1f..4900a905c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java @@ -102,13 +102,13 @@ public class GrantManager { return grant; } - public eu.eudat.data.entities.Grant inactivate(String id) throws InstantiationException, IllegalAccessException { + /*public eu.eudat.data.entities.Grant inactivate(String id) throws InstantiationException, IllegalAccessException { GrantDao grantRepository = databaseRepository.getGrantDao(); eu.eudat.data.entities.Grant grant = grantRepository.find(UUID.fromString(id)); grant.setStatus(eu.eudat.data.entities.Grant.Status.DELETED.getValue()); grant = grantRepository.createOrUpdate(grant); return grant; - } + }*/ public List getCriteriaWithExternal(GrantCriteriaRequest grantCriteria, Principal principal) throws IllegalAccessException, InstantiationException, HugeResultSet, NoURLFound { eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); @@ -155,7 +155,7 @@ public class GrantManager { return grants; } - public void createOrUpdate(eu.eudat.models.data.grant.Grant grant, Principal principal) throws ParseException, IOException { + /*public void createOrUpdate(eu.eudat.models.data.grant.Grant grant, Principal principal) throws ParseException, IOException { eu.eudat.data.entities.Grant grantEntity = grant.toDataModel(); if (grant.getFiles() != null) { for (ContentFile file : grant.getFiles()) { @@ -176,7 +176,7 @@ public class GrantManager { grantEntity.setType(eu.eudat.data.entities.Grant.GrantType.INTERNAL.getValue()); grantEntity.setCreationUser(databaseRepository.getUserInfoDao().find(principal.getId())); databaseRepository.getGrantDao().createOrUpdate(grantEntity); - } + }*/ public void delete(UUID uuid) { eu.eudat.data.entities.Grant oldGrant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(uuid); From da325854c969ca527c4251d1d4a3cfed75f4a51d Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 4 Oct 2019 12:16:59 +0300 Subject: [PATCH 049/161] Makes Grant selector disable when Funder is not selected on Grant Tab of DMP Editor. --- .../editor/grant-tab/grant-tab.component.html | 2 +- .../editor/grant-tab/grant-tab.component.ts | 39 ++++++++++++++++--- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html index 45ad4b56d..ce7eab906 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html @@ -68,7 +68,7 @@ settings_backup_restore {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST-GRANT' | translate}}
-
+
add {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.CREATE-NEW-GRANT' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts index 9969509c5..f14e36cd3 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts @@ -10,17 +10,19 @@ import { FunderService } from '../../../../core/services/funder/funder.service'; import { FunderCriteria } from '../../../../core/query/funder/funder-criteria'; import { ProjectCriteria } from '../../../../core/query/project/project-criteria'; import { TranslateService } from '@ngx-translate/core'; +import { takeUntil } from "rxjs/operators"; +import { BaseComponent } from "../../../../core/common/base/base.component"; @Component({ selector: 'app-grant-tab', templateUrl: './grant-tab.component.html', styleUrls: ['./grant-tab.component.scss'] }) -export class GrantTabComponent implements OnInit { +export class GrantTabComponent extends BaseComponent implements OnInit { @Input() grantformGroup: FormGroup; @Input() projectFormGroup: FormGroup; - @Input() funderFormGroup: FormGroup; + @Input() funderFormGroup: FormGroup = null; @Input() isFinalized: boolean; @Input() isNewVersion: boolean; @@ -38,7 +40,9 @@ export class GrantTabComponent implements OnInit { private projectService: ProjectService, private funderService: FunderService, private language: TranslateService - ) { } + ) { + super(); + } ngOnInit() { @@ -47,7 +51,7 @@ export class GrantTabComponent implements OnInit { this.funderAutoCompleteConfiguration = { filterFn: this.searchFunder.bind(this), - initialItems: (extraData) => this.searchFunder(''), + initialItems: () => this.searchFunder(''), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') @@ -55,7 +59,7 @@ export class GrantTabComponent implements OnInit { this.grantAutoCompleteConfiguration = { filterFn: this.searchGrant.bind(this), - initialItems: (extraData) => this.searchGrant(''), + initialItems: () => this.searchGrant(''), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') @@ -63,7 +67,7 @@ export class GrantTabComponent implements OnInit { this.projectAutoCompleteConfiguration = { filterFn: this.searchProject.bind(this), - initialItems: (extraData) => this.searchProject(''), + initialItems: () => this.searchProject(''), displayFn: (item) => item['label'], titleFn: (item) => item['label'], subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') @@ -75,6 +79,7 @@ export class GrantTabComponent implements OnInit { this.setGrantValidators(); this.setProjectValidators(); this.setFunderValidators(); + this.registerFormListeners(); } searchGrant(query: any) { @@ -103,6 +108,7 @@ export class GrantTabComponent implements OnInit { createGrant() { if (this.isNewVersion) { return }; + if (this.isGrantDisabled()) return; this.isCreateNew = !this.isCreateNew; this.setGrantValidators(); } @@ -169,4 +175,25 @@ export class GrantTabComponent implements OnInit { } } + registerFormListeners() { + this.funderFormGroup.valueChanges + .pipe(takeUntil(this._destroyed)) + .subscribe(x => { + this.funderValueChanged(x); + }) + } + + funderValueChanged(funder: any) { + if ((funder.id !== undefined) || (funder.existFunder !== null && funder.existFunder.id !== undefined)) { + this.grantformGroup.enable(); + } + else { + this.grantformGroup.reset(); + this.grantformGroup.disable(); + } + } + + isGrantDisabled() { + return this.grantformGroup.status === "DISABLED"; + } } From e41163878d8148f5fef34ad5d6c1e51b7ec6338c Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 4 Oct 2019 12:24:13 +0300 Subject: [PATCH 050/161] Fixes bug on mat-chip --- dmp-frontend/src/app/app.component.scss | 22 +++++++++++-------- .../explore-dmp-filter-item.component.ts | 2 +- dmp-frontend/src/styles.scss | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dmp-frontend/src/app/app.component.scss b/dmp-frontend/src/app/app.component.scss index 634a06f22..51ca45e9b 100644 --- a/dmp-frontend/src/app/app.component.scss +++ b/dmp-frontend/src/app/app.component.scss @@ -1,17 +1,21 @@ .fixed { - position: fixed; - top: 0; - /* Sets the sticky toolbar to be on top */ - z-index: 1000; - width: 100%; + position: fixed; + top: 0; + /* Sets the sticky toolbar to be on top */ + z-index: 1000; + width: 100%; } .main-container { - margin-top: 64px; - padding-top: 10px; + margin-top: 64px; + padding-top: 10px; } .sidebar-shadow { - box-shadow: 0 4px 18px 0px rgba(0, 0, 0, 0.12), 0 7px 10px -5px rgba(0, 0, 0, 0.15); - z-index: 100; + box-shadow: 0 4px 18px 0px rgba(0, 0, 0, 0.12), 0 7px 10px -5px rgba(0, 0, 0, 0.15); + z-index: 100; +} + +::ng-deep .mat-chip { + height: auto !important; } diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts index 5be70ac9f..5b706d5e4 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filter-item/explore-dmp-filter-item.component.ts @@ -35,7 +35,7 @@ export class ExploreDmpFilterItemComponent extends BaseComponent implements OnIn optionSearchControl = new FormControl(''); - private selectedOptions: any[] = []; + public selectedOptions: any[] = []; @ViewChild('optionsList', { static: true }) selectionList: MatSelectionList; diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 595e6ed28..5af92cd10 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -131,7 +131,7 @@ } .finalized-bookmark { - color: #08bd63;; + color: #08bd63; // color: #92d050; display: inline; position: absolute; From 4d1f64088c64f7deff10f765851442ed84b175e8 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 4 Oct 2019 14:33:38 +0300 Subject: [PATCH 051/161] Fixes bug on external urls on not setting the first page properly. Configures external urls with official data. --- .../eu/eudat/logic/managers/GrantManager.java | 1 - .../proxy/config/DataPageConfiguration.java | 24 - .../logic/proxy/config/UrlConfiguration.java | 9 + .../logic/proxy/fetching/RemoteFetcher.java | 14 +- .../web/src/main/resources/ExternalUrls.xml | 695 +++++++++--------- 5 files changed, 367 insertions(+), 376 deletions(-) delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataPageConfiguration.java diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java index 4900a905c..116879f5b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java @@ -127,7 +127,6 @@ public class GrantManager { List grants = authItems.select(item -> new Grant().fromDataModel(item)); ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(grantCriteria.getCriteria().getLike()); - if (externalUrlCriteria.getPage() == null) externalUrlCriteria.setPage("0"); if (grantCriteria.getCriteria().getFunderReference() != null) externalUrlCriteria.setFunderId(grantCriteria.getCriteria().getFunderReference()); List> remoteRepos = remoteFetcher.getGrants(externalUrlCriteria); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataPageConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataPageConfiguration.java deleted file mode 100644 index e0592e3f3..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataPageConfiguration.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.logic.proxy.config; - -import javax.xml.bind.annotation.XmlElement; - -public class DataPageConfiguration { - private String type; - private String pageParam; - - public String getType() { - return type; - } - @XmlElement(name = "type") - public void setType(String type) { - this.type = type; - } - - public String getPageParam() { - return pageParam; - } - @XmlElement(name = "pageparam") - public void setPageParam(String pageParam) { - this.pageParam = pageParam; - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java index 4d19000eb..762153ad4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java @@ -14,6 +14,7 @@ public class UrlConfiguration { private String paginationPath; private String contentType; private String funderQuery; + private String firstpage; public String getKey() { return key; @@ -86,4 +87,12 @@ public class UrlConfiguration { public void setFunderQuery(String funderQuery) { this.funderQuery = funderQuery; } + + public String getFirstpage() { + return firstpage; + } + @XmlElement(name = "firstPage") + public void setFirstpage(String firstpage) { + this.firstpage = firstpage; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java index 31fba06e1..61922b878 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -131,7 +131,7 @@ public class RemoteFetcher { for (UrlConfiguration urlConfig : urlConfigs) { ifFunderQueryExist(urlConfig, externalUrlCriteria); if (urlConfig.getType() == null || urlConfig.getType().equals("External")) { - results.addAll(getAllResultsFromUrl(urlConfig.getUrl(), fetchStrategy, urlConfig.getData(), urlConfig.getPaginationPath(), externalUrlCriteria, urlConfig.getLabel(), urlConfig.getContentType())); + results.addAll(getAllResultsFromUrl(urlConfig.getUrl(), fetchStrategy, urlConfig.getData(), urlConfig.getPaginationPath(), externalUrlCriteria, urlConfig.getLabel(), urlConfig.getContentType(), urlConfig.getFirstpage())); } else if (urlConfig.getType() != null && urlConfig.getType().equals("Internal")) { results.addAll(getAllResultsFromMockUpJson(urlConfig.getUrl(), externalUrlCriteria.getLike())); } @@ -150,7 +150,7 @@ public class RemoteFetcher { } } - private String replaceCriteriaOnUrl(String path, ExternalUrlCriteria externalUrlCriteria) { + private String replaceCriteriaOnUrl(String path, ExternalUrlCriteria externalUrlCriteria, String firstPage) { String completedPath = path; if (externalUrlCriteria.getLike() != null) { if (path.contains("openaire") && externalUrlCriteria.getLike().equals("")) @@ -172,7 +172,11 @@ public class RemoteFetcher { if (externalUrlCriteria.getPage() != null) { completedPath = completedPath.replace("{page}", externalUrlCriteria.getPage()); } else { - completedPath = completedPath.replace("{page}", "1"); + if (firstPage != null) { + completedPath = completedPath.replace("{page}", firstPage); + } else { + completedPath = completedPath.replace("{page}", "1"); + } } if (externalUrlCriteria.getPageSize() != null) { completedPath = completedPath.replace("{pageSize}", externalUrlCriteria.getPageSize()); @@ -182,10 +186,10 @@ public class RemoteFetcher { return completedPath; } - private List> getAllResultsFromUrl(String path, FetchStrategy fetchStrategy, final DataUrlConfiguration jsonDataPath, final String jsonPaginationPath, ExternalUrlCriteria externalUrlCriteria, String key, String contentType) throws HugeResultSet { + private List> getAllResultsFromUrl(String path, FetchStrategy fetchStrategy, final DataUrlConfiguration jsonDataPath, final String jsonPaginationPath, ExternalUrlCriteria externalUrlCriteria, String key, String contentType, String firstPage) throws HugeResultSet { Set pages = new HashSet<>(); - String replacedPath = replaceCriteriaOnUrl(path, externalUrlCriteria); + String replacedPath = replaceCriteriaOnUrl(path, externalUrlCriteria, firstPage); Results results = getResultsFromUrl(replacedPath, jsonDataPath, jsonPaginationPath, contentType); if (fetchStrategy == FetchStrategy.FIRST) diff --git a/dmp-backend/web/src/main/resources/ExternalUrls.xml b/dmp-backend/web/src/main/resources/ExternalUrls.xml index 2af67ec07..0a734c1c0 100644 --- a/dmp-backend/web/src/main/resources/ExternalUrls.xml +++ b/dmp-backend/web/src/main/resources/ExternalUrls.xml @@ -6,105 +6,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - + cristin + 1 - Internal - RegistriesInternalMockUpData.json - - $['data'][*]['attributes'] - - 'pid' - - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - - - - - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - - 1 - Internal - TagsInternalMockUpData.json + External + https://eestore.paas2.uninett.no/api/metadataschemarepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 $['data'][*]['attributes'] @@ -116,20 +25,12 @@ $['meta']['pagination']['page','pages','count'] - - - - FIRST - - - - - - + + - - + + @@ -141,13 +42,113 @@ + + + + + + + + + + + + + + + + + + + FIRST + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/tags/ + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FIRST + + + + + + cristin + + 1 + https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + openAIRE 1 https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22{like}%22)or({like}))){funderQuery}&page={page}&size={pageSize}&format=json &fq=(funder%20exact%20%22{funderId}%22) + 0 application/json; charset=utf-8 $['results'][*]['result']['metadata']['oaf:entity']['oaf:project'] @@ -159,7 +160,6 @@ $['meta']['pagination']['page','pages','count'] - @@ -194,49 +194,49 @@ - - FIRST - - cristin - - 1 - External - https://eestore.paas2.uninett.no/api/projectrepo/ - application/vnd.api+json; charset=utf-8 - - $['data'][*]['attributes'] - - 'pid' - 'name' - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - - - openAIRE - - 1 - External - https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22*%22)or(*)))&fq=(funder%20exact%20{funderId})&page={page}&size={pageSize}&format=json - application/json; charset=utf-8 - - $['response']['results']['result'][*]['metadata']['oaf:entity']['oaf:project'] - - 'originalId' - 'title' - 'count' - - - $['meta']['pagination']['page','pages','count'] - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -254,26 +254,24 @@ - - internal - - 1 - Internal - ProjectInternalMockUpData.json - - $['data'][*]['attributes'] - - 'pid' - 'name' - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - - + + + + + + + + + + + + + + + + + - FIRST @@ -327,7 +325,8 @@ 1 External - https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page=0&size=0&format=json + https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 application/json; charset=utf-8 $['refineResults']['relfunder'][*] @@ -343,7 +342,8 @@ 1 External - https://services.openaire.eu/search/v2/api/datasets?&refine=true&fields=relfunder&page=0&size=0&format=json + https://services.openaire.eu/search/v2/api/datasets?&refine=true&fields=relfunder&page=0&size={page}&format=json + 0 application/json; charset=utf-8 $['refineResults']['relfunder'][*] @@ -359,7 +359,8 @@ 1 External - https://services.openaire.eu/search/v2/api/software?&refine=true&fields=relfunder&page=0&size=0&format=json + https://services.openaire.eu/search/v2/api/software?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 application/json; charset=utf-8 $['refineResults']['relfunder'][*] @@ -375,7 +376,8 @@ 1 External - https://services.openaire.eu/search/v2/api/other?&refine=true&fields=relfunder&page=0&size=0&format=json + https://services.openaire.eu/search/v2/api/other?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 application/json; charset=utf-8 $['refineResults']['relfunder'][*] @@ -403,55 +405,20 @@ - - FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - internal - + cristin + 1 - Internal - RepositoriesInternalMockUpData.json + External + https://eestore.paas2.uninett.no/api/datarepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 $['data'][*]['attributes'] @@ -463,21 +430,12 @@ $['meta']['pagination']['page','pages','count'] - - - FIRST - - - - - - - - + + - + @@ -490,6 +448,49 @@ + + + + + + + + + + + + + + + + + + FIRST + + + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/servicerepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + @@ -506,48 +507,49 @@ - - internal - - 1 - Internal - ServicesInternalMockUpData.json - - $['data'][*]['attributes'] - - 'pid' - - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - + + + + + + + + + + + + + + + + + - FIRST - - - - - - - - - - - - - - - - - + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/personrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + @@ -565,48 +567,49 @@ - - internal - - 1 - Internal - ResearcherInternalMockUpData.json - - $['data'][*]['attributes'] - - 'pid' - 'name' - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - + + + + + + + + + + + + + + + + + - FIRST - - - - - - - - - - - - - - - - - + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/organizationrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + @@ -624,48 +627,48 @@ - - internal - - 1 - Internal - OrganisationInternalMockUpData.json - - $['data'][*]['attributes'] - - 'pid' - 'name' - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - + + + + + + + + + + + + + + + + + - FIRST - - - - - - - - - - - - - - - - - - + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/datasetmdrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + @@ -683,23 +686,23 @@ - - internal - - 1 - Internal - DatasetsInternalMockUpData.json - - $['data'][*]['attributes'] - - 'pid' - 'name' - 'uri' - 'description' - - - $['meta']['pagination']['page','pages','count'] - + + + + + + + + + + + + + + + + + FIRST From 9d6469cd7c74746a5153d2cc9199b9d9c158e6df Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 4 Oct 2019 14:34:59 +0300 Subject: [PATCH 052/161] Refactors external references fetching internal created entites when "All" filter is selected. --- .../eu/eudat/logic/managers/DataRepositoryManager.java | 9 +++++++-- .../java/eu/eudat/logic/managers/RegistryManager.java | 9 ++++++--- .../java/eu/eudat/logic/managers/ServiceManager.java | 9 ++++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java index e7143d223..31634fe0c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java @@ -13,6 +13,7 @@ import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -42,9 +43,13 @@ public class DataRepositoryManager { DataRepositoryCriteria criteria = new DataRepositoryCriteria(); if (!query.isEmpty()) criteria.setLike(query); criteria.setCreationUserId(principal.getId()); - List dataRepositoryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().getWithCriteria(criteria)).toList(); - List dataRepositoryModels = dataRepositoryList.stream().map(item -> new DataRepositoryModel().fromDataModel(item)).collect(Collectors.toList()); + List dataRepositoryModels = new LinkedList<>(); + if (type.equals("")) { + List dataRepositoryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().getWithCriteria(criteria)).toList(); + dataRepositoryModels = dataRepositoryList.stream().map(item -> new DataRepositoryModel().fromDataModel(item)).collect(Collectors.toList()); + } + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); dataRepositoryModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, DataRepositoryModel.class)).collect(Collectors.toList())); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java index 8cbbfd52d..703c417b8 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java @@ -13,6 +13,7 @@ import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -40,9 +41,11 @@ public class RegistryManager { RegistryCriteria criteria = new RegistryCriteria(); if (!query.isEmpty()) criteria.setLike(query); criteria.setCreationUserId(principal.getId()); - List registryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().getWithCriteria(criteria)).toList(); - - List registryModels = registryList.stream().map(item -> new RegistryModel().fromDataModel(item)).collect(Collectors.toList()); + List registryModels = new LinkedList<>(); + if (type.equals("")) { + List registryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().getWithCriteria(criteria)).toList(); + registryModels = registryList.stream().map(item -> new RegistryModel().fromDataModel(item)).collect(Collectors.toList()); + } ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); registryModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, RegistryModel.class)).collect(Collectors.toList())); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java index dbdf38c36..03c858c95 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java @@ -13,6 +13,7 @@ import eu.eudat.models.data.services.ServiceModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -43,9 +44,11 @@ public class ServiceManager { ServiceCriteria criteria = new ServiceCriteria(); if (!query.isEmpty()) criteria.setLike(query); criteria.setCreationUserId(principal.getId()); - List serviceList = (this.apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().getWithCriteria(criteria)).toList(); - - List serviceModels = serviceList.stream().map(item -> new ServiceModel().fromDataModel(item)).collect(Collectors.toList()); + List serviceModels = new LinkedList<>(); + if (type.equals("")) { + List serviceList = (this.apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().getWithCriteria(criteria)).toList(); + serviceModels = serviceList.stream().map(item -> new ServiceModel().fromDataModel(item)).collect(Collectors.toList()); + } ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); serviceModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ServiceModel.class)).collect(Collectors.toList())); From fbe932b546d25b5db2f5ed2635d7bea2ada6b2f0 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 4 Oct 2019 17:14:46 +0300 Subject: [PATCH 053/161] Fixes bug on not disbaling Grant when creating new DMP. --- .../src/app/ui/dmp/editor/dmp-editor.component.html | 2 +- .../src/app/ui/dmp/editor/dmp-editor.component.ts | 13 ++----------- .../ui/dmp/editor/grant-tab/grant-tab.component.ts | 10 ++++++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index 4e4d5f5cd..ea9c70321 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -65,7 +65,7 @@ work_outline {{ 'DMP-LISTING.COLUMNS.GRANT' | translate }} - + diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index a02769c44..15dbe087f 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -2,10 +2,9 @@ import {of as observableOf, Observable } from 'rxjs'; import {map, takeUntil } from 'rxjs/operators'; -import { Component, OnInit, ViewContainerRef } from '@angular/core'; -import { FormGroup, FormControl, FormArray, AbstractControl } from '@angular/forms'; +import { Component, OnInit } from '@angular/core'; +import { FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; -import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; @@ -24,16 +23,13 @@ import { GrantCriteria } from '../../../core/query/grant/grant-criteria'; import { RequestItem } from '../../../core/query/request-item'; import { DmpProfileService } from '../../../core/services/dmp/dmp-profile.service'; import { DmpService } from '../../../core/services/dmp/dmp.service'; -import { ExternalSourcesService } from '../../../core/services/external-sources/external-sources.service'; import { SnackBarNotificationLevel, UiNotificationService } from '../../../core/services/notification/ui-notification-service'; -import { GrantService } from '../../../core/services/grant/grant.service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; import { DmpEditorModel } from './dmp-editor.model'; import { DmpFinalizeDialogComponent, DmpFinalizeDialogInput } from './dmp-finalize-dialog/dmp-finalize-dialog.component'; import { AuthService } from '../../../core/services/auth/auth.service'; -import { ExportMethodDialogComponent } from '../../../library/export-method-dialog/export-method-dialog.component'; import { UserInfoListingModel } from '../../../core/model/user/user-info-listing'; import { GrantTabModel } from './grant-tab/grant-tab-model'; import { ProjectFormModel } from './grant-tab/project-form-model'; @@ -67,15 +63,10 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC constructor( private dmpProfileService: DmpProfileService, private dmpService: DmpService, - private grantService: GrantService, - private externalSourcesService: ExternalSourcesService, private route: ActivatedRoute, - private snackBar: MatSnackBar, private router: Router, private language: TranslateService, - private _service: DmpService, private dialog: MatDialog, - private _viewContainerRef: ViewContainerRef, private uiNotificationService: UiNotificationService, private authService: AuthService, ) { diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts index f14e36cd3..86b03927a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts @@ -25,6 +25,7 @@ export class GrantTabComponent extends BaseComponent implements OnInit { @Input() funderFormGroup: FormGroup = null; @Input() isFinalized: boolean; @Input() isNewVersion: boolean; + @Input() isNew: boolean; isCreateNew = false; isCreateNewProject = false; @@ -80,6 +81,10 @@ export class GrantTabComponent extends BaseComponent implements OnInit { this.setProjectValidators(); this.setFunderValidators(); this.registerFormListeners(); + if (this.isNew) { + this.grantformGroup.reset(); + this.grantformGroup.disable(); + } } searchGrant(query: any) { @@ -184,7 +189,8 @@ export class GrantTabComponent extends BaseComponent implements OnInit { } funderValueChanged(funder: any) { - if ((funder.id !== undefined) || (funder.existFunder !== null && funder.existFunder.id !== undefined)) { + if ((funder.label !== "" && funder.label != null && funder.label !== undefined) + || (funder.existFunder !== null && funder.existFunder !== undefined && funder.existFunder.id !== undefined)) { this.grantformGroup.enable(); } else { @@ -194,6 +200,6 @@ export class GrantTabComponent extends BaseComponent implements OnInit { } isGrantDisabled() { - return this.grantformGroup.status === "DISABLED"; + return this.grantformGroup.disabled; } } From b08ac084c90412a345ff0f914b9bc54945299c66 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 4 Oct 2019 18:24:13 +0300 Subject: [PATCH 054/161] Fixes bug on not reseting the Grant selection method on Grant Tab of DMP editor. --- .../src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts index 86b03927a..f76bf72e1 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts @@ -196,6 +196,7 @@ export class GrantTabComponent extends BaseComponent implements OnInit { else { this.grantformGroup.reset(); this.grantformGroup.disable(); + if (this.isCreateNew) this.isCreateNew = !this.isCreateNew; } } From 77d2aa317ee94749e0ef1d6f44552cbe28346c18 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 4 Oct 2019 19:11:52 +0300 Subject: [PATCH 055/161] Funder - Grant Selection in DMP at quick-wizard. (Issue #182) --- .../single/single-auto-complete.component.ts | 3 ++ .../dmp/editor/grant-tab/funder-form-model.ts | 2 +- .../funder-editor-wizard.component.html | 13 ++--- .../funder-editor-wizard.component.ts | 49 ++++++++++++++----- .../grant-editor-wizard.component.html | 3 +- .../grant-editor-wizard.component.ts | 12 ++++- .../project-editor-wizard.component.html | 1 + .../project-editor-wizard.component.ts | 7 ++- .../quick-wizard-editor.component.html | 4 +- .../quick-wizard-editor.component.ts | 2 +- 10 files changed, 68 insertions(+), 28 deletions(-) diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 0650c290f..7ec639b9d 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -24,6 +24,8 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< @Input() configuration: SingleAutoCompleteConfiguration; // Selected Option Event @Output() optionSelected: EventEmitter = new EventEmitter(); + // Removed Option Event + @Output() optionRemoved: EventEmitter = new EventEmitter(); id = `single-autocomplete-${SingleAutoCompleteComponent.nextId++}`; stateChanges = new Subject(); @@ -231,6 +233,7 @@ export class SingleAutoCompleteComponent implements OnInit, MatFormFieldControl< chipRemove(): void { this._setValue(null); + this.optionRemoved.emit(); } autoCompleteDisplayFn() { diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts index ce7f8b967..967fd3775 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts @@ -36,7 +36,7 @@ export class FunderFormModel { baseContext.validation.push({ key: 'id', validators: [] }); baseContext.validation.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'label')] }); baseContext.validation.push({ key: 'status', validators: [] }); - baseContext.validation.push({ key: 'existFunder', validators: [BackendErrorValidator(this.validationErrorModel, 'existFunder')] }); + baseContext.validation.push({ key: 'existFunder', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'existFunder')] }); return baseContext; } diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html index b36d0a087..5cedf1964 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html @@ -1,23 +1,24 @@
-
+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-FUNDER' | translate}}

- + + {{'DMP-EDITOR.FIELDS.EXTERNAL-SOURCE-HINT' | translate}}

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-NEW-FUNDER' | translate}}

- - - {{formGroup.get('label').getError('backendError').message}} - + + + {{funderFormGroup.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts index ab1433438..24bf86356 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts @@ -5,6 +5,7 @@ import { FunderService } from '../../../core/services/funder/funder.service'; import { RequestItem } from '../../../core/query/request-item'; import { FunderCriteria } from '../../../core/query/funder/funder-criteria'; import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-quick-wizard-funder-editor-component', @@ -15,11 +16,13 @@ export class FunderEditorWizardComponent implements OnInit { isNew = false; funder: FunderFormModel; - @Input() formGroup: FormGroup; + @Input() funderFormGroup: FormGroup; + @Input() grantformGroup: FormGroup; funderAutoCompleteConfiguration: SingleAutoCompleteConfiguration; constructor( - private funderService: FunderService + private funderService: FunderService, + private language: TranslateService ) { } ngOnInit() { @@ -28,16 +31,17 @@ export class FunderEditorWizardComponent implements OnInit { filterFn: this.searchFunder.bind(this), initialItems: (extraData) => this.searchFunder(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; - if (!this.formGroup) { + if (!this.funderFormGroup) { this.funder = new FunderFormModel(); - this.formGroup = this.funder.buildForm(); + this.funderFormGroup = this.funder.buildForm(); } - this.formGroup.get('existFunder').enable(); - this.formGroup.get('label').disable(); + this.funderFormGroup.get('existFunder').enable(); + this.funderFormGroup.get('label').disable(); } searchFunder(query: string) { @@ -50,13 +54,32 @@ export class FunderEditorWizardComponent implements OnInit { create() { this.isNew = !this.isNew; if (this.isNew) { - this.formGroup.get('existFunder').disable(); - this.formGroup.get('existFunder').reset(); - this.formGroup.get('label').enable(); + this.funderFormGroup.get('existFunder').disable(); + this.funderFormGroup.get('existFunder').reset(); + this.funderFormGroup.get('label').enable(); } else { - this.formGroup.get('existFunder').enable(); - this.formGroup.get('label').disable(); - this.formGroup.get('label').reset(); + this.funderFormGroup.get('existFunder').enable(); + this.funderFormGroup.get('label').disable(); + this.funderFormGroup.get('label').reset(); + } + } + + onFunderSelected(event: any) { + this.grantformGroup.get('existGrant').enable(); + } + + onFunderRemoved(event: any) { + this.grantformGroup.get('existGrant').disable(); + this.grantformGroup.get('existGrant').reset(); + } + + controlModified(event: any) { + if (event) { + this.grantformGroup.get('existGrant').enable(); + } + else { + this.grantformGroup.get('existGrant').disable(); + this.grantformGroup.get('existGrant').reset(); } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html index ddb3a4e8c..bd01567ed 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html @@ -12,6 +12,7 @@ + {{'DMP-EDITOR.FIELDS.EXTERNAL-SOURCE-HINT' | translate}} {{grantformGroup.get('grant').getError('backendError').message}} @@ -53,7 +54,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts index cdfa6e73b..b2800990f 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts @@ -57,7 +57,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, initialItems: (extraData) => this.searchGrant(''), displayFn: (item) => item['label'], titleFn: (item) => item['label'], - subtitleFn: (item) => item ? item['source'] : null + subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; if (!this.grantformGroup) { @@ -65,7 +65,11 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, this.grantformGroup = this.grant.buildForm(); } - this.grantformGroup.get('existGrant').enable(); + if (this.funderFormGroup && this.funderFormGroup.get('funder')) { + this.grantformGroup.get('existGrant').enable(); + } else { + this.grantformGroup.get('existGrant').disable(); + } this.grantformGroup.get('label').disable(); this.grantformGroup.get('description').disable(); @@ -101,6 +105,10 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, return this.grantformGroup.valid; } + isFunderFormInvalid() { + return !this.funderFormGroup.get('existFunder').value && !this.funderFormGroup.get('label').valid; + } + public touchAllFormFields(formControl: AbstractControl) { if (formControl instanceof FormControl) { formControl.markAsTouched(); diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html index b53fb7f43..208838c21 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html @@ -9,6 +9,7 @@ + {{'DMP-EDITOR.FIELDS.EXTERNAL-SOURCE-HINT' | translate}}
diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts index 73c5c22dc..bc81cbc21 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts @@ -5,6 +5,7 @@ import { ProjectService } from '../../../core/services/project/project.service'; import { RequestItem } from '../../../core/query/request-item'; import { ProjectCriteria } from '../../../core/query/project/project-criteria'; import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-quick-wizard-project-editor-component', @@ -19,7 +20,8 @@ export class ProjectEditorWizardComponent implements OnInit { projectAutoCompleteConfiguration: SingleAutoCompleteConfiguration; constructor( - private projectService: ProjectService + private projectService: ProjectService, + private language: TranslateService ) { } ngOnInit() { @@ -27,7 +29,8 @@ export class ProjectEditorWizardComponent implements OnInit { filterFn: this.searchProject.bind(this), initialItems: (extraData) => this.searchProject(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') }; if (!this.formGroup) { diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html index 62571c7b8..9b3bca847 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html @@ -11,14 +11,14 @@ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.TITLE' | translate}}
- +
- +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index 0890149e8..2ef3ebbb6 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -133,7 +133,7 @@ export class QuickWizardEditorComponent extends CheckDeactivateBaseComponent imp } public isFormValid() { - return this.formGroup.get('grant').valid; + return this.formGroup.get('grant').valid && this.formGroup.get('funder').valid; } public touchAllFormFields(formControl: AbstractControl) { From 72df634132408e091659bcb5875ef953668c88d9 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 7 Oct 2019 18:31:22 +0300 Subject: [PATCH 056/161] Makes DMP overview page responsive. --- .../dmp/overview/dmp-overview.component.html | 242 +++++++++--------- 1 file changed, 128 insertions(+), 114 deletions(-) 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 25ec762c7..9b172f2b0 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 @@ -1,147 +1,161 @@
-
-
-

{{ dmp.label }}

- - {{ 'DMP-EDITOR.TITLE.SUBTITLE' | translate }}: {{ dmp.doi }} - -
-
+
+
+
- - - - - - - +
+

{{ dmp.label }}

+ + + + + + + +
- - - - - +
+ + + + + - - - - - - + + + + + + +
+
+
+ + {{ 'DMP-EDITOR.TITLE.SUBTITLE' | translate }}: {{ dmp.doi }} + +
-
-
-
-
-

{{ dmp.label }}

-

{{ dmp.description }}

-
-
+
+
+
+
+
+

{{ dmp.label }}

+

{{ dmp.description }}

+
+
+
settings

{{ roleDisplay(dmp.users) }}

+
-
- storage - -

- {{ dmp.datasets.length }}

-

- {{'NAV-BAR.DATASETS' | translate}}

-
+
+ storage + +

+ {{ dmp.datasets.length }}

+

+ {{'NAV-BAR.DATASETS' | translate}}

+
+
storage

{{ dmp.datasets.length }}

{{'NAV-BAR.DATASETS' | translate}}

+
+
assignment

{{ dmp.associatedProfiles.length }}

{{ 'DMP-EDITOR.FIELDS.TEMPLATES' | translate }}

+
+
person

{{ dmp.researchers.length }}

{{ 'DMP-EDITOR.FIELDS.RESEARCHERS' | translate }}

-
-
-
-
- bookmark - bookmark -

- {{ 'TYPES.DMP.DRAFT' | translate }}: {{ dataset.label }}

-

{{ dataset.label }}

-
- {{ dataset.datasetTemplate.label }}
+
+
+
+ bookmark + bookmark +

+ {{ 'TYPES.DMP.DRAFT' | translate }}: {{ dataset.label }}

+

{{ dataset.label }}

+
+ {{ dataset.datasetTemplate.label }}
+
-
-
- -
-
-
-
-
- {{ dmp.grant.abbreviation }} +
+
-

{{ dmp.grant.label }}

-

{{ dmp.grant.startDate | date: "shortDate" }} - {{ dmp.grant.endDate | date: "shortDate" }}

- - -

{{ dmp.grant.description }}

- - - - open_in_new - {{ 'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate }} -
-
-
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
-
-
{{ researcher.name }}
+
+
+
+ {{ dmp.grant.abbreviation }} +
+

{{ dmp.grant.label }}

+

{{ dmp.grant.startDate | date: "shortDate" }} - {{ dmp.grant.endDate | date: "shortDate" }}

+ + +

{{ dmp.grant.description }}

+ + + + open_in_new + {{ 'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate }} + +
+
+
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
+
+
{{ researcher.name }}
+
From f2833576d32ec34088086d81e19dc7e8fdb46d84 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 8 Oct 2019 10:40:15 +0300 Subject: [PATCH 057/161] Fixes bug on public roles filters when logged out. (Issue #175) --- .../explore-dataset-filters.component.html | 2 +- .../explore-dataset-filters.component.ts | 6 +++ .../explore-dmp-filters.component.html | 50 ++++++++++--------- .../explore-dmp-filters.component.ts | 6 +++ dmp-frontend/src/assets/i18n/en.json | 2 +- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html index e0271734d..3684f2955 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html @@ -45,7 +45,7 @@
-
+
{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}
{{ 'FACET-SEARCH.ROLE.ANY' | translate }} diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts index f63f62551..2a2fd6880 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts @@ -28,6 +28,7 @@ import { DataTableData } from '../../../core/model/data-table/data-table-data'; import { DmpListingModel } from '../../../core/model/dmp/dmp-listing'; import { ExploreDmpCriteriaModel } from '../../../core/query/explore-dmp/explore-dmp-criteria'; import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria"; +import { AuthService } from '../../../core/services/auth/auth.service'; @Component({ selector: 'app-explore-dataset-filters-component', @@ -105,6 +106,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI constructor( public activatedRoute: ActivatedRoute, + private authentication: AuthService, public grantService: GrantService, public dmpService: DmpService, public organisationService: OrganisationService, @@ -361,4 +363,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data)); } + + public isAuthenticated(): boolean { + return !(!this.authentication.current()); + } } diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html index f3683b5a6..9ae8fe5d3 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html @@ -3,26 +3,29 @@
- + search
{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}
- {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }} - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }} - {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }} + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }} + + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }} + + + {{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }} +
{{ 'FACET-SEARCH.GRANT.TITLE' | translate }}
- + arrow_drop_down @@ -31,30 +34,31 @@
{{ 'FACET-SEARCH.PROFILES.TITLE' | translate }}
- + arrow_drop_down
-
-
{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}
- - {{ 'FACET-SEARCH.ROLE.ANY' | translate }} - {{ 'FACET-SEARCH.ROLE.OWNER' | translate }} - {{ 'FACET-SEARCH.ROLE.MEMBER' | translate }} - -
+
+
{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}
+ + + {{ 'FACET-SEARCH.ROLE.ANY' | translate }} + + + {{ 'FACET-SEARCH.ROLE.OWNER' | translate }} + + + {{ 'FACET-SEARCH.ROLE.MEMBER' | translate }} + + +
{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}
- + arrow_drop_down diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts index 051b78c45..73c4f8048 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts @@ -23,6 +23,7 @@ import { OrganizationModel } from "../../../core/model/organisation/organization import { OrganisationCriteria } from "../../../core/query/organisation/organisation-criteria"; import { OrganisationService } from "../../../core/services/organisation/organisation.service"; import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria"; +import { AuthService } from '../../../core/services/auth/auth.service'; @Component({ selector: 'app-explore-dmp-filters-component', @@ -95,6 +96,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements public activatedRoute: ActivatedRoute, public languageService: TranslateService, public grantService: GrantService, + private authentication: AuthService, public datasetProfileService: DatasetService, public organisationService: OrganisationService, public externalSourcesService: ExternalSourcesService, @@ -340,4 +342,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements isOptionSelected(profile: any) { return this.formGroup.value.map(x => x.id).indexOf(profile.id) !== -1; } + + public isAuthenticated(): boolean { + return !(!this.authentication.current()); + } } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 0c3ee1c97..3c653a58e 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -855,7 +855,7 @@ "EXTERNAL-SOURCE-HINT": "External source", "ACTIONS": { "YES": "Yes", - "No": "No" + "NO": "No" } }, "DATASET-PROFILE-INTERNAL-DMP-ENTITIES-TYPE": { From f59881d7aa8a12071a71c158efd193bb6621ffce Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 8 Oct 2019 10:58:02 +0300 Subject: [PATCH 058/161] Makes Funder a mandatory entity. (Issue #182) --- .../controllers/QuickWizardController.java | 13 ++++++------- .../data/dmp/DataManagementPlanEditorModel.java | 17 ++++++++--------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java index 044700940..adedfcb4f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java @@ -44,10 +44,12 @@ public class QuickWizardController extends BaseController { Funder funderEntity; //Create Funder - if (quickWizard.getFunder().getExistFunder() == null - && quickWizard.getFunder().getLabel() == null) { - funderEntity = null; - } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null){ + if (quickWizard.getFunder() == null) { + throw new Exception("Funder is a mandatory entity"); + } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() == null) { + // funderEntity = null; + throw new Exception("Funder is a mandatory entity"); + } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null) { funderEntity = this.quickWizardManager.createOrUpdate(quickWizard.getFunder().toDataFunder(), principal); } else { funderEntity = quickWizard.getFunder().getExistFunder().toDataModel(); @@ -90,8 +92,6 @@ public class QuickWizardController extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); } - - @RequestMapping(method = RequestMethod.POST, value = {"/datasetcreate"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> addDatasetWizard(@RequestBody DatasetCreateWizardModel datasetCreateWizardModel, Principal principal) throws Exception{ @@ -101,5 +101,4 @@ public class QuickWizardController extends BaseController { return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Dataset added!")); } - } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java index cd886dfff..8a9d283e9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java @@ -293,13 +293,13 @@ public class DataManagementPlanEditorModel implements DataModel Date: Tue, 8 Oct 2019 12:21:10 +0300 Subject: [PATCH 059/161] Fixes bug on not assigning the right "external source provider" on fetched Funders. --- .../main/java/eu/eudat/logic/managers/FunderManager.java | 6 +++++- .../java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java | 2 +- .../models/data/external/FundersExternalSourcesModel.java | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java index 8bdfacaab..e661e7ff2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java @@ -45,8 +45,12 @@ public class FunderManager { eu.eudat.models.data.funder.Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) .status(eu.eudat.data.entities.Funder.Status.fromInteger(0)) - .source(externalListingItem.getTag()) .build(); + if (externalListingItem.getSource() != null) { + funder.setSource(externalListingItem.getSource()); + } else { + funder.setSource(externalListingItem.getTag()); + } funders.add(funder); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java index 61922b878..ba1f79cbe 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -141,7 +141,7 @@ public class RemoteFetcher { private void ifFunderQueryExist(UrlConfiguration urlConfiguration, ExternalUrlCriteria externalUrlCriteria) { if (urlConfiguration.getFunderQuery() != null) { - if (externalUrlCriteria.getFunderId() != null) { + if (externalUrlCriteria.getFunderId() != null && urlConfiguration.getFunderQuery().startsWith("dmp:")) { urlConfiguration.setUrl(urlConfiguration.getUrl().replace("{funderQuery}", urlConfiguration.getFunderQuery())); } else { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java index 794d5c2dd..5526a5552 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java @@ -13,6 +13,7 @@ public class FundersExternalSourcesModel extends ExternalListingItem Date: Tue, 8 Oct 2019 14:20:22 +0300 Subject: [PATCH 060/161] Makes dmp/dataet editors mobile responsive --- .../dataset-editor.component.html | 6 +- .../dataset-wizard.component.html | 83 ++++++++++--------- .../dataset-wizard.component.scss | 23 ++++- .../datasets-tab/datasets-tab.component.html | 2 +- .../datasets-tab/datasets-tab.component.scss | 6 ++ .../ui/dmp/editor/dmp-editor.component.html | 2 +- .../ui/dmp/editor/dmp-editor.component.scss | 10 +++ .../general-tab/general-tab.component.html | 18 ++-- .../people-tab/people-tab.component.html | 2 +- .../form-composite-field.component.scss | 11 +-- .../dataset-description-form.component.html | 2 +- .../dataset-description-form.component.scss | 16 ++-- 12 files changed, 113 insertions(+), 68 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html index 1a82038bb..299133f87 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html @@ -2,21 +2,21 @@
- + {{formGroup.get('label').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- + {{formGroup.get('uri').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- + {{formGroup.get('description').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index 535db7c8e..487d2ffcb 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -1,48 +1,51 @@
-
-
-

{{datasetWizardModel?.label}} - - - {{ 'GENERAL.STATUSES.EDIT' | translate }} -

-
-

{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}

+
+
+
+
+

{{datasetWizardModel?.label}} + - + {{ 'GENERAL.STATUSES.EDIT' | translate }} +

+
+

{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}

+
+ + + + + + +
+
+ + + + + + +
-
- - - - - - - - - - - - - -
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index 1f1a86b30..70bf9f022 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -1,3 +1,22 @@ +@media (max-width: 768px) { + .main-content { + padding: 30px 0px; + } + + ::ng-deep .mat-expansion-panel-header { + min-height: 48px; + height: auto !important; + } + + ::ng-deep .mat-expansion-panel-body { + padding: 0 0px 16px !important; + } + + ::ng-deep .mat-vertical-content { + padding: 0 14px 24px 14px !important; + } +} + .dataset-wizard { .step-container { margin-top: 1em; @@ -40,7 +59,7 @@ text-transform: uppercase; } .export-btn { - padding-right: 6px; + padding-right: 6px; } .downloadPDF { margin-top: 15px; @@ -101,6 +120,6 @@ } ::ng-deep .mat-ink-bar { - background-color: #00b29f !important; + background-color: #00b29f !important; // background-color: #0070c0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html index d09a5c615..8b811e0d7 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.html @@ -10,7 +10,7 @@
-
+
bookmark bookmark diff --git a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss index a7116bf01..1b3deaba4 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/datasets-tab/datasets-tab.component.scss @@ -1,3 +1,9 @@ +@media (max-width: 768px) { + button { + font-size: smaller; + } +} + .draft-bookmark { color: #e7e6e6; display: inline; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index ea9c70321..1f9240f5f 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -95,7 +95,7 @@ --> -
+