MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-07-04 18:01:03 +03:00
parent caa40cc907 c395f09459
commit 72230b6b0a
22 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-frontend/src/app/core/services/matomo/analytics-service.ts
View File

@ -30,12 +30,12 @@ export class AnalyticsService {
public static DescriptionListingItem: string = 'Description Listing Item'; public static DescriptionListingItem: string = 'Description Listing Item';
public static DescriptionOverview: string = 'Description Overview'; public static DescriptionOverview: string = 'Description Overview';
public static PlanEditor: string = 'DMP Editor'; public static PlanEditor: string = 'DMP Editor';
public static DmpListing: string = 'DMPs'; public static PlanListing: string = 'DMPs';
public static DmpFilterDialog: string = 'DMP Criteria'; public static PlanFilterDialog: string = 'DMP Criteria';
public static DmpListingItem: string = 'DMP Listing Item'; public static PlanListingItem: string = 'DMP Listing Item';
public static StartNewPlanDialog: string = 'Start New DMP Dialog'; public static StartNewPlanDialog: string = 'Start New DMP Dialog';
public static DmpUploadDialog: string = 'DMP Upload Dialog'; public static DmpUploadDialog: string = 'DMP Upload Dialog';
public static DmpOverview: string = 'DMP Overview'; public static PlanOverview: string = 'DMP Overview';
public static FAQ: string = 'FAQ'; public static FAQ: string = 'FAQ';
public static Glossary: string = 'Glossary'; public static Glossary: string = 'Glossary';
public static Navbar: string = 'Navbar'; public static Navbar: string = 'Navbar';

4
dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
View File

@ -6,7 +6,7 @@ import { DashboardRoutingModule } from '@app/ui/dashboard/dashboard.routing';
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module'; import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
import { CommonUiModule } from '@common/ui/common-ui.module'; import { CommonUiModule } from '@common/ui/common-ui.module';
import { DescriptionListingModule } from '../description/listing/description-listing.module'; import { DescriptionListingModule } from '../description/listing/description-listing.module';
import { DmpListingModule } from '../plan/listing/plan-listing.module'; import { PlanListingModule } from '../plan/listing/plan-listing.module';
import { StartNewPlanDialogModule } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.module'; import { StartNewPlanDialogModule } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.module';
import { RecentEditedActivityComponent } from './recent-edited-activity/recent-edited-activity.component'; import { RecentEditedActivityComponent } from './recent-edited-activity/recent-edited-activity.component';
@ -19,7 +19,7 @@ import { RecentEditedActivityComponent } from './recent-edited-activity/recent-e
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
DmpListingModule, PlanListingModule,
DescriptionListingModule, DescriptionListingModule,
StartNewPlanDialogModule StartNewPlanDialogModule
], ],

4
dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts
View File

@ -16,7 +16,7 @@ import { ReferenceTypeService } from '@app/core/services/reference-type/referenc
import { ReferenceService } from '@app/core/services/reference/reference.service'; import { ReferenceService } from '@app/core/services/reference/reference.service';
import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
import { FileUtils } from '@app/core/services/utilities/file-utils.service'; import { FileUtils } from '@app/core/services/utilities/file-utils.service';
import { DmpInvitationDialogComponent } from '@app/ui/plan/invitation/dialog/plan-invitation-dialog.component'; import { PlanInvitationDialogComponent } from '@app/ui/plan/invitation/dialog/plan-invitation-dialog.component';
import { BaseComponent } from '@common/base/base.component'; import { BaseComponent } from '@common/base/base.component';
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
import { Guid } from '@common/types/guid'; import { Guid } from '@common/types/guid';
@ -128,7 +128,7 @@ export class DescriptionListingItemComponent extends BaseComponent implements On
openShareDialog() { openShareDialog() {
// TODO: This is a shared component. Put it in a seperate module. // TODO: This is a shared component. Put it in a seperate module.
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(PlanInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false, autoFocus: false,

4
dmp-frontend/src/app/ui/description/overview/description-overview.component.ts
View File

@ -33,7 +33,7 @@ import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
import { FileUtils } from '@app/core/services/utilities/file-utils.service'; import { FileUtils } from '@app/core/services/utilities/file-utils.service';
import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component'; import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
import { DescriptionValidationOutput } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component'; import { DescriptionValidationOutput } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component';
import { DmpInvitationDialogComponent } from '@app/ui/plan/invitation/dialog/plan-invitation-dialog.component'; import { PlanInvitationDialogComponent } from '@app/ui/plan/invitation/dialog/plan-invitation-dialog.component';
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service'; import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
import { BaseComponent } from '@common/base/base.component'; import { BaseComponent } from '@common/base/base.component';
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
@ -261,7 +261,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
} }
openShareDialog() { openShareDialog() {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(PlanInvitationDialogComponent, {
autoFocus: false, autoFocus: false,
restoreFocus: false, restoreFocus: false,
data: { data: {

2
dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts
View File

@ -24,7 +24,7 @@ import { nameof } from 'ts-simple-nameof';
templateUrl: './plan-deposit-dropdown.component.html', templateUrl: './plan-deposit-dropdown.component.html',
styleUrls: ['./plan-deposit-dropdown.component.scss'] styleUrls: ['./plan-deposit-dropdown.component.scss']
}) })
export class DmpDepositDropdown extends BaseComponent implements OnInit { export class PlanDepositDropdown extends BaseComponent implements OnInit {
@Input() inputRepos: DepositConfiguration[]; @Input() inputRepos: DepositConfiguration[];
@Input() dmp: Plan; @Input() dmp: Plan;
outputRepos = []; outputRepos = [];

4
dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts
View File

@ -24,7 +24,7 @@ import { PlanEditorModel } from '../../plan-editor-blueprint/plan-editor.model';
templateUrl: 'plan-invitation-dialog.component.html', templateUrl: 'plan-invitation-dialog.component.html',
styleUrls: ['./plan-invitation-dialog.component.scss'] styleUrls: ['./plan-invitation-dialog.component.scss']
}) })
export class DmpInvitationDialogComponent extends BaseComponent implements OnInit { export class PlanInvitationDialogComponent extends BaseComponent implements OnInit {
planId: Guid; planId: Guid;
editorModel: PlanEditorModel; editorModel: PlanEditorModel;
@ -39,7 +39,7 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni
public route: ActivatedRoute, public route: ActivatedRoute,
public router: Router, public router: Router,
private language: TranslateService, private language: TranslateService,
public dialogRef: MatDialogRef<DmpInvitationDialogComponent>, public dialogRef: MatDialogRef<PlanInvitationDialogComponent>,
private uiNotificationService: UiNotificationService, private uiNotificationService: UiNotificationService,
private httpErrorHandlingService: HttpErrorHandlingService, private httpErrorHandlingService: HttpErrorHandlingService,
private planService: PlanService, private planService: PlanService,

8
dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts
View File

@ -3,14 +3,14 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
import { RichTextEditorModule } from "@app/library/rich-text-editor/rich-text-editor.module"; import { RichTextEditorModule } from "@app/library/rich-text-editor/rich-text-editor.module";
import { CommonUiModule } from '@common/ui/common-ui.module'; import { CommonUiModule } from '@common/ui/common-ui.module';
import { DmpInvitationDialogComponent } from './plan-invitation-dialog.component'; import { PlanInvitationDialogComponent } from './plan-invitation-dialog.component';
import { PlanUserFieldModule } from '../../plan-user-field/plan-user-field.module'; import { PlanUserFieldModule } from '../../plan-user-field/plan-user-field.module';
@NgModule({ @NgModule({
imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule, PlanUserFieldModule], imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule, PlanUserFieldModule],
declarations: [DmpInvitationDialogComponent], declarations: [PlanInvitationDialogComponent],
exports: [DmpInvitationDialogComponent] exports: [PlanInvitationDialogComponent]
}) })
export class DmpInvitationDialogModule { export class PlanInvitationDialogModule {
constructor() { } constructor() { }
} }

10
dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts
View File

@ -2,7 +2,7 @@ import { Inject, Component, ViewChild, OnInit } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { UntypedFormGroup } from '@angular/forms'; import { UntypedFormGroup } from '@angular/forms';
import { AnalyticsService } from '@app/core/services/matomo/analytics-service'; import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
import { DmpFilterComponent } from '../plan-filter.component'; import { PlanFilterComponent } from '../plan-filter.component';
import { ReferencesWithType } from '@app/core/query/description.lookup'; import { ReferencesWithType } from '@app/core/query/description.lookup';
@Component({ @Component({
@ -11,12 +11,12 @@ import { ReferencesWithType } from '@app/core/query/description.lookup';
styleUrls: ['./plan-filter-dialog.component.scss'] styleUrls: ['./plan-filter-dialog.component.scss']
}) })
export class DmpFilterDialogComponent implements OnInit { export class PlanFilterDialogComponent implements OnInit {
@ViewChild(DmpFilterComponent, { static: true }) filter: DmpFilterComponent; @ViewChild(PlanFilterComponent, { static: true }) filter: PlanFilterComponent;
constructor( constructor(
public dialogRef: MatDialogRef<DmpFilterDialogComponent>, public dialogRef: MatDialogRef<PlanFilterDialogComponent>,
private analyticsService: AnalyticsService, private analyticsService: AnalyticsService,
@Inject(MAT_DIALOG_DATA) public data: { @Inject(MAT_DIALOG_DATA) public data: {
isPublic: boolean, isPublic: boolean,
@ -25,7 +25,7 @@ export class DmpFilterDialogComponent implements OnInit {
}) { } }) { }
ngOnInit() { ngOnInit() {
this.analyticsService.trackPageView(AnalyticsService.DmpFilterDialog); this.analyticsService.trackPageView(AnalyticsService.PlanFilterDialog);
} }
onNoClick(): void { onNoClick(): void {

2
dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts
View File

@ -27,7 +27,7 @@ import { ReferencesWithType } from '@app/core/query/description.lookup';
templateUrl: './plan-filter.component.html', templateUrl: './plan-filter.component.html',
styleUrls: ['./plan-filter.component.scss'], styleUrls: ['./plan-filter.component.scss'],
}) })
export class DmpFilterComponent extends BaseCriteriaComponent implements OnInit, OnChanges { export class PlanFilterComponent extends BaseCriteriaComponent implements OnInit, OnChanges {
@Input() isPublic: boolean; @Input() isPublic: boolean;
@Input() referencesWithTypeItems: ReferencesWithType[]; @Input() referencesWithTypeItems: ReferencesWithType[];

2
dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts
View File

@ -10,7 +10,7 @@ import { IsActive } from "@notification-service/core/enum/is-active.enum";
import { nameof } from "ts-simple-nameof"; import { nameof } from "ts-simple-nameof";
@Injectable() @Injectable()
export class DmpFilterService { export class PlanFilterService {
public static initializePlanDescriptionTemplateLookup(): PlanDescriptionTemplateLookup { public static initializePlanDescriptionTemplateLookup(): PlanDescriptionTemplateLookup {

12
dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts
View File

@ -22,12 +22,12 @@ import { takeUntil } from 'rxjs/operators';
import { PlanStatus } from '../../../../core/common/enum/plan-status'; import { PlanStatus } from '../../../../core/common/enum/plan-status';
import { AuthService } from '../../../../core/services/auth/auth.service'; import { AuthService } from '../../../../core/services/auth/auth.service';
import { ClonePlanDialogComponent } from '../../clone-dialog/plan-clone-dialog.component'; import { ClonePlanDialogComponent } from '../../clone-dialog/plan-clone-dialog.component';
import { DmpInvitationDialogComponent } from '../../invitation/dialog/plan-invitation-dialog.component'; import { PlanInvitationDialogComponent } from '../../invitation/dialog/plan-invitation-dialog.component';
import { NewVersionPlanDialogComponent } from '../../new-version-dialog/plan-new-version-dialog.component'; import { NewVersionPlanDialogComponent } from '../../new-version-dialog/plan-new-version-dialog.component';
import { AppPermission } from '@app/core/common/enum/permission.enum'; import { AppPermission } from '@app/core/common/enum/permission.enum';
import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type'; import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
import { PlanVersionStatus } from '@app/core/common/enum/plan-version-status'; import { PlanVersionStatus } from '@app/core/common/enum/plan-version-status';
import { DmpDeleteDialogComponent } from '../../plan-delete-dialog/plan-delete-dialog.component'; import { PlanDeleteDialogComponent } from '../../plan-delete-dialog/plan-delete-dialog.component';
import { AnalyticsService } from '@app/core/services/matomo/analytics-service'; import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service'; import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
@ -37,7 +37,7 @@ import { RouterUtilsService } from '@app/core/services/router/router-utils.servi
templateUrl: './plan-listing-item.component.html', templateUrl: './plan-listing-item.component.html',
styleUrls: ['./plan-listing-item.component.scss'], styleUrls: ['./plan-listing-item.component.scss'],
}) })
export class DmpListingItemComponent extends BaseComponent implements OnInit { export class PlanListingItemComponent extends BaseComponent implements OnInit {
@Input() dmp: Plan; @Input() dmp: Plan;
@Input() showDivider: boolean = true; @Input() showDivider: boolean = true;
@ -74,7 +74,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.analyticsService.trackPageView(AnalyticsService.DmpListingItem); this.analyticsService.trackPageView(AnalyticsService.PlanListingItem);
if (this.dmp.status == PlanStatus.Draft) { if (this.dmp.status == PlanStatus.Draft) {
this.isDraft = true; this.isDraft = true;
this.isFinalized = false; this.isFinalized = false;
@ -93,7 +93,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit {
} }
inviteToDmp() { inviteToDmp() {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(PlanInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false, autoFocus: false,
@ -169,7 +169,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit {
let dialogRef: any; let dialogRef: any;
if (this.dmp.descriptions && this.dmp.descriptions.length > 0){ if (this.dmp.descriptions && this.dmp.descriptions.length > 0){
dialogRef = this.dialog.open(DmpDeleteDialogComponent, { dialogRef = this.dialog.open(PlanDeleteDialogComponent, {
maxWidth: '300px', maxWidth: '300px',
data: { data: {
descriptions: this.dmp.descriptions, descriptions: this.dmp.descriptions,

20
dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts
View File

@ -27,7 +27,7 @@ import { TranslateService } from '@ngx-translate/core';
import { NgDialogAnimationService } from "ng-dialog-animation"; import { NgDialogAnimationService } from "ng-dialog-animation";
import { debounceTime, takeUntil, tap } from 'rxjs/operators'; import { debounceTime, takeUntil, tap } from 'rxjs/operators';
import { nameof } from 'ts-simple-nameof'; import { nameof } from 'ts-simple-nameof';
import { DmpFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component'; import { PlanFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component';
import { BaseListingComponent } from '@common/base/base-listing-component'; import { BaseListingComponent } from '@common/base/base-listing-component';
import { QueryResult } from '@common/model/query-result'; import { QueryResult } from '@common/model/query-result';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
@ -35,16 +35,16 @@ import { UiNotificationService } from '@app/core/services/notification/ui-notifi
import { QueryParamsService } from '@app/core/services/utilities/query-params.service'; import { QueryParamsService } from '@app/core/services/utilities/query-params.service';
import { ReferencesWithType } from '@app/core/query/description.lookup'; import { ReferencesWithType } from '@app/core/query/description.lookup';
import { Guid } from '@common/types/guid'; import { Guid } from '@common/types/guid';
import { DmpFilterService } from './filtering/services/plan-filter.service'; import { PlanFilterService } from './filtering/services/plan-filter.service';
@Component({ @Component({
selector: 'app-plan-listing-component', selector: 'app-plan-listing-component',
templateUrl: 'plan-listing.component.html', templateUrl: 'plan-listing.component.html',
styleUrls: ['./plan-listing.component.scss'], styleUrls: ['./plan-listing.component.scss'],
}) })
export class DmpListingComponent extends BaseListingComponent<BasePlan, PlanLookup> implements OnInit { export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLookup> implements OnInit {
userSettingsKey = { key: 'DmpListingUserSettings' }; userSettingsKey = { key: 'PlanListingUserSettings' };
@ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
@ -110,7 +110,7 @@ export class DmpListingComponent extends BaseListingComponent<BasePlan, PlanLook
} }
ngOnInit() { ngOnInit() {
this.analyticsService.trackPageView(AnalyticsService.DmpListing); this.analyticsService.trackPageView(AnalyticsService.PlanListing);
this.isPublic = this.route.snapshot.data['isPublic'] ?? false; this.isPublic = this.route.snapshot.data['isPublic'] ?? false;
if (!this.isPublic && !this.authService.currentAccountIsAuthenticated()) { if (!this.isPublic && !this.authService.currentAccountIsAuthenticated()) {
@ -266,7 +266,7 @@ export class DmpListingComponent extends BaseListingComponent<BasePlan, PlanLook
} }
openFiltersDialog(): void { openFiltersDialog(): void {
let dialogRef = this.dialog.open(DmpFilterDialogComponent, { let dialogRef = this.dialog.open(PlanFilterDialogComponent, {
width: '456px', width: '456px',
height: '100%', height: '100%',
id: 'filters', id: 'filters',
@ -359,7 +359,7 @@ export class DmpListingComponent extends BaseListingComponent<BasePlan, PlanLook
// Description Templates // Description Templates
let descriptionTemplates = formGroup.get("descriptionTemplates")?.value ?? null; let descriptionTemplates = formGroup.get("descriptionTemplates")?.value ?? null;
if (descriptionTemplates && descriptionTemplates?.length > 0) { if (descriptionTemplates && descriptionTemplates?.length > 0) {
lookup.planDescriptionTemplateSubQuery = DmpFilterService.initializePlanDescriptionTemplateLookup(); lookup.planDescriptionTemplateSubQuery = PlanFilterService.initializePlanDescriptionTemplateLookup();
lookup.planDescriptionTemplateSubQuery.descriptionTemplateGroupIds = descriptionTemplates; lookup.planDescriptionTemplateSubQuery.descriptionTemplateGroupIds = descriptionTemplates;
} else lookup.planDescriptionTemplateSubQuery = null; } else lookup.planDescriptionTemplateSubQuery = null;
@ -367,14 +367,14 @@ export class DmpListingComponent extends BaseListingComponent<BasePlan, PlanLook
let dmpBlueprints = formGroup.get("dmpBlueprints")?.value ?? null; let dmpBlueprints = formGroup.get("dmpBlueprints")?.value ?? null;
if (dmpBlueprints && dmpBlueprints?.length > 0) { if (dmpBlueprints && dmpBlueprints?.length > 0) {
lookup.planBlueprintSubQuery = DmpFilterService.initializePlanBlueprintLookup(); lookup.planBlueprintSubQuery = PlanFilterService.initializePlanBlueprintLookup();
lookup.planBlueprintSubQuery.ids = dmpBlueprints; lookup.planBlueprintSubQuery.ids = dmpBlueprints;
} else lookup.planBlueprintSubQuery = null; } else lookup.planBlueprintSubQuery = null;
// Dmps // Dmps
let roles = formGroup.get("role")?.value !== null ? [formGroup.get("role")?.value] : null; let roles = formGroup.get("role")?.value !== null ? [formGroup.get("role")?.value] : null;
if (roles && roles?.length > 0) { if (roles && roles?.length > 0) {
lookup.planUserSubQuery = DmpFilterService.initializePlanUserLookup(); lookup.planUserSubQuery = PlanFilterService.initializePlanUserLookup();
lookup.planUserSubQuery.userRoles = roles; lookup.planUserSubQuery.userRoles = roles;
} else lookup.planUserSubQuery = null; } else lookup.planUserSubQuery = null;
@ -383,7 +383,7 @@ export class DmpListingComponent extends BaseListingComponent<BasePlan, PlanLook
?.flatMap((referencesWithType: ReferencesWithType) => referencesWithType.referenceIds) as Guid[]; ?.flatMap((referencesWithType: ReferencesWithType) => referencesWithType.referenceIds) as Guid[];
if (references && references?.length > 0) { if (references && references?.length > 0) {
lookup.planReferenceSubQuery = DmpFilterService.initializePlanReferenceLookup(); lookup.planReferenceSubQuery = PlanFilterService.initializePlanReferenceLookup();
lookup.planReferenceSubQuery.referenceIds = references; lookup.planReferenceSubQuery.referenceIds = references;
} else lookup.planReferenceSubQuery = null; } else lookup.planReferenceSubQuery = null;

32
dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts
View File

@ -3,15 +3,15 @@ import { FormattingModule } from '@app/core/formatting.module';
import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonFormsModule } from '@common/forms/common-forms.module';
import { CommonUiModule } from '@common/ui/common-ui.module'; import { CommonUiModule } from '@common/ui/common-ui.module';
import { NewVersionPlanDialogModule } from '../new-version-dialog/plan-new-version-dialog.module'; import { NewVersionPlanDialogModule } from '../new-version-dialog/plan-new-version-dialog.module';
import { DmpInvitationDialogModule } from '../invitation/dialog/plan-invitation-dialog.module'; import { PlanInvitationDialogModule } from '../invitation/dialog/plan-invitation-dialog.module';
import { DmpFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component'; import { PlanFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component';
import { DmpFilterComponent } from './filtering/plan-filter.component'; import { PlanFilterComponent } from './filtering/plan-filter.component';
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
import { DmpFilterService } from './filtering/services/plan-filter.service'; import { PlanFilterService } from './filtering/services/plan-filter.service';
import { ClonePlanDialogModule } from '../clone-dialog/plan-clone-dialog.module'; import { ClonePlanDialogModule } from '../clone-dialog/plan-clone-dialog.module';
import { DmpListingComponent } from './plan-listing.component'; import { PlanListingComponent } from './plan-listing.component';
import { DmpListingItemComponent } from './listing-item/plan-listing-item.component'; import { PlanListingItemComponent } from './listing-item/plan-listing-item.component';
import { DmpListingRoutingModule } from './plan-listing.routing'; import { PlanListingRoutingModule } from './plan-listing.routing';
@NgModule({ @NgModule({
imports: [ imports: [
@ -21,18 +21,18 @@ import { DmpListingRoutingModule } from './plan-listing.routing';
AutoCompleteModule, AutoCompleteModule,
ClonePlanDialogModule, ClonePlanDialogModule,
NewVersionPlanDialogModule, NewVersionPlanDialogModule,
DmpInvitationDialogModule, PlanInvitationDialogModule,
DmpListingRoutingModule PlanListingRoutingModule
], ],
declarations: [ declarations: [
DmpListingComponent, PlanListingComponent,
DmpListingItemComponent, PlanListingItemComponent,
DmpFilterDialogComponent, PlanFilterDialogComponent,
DmpFilterComponent, PlanFilterComponent,
], ],
exports: [ exports: [
DmpListingItemComponent PlanListingItemComponent
], ],
providers: [ DmpFilterService ] providers: [ PlanFilterService ]
}) })
export class DmpListingModule { } export class PlanListingModule { }

8
dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts
View File

@ -1,11 +1,11 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { DmpListingComponent } from './plan-listing.component'; import { PlanListingComponent } from './plan-listing.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: DmpListingComponent, component: PlanListingComponent,
// canActivate: [AuthGuard], // canActivate: [AuthGuard],
data: { data: {
breadcrumb: true breadcrumb: true
@ -13,7 +13,7 @@ const routes: Routes = [
}, },
{ {
path: 'versions/:groupId', path: 'versions/:groupId',
component: DmpListingComponent, component: PlanListingComponent,
data: { data: {
breadcrumb: true breadcrumb: true
}, },
@ -25,4 +25,4 @@ const routes: Routes = [
exports: [RouterModule], exports: [RouterModule],
providers: [] providers: []
}) })
export class DmpListingRoutingModule { } export class PlanListingRoutingModule { }

14
dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts
View File

@ -44,10 +44,10 @@ import { TranslateService } from '@ngx-translate/core';
import { map, takeUntil } from 'rxjs/operators'; import { map, takeUntil } from 'rxjs/operators';
import { nameof } from 'ts-simple-nameof'; import { nameof } from 'ts-simple-nameof';
import { ClonePlanDialogComponent } from '../clone-dialog/plan-clone-dialog.component'; import { ClonePlanDialogComponent } from '../clone-dialog/plan-clone-dialog.component';
import { DmpDeleteDialogComponent } from '../plan-delete-dialog/plan-delete-dialog.component'; import { PlanDeleteDialogComponent } from '../plan-delete-dialog/plan-delete-dialog.component';
import { PlanEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver'; import { PlanEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver';
import { PlanFinalizeDialogComponent, PlanFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component'; import { PlanFinalizeDialogComponent, PlanFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component';
import { DmpInvitationDialogComponent } from '../invitation/dialog/plan-invitation-dialog.component'; import { PlanInvitationDialogComponent } from '../invitation/dialog/plan-invitation-dialog.component';
import { NewVersionPlanDialogComponent } from '../new-version-dialog/plan-new-version-dialog.component'; import { NewVersionPlanDialogComponent } from '../new-version-dialog/plan-new-version-dialog.component';
import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
@ -56,7 +56,7 @@ import { RouterUtilsService } from '@app/core/services/router/router-utils.servi
templateUrl: './plan-overview.component.html', templateUrl: './plan-overview.component.html',
styleUrls: ['./plan-overview.component.scss'] styleUrls: ['./plan-overview.component.scss']
}) })
export class DmpOverviewComponent extends BaseComponent implements OnInit { export class PlanOverviewComponent extends BaseComponent implements OnInit {
dmp: any; dmp: any;
selectedBlueprint: PlanBlueprint; selectedBlueprint: PlanBlueprint;
@ -113,7 +113,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.analyticsService.trackPageView(AnalyticsService.DmpOverview); this.analyticsService.trackPageView(AnalyticsService.PlanOverview);
// Gets dmp data using parameter id // Gets dmp data using parameter id
this.route.params this.route.params
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
@ -149,7 +149,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
// this.setIsUserOwner(); // this.setIsUserOwner();
// const breadCrumbs = []; // const breadCrumbs = [];
// breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DMPS'), url: "/plans" }); // 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 }); // breadCrumbs.push({ parentComponentName: 'PlanListingComponent', label: this.dmp.label, url: '/plans/overview/' + this.dmp.id });
// this.breadCrumbs = observableOf(breadCrumbs); // this.breadCrumbs = observableOf(breadCrumbs);
}, (error: any) => { }, (error: any) => {
this.httpErrorHandlingService.handleBackedRequestError(error); this.httpErrorHandlingService.handleBackedRequestError(error);
@ -323,7 +323,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
deleteClicked() { deleteClicked() {
let dialogRef: any; let dialogRef: any;
if (this.dmp.descriptions && this.dmp.descriptions.length > 0) { if (this.dmp.descriptions && this.dmp.descriptions.length > 0) {
dialogRef = this.dialog.open(DmpDeleteDialogComponent, { dialogRef = this.dialog.open(PlanDeleteDialogComponent, {
maxWidth: '300px', maxWidth: '300px',
data: { data: {
descriptions: this.dmp.descriptions, descriptions: this.dmp.descriptions,
@ -445,7 +445,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
} }
openShareDialog(rowId: any, rowName: any) { openShareDialog(rowId: any, rowName: any) {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(PlanInvitationDialogComponent, {
// height: '250px', // height: '250px',
// width: '700px', // width: '700px',
autoFocus: false, autoFocus: false,

18
dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts
View File

@ -1,35 +1,35 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormattingModule } from '@app/core/formatting.module'; import { FormattingModule } from '@app/core/formatting.module';
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
import { DmpDepositDropdown } from '../editor/plan-deposit-dropdown/plan-deposit-dropdown.component'; import { PlanDepositDropdown } from '../editor/plan-deposit-dropdown/plan-deposit-dropdown.component';
import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonFormsModule } from '@common/forms/common-forms.module';
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module'; import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
import { CommonUiModule } from '@common/ui/common-ui.module'; import { CommonUiModule } from '@common/ui/common-ui.module';
import { NgDialogAnimationService } from 'ng-dialog-animation'; import { NgDialogAnimationService } from 'ng-dialog-animation';
import { PlanFinalizeDialogModule } from '../plan-finalize-dialog/plan-finalize-dialog.module'; import { PlanFinalizeDialogModule } from '../plan-finalize-dialog/plan-finalize-dialog.module';
import { DmpOverviewRoutingModule } from './plan-overview.routing'; import { PlanOverviewRoutingModule } from './plan-overview.routing';
import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module'; import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module';
import { DmpDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module'; import { PlanDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module';
import { DmpOverviewComponent } from './plan-overview.component'; import { PlanOverviewComponent } from './plan-overview.component';
@NgModule({ @NgModule({
imports: [ imports: [
CommonUiModule, CommonUiModule,
CommonFormsModule, CommonFormsModule,
ConfirmationDialogModule, ConfirmationDialogModule,
DmpDeleteDialogModule, PlanDeleteDialogModule,
MultipleChoiceDialogModule, MultipleChoiceDialogModule,
FormattingModule, FormattingModule,
AutoCompleteModule, AutoCompleteModule,
DmpOverviewRoutingModule, PlanOverviewRoutingModule,
PlanFinalizeDialogModule PlanFinalizeDialogModule
], ],
declarations: [ declarations: [
DmpOverviewComponent, PlanOverviewComponent,
DmpDepositDropdown PlanDepositDropdown
], ],
providers: [ providers: [
NgDialogAnimationService NgDialogAnimationService
] ]
}) })
export class DmpOverviewModule { } export class PlanOverviewModule { }

8
dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts
View File

@ -1,12 +1,12 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { DmpOverviewComponent } from './plan-overview.component'; import { PlanOverviewComponent } from './plan-overview.component';
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service'; import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
const routes: Routes = [ const routes: Routes = [
{ {
path: ':id', path: ':id',
component: DmpOverviewComponent, component: PlanOverviewComponent,
data: { data: {
breadcrumb: true, breadcrumb: true,
title: 'GENERAL.TITLES.PLAN-OVERVIEW' title: 'GENERAL.TITLES.PLAN-OVERVIEW'
@ -14,7 +14,7 @@ const routes: Routes = [
}, },
{ {
path: 'public/:publicId', path: 'public/:publicId',
component: DmpOverviewComponent, component: PlanOverviewComponent,
data: { data: {
breadcrumb: true, breadcrumb: true,
title: 'GENERAL.TITLES.PLAN-OVERVIEW' title: 'GENERAL.TITLES.PLAN-OVERVIEW'
@ -27,4 +27,4 @@ const routes: Routes = [
exports: [RouterModule], exports: [RouterModule],
providers: [] providers: []
}) })
export class DmpOverviewRoutingModule { } export class PlanOverviewRoutingModule { }

4
dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts
View File

@ -7,11 +7,11 @@ import { Description } from '@app/core/model/description/description';
templateUrl: './plan-delete-dialog.component.html', templateUrl: './plan-delete-dialog.component.html',
styleUrls: ['./plan-delete-dialog.component.scss'] styleUrls: ['./plan-delete-dialog.component.scss']
}) })
export class DmpDeleteDialogComponent { export class PlanDeleteDialogComponent {
descriptions: Description[]; descriptions: Description[];
constructor( constructor(
public dialogRef: MatDialogRef<DmpDeleteDialogComponent>, public dialogRef: MatDialogRef<PlanDeleteDialogComponent>,
@Inject(MAT_DIALOG_DATA) public data: any @Inject(MAT_DIALOG_DATA) public data: any
) { ) {
this.descriptions = data.descriptions; this.descriptions = data.descriptions;

8
dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts
View File

@ -1,13 +1,13 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { CommonUiModule } from '@common/ui/common-ui.module'; import { CommonUiModule } from '@common/ui/common-ui.module';
import { DmpDeleteDialogComponent } from './plan-delete-dialog.component'; import { PlanDeleteDialogComponent } from './plan-delete-dialog.component';
@NgModule({ @NgModule({
imports: [CommonUiModule, FormsModule], imports: [CommonUiModule, FormsModule],
declarations: [DmpDeleteDialogComponent], declarations: [PlanDeleteDialogComponent],
exports: [DmpDeleteDialogComponent] exports: [PlanDeleteDialogComponent]
}) })
export class DmpDeleteDialogModule { export class PlanDeleteDialogModule {
constructor() { } constructor() { }
} }

4
dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts
View File

@ -11,7 +11,7 @@ import { PlanUserFieldModule } from '../plan-user-field/plan-user-field.module';
import { PlanEditorComponent } from './plan-editor.component'; import { PlanEditorComponent } from './plan-editor.component';
import { PlanEditorRoutingModule } from './plan-editor.routing'; import { PlanEditorRoutingModule } from './plan-editor.routing';
import { DmpFormProgressIndicationModule } from './form-progress-indication/plan-form-progress-indication.module'; import { DmpFormProgressIndicationModule } from './form-progress-indication/plan-form-progress-indication.module';
import { DmpDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module'; import { PlanDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module';
import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.module'; import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.module';
@NgModule({ @NgModule({
@ -20,7 +20,7 @@ import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/p
CommonFormsModule, CommonFormsModule,
FormattingModule, FormattingModule,
ConfirmationDialogModule, ConfirmationDialogModule,
DmpDeleteDialogModule, PlanDeleteDialogModule,
PlanEditorRoutingModule, PlanEditorRoutingModule,
RichTextEditorModule, RichTextEditorModule,
AutoCompleteModule, AutoCompleteModule,

2
dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts
View File

@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
// import { DmpWizardComponent } from './description-wizard/description-wizard.component'; // import { DmpWizardComponent } from './description-wizard/description-wizard.component';
import { AppPermission } from '@app/core/common/enum/permission.enum'; import { AppPermission } from '@app/core/common/enum/permission.enum';
import { PendingChangesGuard } from '@common/forms/pending-form-changes/pending-form-changes-guard.service'; import { PendingChangesGuard } from '@common/forms/pending-form-changes/pending-form-changes-guard.service';
// import { DmpOverviewComponent } from './overview/description-overview.component'; // import { PlanOverviewComponent } from './overview/description-overview.component';
import { AuthGuard } from '@app/core/auth-guard.service'; import { AuthGuard } from '@app/core/auth-guard.service';
import { PlanEditorComponent } from './plan-editor.component'; import { PlanEditorComponent } from './plan-editor.component';
import { PlanEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver'; import { PlanEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver';

8
dmp-frontend/src/app/ui/plan/plan.routing.ts
View File

@ -6,7 +6,7 @@ import { AuthGuard } from '@app/core/auth-guard.service';
const routes: Routes = [ const routes: Routes = [
{ {
path: 'overview', path: 'overview',
loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule), loadChildren: () => import('./overview/plan-overview.module').then(m => m.PlanOverviewModule),
canActivate:[AuthGuard], canActivate:[AuthGuard],
data: { data: {
breadcrumb: true, breadcrumb: true,
@ -42,7 +42,7 @@ const routes: Routes = [
{ {
path: '', path: '',
canActivate:[AuthGuard], canActivate:[AuthGuard],
loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule), loadChildren: () => import('./listing/plan-listing.module').then(m => m.PlanListingModule),
data: { data: {
breadcrumb: true breadcrumb: true
}, },
@ -52,7 +52,7 @@ const routes: Routes = [
const publicRoutes: Routes = [ const publicRoutes: Routes = [
{ {
path: 'overview', path: 'overview',
loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule), loadChildren: () => import('./overview/plan-overview.module').then(m => m.PlanOverviewModule),
data: { data: {
breadcrumb: true, breadcrumb: true,
...BreadcrumbService.generateRouteDataConfiguration({ ...BreadcrumbService.generateRouteDataConfiguration({
@ -62,7 +62,7 @@ const publicRoutes: Routes = [
}, },
{ {
path: '', path: '',
loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule), loadChildren: () => import('./listing/plan-listing.module').then(m => m.PlanListingModule),
data: { data: {
breadcrumb: true, breadcrumb: true,
isPublic: true isPublic: true