+
+
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 200ae686d..19f35902f 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
@@ -195,8 +195,7 @@
.doi-label {
font-size: 1em;
- color: #212121;
- opacity: 0.6;
+ color: rgba(33, 33, 33, 0.6);
margin-bottom: 0.3em;
}
@@ -337,6 +336,10 @@
padding: 0rem 0rem 0.4rem 0rem !important;
}
+.select-repo {
+ border-bottom: 1px solid #212121;
+}
+
// .card-content {
// display: flex;
// justify-content: center;
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 6848e176e..0778658bf 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,51 +1,52 @@
-
-import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { DatasetStatus } from '@app/core/common/enum/dataset-status';
-import { DmpStatus } from '@app/core/common/enum/dmp-status';
-import { Principal } from '@app/core/model/auth/principal';
-import { DatasetOverviewModel } from '@app/core/model/dataset/dataset-overview';
-import { DatasetsToBeFinalized } from '@app/core/model/dataset/datasets-toBeFinalized';
-import { DmpOverviewModel } from '@app/core/model/dmp/dmp-overview';
-import { UserInfoListingModel } from '@app/core/model/user/user-info-listing';
-import { AuthService } from '@app/core/services/auth/auth.service';
-import { DmpService } from '@app/core/services/dmp/dmp.service';
-import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
-import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
-import { DmpFinalizeDialogComponent, DmpFinalizeDialogInput, DmpFinalizeDialogOutput } from '@app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component';
-import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item';
-import { BaseComponent } from '@common/base/base.component';
-import { TranslateService } from '@ngx-translate/core';
+import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {ActivatedRoute, Params, Router} from '@angular/router';
+import {DatasetStatus} from '@app/core/common/enum/dataset-status';
+import {DmpStatus} from '@app/core/common/enum/dmp-status';
+import {Principal} from '@app/core/model/auth/principal';
+import {DatasetOverviewModel} from '@app/core/model/dataset/dataset-overview';
+import {DatasetsToBeFinalized} from '@app/core/model/dataset/datasets-toBeFinalized';
+import {DmpOverviewModel} from '@app/core/model/dmp/dmp-overview';
+import {UserInfoListingModel} from '@app/core/model/user/user-info-listing';
+import {AuthService} from '@app/core/services/auth/auth.service';
+import {DmpService} from '@app/core/services/dmp/dmp.service';
+import {
+ SnackBarNotificationLevel,
+ UiNotificationService
+} from '@app/core/services/notification/ui-notification-service';
+import {ConfirmationDialogComponent} from '@common/modules/confirmation-dialog/confirmation-dialog.component';
+import {
+ DmpFinalizeDialogComponent,
+ DmpFinalizeDialogInput,
+ DmpFinalizeDialogOutput
+} from '@app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component';
+import {BreadcrumbItem} from '@app/ui/misc/breadcrumb/definition/breadcrumb-item';
+import {BaseComponent} from '@common/base/base.component';
+import {TranslateService} from '@ngx-translate/core';
import * as FileSaver from 'file-saver';
-import { Observable, of as observableOf } from 'rxjs';
-import { takeUntil, map } from 'rxjs/operators';
-import { Role } from "@app/core/common/enum/role";
-import { DmpInvitationDialogComponent } from '../invitation/dmp-invitation-dialog.component';
-import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
-import { Oauth2DialogService } from '@app/ui/misc/oauth2-dialog/service/oauth2-dialog.service';
-import { UserService } from '@app/core/services/user/user.service';
-import { Location } from '@angular/common';
-import { FormGroup } from '@angular/forms';
-import { LockService } from '@app/core/services/lock/lock.service';
-import { VersionListingModel } from '@app/core/model/version/version-listing.model';
-import { CloneDialogComponent } from '../clone/clone-dialog/clone-dialog.component';
-import { DmpModel } from '@app/core/model/dmp/dmp';
-import { DmpEditorModel } from '../editor/dmp-editor.model';
-import { FunderFormModel } from '../editor/grant-tab/funder-form-model';
-import { ProjectFormModel } from '../editor/grant-tab/project-form-model';
-import { GrantTabModel } from '../editor/grant-tab/grant-tab-model';
-import { ExtraPropertiesFormModel } from '../editor/general-tab/extra-properties-form.model';
-import { StartNewDmpDialogComponent } from '../start-new-dmp-dialogue/start-new-dmp-dialog.component';
-import { HttpClient } from '@angular/common/http';
-import { MatomoService } from '@app/core/services/matomo/matomo-service';
-import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
-import { DepositRepositoriesService } from '@app/core/services/deposit-repositories/deposit-repositories.service';
-import { DmpDepositDialogComponent } from '../editor/dmp-deposit-dialog/dmp-deposit-dialog.component';
-import { DepositConfigurationModel } from '@app/core/model/deposit/deposit-configuration';
-import { DoiModel } from '@app/core/model/doi/doi';
-import { MatSelect } from '@angular/material/select';
-import { isNullOrUndefined } from '@app/utilities/enhancers/utils';
+import {Observable, of as observableOf} from 'rxjs';
+import {map, takeUntil} from 'rxjs/operators';
+import {Role} from "@app/core/common/enum/role";
+import {DmpInvitationDialogComponent} from '../invitation/dmp-invitation-dialog.component';
+import {ConfigurationService} from '@app/core/services/configuration/configuration.service';
+import {Location} from '@angular/common';
+import {FormGroup} from '@angular/forms';
+import {LockService} from '@app/core/services/lock/lock.service';
+import {VersionListingModel} from '@app/core/model/version/version-listing.model';
+import {CloneDialogComponent} from '../clone/clone-dialog/clone-dialog.component';
+import {DmpModel} from '@app/core/model/dmp/dmp';
+import {DmpEditorModel} from '../editor/dmp-editor.model';
+import {FunderFormModel} from '../editor/grant-tab/funder-form-model';
+import {ProjectFormModel} from '../editor/grant-tab/project-form-model';
+import {GrantTabModel} from '../editor/grant-tab/grant-tab-model';
+import {ExtraPropertiesFormModel} from '../editor/general-tab/extra-properties-form.model';
+import {StartNewDmpDialogComponent} from '../start-new-dmp-dialogue/start-new-dmp-dialog.component';
+import {MatomoService} from '@app/core/services/matomo/matomo-service';
+import {PopupNotificationDialogComponent} from '@app/library/notification/popup/popup-notification.component';
+import {DepositRepositoriesService} from '@app/core/services/deposit-repositories/deposit-repositories.service';
+import {DepositConfigurationModel} from '@app/core/model/deposit/deposit-configuration';
+import {DoiModel} from '@app/core/model/doi/doi';
+import {isNullOrUndefined} from '@app/utilities/enhancers/utils';
@Component({
selector: 'app-dmp-overview',
@@ -68,6 +69,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
textMessage: any;
versions: VersionListingModel[];
version: VersionListingModel;
+ selectedModel: DoiModel;
@ViewChild('doi')
doi: ElementRef;
@@ -109,6 +111,9 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed))
.subscribe(data => {
this.dmp = data;
+ if(!this.hasDoi()) {
+ this.selectedModel = this.dmp.dois[0];
+ }
this.checkLockStatus(this.dmp.id);
this.setIsUserOwner();
this.getAllVersions(this.dmp);
@@ -133,6 +138,9 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
.pipe(takeUntil(this._destroyed))
.subscribe(data => {
this.dmp = data;
+ if(!this.hasDoi()) {
+ this.selectedModel = this.dmp.dois[0];
+ }
// this.checkLockStatus(this.dmp.id);
this.getAllVersions(this.dmp);
const breadCrumbs = [];
@@ -454,8 +462,8 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
return (dmp.status == DmpStatus.Finalized && dmp.isPublic);
}
- hasDoi(dmp: DmpOverviewModel) {
- return (this.dmp.dois == null || this.dmp.dois.length == 0) ? true : false;
+ hasDoi(dmp: DmpOverviewModel = null) {
+ return (this.dmp.dois == null || this.dmp.dois.length == 0);
}
getAllVersions(dmp: DmpOverviewModel) {
@@ -494,29 +502,15 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
});
}
- deposit(){
- const dialogRef = this.dialog.open(DmpDepositDialogComponent, {
- maxWidth: '600px',
- disableClose: true,
- restoreFocus: false,
- autoFocus: false,
- data: {
- depositRepos: [this.depositRepos, this.dmp],
- message: this.language.instant('DMP-OVERVIEW.DEPOSIT.SELECT-REPOSITORIES'),
- confirmButton: this.language.instant('DMP-OVERVIEW.DEPOSIT.AUTHORIZE'),
- cancelButton: this.language.instant('DMP-OVERVIEW.DEPOSIT.CANCEL'),
- }
- });
- dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe((result: DoiModel[]) => {
- if (result.length > 0) {
- this.dmp.dois.push(...result);
- this.hasDOIToken = true;
- }
- });
+ afterDeposit(result: DoiModel[]) {
+ if (result.length > 0) {
+ this.dmp.dois.push(...result);
+ this.hasDOIToken = true;
+ }
}
moreDeposit(){
- return (this.dmp.dois.length < this.depositRepos.length) ? true : false;
+ return (this.dmp.dois.length < this.depositRepos.length);
}
finalize(dmp: DmpOverviewModel) {
@@ -537,7 +531,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
}),
accessRights: extraProperties.visible
}
-
+
const dialogRef = this.dialog.open(DmpFinalizeDialogComponent, {
maxWidth: '500px',
restoreFocus: false,
@@ -642,8 +636,8 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
this.router.navigate(['/datasets', 'new', this.dmp.id]);
}
- selectDoi(s: MatSelect, doiModel: DoiModel){
- s.placeholder = doiModel.doi;
+ selectDoi(doiModel: DoiModel){
+ this.selectedModel = doiModel;
const foundIdx = this.dmp.dois.findIndex(el => el == doiModel);
this.dmp.dois.splice(foundIdx, 1);
this.dmp.dois.unshift(doiModel);
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts
index dc73b4f76..53561af58 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts
@@ -10,21 +10,24 @@ import { CommonUiModule } from '@common/ui/common-ui.module';
import { RouterModule } from '@angular/router';
import { CloneDialogModule } from '../clone/clone-dialog/clone-dialog.module';
import { NgDialogAnimationService } from 'ng-dialog-animation';
+import {DmpModule} from "@app/ui/dmp/dmp.module";
+import {DmpDepositDropdown} from "@app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component";
@NgModule({
- imports: [
- CommonUiModule,
- CommonFormsModule,
- UrlListingModule,
- ConfirmationDialogModule,
- CloneDialogModule,
- ExportMethodDialogModule,
- FormattingModule,
- AutoCompleteModule,
- RouterModule
- ],
+ imports: [
+ CommonUiModule,
+ CommonFormsModule,
+ UrlListingModule,
+ ConfirmationDialogModule,
+ CloneDialogModule,
+ ExportMethodDialogModule,
+ FormattingModule,
+ AutoCompleteModule,
+ RouterModule
+ ],
declarations: [
- DmpOverviewComponent
+ DmpOverviewComponent,
+ DmpDepositDropdown
],
providers: [
NgDialogAnimationService
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 0e7336915..da9ec99c6 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -1017,7 +1017,7 @@
"CLONE-DMP": "Clone",
"NEW-VERSION": "New Version",
"CREATE-DATASET": "Creating Dataset",
- "SUBTITLE": "DOI",
+ "SUBTITLE": "DOI provided by",
"PREVIEW-DATASET": "Previewing Dataset"
},
"FIELDS": {
diff --git a/dmp-frontend/src/assets/images/repository-placeholder.png b/dmp-frontend/src/assets/images/repository-placeholder.png
new file mode 100644
index 000000000..c5f84947a
Binary files /dev/null and b/dmp-frontend/src/assets/images/repository-placeholder.png differ