diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index f3a7c4a16..3c3d55883 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -45,7 +45,7 @@ const appRoutes: Routes = [ }, { path: 'plans', - loadChildren: () => import('./ui/plan/plan.module').then(m => m.DmpModule), + loadChildren: () => import('./ui/plan/plan.module').then(m => m.PlanModule), data: { authContext: { permissions: [AppPermission.ViewMyPlanPage] @@ -59,7 +59,7 @@ const appRoutes: Routes = [ }, { path: 'explore-plans', - loadChildren: () => import('./ui/plan/plan.module').then(m => m.PublicDmpModule), + loadChildren: () => import('./ui/plan/plan.module').then(m => m.PublicPlanModule), data: { breadcrumb: true, ...BreadcrumbService.generateRouteDataConfiguration({ diff --git a/dmp-frontend/src/app/core/services/matomo/analytics-service.ts b/dmp-frontend/src/app/core/services/matomo/analytics-service.ts index db77d373d..fc1f0b250 100644 --- a/dmp-frontend/src/app/core/services/matomo/analytics-service.ts +++ b/dmp-frontend/src/app/core/services/matomo/analytics-service.ts @@ -34,7 +34,7 @@ export class AnalyticsService { public static PlanFilterDialog: string = 'DMP Criteria'; public static PlanListingItem: string = 'DMP Listing Item'; public static StartNewPlanDialog: string = 'Start New DMP Dialog'; - public static DmpUploadDialog: string = 'DMP Upload Dialog'; + public static PlanUploadDialog: string = 'DMP Upload Dialog'; public static PlanOverview: string = 'DMP Overview'; public static FAQ: string = 'FAQ'; public static Glossary: string = 'Glossary'; diff --git a/dmp-frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.ts b/dmp-frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.ts index 48bc49c94..6b03fecc1 100644 --- a/dmp-frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.ts +++ b/dmp-frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.ts @@ -167,12 +167,12 @@ export class MaintenanceTasksComponent extends BaseComponent implements OnInit { .afterClosed() .subscribe(confirm => { if (confirm) { - this.doSendDmpTouchEvents(ev); + this.doSendPlanTouchEvents(ev); } }); } - private doSendDmpTouchEvents(ev: Event) { + private doSendPlanTouchEvents(ev: Event) { (ev.target as HTMLButtonElement).disabled = true; this.maintenanceService.sendPlanTouchEvents().pipe(takeUntil(this._destroyed)).subscribe( _ => { diff --git a/dmp-frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts b/dmp-frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts index db73cdb61..f5b4b4067 100644 --- a/dmp-frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts @@ -190,7 +190,7 @@ export class PlanBlueprintEditorComponent extends BaseEditor this.planService.query(this.buildPlanLookup(null,null,null, this.planDescriptionTemplateLookup)).pipe(map(x => x.items)), filterFn: (searchQuery: string, data?: any) => this.planService.query(this.buildPlanLookup(searchQuery, null, null, this.planDescriptionTemplateLookup)).pipe(map(x => x.items)), getSelectedItem: (selectedItem: any) => this.planService.query(this.buildPlanLookup(null, null, [selectedItem])).pipe(map(x => x.items[0])), diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html index d76fa1808..057b03d8f 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html +++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html @@ -86,7 +86,7 @@
-
+
chevron_left {{'DESCRIPTION-EDITOR.ACTIONS.BACK-TO' | translate}}
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts index d202d8b77..bade72910 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts +++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts @@ -333,7 +333,7 @@ export class DescriptionEditorComponent extends BaseEditor { if (result) { - const dmpUserRemovePersist: DescriptionStatusPersist = { + const planUserRemovePersist: DescriptionStatusPersist = { id: this.formGroup.get('id').value, status: DescriptionStatus.Draft, hash: this.formGroup.get('hash').value }; - this.descriptionService.persistStatus(dmpUserRemovePersist, DescriptionEditorEntityResolver.lookupFields()).pipe(takeUntil(this._destroyed)) + this.descriptionService.persistStatus(planUserRemovePersist, DescriptionEditorEntityResolver.lookupFields()).pipe(takeUntil(this._destroyed)) .subscribe(data => { this.isFinalized = false; this.refreshData(); diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts index b54ad498e..fee1ac61d 100644 --- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts +++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts @@ -54,7 +54,7 @@ export class DescriptionListingComponent extends BaseListingComponent 0; + // Plans + let plans = formGroup.get("associatedPlanIds")?.value ?? null; let addPlans = plans && plans?.length > 0; let roles = formGroup.get("role")?.value !== null ? [formGroup.get("role")?.value] : null; let addRoles = roles && roles?.length > 0; - if (addDmps || addRoles) { + if (addPlans || addRoles) { lookup.planSubQuery = DescriptionFilterService.initializePlanLookup(); - if (addDmps) lookup.planSubQuery.ids = plans?.length > 0 ? plans : null; + if (addPlans) lookup.planSubQuery.ids = plans?.length > 0 ? plans : null; if (addRoles) { lookup.planSubQuery.planUserSubQuery = DescriptionFilterService.initializePlanUserLookup(); diff --git a/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.html b/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.html index 2f62c7252..454d28922 100644 --- a/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.html +++ b/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.html @@ -8,8 +8,8 @@
{{description.label}}
{{description.label}}
- {{ enumUtils.toPlanUserRolesString(planService.getCurrentUserRolesInPlan(description?.plan?.planUsers)) }} - . + {{ enumUtils.toPlanUserRolesString(planService.getCurrentUserRolesInPlan(description?.plan?.planUsers)) }} + . public{{'DESCRIPTION-LISTING.STATES.PUBLIC' | translate}} done{{ enumUtils.toDescriptionStatusString(description.status) }} create{{ enumUtils.toDescriptionStatusString(description.status) }} @@ -26,11 +26,11 @@
open_in_new{{'DESCRIPTION-LISTING.ACTIONS.EXPORT' | translate}} group_add{{'DESCRIPTION-LISTING.ACTIONS.INVITE-SHORT' | translate}} - file_copy{{'DESCRIPTION-LISTING.ACTIONS.COPY-DESCRIPTION' | translate}} + file_copy{{'DESCRIPTION-LISTING.ACTIONS.COPY-DESCRIPTION' | translate}} delete{{ 'DESCRIPTION-LISTING.ACTIONS.DELETE' | translate }}
-
-
@@ -72,7 +72,7 @@
-
-
diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts b/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts index e56dd79d9..34b8fb480 100644 --- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts +++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts @@ -308,7 +308,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni }); } - dmpClicked(plan: Plan) { + planClicked(plan: Plan) { if (this.isPublicView) { this.router.navigate([this.routerUtils.generateUrl(['/explore-plans/overview/public/', plan.id.toString()])]); } else { @@ -360,7 +360,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni return sections == null ? '' : sections[0].label; } - openCopyToDmpDialog() { + openCopyToPlanDialog() { const formGroup = this.fb.group({ planId: this.fb.control(null, Validators.required), sectionId: this.fb.control(null, Validators.required), @@ -387,7 +387,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni }); } - removeUserFromDmp(dmpUser: PlanUser) { + removeUserFromPlan(planUser: PlanUser) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-USER'), @@ -398,12 +398,12 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni }); dialogRef.afterClosed().subscribe(result => { if (result) { - const dmpUserRemovePersist: PlanUserRemovePersist = { - id: dmpUser.id, + const planUserRemovePersist: PlanUserRemovePersist = { + id: planUser.id, planId: this.description.plan.id, - role: dmpUser.role + role: planUser.role }; - this.planService.removeUser(dmpUserRemovePersist).pipe(takeUntil(this._destroyed)) + this.planService.removeUser(planUserRemovePersist).pipe(takeUntil(this._destroyed)) .subscribe(data => { this.reloadPage(); }, (error: any) => this.httpErrorHandlingService.handleBackedRequestError(error)); @@ -465,12 +465,12 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni }); dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { if (result) { - const dmpUserRemovePersist: DescriptionStatusPersist = { + const planUserRemovePersist: DescriptionStatusPersist = { id: description.id, status: DescriptionStatus.Draft, hash: description.hash }; - this.descriptionService.persistStatus(dmpUserRemovePersist).pipe(takeUntil(this._destroyed)) + this.descriptionService.persistStatus(planUserRemovePersist).pipe(takeUntil(this._destroyed)) .subscribe(data => { this.reloadPage(); this.onUpdateCallbackSuccess() diff --git a/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html index 1fcc4f6ef..d33a4a52b 100644 --- a/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html +++ b/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.html @@ -5,7 +5,7 @@
{{'USER-DIALOG.USER-PROFILE-SETTINGS' | translate}} - {{'USER-PROFILE.ASSOCIATED-PLANS' | translate}} + {{'USER-PROFILE.ASSOCIATED-PLANS' | translate}}
diff --git a/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.ts b/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.ts index 7fd28bcac..dfe5988ca 100644 --- a/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.ts +++ b/dmp-frontend/src/app/ui/navbar/user-dialog/user-dialog.component.ts @@ -68,7 +68,7 @@ export class UserDialogComponent implements OnInit, OnDestroy { this.router.navigate([this.routerUtils.generateUrl('/profile')]); } - public navigateToMyDmps() { + public navigateToMyPlans() { this.dialogRef.close(); this.router.navigate([this.routerUtils.generateUrl('/plans')]); } diff --git a/dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.ts b/dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.ts index 1058e79d8..9a3f37a45 100644 --- a/dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.ts +++ b/dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { AuthService } from '@app/core/services/auth/auth.service'; -import { DmpInvitationService } from '@app/core/services/plan/plan-invitation.service'; +import { PlanInvitationService } from '@app/core/services/plan/plan-invitation.service'; import { BaseComponent } from '@common/base/base.component'; import { takeUntil } from 'rxjs/operators'; @@ -12,7 +12,7 @@ import { takeUntil } from 'rxjs/operators'; }) export class InvitationAcceptedComponent extends BaseComponent implements OnInit { constructor( - private dmpInvitationService: DmpInvitationService, + private planInvitationService: PlanInvitationService, private route: ActivatedRoute, private router: Router, private authentication: AuthService, @@ -27,7 +27,7 @@ export class InvitationAcceptedComponent extends BaseComponent implements OnInit const id = params['id']; if(this.isAuthenticated()){ - this.dmpInvitationService.exchange(id) + this.planInvitationService.exchange(id) .pipe(takeUntil(this._destroyed)) .subscribe(result => { this.router.navigate(['plans/edit/' + result]); diff --git a/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html index a16a0e42d..3d21ccb58 100644 --- a/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html @@ -29,16 +29,16 @@
- +
{{ 'PLAN-LISTING.FILTERS.ASSOCIATED-PLAN-BLUEPRINTS.NAME' | translate}}
{{ 'PLAN-LISTING.FILTERS.ASSOCIATED-PLAN-BLUEPRINTS.PLACEHOLDER' | translate }} - +
- +
diff --git a/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts index 9bfab5d2b..b0306b955 100644 --- a/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts @@ -41,7 +41,7 @@ export class PlanFilterComponent extends BaseCriteriaComponent implements OnInit maxFileSize: number = 1048576; descriptionTemplateAutoCompleteConfiguration: MultipleAutoCompleteConfiguration; - dmpBlueprintAutoCompleteConfiguration: MultipleAutoCompleteConfiguration; + planBlueprintAutoCompleteConfiguration: MultipleAutoCompleteConfiguration; referenceTypeAutocompleteConfiguration: SingleAutoCompleteConfiguration; referenceAutocompleteConfiguration: Map; @@ -65,7 +65,7 @@ export class PlanFilterComponent extends BaseCriteriaComponent implements OnInit if (changes['filterFormGroup']) { this.descriptionTemplateAutoCompleteConfiguration = this.descriptionTemplateService.buildDescriptionTempalteGroupMultipleAutocompleteConfiguration(); - this.dmpBlueprintAutoCompleteConfiguration = this.planBlueprintService.multipleAutocompleteConfiguration; + this.planBlueprintAutoCompleteConfiguration = this.planBlueprintService.multipleAutocompleteConfiguration; this.referenceTypeAutocompleteConfiguration = this.getReferenceTypeAutocompleteConfiguration(); this.referenceAutocompleteConfiguration = new Map(); diff --git a/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html index 6148cdd9d..72506c325 100644 --- a/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html +++ b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html @@ -30,7 +30,7 @@
open_in_new{{'PLAN-LISTING.ACTIONS.EXPORT' | translate}} add{{'PLAN-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}} - group_add{{'PLAN-LISTING.ACTIONS.INVITE-SHORT' | translate}} + group_add{{'PLAN-LISTING.ACTIONS.INVITE-SHORT' | translate}} filter_none{{'PLAN-LISTING.ACTIONS.CLONE' | translate}} library_books{{'PLAN-LISTING.ACTIONS.VIEW-VERSION' | translate}} diff --git a/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts index 7e545da9f..fa3659bb3 100644 --- a/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts @@ -92,7 +92,7 @@ export class PlanListingItemComponent extends BaseComponent implements OnInit { return this.authentication.currentAccountIsAuthenticated(); } - inviteToDmp() { + inviteToPlan() { const dialogRef = this.dialog.open(PlanInvitationDialogComponent, { // height: '250px', // width: '700px', diff --git a/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts b/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts index 1e3eeb663..fb9c7b2f4 100644 --- a/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts @@ -194,7 +194,7 @@ export class PlanListingComponent extends BaseListingComponent 0) { + let planBlueprints = formGroup.get("planBlueprints")?.value ?? null; + if (planBlueprints && planBlueprints?.length > 0) { lookup.planBlueprintSubQuery = PlanFilterService.initializePlanBlueprintLookup(); - lookup.planBlueprintSubQuery.ids = dmpBlueprints; + lookup.planBlueprintSubQuery.ids = planBlueprints; } else lookup.planBlueprintSubQuery = null; - // Dmps + // plans let roles = formGroup.get("role")?.value !== null ? [formGroup.get("role")?.value] : null; if (roles && roles?.length > 0) { lookup.planUserSubQuery = PlanFilterService.initializePlanUserLookup(); @@ -399,7 +399,7 @@ export class PlanListingComponent extends BaseListingComponent 0 ? lookup.statuses[0] : null], descriptionTemplates: lookup.planDescriptionTemplateSubQuery?.descriptionTemplateGroupIds ? [lookup.planDescriptionTemplateSubQuery?.descriptionTemplateGroupIds] : [], - dmpBlueprints: lookup.planBlueprintSubQuery?.ids ? [lookup.planBlueprintSubQuery?.ids]: [], + planBlueprints: lookup.planBlueprintSubQuery?.ids ? [lookup.planBlueprintSubQuery?.ids]: [], role: lookup.planUserSubQuery?.userRoles ? lookup.planUserSubQuery?.userRoles[0] : null, }); } @@ -416,7 +416,7 @@ export class PlanListingComponent extends BaseListingComponent { plan.descriptions = plan.descriptions?.filter(d => d.isActive == IsActive.Active) ?? []; }) diff --git a/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts index 4ea67392d..0aa9a84b2 100644 --- a/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts @@ -7,7 +7,7 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; -import { DmpNewVersionDialogEditorModel } from './plan-new-version-dialog.editor.model'; +import { PlanNewVersionDialogEditorModel } from './plan-new-version-dialog.editor.model'; import { PlanBlueprintService } from '@app/core/services/plan/plan-blueprint.service'; import { PlanEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; @@ -33,7 +33,7 @@ import { Description } from '@app/core/model/description/description'; export class NewVersionPlanDialogComponent extends BaseComponent { plan: Plan; - editorModel: DmpNewVersionDialogEditorModel; + editorModel: PlanNewVersionDialogEditorModel; formGroup: UntypedFormGroup; selectedBlueprintSections: PlanBlueprintDefinitionSection[]; @@ -110,7 +110,7 @@ export class NewVersionPlanDialogComponent extends BaseComponent { ngOnInit() { this.selectedBlueprintSections = this.plan.blueprint?.definition?.sections?.filter(x => x.hasTemplates) || null; - this.editorModel = new DmpNewVersionDialogEditorModel().fromModel(this.plan, this.plan.blueprint); + this.editorModel = new PlanNewVersionDialogEditorModel().fromModel(this.plan, this.plan.blueprint); this.formGroup = this.editorModel.buildForm(); } diff --git a/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.editor.model.ts b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.editor.model.ts index 57378fdd4..1aaf46709 100644 --- a/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.editor.model.ts +++ b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.editor.model.ts @@ -6,12 +6,12 @@ import { ValidationErrorModel } from '@common/forms/validation/error-model/valid import { Validation, ValidationContext } from '@common/forms/validation/validation-context'; import { Guid } from "@common/types/guid"; -export class DmpNewVersionDialogEditorModel implements NewVersionPlanPersist { +export class PlanNewVersionDialogEditorModel implements NewVersionPlanPersist { id: Guid; label: string; description: String; blueprintId: Guid; - descriptions: NewVersionDmpDescriptionEditorModel[] = []; + descriptions: NewVersionPlanDescriptionEditorModel[] = []; hash?: string; public validationErrorModel: ValidationErrorModel = new ValidationErrorModel(); @@ -19,7 +19,7 @@ export class DmpNewVersionDialogEditorModel implements NewVersionPlanPersist { constructor() { } - public fromModel(item: Plan, blueprint: PlanBlueprint, label?: string, description?: string): DmpNewVersionDialogEditorModel { + public fromModel(item: Plan, blueprint: PlanBlueprint, label?: string, description?: string): PlanNewVersionDialogEditorModel { if (item) { this.id = item.id; this.label = label != undefined ? label : item.label; @@ -34,14 +34,14 @@ export class DmpNewVersionDialogEditorModel implements NewVersionPlanPersist { if (item.planDescriptionTemplates?.length > 0 && blueprint.id === item.blueprint.id) { // plan's first blueprint item.descriptions.forEach(description => { - this.descriptions.push(new NewVersionDmpDescriptionEditorModel(this.validationErrorModel).fromModel(description.id, description.planDescriptionTemplate.sectionId)); + this.descriptions.push(new NewVersionPlanDescriptionEditorModel(this.validationErrorModel).fromModel(description.id, description.planDescriptionTemplate.sectionId)); }) } else { // in case the user changes the blueprint from the dropdown and the new blueprint has prefilled templates const selectedBlueprintSections = blueprint.definition?.sections?.filter(x => x.hasTemplates) || null; if (selectedBlueprintSections != null){ item.descriptions.forEach(description => { const matchingSection = selectedBlueprintSections.find(blueprintSection => blueprintSection.descriptionTemplates != null && blueprintSection.descriptionTemplates.map(y => y.descriptionTemplateGroupId).includes(description.descriptionTemplate.groupId)) || null; - this.descriptions.push(new NewVersionDmpDescriptionEditorModel(this.validationErrorModel).fromModel(description.id, matchingSection != null ? matchingSection.id : null)); + this.descriptions.push(new NewVersionPlanDescriptionEditorModel(this.validationErrorModel).fromModel(description.id, matchingSection != null ? matchingSection.id : null)); }) } } @@ -86,7 +86,7 @@ export class DmpNewVersionDialogEditorModel implements NewVersionPlanPersist { } } -export class NewVersionDmpDescriptionEditorModel implements NewVersionPlanDescriptionPersist { +export class NewVersionPlanDescriptionEditorModel implements NewVersionPlanDescriptionPersist { descriptionId: Guid; blueprintSectionId: Guid; @@ -96,7 +96,7 @@ export class NewVersionDmpDescriptionEditorModel implements NewVersionPlanDescri public validationErrorModel: ValidationErrorModel = new ValidationErrorModel() ) { } - fromModel(descriptionId: Guid, blueprintSectionId: Guid): NewVersionDmpDescriptionEditorModel { + fromModel(descriptionId: Guid, blueprintSectionId: Guid): NewVersionPlanDescriptionEditorModel { this.descriptionId = descriptionId; this.blueprintSectionId = blueprintSectionId; @@ -110,7 +110,7 @@ export class NewVersionDmpDescriptionEditorModel implements NewVersionPlanDescri }): UntypedFormGroup { let { context = null, disabled = false, rootPath } = params ?? {} if (context == null) { - context = NewVersionDmpDescriptionEditorModel.createValidationContext({ + context = NewVersionPlanDescriptionEditorModel.createValidationContext({ validationErrorModel: this.validationErrorModel, rootPath }); diff --git a/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts index cde901968..bbb11b974 100644 --- a/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts @@ -7,7 +7,7 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; -import { DmpUploadDialogComponent } from '../upload-dialogue/plan-upload-dialog.component'; +import { PlanUploadDialogComponent } from '../upload-dialogue/plan-upload-dialog.component'; import { AnalyticsService } from '@app/core/services/matomo/analytics-service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; @@ -58,7 +58,7 @@ export class StartNewPlanDialogComponent extends BaseComponent { } uploadFile(event) { - const dialogRef = this.dialog.open(DmpUploadDialogComponent, { + const dialogRef = this.dialog.open(PlanUploadDialogComponent, { width: '528px', data: { fileList: FileList, diff --git a/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts index c7078aec9..8d83a43c8 100644 --- a/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { FormattingModule } from '@app/core/formatting.module'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; -import { DmpUploadDialogModule } from '../upload-dialogue/plan-upload-dialog.module'; +import { PlanUploadDialogModule } from '../upload-dialogue/plan-upload-dialog.module'; import { StartNewPlanDialogComponent } from './start-new-plan-dialog.component'; @NgModule({ @@ -10,7 +10,7 @@ import { StartNewPlanDialogComponent } from './start-new-plan-dialog.component'; CommonUiModule, CommonFormsModule, FormattingModule, - DmpUploadDialogModule + PlanUploadDialogModule ], declarations: [ StartNewPlanDialogComponent, diff --git a/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-common-model-config.editor.model.ts b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-common-model-config.editor.model.ts index e903b2c1a..5f6a4129b 100644 --- a/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-common-model-config.editor.model.ts +++ b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-common-model-config.editor.model.ts @@ -6,7 +6,7 @@ import { Guid } from "@common/types/guid"; import { PlanCommonModelConfig, PreprocessingPlanModel } from "@app/core/model/plan/plan-import"; import { DescriptionCommonModelConfig, PreprocessingDescriptionModel } from "@app/core/model/description/description-import"; -export class DmpImportRdaConfigEditorModel implements PlanCommonModelConfig{ +export class PlanImportRdaConfigEditorModel implements PlanCommonModelConfig{ fileId: Guid; label: string; blueprintId: Guid; @@ -18,7 +18,7 @@ export class DmpImportRdaConfigEditorModel implements PlanCommonModelConfig{ constructor() { } - fromModel(item: PreprocessingPlanModel, fileId: Guid): DmpImportRdaConfigEditorModel { + fromModel(item: PreprocessingPlanModel, fileId: Guid): PlanImportRdaConfigEditorModel { this.fileId = fileId; if (item){ this.label = item.label + '.json'; diff --git a/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts index 600bde1b4..ce9d25507 100644 --- a/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts @@ -8,7 +8,7 @@ import { PlanService } from '@app/core/services/plan/plan.service'; import { AnalyticsService } from '@app/core/services/matomo/analytics-service'; import { BaseComponent } from '@common/base/base.component'; import { map, takeUntil } from 'rxjs/operators'; -import { DmpImportRdaConfigEditorModel } from './plan-common-model-config.editor.model'; +import { PlanImportRdaConfigEditorModel } from './plan-common-model-config.editor.model'; import { UntypedFormArray, UntypedFormGroup } from '@angular/forms'; import { DescriptionTemplateService } from '@app/core/services/description-template/description-template.service'; import { FormService } from '@common/forms/form-service'; @@ -24,9 +24,9 @@ import { TranslateService } from '@ngx-translate/core'; templateUrl: './plan-upload-dialog.component.html', styleUrls: ['./plan-upload-dialog.component.scss'] }) -export class DmpUploadDialogComponent extends BaseComponent { +export class PlanUploadDialogComponent extends BaseComponent { planTitle: string; - dmpBlueprints: any[] = []; + planBlueprints: any[] = []; files: File[] = []; selectedBlueprintSections: PlanBlueprintDefinitionSection[]; formGroup: UntypedFormGroup; @@ -44,7 +44,7 @@ export class DmpUploadDialogComponent extends BaseComponent { constructor( - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, private _service: PlanService, private dialog: MatDialog, private httpClient: HttpClient, @@ -63,7 +63,7 @@ export class DmpUploadDialogComponent extends BaseComponent { } ngOnInit() { - this.analyticsService.trackPageView(AnalyticsService.DmpUploadDialog); + this.analyticsService.trackPageView(AnalyticsService.PlanUploadDialog); } cancel() { @@ -78,7 +78,7 @@ export class DmpUploadDialogComponent extends BaseComponent { confirm() { this.data.success = true; this.data.planTitle = this.planTitle; - this.data.planBlueprints = this.dmpBlueprints; + this.data.planBlueprint = this.planBlueprints; if (this.files.length > 0 && this.files[0].type.includes('/json') && this.formGroup){ this.formService.removeAllBackEndErrors(this.formGroup); @@ -121,7 +121,7 @@ export class DmpUploadDialogComponent extends BaseComponent { .pipe(takeUntil(this._destroyed)) .subscribe( (preprocessingData) => { - this.formGroup = new DmpImportRdaConfigEditorModel().fromModel(preprocessingData, storageFile[0].id,).buildForm(); + this.formGroup = new PlanImportRdaConfigEditorModel().fromModel(preprocessingData, storageFile[0].id,).buildForm(); }, (error) => this.onCallbackEror(error.error) ); diff --git a/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.module.ts b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.module.ts index ebf21f138..addada799 100644 --- a/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.module.ts @@ -3,7 +3,7 @@ import { FormattingModule } from '@app/core/formatting.module'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; import { NgxDropzoneModule } from 'ngx-dropzone'; -import { DmpUploadDialogComponent } from './plan-upload-dialog.component'; +import { PlanUploadDialogComponent } from './plan-upload-dialog.component'; import { ReactiveFormsModule } from '@angular/forms'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; @@ -17,10 +17,10 @@ import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.mod NgxDropzoneModule ], declarations: [ - DmpUploadDialogComponent, + PlanUploadDialogComponent, ], exports: [ - DmpUploadDialogComponent, + PlanUploadDialogComponent, ] }) -export class DmpUploadDialogModule { } +export class PlanUploadDialogModule { } diff --git a/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html index a6e134e61..7233e46b1 100644 --- a/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html @@ -27,15 +27,15 @@
-
+

{{ enumUtils.toPlanUserRolesString(planService.getCurrentUserRolesInPlan(plan?.planUsers)) }}

-
.
-
+
.
+
public {{'PLAN-OVERVIEW.PUBLIC' | translate}}
-
.
+
.
lock_outline {{'PLAN-OVERVIEW.LOCKED' | translate}} @@ -190,8 +190,8 @@
- - + +
- +
-
diff --git a/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts index e07855876..473a0d3ec 100644 --- a/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts @@ -371,7 +371,7 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit { this.httpErrorHandlingService.handleBackedRequestError(error); } - isUserDmpRelated(): boolean { + isUserPlanRelated(): boolean { const principalId: Guid = this.authentication.userId(); return this.plan.planUsers?.some(x => (x.user.id === principalId)); } @@ -380,11 +380,11 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit { return this.plan.status == PlanStatus.Draft; } - isFinalizedDmp(plan: Plan) { + isFinalizedPlan(plan: Plan) { return plan.status == PlanStatus.Finalized; } - isPublishedDmp() { + isPublishedPlan() { return (this.plan.status == PlanStatus.Finalized && this.plan.accessType === PlanAccessType.Public); } @@ -510,7 +510,7 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit { }); } - removeUserFromDmp(dmpUser: PlanUser) { + removeUserFromPlan(planUser: PlanUser) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-USER'), @@ -521,12 +521,12 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { if (result) { - const dmpUserRemovePersist: PlanUserRemovePersist = { - id: dmpUser.id, + const planUserRemovePersist: PlanUserRemovePersist = { + id: planUser.id, planId: this.plan.id, - role: dmpUser.role + role: planUser.role }; - this.planService.removeUser(dmpUserRemovePersist).pipe(takeUntil(this._destroyed)) + this.planService.removeUser(planUserRemovePersist).pipe(takeUntil(this._destroyed)) .subscribe(data => { this.reloadPage(); this.onUpdateCallbackSuccess() diff --git a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts index 6dbe6d775..1c6858265 100644 --- a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts @@ -9,7 +9,7 @@ import { takeUntil } from 'rxjs/operators'; templateUrl: './plan-form-progress-indication.component.html', styleUrls: ['./plan-form-progress-indication.component.scss'] }) -export class DmpFormProgressIndicationComponent extends BaseComponent implements OnInit, OnChanges { +export class PlanFormProgressIndicationComponent extends BaseComponent implements OnInit, OnChanges { @Input() formGroup: UntypedFormGroup; @Input() public progressValueAccuracy = 2; diff --git a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.module.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.module.ts index 117f46a83..467aeb399 100644 --- a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; -import { DmpFormProgressIndicationComponent } from './plan-form-progress-indication.component'; +import { PlanFormProgressIndicationComponent } from './plan-form-progress-indication.component'; @NgModule({ imports: [ @@ -9,10 +9,10 @@ import { DmpFormProgressIndicationComponent } from './plan-form-progress-indicat CommonFormsModule ], declarations: [ - DmpFormProgressIndicationComponent + PlanFormProgressIndicationComponent ], exports: [ - DmpFormProgressIndicationComponent + PlanFormProgressIndicationComponent ] }) -export class DmpFormProgressIndicationModule { } +export class PlanFormProgressIndicationModule { } diff --git a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts index d7fed6815..128024480 100644 --- a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts @@ -49,7 +49,7 @@ import { Guid } from '@common/types/guid'; import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; import { PlanContactPrefillDialogComponent } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.component'; -import { PlanEditorModel, DmpFieldIndicator } from './plan-editor.model'; +import { PlanEditorModel, PlanFieldIndicator } from './plan-editor.model'; import { PlanEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver'; import { PlanEditorService } from './plan-editor.service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; @@ -113,7 +113,7 @@ export class PlanEditorComponent extends BaseEditor imple } }; - sectionToFieldsMap: Map = new Map(); + sectionToFieldsMap: Map = new Map(); protected get canDelete(): boolean { return !this.isDeleted && !this.isNew && (this.hasPermission(this.authService.permissionEnum.DeletePlan) || this.item?.authorizationFlags?.some(x => x === AppPermission.DeletePlan)); @@ -269,12 +269,12 @@ export class PlanEditorComponent extends BaseEditor imple } } - prepareErrorIndication(): Map { + prepareErrorIndication(): Map { if (this.selectedBlueprint?.definition == null) return; - const sectionToFieldsMap: Map = new Map(); + const sectionToFieldsMap: Map = new Map(); this.selectedBlueprint.definition.sections.forEach((section: PlanBlueprintDefinitionSection) => { - let value: DmpFieldIndicator = new DmpFieldIndicator(section); + let value: PlanFieldIndicator = new PlanFieldIndicator(section); sectionToFieldsMap.set(section.id.toString(), value); }); diff --git a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.model.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.model.ts index 6b495d1cf..49b7f87f9 100644 --- a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.model.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.model.ts @@ -47,10 +47,10 @@ export class PlanEditorModel extends BaseEditorModel implements PlanPersist { item.blueprint.definition.sections.forEach(section => { if (section.hasTemplates) { - const sectionTempaltesFromDmp = item.planDescriptionTemplates?.filter(x => x.sectionId == section.id && x.isActive == IsActive.Active) || []; + const sectionTemplatesFromPlan = item.planDescriptionTemplates?.filter(x => x.sectionId == section.id && x.isActive == IsActive.Active) || []; - if (sectionTempaltesFromDmp.length > 0) { - sectionTempaltesFromDmp?.filter(x => x.sectionId == section.id).forEach(planDescriptionTemplate => { + if (sectionTemplatesFromPlan.length > 0) { + sectionTemplatesFromPlan?.filter(x => x.sectionId == section.id).forEach(planDescriptionTemplate => { this.descriptionTemplates.push(new PlanDescriptionTemplateEditorModel(this.validationErrorModel).fromModel( { sectionId: section.id, @@ -132,7 +132,7 @@ export class PlanEditorModel extends BaseEditorModel implements PlanPersist { baseValidationArray.push({ key: 'accessType', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'accessType')] }); baseValidationArray.push({ key: 'descriptionTemplates', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'descriptionTemplates')] }); - baseValidationArray.push({ key: 'dmpDescriptionValidator', validators: [] }); + baseValidationArray.push({ key: 'planDescriptionValidator', validators: [] }); baseValidationArray.push({ key: 'users', validators: [BackendErrorValidator(this.validationErrorModel, `users`)] }); baseValidationArray.push({ key: 'hash', validators: [] }); @@ -233,7 +233,7 @@ export class PlanPropertiesEditorModel implements PlanPropertiesPersist { context?: ValidationContext, disabled?: boolean, rootPath?: string - }, planReferences?: PlanReference[], dmpBlueprint?: PlanBlueprint): UntypedFormGroup { + }, planReferences?: PlanReference[], planBlueprint?: PlanBlueprint): UntypedFormGroup { let { context = null, disabled = false, rootPath } = params ?? {} if (context == null) { context = PlanPropertiesEditorModel.createValidationContext({ @@ -738,7 +738,7 @@ export class PlanDescriptionTemplateEditorModel implements PlanDescriptionTempla } } -export class DmpFieldIndicator { +export class PlanFieldIndicator { private _fieldControlNames; diff --git a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts index b76f04232..a8ab9b1d1 100644 --- a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts @@ -10,7 +10,7 @@ import { CommonUiModule } from '@common/ui/common-ui.module'; import { PlanUserFieldModule } from '../plan-user-field/plan-user-field.module'; import { PlanEditorComponent } from './plan-editor.component'; import { PlanEditorRoutingModule } from './plan-editor.routing'; -import { DmpFormProgressIndicationModule } from './form-progress-indication/plan-form-progress-indication.module'; +import { PlanFormProgressIndicationModule } from './form-progress-indication/plan-form-progress-indication.module'; import { PlanDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module'; import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.module'; @@ -27,7 +27,7 @@ import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/p ReferenceFieldModule, DragDropModule, PlanUserFieldModule, - DmpFormProgressIndicationModule, + PlanFormProgressIndicationModule, PlanContactPrefillDialogModule ], declarations: [ diff --git a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts index 3b6591e67..c97414474 100644 --- a/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -// import { DmpWizardComponent } from './description-wizard/description-wizard.component'; +// import { PlanWizardComponent } from './description-wizard/description-wizard.component'; import { AppPermission } from '@app/core/common/enum/permission.enum'; import { PendingChangesGuard } from '@common/forms/pending-form-changes/pending-form-changes-guard.service'; // import { PlanOverviewComponent } from './overview/description-overview.component'; diff --git a/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts index e9240b8af..d63665019 100644 --- a/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts @@ -53,8 +53,8 @@ export class PlanUserFieldComponent extends BaseComponent implements OnInit { addUser(): void { const userArray = this.form.get('users') as FormArray; - const dmpUser: PlanUserEditorModel = new PlanUserEditorModel(this.validationErrorModel); - userArray.push(dmpUser.buildForm({ rootPath: "users[" + userArray.length + "]." })); + const planUser: PlanUserEditorModel = new PlanUserEditorModel(this.validationErrorModel); + userArray.push(planUser.buildForm({ rootPath: "users[" + userArray.length + "]." })); } removeUser(userIndex: number): void { diff --git a/dmp-frontend/src/app/ui/plan/plan.module.ts b/dmp-frontend/src/app/ui/plan/plan.module.ts index 520bda4bc..08abac917 100644 --- a/dmp-frontend/src/app/ui/plan/plan.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { FormattingModule } from '@app/core/formatting.module'; -import { DmpRoutingModule, PublicDmpRoutingModule } from '@app/ui/plan/plan.routing'; +import { PlanRoutingModule, PublicPlanRoutingModule } from '@app/ui/plan/plan.routing'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; @@ -9,25 +9,25 @@ import { CommonUiModule } from '@common/ui/common-ui.module'; CommonUiModule, CommonFormsModule, FormattingModule, - DmpRoutingModule, + PlanRoutingModule, ], declarations: [ ], exports: [ ] }) -export class DmpModule { } +export class PlanModule { } @NgModule({ imports: [ CommonUiModule, CommonFormsModule, FormattingModule, - PublicDmpRoutingModule, + PublicPlanRoutingModule, ], declarations: [ ], exports: [ ] }) -export class PublicDmpModule { } +export class PublicPlanModule { } diff --git a/dmp-frontend/src/app/ui/plan/plan.routing.ts b/dmp-frontend/src/app/ui/plan/plan.routing.ts index ac758b19c..08ce9f9ef 100644 --- a/dmp-frontend/src/app/ui/plan/plan.routing.ts +++ b/dmp-frontend/src/app/ui/plan/plan.routing.ts @@ -74,10 +74,10 @@ const publicRoutes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class DmpRoutingModule { } +export class PlanRoutingModule { } @NgModule({ imports: [RouterModule.forChild(publicRoutes)], exports: [RouterModule] }) -export class PublicDmpRoutingModule { } +export class PublicPlanRoutingModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index 97a15cdb6..27c57ca32 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -36,7 +36,7 @@ class GroupMenuItem { }) export class SidebarComponent implements OnInit { generalItems: GroupMenuItem; - dmpItems: GroupMenuItem; + planItems: GroupMenuItem; adminItems: GroupMenuItem; descriptionItems: GroupMenuItem; grantItems: GroupMenuItem; @@ -81,14 +81,14 @@ export class SidebarComponent implements OnInit { this.groupMenuItems.push(this.generalItems); - this.dmpItems = { + this.planItems = { title: 'SIDE-BAR.PLAN', routes: [], } - if (this.authentication.hasPermission(AppPermission.ViewMyPlanPage)) this.dmpItems.routes.push({ path: '/plans', title: 'SIDE-BAR.MY-PLANS', icon: 'library_books', routeType: RouteType.System }); - if (this.authentication.hasPermission(AppPermission.ViewMyDescriptionPage)) this.dmpItems.routes.push({ path: '/descriptions', title: 'SIDE-BAR.MY-DESCRIPTIONS', icon: 'dns', routeType: RouteType.System }); - this.groupMenuItems.push(this.dmpItems); + if (this.authentication.hasPermission(AppPermission.ViewMyPlanPage)) this.planItems.routes.push({ path: '/plans', title: 'SIDE-BAR.MY-PLANS', icon: 'library_books', routeType: RouteType.System }); + if (this.authentication.hasPermission(AppPermission.ViewMyDescriptionPage)) this.planItems.routes.push({ path: '/descriptions', title: 'SIDE-BAR.MY-DESCRIPTIONS', icon: 'dns', routeType: RouteType.System }); + this.groupMenuItems.push(this.planItems); this.descriptionItems = { title: 'SIDE-BAR.DESCRIPTIONS', diff --git a/dmp-frontend/src/assets/i18n/baq.json b/dmp-frontend/src/assets/i18n/baq.json index 6278575b4..9cdf547d4 100644 --- a/dmp-frontend/src/assets/i18n/baq.json +++ b/dmp-frontend/src/assets/i18n/baq.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 57ef3cdfe..0fcefd31b 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index b7c93e80a..41f79585c 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 801e60533..400f6c59f 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 3b015f7de..29b03d9d0 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json index 576a6134f..d5289f660 100644 --- a/dmp-frontend/src/assets/i18n/hr.json +++ b/dmp-frontend/src/assets/i18n/hr.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/pl.json b/dmp-frontend/src/assets/i18n/pl.json index 830a06de6..548d957a3 100644 --- a/dmp-frontend/src/assets/i18n/pl.json +++ b/dmp-frontend/src/assets/i18n/pl.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index 48220ced2..f235b5f6c 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 8a4f149c6..b1f8a4f81 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index e3dcc2dcf..e75806d15 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } } diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 76b5d54c1..6adcecc68 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -355,7 +355,7 @@ "ACTIONS": { "SEND-USER-TOUCH": "Send user touch events", "SEND-TENANT-TOUCH": "Send tenant touch events", - "SEND-PLAN-TOUCH": "Send dmp touch events", + "SEND-PLAN-TOUCH": "Send plan touch events", "SEND-DESCRIPTION-TOUCH": "Send description touch events" } }