diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 4f74fc2d6..d50609f8e 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/dmp/dmp.module').then(m => m.DmpModule), + loadChildren: () => import('./ui/plan/plan.module').then(m => m.DmpModule), data: { authContext: { permissions: [AppPermission.ViewMyDmpPage] @@ -59,7 +59,7 @@ const appRoutes: Routes = [ }, { path: 'explore-plans', - loadChildren: () => import('./ui/dmp/dmp.module').then(m => m.PublicDmpModule), + loadChildren: () => import('./ui/plan/plan.module').then(m => m.PublicDmpModule), data: { breadcrumb: true, ...BreadcrumbService.generateRouteDataConfiguration({ diff --git a/dmp-frontend/src/app/core/services/description/description.service.ts b/dmp-frontend/src/app/core/services/description/description.service.ts index 919391fdf..737416951 100644 --- a/dmp-frontend/src/app/core/services/description/description.service.ts +++ b/dmp-frontend/src/app/core/services/description/description.service.ts @@ -15,7 +15,7 @@ import { ConfigurationService } from '../configuration/configuration.service'; import { BaseHttpV2Service } from '../http/base-http-v2.service'; import { BaseHttpParams } from '@common/http/base-http-params'; import { InterceptorType } from '@common/http/interceptors/interceptor-type'; -import { DescriptionValidationResult } from '@app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component'; +import { DescriptionValidationResult } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component'; @Injectable() export class DescriptionService { diff --git a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts index 4f311f0d9..8dfa8cd2a 100644 --- a/dmp-frontend/src/app/core/services/dmp/dmp.service.ts +++ b/dmp-frontend/src/app/core/services/dmp/dmp.service.ts @@ -19,7 +19,7 @@ import { CloneDmpPersist, Dmp, DmpPersist, DmpUser, DmpUserInvitePersist, DmpUse import { AuthService } from '../auth/auth.service'; import { ConfigurationService } from '../configuration/configuration.service'; import { BaseHttpV2Service } from '../http/base-http-v2.service'; -import { DmpValidationResult } from '@app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component'; +import { DmpValidationResult } from '@app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component'; import { DmpCommonModelConfig, PreprocessingDmpModel } from '@app/core/model/dmp/dmp-import'; @Injectable() diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index d32bbdbd4..4445baf3f 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -16,7 +16,7 @@ import moment from 'moment'; import { CookieService } from 'ngx-cookie-service'; import { takeUntil } from 'rxjs/operators'; import { StartNewDescriptionDialogComponent } from '../description/start-new-description-dialog/start-new-description-dialog.component'; -import { StartNewDmpDialogComponent } from '../dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component'; +import { StartNewDmpDialogComponent } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.component'; import { AnalyticsService } from '@app/core/services/matomo/analytics-service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts index 1a1b02c3f..62a8930e3 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts @@ -6,8 +6,8 @@ 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 '../dmp/listing/dmp-listing.module'; -import { StartNewDmpDialogModule } from '../dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.module'; +import { DmpListingModule } from '../plan/listing/plan-listing.module'; +import { StartNewDmpDialogModule } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.module'; import { RecentEditedActivityComponent } from './recent-edited-activity/recent-edited-activity.component'; @NgModule({ 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 2ce559ed1..ef7ab174f 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 @@ -21,7 +21,7 @@ import { AnalyticsService } from '@app/core/services/matomo/analytics-service'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'; -import { StartNewDmpDialogComponent } from '@app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component'; +import { StartNewDmpDialogComponent } from '@app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component'; import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service'; import { PageLoadEvent, SortDirection } from '@common/modules/hybrid-listing/hybrid-listing.component'; import { TranslateService } from '@ngx-translate/core'; 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 79e2ac6a1..3088f9a37 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/dmp/invitation/dialog/dmp-invitation-dialog.component'; +import { DmpInvitationDialogComponent } 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'; 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 7cf1c6001..8c6c69f1b 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 @@ -32,8 +32,8 @@ import { UserService } from '@app/core/services/user/user.service'; 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/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component'; -import { DmpInvitationDialogComponent } from '@app/ui/dmp/invitation/dialog/dmp-invitation-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 { 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'; diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts index ad9135650..9cafae5f3 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts @@ -24,7 +24,7 @@ import { MineInAppNotificationListingDialogComponent } from '@notification-servi import { timer } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; -import { StartNewDmpDialogComponent } from '../dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component'; +import { StartNewDmpDialogComponent } from '../plan/new/start-new-plan-dialogue/start-new-plan-dialog.component'; import { FaqDialogComponent } from '../faq/dialog/faq-dialog.component'; import { UserDialogComponent } from './user-dialog/user-dialog.component'; diff --git a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.html b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.html rename to dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.scss b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.ts b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.ts similarity index 90% rename from dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.ts index 1b4dba71a..04d4cb9ca 100644 --- a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.ts @@ -7,15 +7,15 @@ 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 { DmpCloneDialogEditorModel } from './dmp-clone-dialog.editor.model'; -import { DmpEditorEntityResolver } from '../dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver'; +import { DmpCloneDialogEditorModel } from './plan-clone-dialog.editor.model'; +import { DmpEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver'; import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service'; import { HttpErrorResponse } from '@angular/common/http'; @Component({ - selector: 'app-dmp-clone-dialog', - templateUrl: './dmp-clone-dialog.component.html', - styleUrls: ['./dmp-clone-dialog.component.scss'] + selector: 'app-plan-clone-dialog', + templateUrl: './plan-clone-dialog.component.html', + styleUrls: ['./plan-clone-dialog.component.scss'] }) export class CloneDmpDialogComponent extends BaseComponent { diff --git a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.editor.model.ts b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.editor.model.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.editor.model.ts rename to dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.editor.model.ts diff --git a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.module.ts b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.module.ts similarity index 89% rename from dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.module.ts index e2040ebd5..142ab8d5c 100644 --- a/dmp-frontend/src/app/ui/dmp/clone-dialog/dmp-clone-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonUiModule } from '@common/ui/common-ui.module'; -import { CloneDmpDialogComponent } from './dmp-clone-dialog.component'; +import { CloneDmpDialogComponent } from './plan-clone-dialog.component'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; import {RichTextEditorModule} from "@app/library/rich-text-editor/rich-text-editor.module"; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.html b/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.html rename to dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.html diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.scss b/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.scss rename to dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts b/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts similarity index 97% rename from dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts rename to dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts index a32980bb4..c3436e7e3 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts +++ b/dmp-frontend/src/app/ui/plan/editor/plan-deposit-dropdown/plan-deposit-dropdown.component.ts @@ -20,9 +20,9 @@ import { takeUntil } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; @Component({ - selector: 'app-dmp-deposit-dropdown', - templateUrl: './dmp-deposit-dropdown.component.html', - styleUrls: ['./dmp-deposit-dropdown.component.scss'] + selector: 'app-plan-deposit-dropdown', + templateUrl: './plan-deposit-dropdown.component.html', + styleUrls: ['./plan-deposit-dropdown.component.scss'] }) export class DmpDepositDropdown extends BaseComponent implements OnInit { @Input() inputRepos: DepositConfiguration[]; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.html b/dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.html rename to dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.html diff --git a/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.ts b/dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.ts similarity index 93% rename from dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-invitation-accepted.component.ts rename to dmp-frontend/src/app/ui/plan/invitation/accepted/plan-invitation-accepted.component.ts index fe4214d05..7df3f42ca 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/accepted/dmp-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/dmp/dmp-invitation.service'; +import { DmpInvitationService } from '@app/core/services/plan/dmp-invitation.service'; import { BaseComponent } from '@common/base/base.component'; import { takeUntil } from 'rxjs/operators'; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html similarity index 76% rename from dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html rename to dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html index 3a86701b1..7173158e4 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.html +++ b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html @@ -9,7 +9,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.scss b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.ts b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts similarity index 95% rename from dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts index 00f2af113..d8fd12d2a 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.ts @@ -17,12 +17,12 @@ import { HttpError, HttpErrorHandlingService } from '@common/modules/errors/erro import { Guid } from '@common/types/guid'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; -import { DmpEditorModel } from '../../dmp-editor-blueprint/dmp-editor.model'; +import { DmpEditorModel } from '../../plan-editor-blueprint/plan-editor.model'; @Component({ selector: 'app-invitation-dialog-component', - templateUrl: 'dmp-invitation-dialog.component.html', - styleUrls: ['./dmp-invitation-dialog.component.scss'] + templateUrl: 'plan-invitation-dialog.component.html', + styleUrls: ['./plan-invitation-dialog.component.scss'] }) export class DmpInvitationDialogComponent extends BaseComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.module.ts b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts similarity index 79% rename from dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts index 0a708ae42..1917312bf 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dialog/dmp-invitation-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.module.ts @@ -3,8 +3,8 @@ 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 './dmp-invitation-dialog.component'; -import { DmpUserFieldModule } from '../../dmp-user-field/dmp-user-field.module'; +import { DmpInvitationDialogComponent } from './plan-invitation-dialog.component'; +import { DmpUserFieldModule } from '../../plan-user-field/plan-user-field.module'; @NgModule({ imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule, DmpUserFieldModule], diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.html b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.html similarity index 83% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.html rename to dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.html index 5f5ef1aef..9cc3f037d 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.html +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.html @@ -1,7 +1,7 @@ clear - + > diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.scss b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.ts b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts similarity index 83% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts index 161138566..10aac75ba 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter-dialog/dmp-filter-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter-dialog/plan-filter-dialog.component.ts @@ -2,13 +2,13 @@ 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 '../dmp-filter.component'; +import { DmpFilterComponent } from '../plan-filter.component'; import { ReferencesWithType } from '@app/core/query/description.lookup'; @Component({ - selector: 'dmp-filter-dialog-component', - templateUrl: './dmp-filter-dialog.component.html', - styleUrls: ['./dmp-filter-dialog.component.scss'] + selector: 'plan-filter-dialog-component', + templateUrl: './plan-filter-dialog.component.html', + styleUrls: ['./plan-filter-dialog.component.scss'] }) export class DmpFilterDialogComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.html b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.html rename to dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.scss b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.scss rename to dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.ts b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts similarity index 98% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.ts rename to dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts index 3b97dd40d..4f74419d4 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/filtering/dmp-filter.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts @@ -23,9 +23,9 @@ import { QueryResult } from '@common/model/query-result'; import { ReferencesWithType } from '@app/core/query/description.lookup'; @Component({ - selector: 'app-dmp-filter-component', - templateUrl: './dmp-filter.component.html', - styleUrls: ['./dmp-filter.component.scss'], + selector: 'app-plan-filter-component', + templateUrl: './plan-filter.component.html', + styleUrls: ['./plan-filter.component.scss'], }) export class DmpFilterComponent extends BaseCriteriaComponent implements OnInit, OnChanges { diff --git a/dmp-frontend/src/app/ui/dmp/listing/filtering/services/dmp-filter.service.ts b/dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/filtering/services/dmp-filter.service.ts rename to dmp-frontend/src/app/ui/plan/listing/filtering/services/plan-filter.service.ts diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html rename to dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss rename to dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts similarity index 96% rename from dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts rename to dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts index 398bbbefc..91ec096cb 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.ts @@ -21,21 +21,21 @@ import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { DmpStatus } from '../../../../core/common/enum/dmp-status'; import { AuthService } from '../../../../core/services/auth/auth.service'; -import { CloneDmpDialogComponent } from '../../clone-dialog/dmp-clone-dialog.component'; -import { DmpInvitationDialogComponent } from '../../invitation/dialog/dmp-invitation-dialog.component'; -import { NewVersionDmpDialogComponent } from '../../new-version-dialog/dmp-new-version-dialog.component'; +import { CloneDmpDialogComponent } from '../../clone-dialog/plan-clone-dialog.component'; +import { DmpInvitationDialogComponent } from '../../invitation/dialog/plan-invitation-dialog.component'; +import { NewVersionDmpDialogComponent } 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 { DmpVersionStatus } from '@app/core/common/enum/dmp-version-status'; -import { DmpDeleteDialogComponent } from '../../dmp-delete-dialog/dmp-delete-dialog.component'; +import { DmpDeleteDialogComponent } 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'; @Component({ selector: 'app-dmp-listing-item-component', - templateUrl: './dmp-listing-item.component.html', - styleUrls: ['./dmp-listing-item.component.scss'], + templateUrl: './plan-listing-item.component.html', + styleUrls: ['./plan-listing-item.component.scss'], }) export class DmpListingItemComponent extends BaseComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html rename to dmp-frontend/src/app/ui/plan/listing/plan-listing.component.html diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss rename to dmp-frontend/src/app/ui/plan/listing/plan-listing.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts similarity index 98% rename from dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts rename to dmp-frontend/src/app/ui/plan/listing/plan-listing.component.ts index 50d43d110..7e783ae87 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-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/dmp-filter-dialog/dmp-filter-dialog.component'; +import { DmpFilterDialogComponent } 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,12 +35,12 @@ 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/dmp-filter.service'; +import { DmpFilterService } from './filtering/services/plan-filter.service'; @Component({ - selector: 'app-dmp-listing-component', - templateUrl: 'dmp-listing.component.html', - styleUrls: ['./dmp-listing.component.scss'], + selector: 'app-plan-listing-component', + templateUrl: 'plan-listing.component.html', + styleUrls: ['./plan-listing.component.scss'], }) export class DmpListingComponent extends BaseListingComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.module.ts b/dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts similarity index 58% rename from dmp-frontend/src/app/ui/dmp/listing/dmp-listing.module.ts rename to dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts index e09ae26d9..60bae269a 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.module.ts +++ b/dmp-frontend/src/app/ui/plan/listing/plan-listing.module.ts @@ -1,17 +1,17 @@ import { NgModule } from '@angular/core'; import { FormattingModule } from '@app/core/formatting.module'; -import { DmpListingComponent } from '@app/ui/dmp/listing/dmp-listing.component'; -import { DmpListingItemComponent } from '@app/ui/dmp/listing/listing-item/dmp-listing-item.component'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; -import { CloneDmpDialogModule } from '../clone-dialog/dmp-clone-dialog.module'; -import { NewVersionDmpDialogModule } from '../new-version-dialog/dmp-new-version-dialog.module'; -import { DmpListingRoutingModule } from './dmp-listing.routing'; -import { DmpInvitationDialogModule } from '../invitation/dialog/dmp-invitation-dialog.module'; -import { DmpFilterDialogComponent } from './filtering/dmp-filter-dialog/dmp-filter-dialog.component'; -import { DmpFilterComponent } from './filtering/dmp-filter.component'; +import { NewVersionDmpDialogModule } 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 { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; -import { DmpFilterService } from './filtering/services/dmp-filter.service'; +import { DmpFilterService } from './filtering/services/plan-filter.service'; +import { CloneDmpDialogModule } 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'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.routing.ts b/dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts similarity index 88% rename from dmp-frontend/src/app/ui/dmp/listing/dmp-listing.routing.ts rename to dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts index 101707c68..30dd11cf0 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.routing.ts +++ b/dmp-frontend/src/app/ui/plan/listing/plan-listing.routing.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DmpListingComponent } from './dmp-listing.component'; +import { DmpListingComponent } from './plan-listing.component'; const routes: Routes = [ { diff --git a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.html b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.html rename to dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.scss b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.ts b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts similarity index 96% rename from dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts index 5104296a4..dc65190ed 100644 --- a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.ts @@ -7,9 +7,9 @@ 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 './dmp-new-version-dialog.editor.model'; +import { DmpNewVersionDialogEditorModel } from './plan-new-version-dialog.editor.model'; import { DmpBlueprintService } from '@app/core/services/dmp/dmp-blueprint.service'; -import { DmpEditorEntityResolver } from '../dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver'; +import { DmpEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; import { DescriptionTemplatesInSection, DmpBlueprint, DmpBlueprintDefinition, DmpBlueprintDefinitionSection } from '@app/core/model/dmp-blueprint/dmp-blueprint'; import { DmpBlueprintStatus } from '@app/core/common/enum/dmp-blueprint-status'; @@ -26,9 +26,9 @@ import { HttpErrorResponse } from '@angular/common/http'; import { Description } from '@app/core/model/description/description'; @Component({ - selector: 'app-dmp-new-version-dialog', - templateUrl: './dmp-new-version-dialog.component.html', - styleUrls: ['./dmp-new-version-dialog.component.scss'] + selector: 'app-plan-new-version-dialog', + templateUrl: './plan-new-version-dialog.component.html', + styleUrls: ['./plan-new-version-dialog.component.scss'] }) export class NewVersionDmpDialogComponent extends BaseComponent { diff --git a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.editor.model.ts b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.editor.model.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.editor.model.ts rename to dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.editor.model.ts diff --git a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.module.ts b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.module.ts similarity index 88% rename from dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.module.ts index 71ff8cdd4..b61640eb1 100644 --- a/dmp-frontend/src/app/ui/dmp/new-version-dialog/dmp-new-version-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.module.ts @@ -3,7 +3,7 @@ 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 { NewVersionDmpDialogComponent } from './dmp-new-version-dialog.component'; +import { NewVersionDmpDialogComponent } from './plan-new-version-dialog.component'; @NgModule({ imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule], diff --git a/dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.html b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.html rename to dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.scss b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts similarity index 93% rename from dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts index 48146ff0e..dd356ef51 100644 --- a/dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.ts @@ -7,14 +7,14 @@ 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/dmp-upload-dialog.component'; +import { DmpUploadDialogComponent } 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'; @Component({ - selector: 'app-start-new-dmp', - templateUrl: './start-new-dmp-dialog.component.html', - styleUrls: ['./start-new-dmp-dialog.component.scss'] + selector: 'app-start-new-plan', + templateUrl: './start-new-plan-dialog.component.html', + styleUrls: ['./start-new-plan-dialog.component.scss'] }) export class StartNewDmpDialogComponent extends BaseComponent { diff --git a/dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.module.ts b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts similarity index 74% rename from dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts index 90af27311..d9614feac 100644 --- a/dmp-frontend/src/app/ui/dmp/new/start-new-dmp-dialogue/start-new-dmp-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.module.ts @@ -2,8 +2,8 @@ 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/dmp-upload-dialog.module'; -import { StartNewDmpDialogComponent } from './start-new-dmp-dialog.component'; +import { DmpUploadDialogModule } from '../upload-dialogue/plan-upload-dialog.module'; +import { StartNewDmpDialogComponent } from './start-new-plan-dialog.component'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-common-model-config.editor.model.ts b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-common-model-config.editor.model.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-common-model-config.editor.model.ts rename to dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-common-model-config.editor.model.ts diff --git a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.html b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.html rename to dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.scss b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.ts b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts similarity index 96% rename from dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts index 65c1bc5c0..5f6755ab8 100644 --- a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.ts @@ -8,7 +8,7 @@ import { DmpService } from '@app/core/services/dmp/dmp.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 './dmp-common-model-config.editor.model'; +import { DmpImportRdaConfigEditorModel } 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'; @@ -20,9 +20,9 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv import { TranslateService } from '@ngx-translate/core'; @Component({ - selector: 'dmp-upload-dialog', - templateUrl: './dmp-upload-dialog.component.html', - styleUrls: ['./dmp-upload-dialog.component.scss'] + selector: 'plan-upload-dialog', + templateUrl: './plan-upload-dialog.component.html', + styleUrls: ['./plan-upload-dialog.component.scss'] }) export class DmpUploadDialogComponent extends BaseComponent { dmpTitle: string; diff --git a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.module.ts b/dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.module.ts similarity index 90% rename from dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-upload-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.module.ts index 09b4ee30a..ebf21f138 100644 --- a/dmp-frontend/src/app/ui/dmp/new/upload-dialogue/dmp-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 './dmp-upload-dialog.component'; +import { DmpUploadDialogComponent } from './plan-upload-dialog.component'; import { ReactiveFormsModule } from '@angular/forms'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html rename to dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss rename to dmp-frontend/src/app/ui/plan/overview/plan-overview.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts similarity index 98% rename from dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts rename to dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts index 13d3f1bf8..3f543a356 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts @@ -43,18 +43,18 @@ import { Guid } from '@common/types/guid'; import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; -import { CloneDmpDialogComponent } from '../clone-dialog/dmp-clone-dialog.component'; -import { DmpDeleteDialogComponent } from '../dmp-delete-dialog/dmp-delete-dialog.component'; -import { DmpEditorEntityResolver } from '../dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver'; -import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../dmp-finalize-dialog/dmp-finalize-dialog.component'; -import { DmpInvitationDialogComponent } from '../invitation/dialog/dmp-invitation-dialog.component'; -import { NewVersionDmpDialogComponent } from '../new-version-dialog/dmp-new-version-dialog.component'; +import { CloneDmpDialogComponent } from '../clone-dialog/plan-clone-dialog.component'; +import { DmpDeleteDialogComponent } from '../plan-delete-dialog/plan-delete-dialog.component'; +import { DmpEditorEntityResolver } from '../plan-editor-blueprint/resolvers/plan-editor-enitity.resolver'; +import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component'; +import { DmpInvitationDialogComponent } from '../invitation/dialog/plan-invitation-dialog.component'; +import { NewVersionDmpDialogComponent } from '../new-version-dialog/plan-new-version-dialog.component'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; @Component({ selector: 'app-dmp-overview', - templateUrl: './dmp-overview.component.html', - styleUrls: ['./dmp-overview.component.scss'] + templateUrl: './plan-overview.component.html', + styleUrls: ['./plan-overview.component.scss'] }) export class DmpOverviewComponent extends BaseComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts b/dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts similarity index 69% rename from dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts rename to dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts index 26553c95c..a196ddd14 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.module.ts +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.module.ts @@ -1,16 +1,16 @@ 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 "@app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component"; -import { DmpOverviewComponent } from '@app/ui/dmp/overview/dmp-overview.component'; +import { DmpDepositDropdown } 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 { DmpFinalizeDialogModule } from '../dmp-finalize-dialog/dmp-finalize-dialog.module'; -import { DmpOverviewRoutingModule } from './dmp-overview.routing'; +import { DmpFinalizeDialogModule } from '../plan-finalize-dialog/plan-finalize-dialog.module'; +import { DmpOverviewRoutingModule } from './plan-overview.routing'; import { MultipleChoiceDialogModule } from '@common/modules/multiple-choice-dialog/multiple-choice-dialog.module'; -import { DmpDeleteDialogModule } from '../dmp-delete-dialog/dmp-delete-dialog.module'; +import { DmpDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module'; +import { DmpOverviewComponent } from './plan-overview.component'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.routing.ts b/dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts similarity index 90% rename from dmp-frontend/src/app/ui/dmp/overview/dmp-overview.routing.ts rename to dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts index 089415b03..74218522f 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.routing.ts +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.routing.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DmpOverviewComponent } from './dmp-overview.component'; +import { DmpOverviewComponent } from './plan-overview.component'; import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service'; const routes: Routes = [ diff --git a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.html b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.html rename to dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.scss b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.ts b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.ts similarity index 90% rename from dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.ts index b90a34cec..0e9433d48 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.ts @@ -6,15 +6,15 @@ import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/sing import { map } from 'rxjs'; import { DmpAssociatedUser } from '@app/core/model/user/user'; import { UntypedFormGroup } from '@angular/forms'; -import { DmpContactPrefillDialogEditorModel } from './dmp-contact-prefill-dialog.editor.model'; +import { DmpContactPrefillDialogEditorModel } from './plan-contact-prefill-dialog.editor.model'; import { FormService } from '@common/forms/form-service'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; import { DmpBlueprintSystemFieldType } from '@app/core/common/enum/dmp-blueprint-system-field-type'; @Component({ - selector: 'app-dmp-contact-prefill-dialog', - templateUrl: './dmp-contact-prefill-dialog.component.html', - styleUrls: ['./dmp-contact-prefill-dialog.component.scss'] + selector: 'app-plan-contact-prefill-dialog', + templateUrl: './plan-contact-prefill-dialog.component.html', + styleUrls: ['./plan-contact-prefill-dialog.component.scss'] }) export class DmpContactPrefillDialogComponent extends BaseComponent { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.editor.model.ts b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.editor.model.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.editor.model.ts rename to dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.editor.model.ts diff --git a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.module.ts b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.module.ts similarity index 85% rename from dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.module.ts index 432e14131..879467585 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonUiModule } from '@common/ui/common-ui.module'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; -import { DmpContactPrefillDialogComponent } from './dmp-contact-prefill-dialog.component'; +import { DmpContactPrefillDialogComponent } from './plan-contact-prefill-dialog.component'; @NgModule({ imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule], diff --git a/dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.html b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.html rename to dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.scss b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.ts b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts similarity index 80% rename from dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts index 462545121..4374b3e0d 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.ts @@ -3,9 +3,9 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Description } from '@app/core/model/description/description'; @Component({ - selector: 'app-dmp-delete-dialog', - templateUrl: './dmp-delete-dialog.component.html', - styleUrls: ['./dmp-delete-dialog.component.scss'] + selector: 'app-plan-delete-dialog', + templateUrl: './plan-delete-dialog.component.html', + styleUrls: ['./plan-delete-dialog.component.scss'] }) export class DmpDeleteDialogComponent { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.module.ts b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts similarity index 82% rename from dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts index 83366e14b..3fd19e4a3 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-delete-dialog/dmp-delete-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonUiModule } from '@common/ui/common-ui.module'; -import { DmpDeleteDialogComponent } from './dmp-delete-dialog.component'; +import { DmpDeleteDialogComponent } from './plan-delete-dialog.component'; @NgModule({ imports: [CommonUiModule, FormsModule], diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.html b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.html rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.html diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.scss b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.scss rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts similarity index 95% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts index f38f5c58d..6dbe6d775 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.component.ts @@ -5,9 +5,9 @@ import { BaseComponent } from '@common/base/base.component'; import { takeUntil } from 'rxjs/operators'; @Component({ - selector: 'app-dmp-form-progress-indication', - templateUrl: './dmp-form-progress-indication.component.html', - styleUrls: ['./dmp-form-progress-indication.component.scss'] + selector: 'app-plan-form-progress-indication', + templateUrl: './plan-form-progress-indication.component.html', + styleUrls: ['./plan-form-progress-indication.component.scss'] }) export class DmpFormProgressIndicationComponent extends BaseComponent implements OnInit, OnChanges { @Input() formGroup: UntypedFormGroup; diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.module.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.module.ts similarity index 80% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-form-progress-indication.module.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/form-progress-indication/plan-form-progress-indication.module.ts index 3c004582a..117f46a83 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/form-progress-indication/dmp-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 './dmp-form-progress-indication.component'; +import { DmpFormProgressIndicationComponent } from './plan-form-progress-indication.component'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html similarity index 99% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html index 3a76a78ef..4bc042a3f 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html @@ -308,7 +308,7 @@
-
+
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.scss b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.scss rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts similarity index 98% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts index ef2ce7650..891b48205 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts @@ -48,19 +48,19 @@ import { FilterService } from '@common/modules/text-filter/filter-service'; import { Guid } from '@common/types/guid'; import { TranslateService } from '@ngx-translate/core'; import { map, takeUntil } from 'rxjs/operators'; -import { DmpContactPrefillDialogComponent } from '../dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.component'; -import { DmpEditorModel, DmpFieldIndicator } from './dmp-editor.model'; -import { DmpEditorEntityResolver } from './resolvers/dmp-editor-enitity.resolver'; -import { DmpEditorService } from './dmp-editor.service'; +import { DmpContactPrefillDialogComponent } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.component'; +import { DmpEditorModel, DmpFieldIndicator } from './plan-editor.model'; +import { DmpEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver'; +import { DmpEditorService } from './plan-editor.service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; import { FileTransformerService } from '@app/core/services/file-transformer/file-transformer.service'; import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type'; -import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../dmp-finalize-dialog/dmp-finalize-dialog.component'; +import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component'; @Component({ - selector: 'app-dmp-editor', - templateUrl: './dmp-editor.component.html', - styleUrls: ['./dmp-editor.component.scss'], + selector: 'app-plan-editor', + templateUrl: './plan-editor.component.html', + styleUrls: ['./plan-editor.component.scss'], providers: [DmpEditorService] }) export class DmpEditorComponent extends BaseEditor implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.model.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.model.ts diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.module.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts similarity index 72% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.module.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts index b51490e59..ae5579dd1 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts @@ -7,12 +7,12 @@ import { ReferenceFieldModule } from '@app/ui/reference/reference-field/referenc 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 { DmpUserFieldModule } from '../dmp-user-field/dmp-user-field.module'; -import { DmpEditorComponent } from './dmp-editor.component'; -import { DmpEditorRoutingModule } from './dmp-editor.routing'; -import { DmpFormProgressIndicationModule } from './form-progress-indication/dmp-form-progress-indication.module'; -import { DmpDeleteDialogModule } from '../dmp-delete-dialog/dmp-delete-dialog.module'; -import { DmpContactPrefillDialogModule } from '../dmp-contact-prefill-dialog/dmp-contact-prefill-dialog.module'; +import { DmpUserFieldModule } from '../plan-user-field/plan-user-field.module'; +import { DmpEditorComponent } from './plan-editor.component'; +import { DmpEditorRoutingModule } 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 { DmpContactPrefillDialogModule } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.module'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.routing.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts similarity index 84% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.routing.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts index a8aeeb29c..772b79d6f 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.routing.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.routing.ts @@ -5,9 +5,9 @@ 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 { AuthGuard } from '@app/core/auth-guard.service'; -import { DmpEditorComponent } from './dmp-editor.component'; -import { DmpEditorEntityResolver } from './resolvers/dmp-editor-enitity.resolver'; -import { DmpEditorPermissionsResolver } from './resolvers/dmp-editor-permissions.resolver'; +import { DmpEditorComponent } from './plan-editor.component'; +import { DmpEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver'; +import { DmpEditorPermissionsResolver } from './resolvers/plan-editor-permissions.resolver'; const routes: Routes = [ { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.service.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.service.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.service.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.service.ts diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/resolvers/plan-editor-enitity.resolver.ts similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/resolvers/dmp-editor-enitity.resolver.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/resolvers/plan-editor-enitity.resolver.ts diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/resolvers/dmp-editor-permissions.resolver.ts b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/resolvers/plan-editor-permissions.resolver.ts similarity index 96% rename from dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/resolvers/dmp-editor-permissions.resolver.ts rename to dmp-frontend/src/app/ui/plan/plan-editor-blueprint/resolvers/plan-editor-permissions.resolver.ts index 6be5acc75..62c4a55fb 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/resolvers/dmp-editor-permissions.resolver.ts +++ b/dmp-frontend/src/app/ui/plan/plan-editor-blueprint/resolvers/plan-editor-permissions.resolver.ts @@ -8,7 +8,7 @@ import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service'; import { BaseEditorResolver } from '@common/base/base-editor.resolver'; import { Guid } from '@common/types/guid'; import { mergeMap, takeUntil, tap } from 'rxjs/operators'; -import { DmpEditorEntityResolver } from './dmp-editor-enitity.resolver'; +import { DmpEditorEntityResolver } from './plan-editor-enitity.resolver'; @Injectable() export class DmpEditorPermissionsResolver extends BaseEditorResolver { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.html b/dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.html rename to dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html diff --git a/dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.scss b/dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.scss rename to dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.ts b/dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.ts similarity index 96% rename from dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.ts rename to dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.ts index c974174dd..336cf5468 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.ts @@ -13,9 +13,9 @@ import { takeUntil } from 'rxjs/operators'; @Component({ - selector: 'app-dmp-finalize-dialog-component', - templateUrl: 'dmp-finalize-dialog.component.html', - styleUrls: ['./dmp-finalize-dialog.component.scss'] + selector: 'app-plan-finalize-dialog-component', + templateUrl: 'plan-finalize-dialog.component.html', + styleUrls: ['./plan-finalize-dialog.component.scss'] }) export class DmpFinalizeDialogComponent extends BaseComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.module.ts b/dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.module.ts similarity index 88% rename from dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.module.ts rename to dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.module.ts index 3ba72d62f..8a67814d5 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-finalize-dialog/dmp-finalize-dialog.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.module.ts @@ -3,7 +3,7 @@ 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 { DmpFinalizeDialogComponent } from './dmp-finalize-dialog.component'; +import { DmpFinalizeDialogComponent } from './plan-finalize-dialog.component'; @NgModule({ imports: [CommonUiModule, FormsModule, ReactiveFormsModule, AutoCompleteModule, RichTextEditorModule], diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.html similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html rename to dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.html diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.scss b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.scss similarity index 100% rename from dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.scss rename to dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.scss diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts similarity index 93% rename from dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts rename to dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts index c87fc687f..4272ccf3f 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts +++ b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.component.ts @@ -9,13 +9,13 @@ import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; import { BaseComponent } from '@common/base/base.component'; import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model'; -import { DmpEditorModel, DmpUserEditorModel } from '../dmp-editor-blueprint/dmp-editor.model'; +import { DmpEditorModel, DmpUserEditorModel } from '../plan-editor-blueprint/plan-editor.model'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; @Component({ - selector: 'app-dmp-user-field-component', - templateUrl: 'dmp-user-field.component.html', - styleUrls: ['./dmp-user-field.component.scss'] + selector: 'app-plan-user-field-component', + templateUrl: 'plan-user-field.component.html', + styleUrls: ['./plan-user-field.component.scss'] }) export class DmpUserFieldComponent extends BaseComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.module.ts b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.module.ts similarity index 91% rename from dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.module.ts rename to dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.module.ts index 65d024af3..da3f62dea 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.module.ts +++ b/dmp-frontend/src/app/ui/plan/plan-user-field/plan-user-field.module.ts @@ -5,7 +5,7 @@ import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { NgxDropzoneModule } from "ngx-dropzone"; -import { DmpUserFieldComponent } from './dmp-user-field.component'; +import { DmpUserFieldComponent } from './plan-user-field.component'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/app/ui/dmp/dmp.module.ts b/dmp-frontend/src/app/ui/plan/plan.module.ts similarity index 96% rename from dmp-frontend/src/app/ui/dmp/dmp.module.ts rename to dmp-frontend/src/app/ui/plan/plan.module.ts index 224faf81b..520bda4bc 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp.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/dmp/dmp.routing'; +import { DmpRoutingModule, PublicDmpRoutingModule } from '@app/ui/plan/plan.routing'; import { CommonFormsModule } from '@common/forms/common-forms.module'; import { CommonUiModule } from '@common/ui/common-ui.module'; diff --git a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts b/dmp-frontend/src/app/ui/plan/plan.routing.ts similarity index 71% rename from dmp-frontend/src/app/ui/dmp/dmp.routing.ts rename to dmp-frontend/src/app/ui/plan/plan.routing.ts index 015fb8224..303610587 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp.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/dmp-overview.module').then(m => m.DmpOverviewModule), + loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule), canActivate:[AuthGuard], data: { breadcrumb: true, @@ -17,7 +17,7 @@ const routes: Routes = [ }, { path: 'new', - loadChildren: () => import('./dmp-editor-blueprint/dmp-editor.module').then(m => m.DmpEditorModule), + loadChildren: () => import('./plan-editor-blueprint/plan-editor.module').then(m => m.DmpEditorModule), canActivate:[AuthGuard], data: { breadcrumb: true, @@ -29,7 +29,7 @@ const routes: Routes = [ }, { path: 'edit', - loadChildren: () => import('./dmp-editor-blueprint/dmp-editor.module').then(m => m.DmpEditorModule), + loadChildren: () => import('./plan-editor-blueprint/plan-editor.module').then(m => m.DmpEditorModule), canActivate:[AuthGuard], data: { breadcrumb: true, @@ -42,7 +42,7 @@ const routes: Routes = [ { path: '', canActivate:[AuthGuard], - loadChildren: () => import('./listing/dmp-listing.module').then(m => m.DmpListingModule), + loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule), data: { breadcrumb: true }, @@ -52,7 +52,7 @@ const routes: Routes = [ const publicRoutes: Routes = [ { path: 'overview', - loadChildren: () => import('./overview/dmp-overview.module').then(m => m.DmpOverviewModule), + loadChildren: () => import('./overview/plan-overview.module').then(m => m.DmpOverviewModule), data: { breadcrumb: true, ...BreadcrumbService.generateRouteDataConfiguration({ @@ -62,7 +62,7 @@ const publicRoutes: Routes = [ }, { path: '', - loadChildren: () => import('./listing/dmp-listing.module').then(m => m.DmpListingModule), + loadChildren: () => import('./listing/plan-listing.module').then(m => m.DmpListingModule), data: { breadcrumb: true, isPublic: true