From c395f09459a30ae41ad2cde4514f23518683caeb Mon Sep 17 00:00:00 2001 From: amentis Date: Thu, 4 Jul 2024 17:53:24 +0300 Subject: [PATCH] rename frontend dmp to plan (in progress) --- .../core/services/matomo/analytics-service.ts | 8 ++--- .../src/app/ui/dashboard/dashboard.module.ts | 4 +-- .../description-listing-item.component.ts | 4 +-- .../description-overview.component.ts | 4 +-- .../plan-deposit-dropdown.component.ts | 2 +- .../plan-invitation-dialog.component.ts | 4 +-- .../dialog/plan-invitation-dialog.module.ts | 8 ++--- .../plan-filter-dialog.component.ts | 10 +++--- .../filtering/plan-filter.component.ts | 2 +- .../filtering/services/plan-filter.service.ts | 2 +- .../plan-listing-item.component.ts | 12 +++---- .../ui/plan/listing/plan-listing.component.ts | 20 ++++++------ .../ui/plan/listing/plan-listing.module.ts | 32 +++++++++---------- .../ui/plan/listing/plan-listing.routing.ts | 8 ++--- .../plan/overview/plan-overview.component.ts | 14 ++++---- .../ui/plan/overview/plan-overview.module.ts | 18 +++++------ .../ui/plan/overview/plan-overview.routing.ts | 8 ++--- .../plan-delete-dialog.component.ts | 4 +-- .../plan-delete-dialog.module.ts | 8 ++--- .../plan-editor.module.ts | 4 +-- .../plan-editor.routing.ts | 2 +- dmp-frontend/src/app/ui/plan/plan.routing.ts | 8 ++--- 22 files changed, 93 insertions(+), 93 deletions(-) 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 c2e40ef55..db77d373d 100644 --- a/dmp-frontend/src/app/core/services/matomo/analytics-service.ts +++ b/dmp-frontend/src/app/core/services/matomo/analytics-service.ts @@ -30,12 +30,12 @@ export class AnalyticsService { public static DescriptionListingItem: string = 'Description Listing Item'; public static DescriptionOverview: string = 'Description Overview'; public static PlanEditor: string = 'DMP Editor'; - public static DmpListing: string = 'DMPs'; - public static DmpFilterDialog: string = 'DMP Criteria'; - public static DmpListingItem: string = 'DMP Listing Item'; + public static PlanListing: string = 'DMPs'; + 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 DmpOverview: string = 'DMP Overview'; + public static PlanOverview: string = 'DMP Overview'; public static FAQ: string = 'FAQ'; public static Glossary: string = 'Glossary'; public static Navbar: string = 'Navbar'; diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts index 4abf59d3c..3967e273e 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts @@ -6,7 +6,7 @@ import { DashboardRoutingModule } from '@app/ui/dashboard/dashboard.routing'; import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module'; import { CommonUiModule } from '@common/ui/common-ui.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 { RecentEditedActivityComponent } from './recent-edited-activity/recent-edited-activity.component'; @@ -19,7 +19,7 @@ import { RecentEditedActivityComponent } from './recent-edited-activity/recent-e FormsModule, ReactiveFormsModule, - DmpListingModule, + PlanListingModule, DescriptionListingModule, StartNewPlanDialogModule ], diff --git a/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts b/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts index aeadfe0c8..7cc21320c 100644 --- a/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts @@ -16,7 +16,7 @@ import { ReferenceTypeService } from '@app/core/services/reference-type/referenc import { ReferenceService } from '@app/core/services/reference/reference.service'; import { EnumUtils } from '@app/core/services/utilities/enum-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 { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { Guid } from '@common/types/guid'; @@ -128,7 +128,7 @@ export class DescriptionListingItemComponent extends BaseComponent implements On openShareDialog() { // 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', // width: '700px', autoFocus: false, 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 378a24562..e7cb105ad 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 @@ -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 { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.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 { BaseComponent } from '@common/base/base.component'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; @@ -261,7 +261,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni } openShareDialog() { - const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { + const dialogRef = this.dialog.open(PlanInvitationDialogComponent, { autoFocus: false, restoreFocus: false, data: { diff --git a/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts b/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts index ec7c98e35..2db6265d2 100644 --- a/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts +++ b/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts @@ -24,7 +24,7 @@ import { nameof } from 'ts-simple-nameof'; templateUrl: './plan-deposit-dropdown.component.html', styleUrls: ['./plan-deposit-dropdown.component.scss'] }) -export class DmpDepositDropdown extends BaseComponent implements OnInit { +export class PlanDepositDropdown extends BaseComponent implements OnInit { @Input() inputRepos: DepositConfiguration[]; @Input() dmp: Plan; outputRepos = []; diff --git a/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts index 3bc4f594b..8eba91a99 100644 --- a/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts @@ -24,7 +24,7 @@ import { PlanEditorModel } from '../../plan-editor-blueprint/plan-editor.model'; templateUrl: 'plan-invitation-dialog.component.html', styleUrls: ['./plan-invitation-dialog.component.scss'] }) -export class DmpInvitationDialogComponent extends BaseComponent implements OnInit { +export class PlanInvitationDialogComponent extends BaseComponent implements OnInit { planId: Guid; editorModel: PlanEditorModel; @@ -39,7 +39,7 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni public route: ActivatedRoute, public router: Router, private language: TranslateService, - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, private uiNotificationService: UiNotificationService, private httpErrorHandlingService: HttpErrorHandlingService, private planService: PlanService, diff --git a/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts index 7af3e772f..9bde801b4 100644 --- a/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts @@ -3,14 +3,14 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; import { RichTextEditorModule } from "@app/library/rich-text-editor/rich-text-editor.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'; @NgModule({ imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule, PlanUserFieldModule], - declarations: [DmpInvitationDialogComponent], - exports: [DmpInvitationDialogComponent] + declarations: [PlanInvitationDialogComponent], + exports: [PlanInvitationDialogComponent] }) -export class DmpInvitationDialogModule { +export class PlanInvitationDialogModule { constructor() { } } diff --git a/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts index 10aac75ba..35f564006 100644 --- a/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts @@ -2,7 +2,7 @@ import { Inject, Component, ViewChild, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UntypedFormGroup } from '@angular/forms'; 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'; @Component({ @@ -11,12 +11,12 @@ import { ReferencesWithType } from '@app/core/query/description.lookup'; 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( - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, private analyticsService: AnalyticsService, @Inject(MAT_DIALOG_DATA) public data: { isPublic: boolean, @@ -25,7 +25,7 @@ export class DmpFilterDialogComponent implements OnInit { }) { } ngOnInit() { - this.analyticsService.trackPageView(AnalyticsService.DmpFilterDialog); + this.analyticsService.trackPageView(AnalyticsService.PlanFilterDialog); } onNoClick(): void { 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 b01100ff1..9bfab5d2b 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 @@ -27,7 +27,7 @@ import { ReferencesWithType } from '@app/core/query/description.lookup'; templateUrl: './plan-filter.component.html', 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() referencesWithTypeItems: ReferencesWithType[]; diff --git a/dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts b/dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts index 1de025d89..d331bac89 100644 --- a/dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts @@ -10,7 +10,7 @@ import { IsActive } from "@notification-service/core/enum/is-active.enum"; import { nameof } from "ts-simple-nameof"; @Injectable() -export class DmpFilterService { +export class PlanFilterService { public static initializePlanDescriptionTemplateLookup(): PlanDescriptionTemplateLookup { 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 506bda4ee..c54056058 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 @@ -22,12 +22,12 @@ import { takeUntil } from 'rxjs/operators'; import { PlanStatus } from '../../../../core/common/enum/plan-status'; import { AuthService } from '../../../../core/services/auth/auth.service'; 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 { AppPermission } from '@app/core/common/enum/permission.enum'; import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type'; 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 { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.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', styleUrls: ['./plan-listing-item.component.scss'], }) -export class DmpListingItemComponent extends BaseComponent implements OnInit { +export class PlanListingItemComponent extends BaseComponent implements OnInit { @Input() dmp: Plan; @Input() showDivider: boolean = true; @@ -74,7 +74,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit { } ngOnInit() { - this.analyticsService.trackPageView(AnalyticsService.DmpListingItem); + this.analyticsService.trackPageView(AnalyticsService.PlanListingItem); if (this.dmp.status == PlanStatus.Draft) { this.isDraft = true; this.isFinalized = false; @@ -93,7 +93,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit { } inviteToDmp() { - const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { + const dialogRef = this.dialog.open(PlanInvitationDialogComponent, { // height: '250px', // width: '700px', autoFocus: false, @@ -169,7 +169,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit { let dialogRef: any; if (this.dmp.descriptions && this.dmp.descriptions.length > 0){ - dialogRef = this.dialog.open(DmpDeleteDialogComponent, { + dialogRef = this.dialog.open(PlanDeleteDialogComponent, { maxWidth: '300px', data: { descriptions: this.dmp.descriptions, 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 fad8eb621..b5ecf8809 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 @@ -27,7 +27,7 @@ import { TranslateService } from '@ngx-translate/core'; import { NgDialogAnimationService } from "ng-dialog-animation"; import { debounceTime, takeUntil, tap } from 'rxjs/operators'; 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 { QueryResult } from '@common/model/query-result'; 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 { ReferencesWithType } from '@app/core/query/description.lookup'; import { Guid } from '@common/types/guid'; -import { DmpFilterService } from './filtering/services/plan-filter.service'; +import { PlanFilterService } from './filtering/services/plan-filter.service'; @Component({ selector: 'app-plan-listing-component', templateUrl: 'plan-listing.component.html', styleUrls: ['./plan-listing.component.scss'], }) -export class DmpListingComponent extends BaseListingComponent implements OnInit { +export class PlanListingComponent extends BaseListingComponent implements OnInit { - userSettingsKey = { key: 'DmpListingUserSettings' }; + userSettingsKey = { key: 'PlanListingUserSettings' }; @ViewChild(MatPaginator, { static: true }) _paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -110,7 +110,7 @@ export class DmpListingComponent extends BaseListingComponent 0) { - lookup.planDescriptionTemplateSubQuery = DmpFilterService.initializePlanDescriptionTemplateLookup(); + lookup.planDescriptionTemplateSubQuery = PlanFilterService.initializePlanDescriptionTemplateLookup(); lookup.planDescriptionTemplateSubQuery.descriptionTemplateGroupIds = descriptionTemplates; } else lookup.planDescriptionTemplateSubQuery = null; @@ -367,14 +367,14 @@ export class DmpListingComponent extends BaseListingComponent 0) { - lookup.planBlueprintSubQuery = DmpFilterService.initializePlanBlueprintLookup(); + lookup.planBlueprintSubQuery = PlanFilterService.initializePlanBlueprintLookup(); lookup.planBlueprintSubQuery.ids = dmpBlueprints; } else lookup.planBlueprintSubQuery = null; // Dmps let roles = formGroup.get("role")?.value !== null ? [formGroup.get("role")?.value] : null; if (roles && roles?.length > 0) { - lookup.planUserSubQuery = DmpFilterService.initializePlanUserLookup(); + lookup.planUserSubQuery = PlanFilterService.initializePlanUserLookup(); lookup.planUserSubQuery.userRoles = roles; } else lookup.planUserSubQuery = null; @@ -383,7 +383,7 @@ export class DmpListingComponent extends BaseListingComponent referencesWithType.referenceIds) as Guid[]; if (references && references?.length > 0) { - lookup.planReferenceSubQuery = DmpFilterService.initializePlanReferenceLookup(); + lookup.planReferenceSubQuery = PlanFilterService.initializePlanReferenceLookup(); lookup.planReferenceSubQuery.referenceIds = references; } else lookup.planReferenceSubQuery = null; diff --git a/dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts b/dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts index 7efe447d6..d693f896b 100644 --- a/dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts +++ b/dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts @@ -3,15 +3,15 @@ import { FormattingModule } from '@app/core/formatting.module'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; import { NewVersionPlanDialogModule } from '../new-version-dialog/plan-new-version-dialog.module'; -import { DmpInvitationDialogModule } from '../invitation/dialog/plan-invitation-dialog.module'; -import { DmpFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component'; -import { DmpFilterComponent } from './filtering/plan-filter.component'; +import { PlanInvitationDialogModule } from '../invitation/dialog/plan-invitation-dialog.module'; +import { PlanFilterDialogComponent } from './filtering/plan-filter-dialog/plan-filter-dialog.component'; +import { PlanFilterComponent } from './filtering/plan-filter.component'; 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 { DmpListingComponent } from './plan-listing.component'; -import { DmpListingItemComponent } from './listing-item/plan-listing-item.component'; -import { DmpListingRoutingModule } from './plan-listing.routing'; +import { PlanListingComponent } from './plan-listing.component'; +import { PlanListingItemComponent } from './listing-item/plan-listing-item.component'; +import { PlanListingRoutingModule } from './plan-listing.routing'; @NgModule({ imports: [ @@ -21,18 +21,18 @@ import { DmpListingRoutingModule } from './plan-listing.routing'; AutoCompleteModule, ClonePlanDialogModule, NewVersionPlanDialogModule, - DmpInvitationDialogModule, - DmpListingRoutingModule + PlanInvitationDialogModule, + PlanListingRoutingModule ], declarations: [ - DmpListingComponent, - DmpListingItemComponent, - DmpFilterDialogComponent, - DmpFilterComponent, + PlanListingComponent, + PlanListingItemComponent, + PlanFilterDialogComponent, + PlanFilterComponent, ], exports: [ - DmpListingItemComponent + PlanListingItemComponent ], - providers: [ DmpFilterService ] + providers: [ PlanFilterService ] }) -export class DmpListingModule { } +export class PlanListingModule { } diff --git a/dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts b/dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts index 30dd11cf0..937f41a25 100644 --- a/dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts +++ b/dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DmpListingComponent } from './plan-listing.component'; +import { PlanListingComponent } from './plan-listing.component'; const routes: Routes = [ { path: '', - component: DmpListingComponent, + component: PlanListingComponent, // canActivate: [AuthGuard], data: { breadcrumb: true @@ -13,7 +13,7 @@ const routes: Routes = [ }, { path: 'versions/:groupId', - component: DmpListingComponent, + component: PlanListingComponent, data: { breadcrumb: true }, @@ -25,4 +25,4 @@ const routes: Routes = [ exports: [RouterModule], providers: [] }) -export class DmpListingRoutingModule { } +export class PlanListingRoutingModule { } 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 e47758847..27fd54269 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 @@ -44,10 +44,10 @@ import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; 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 { 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 { 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', styleUrls: ['./plan-overview.component.scss'] }) -export class DmpOverviewComponent extends BaseComponent implements OnInit { +export class PlanOverviewComponent extends BaseComponent implements OnInit { dmp: any; selectedBlueprint: PlanBlueprint; @@ -113,7 +113,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } ngOnInit() { - this.analyticsService.trackPageView(AnalyticsService.DmpOverview); + this.analyticsService.trackPageView(AnalyticsService.PlanOverview); // Gets dmp data using parameter id this.route.params .pipe(takeUntil(this._destroyed)) @@ -149,7 +149,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { // this.setIsUserOwner(); // const breadCrumbs = []; // breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DMPS'), url: "/plans" }); - // breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/plans/overview/' + this.dmp.id }); + // breadCrumbs.push({ parentComponentName: 'PlanListingComponent', label: this.dmp.label, url: '/plans/overview/' + this.dmp.id }); // this.breadCrumbs = observableOf(breadCrumbs); }, (error: any) => { this.httpErrorHandlingService.handleBackedRequestError(error); @@ -323,7 +323,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { deleteClicked() { let dialogRef: any; if (this.dmp.descriptions && this.dmp.descriptions.length > 0) { - dialogRef = this.dialog.open(DmpDeleteDialogComponent, { + dialogRef = this.dialog.open(PlanDeleteDialogComponent, { maxWidth: '300px', data: { descriptions: this.dmp.descriptions, @@ -445,7 +445,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } openShareDialog(rowId: any, rowName: any) { - const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { + const dialogRef = this.dialog.open(PlanInvitationDialogComponent, { // height: '250px', // width: '700px', autoFocus: false, diff --git a/dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts b/dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts index 9040b65d1..4d6cec963 100644 --- a/dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts @@ -1,35 +1,35 @@ import { NgModule } from '@angular/core'; import { FormattingModule } from '@app/core/formatting.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 { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; import { NgDialogAnimationService } from 'ng-dialog-animation'; 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 { DmpDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module'; -import { DmpOverviewComponent } from './plan-overview.component'; +import { PlanDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module'; +import { PlanOverviewComponent } from './plan-overview.component'; @NgModule({ imports: [ CommonUiModule, CommonFormsModule, ConfirmationDialogModule, - DmpDeleteDialogModule, + PlanDeleteDialogModule, MultipleChoiceDialogModule, FormattingModule, AutoCompleteModule, - DmpOverviewRoutingModule, + PlanOverviewRoutingModule, PlanFinalizeDialogModule ], declarations: [ - DmpOverviewComponent, - DmpDepositDropdown + PlanOverviewComponent, + PlanDepositDropdown ], providers: [ NgDialogAnimationService ] }) -export class DmpOverviewModule { } +export class PlanOverviewModule { } diff --git a/dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts b/dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts index 74218522f..211e2b968 100644 --- a/dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; 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'; const routes: Routes = [ { path: ':id', - component: DmpOverviewComponent, + component: PlanOverviewComponent, data: { breadcrumb: true, title: 'GENERAL.TITLES.PLAN-OVERVIEW' @@ -14,7 +14,7 @@ const routes: Routes = [ }, { path: 'public/:publicId', - component: DmpOverviewComponent, + component: PlanOverviewComponent, data: { breadcrumb: true, title: 'GENERAL.TITLES.PLAN-OVERVIEW' @@ -27,4 +27,4 @@ const routes: Routes = [ exports: [RouterModule], providers: [] }) -export class DmpOverviewRoutingModule { } +export class PlanOverviewRoutingModule { } diff --git a/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts index 4374b3e0d..748c95cda 100644 --- a/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts @@ -7,11 +7,11 @@ import { Description } from '@app/core/model/description/description'; templateUrl: './plan-delete-dialog.component.html', styleUrls: ['./plan-delete-dialog.component.scss'] }) -export class DmpDeleteDialogComponent { +export class PlanDeleteDialogComponent { descriptions: Description[]; constructor( - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any ) { this.descriptions = data.descriptions; diff --git a/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts index 3fd19e4a3..a90e5ad52 100644 --- a/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonUiModule } from '@common/ui/common-ui.module'; -import { DmpDeleteDialogComponent } from './plan-delete-dialog.component'; +import { PlanDeleteDialogComponent } from './plan-delete-dialog.component'; @NgModule({ imports: [CommonUiModule, FormsModule], - declarations: [DmpDeleteDialogComponent], - exports: [DmpDeleteDialogComponent] + declarations: [PlanDeleteDialogComponent], + exports: [PlanDeleteDialogComponent] }) -export class DmpDeleteDialogModule { +export class PlanDeleteDialogModule { constructor() { } } 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 b454e8659..b76f04232 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 @@ -11,7 +11,7 @@ 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 { 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'; @NgModule({ @@ -20,7 +20,7 @@ import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/p CommonFormsModule, FormattingModule, ConfirmationDialogModule, - DmpDeleteDialogModule, + PlanDeleteDialogModule, PlanEditorRoutingModule, RichTextEditorModule, AutoCompleteModule, 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 33d6ccb13..3b6591e67 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 @@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router'; // import { DmpWizardComponent } 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 { DmpOverviewComponent } from './overview/description-overview.component'; +// import { PlanOverviewComponent } from './overview/description-overview.component'; import { AuthGuard } from '@app/core/auth-guard.service'; import { PlanEditorComponent } from './plan-editor.component'; import { PlanEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver'; diff --git a/dmp-frontend/src/app/ui/plan/plan.routing.ts b/dmp-frontend/src/app/ui/plan/plan.routing.ts index 182a25e57..ac758b19c 100644 --- a/dmp-frontend/src/app/ui/plan/plan.routing.ts +++ b/dmp-frontend/src/app/ui/plan/plan.routing.ts @@ -6,7 +6,7 @@ import { AuthGuard } from '@app/core/auth-guard.service'; const routes: Routes = [ { path: 'overview', - loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule), + loadChildren: () => import('./overview/plan-overview.module').then(m => m.PlanOverviewModule), canActivate:[AuthGuard], data: { breadcrumb: true, @@ -42,7 +42,7 @@ const routes: Routes = [ { path: '', canActivate:[AuthGuard], - loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule), + loadChildren: () => import('./listing/plan-listing.module').then(m => m.PlanListingModule), data: { breadcrumb: true }, @@ -52,7 +52,7 @@ const routes: Routes = [ const publicRoutes: Routes = [ { path: 'overview', - loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule), + loadChildren: () => import('./overview/plan-overview.module').then(m => m.PlanOverviewModule), data: { breadcrumb: true, ...BreadcrumbService.generateRouteDataConfiguration({ @@ -62,7 +62,7 @@ const publicRoutes: Routes = [ }, { path: '', - loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule), + loadChildren: () => import('./listing/plan-listing.module').then(m => m.PlanListingModule), data: { breadcrumb: true, isPublic: true