From b68d826afa55cfcc1347f5908aecb5bec3fc72a0 Mon Sep 17 00:00:00 2001 From: Florent Poittevin <florent.poittevin@unige.ch> Date: Thu, 14 Nov 2019 12:34:24 +0100 Subject: [PATCH] refacto: rename detail file to detail-edit file --- .../admin-funding-agencies-detail-edit.routable.html} | 0 .../admin-funding-agencies-detail-edit.routable.ts} | 6 +++--- .../funding-agencies/funding-agencies-routing.module.ts | 4 ++-- .../admin/funding-agencies/funding-agencies.module.ts | 4 ++-- .../admin-institution-detail-edit.routable.html} | 0 .../admin-institution-detail-edit.routable.ts} | 6 +++--- .../admin/institution/institution-routing.module.ts | 4 ++-- src/app/features/admin/institution/institution.module.ts | 4 ++-- .../admin-license-detail-edit.routable.html} | 0 .../admin-license-detail-edit.routable.ts} | 6 +++--- src/app/features/admin/license/license-routing.module.ts | 4 ++-- src/app/features/admin/license/license.module.ts | 4 ++-- .../admin-oauth2-client-detail-edit.routable.html} | 0 .../admin-oauth2-client-detail-edit.routable.ts} | 6 +++--- .../admin/oauth2-client/oauth2-client-routing.module.ts | 4 ++-- .../features/admin/oauth2-client/oauth2-client.module.ts | 4 ++-- .../admin-orgunit-create/admin-orgunit-create.routable.ts | 2 -- .../admin-orgunit-detail-edit.routable.html} | 0 .../admin-orgunit-detail-edit.routable.ts} | 6 +++--- src/app/features/admin/orgunit/orgunit-routing.module.ts | 4 ++-- src/app/features/admin/orgunit/orgunit.module.ts | 6 ++---- .../admin-person-detail-edit.routable.html} | 0 .../admin-person-detail-edit.routable.ts} | 6 +++--- src/app/features/admin/person/person-routing.module.ts | 4 ++-- src/app/features/admin/person/person.module.ts | 4 ++-- .../admin-preservation-policy-detail-edit.routable.html} | 0 .../admin-preservation-policy-detail-edit.routable.ts} | 6 +++--- .../preservation-policy-routing.module.ts | 4 ++-- .../preservation-policy/preservation-policy.module.ts | 4 ++-- .../admin-role-detail-edit.routable.html} | 0 .../admin-role-detail-edit.routable.ts} | 6 +++--- src/app/features/admin/role/role-routing.module.ts | 4 ++-- src/app/features/admin/role/role.module.ts | 4 ++-- .../admin-submission-policy-detail-edit.routable.html} | 0 .../admin-submission-policy-detail-edit.routable.ts} | 6 +++--- .../submission-policy/submission-policy-routing.module.ts | 4 ++-- .../admin/submission-policy/submission-policy.module.ts | 4 ++-- .../admin-user-detail-edit.routable.html} | 0 .../admin-user-detail-edit.routable.scss} | 0 .../admin-user-detail-edit.routable.ts} | 8 ++++---- src/app/features/admin/user/user-routing.module.ts | 4 ++-- src/app/features/admin/user/user.module.ts | 4 ++-- .../deposit-detail-edit.routable.html} | 0 .../deposit-detail-edit.routable.scss} | 0 .../deposit-detail-edit.routable.ts} | 8 ++++---- src/app/features/deposit/deposit-routing.module.ts | 4 ++-- src/app/features/deposit/deposit.module.ts | 4 ++-- .../orgunit-detail-edit.routable.html} | 0 .../orgunit-detail-edit.routable.ts} | 6 +++--- .../organizational-unit-routing.module.ts | 4 ++-- .../organizational-unit/organizational-unit.module.ts | 4 ++-- 51 files changed, 86 insertions(+), 90 deletions(-) rename src/app/features/admin/funding-agencies/components/routables/{admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html => admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.html} (100%) rename src/app/features/admin/funding-agencies/components/routables/{admin-funding-agencies-detail/admin-funding-agencies-detail.routable.ts => admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.ts} (89%) rename src/app/features/admin/institution/components/routables/{admin-institution-detail/admin-institution-detail.routable.html => admin-institution-detail-edit/admin-institution-detail-edit.routable.html} (100%) rename src/app/features/admin/institution/components/routables/{admin-institution-detail/admin-institution-detail.routable.ts => admin-institution-detail-edit/admin-institution-detail-edit.routable.ts} (86%) rename src/app/features/admin/license/components/routables/{admin-license-detail/admin-license-detail.routable.html => admin-license-detail-edit/admin-license-detail-edit.routable.html} (100%) rename src/app/features/admin/license/components/routables/{admin-license-detail/admin-license-detail.routable.ts => admin-license-detail-edit/admin-license-detail-edit.routable.ts} (87%) rename src/app/features/admin/oauth2-client/components/routables/{admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html => admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.html} (100%) rename src/app/features/admin/oauth2-client/components/routables/{admin-oauth2-client-detail/admin-oauth2-client-detail.routable.ts => admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.ts} (86%) rename src/app/features/admin/orgunit/components/routables/{admin-orgunit-detail/admin-orgunit-detail.routable.html => admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.html} (100%) rename src/app/features/admin/orgunit/components/routables/{admin-orgunit-detail/admin-orgunit-detail.routable.ts => admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts} (94%) rename src/app/features/admin/person/components/routables/{admin-person-detail/admin-person-detail.routable.html => admin-person-detail-edit/admin-person-detail-edit.routable.html} (100%) rename src/app/features/admin/person/components/routables/{admin-person-detail/admin-person-detail.routable.ts => admin-person-detail-edit/admin-person-detail-edit.routable.ts} (92%) rename src/app/features/admin/preservation-policy/components/routables/{admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html => admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.html} (100%) rename src/app/features/admin/preservation-policy/components/routables/{admin-preservation-policy-detail/admin-preservation-policy-detail.routable.ts => admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.ts} (85%) rename src/app/features/admin/role/components/routables/{admin-role-detail/admin-role-detail.routable.html => admin-role-detail-edit/admin-role-detail-edit.routable.html} (100%) rename src/app/features/admin/role/components/routables/{admin-role-detail/admin-role-detail.routable.ts => admin-role-detail-edit/admin-role-detail-edit.routable.ts} (87%) rename src/app/features/admin/submission-policy/components/routables/{admin-submission-policy-detail/admin-submission-policy-detail.routable.html => admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.html} (100%) rename src/app/features/admin/submission-policy/components/routables/{admin-submission-policy-detail/admin-submission-policy-detail.routable.ts => admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.ts} (86%) rename src/app/features/admin/user/components/routables/{admin-user-detail/admin-user-detail.routable.html => admin-user-detail-edit/admin-user-detail-edit.routable.html} (100%) rename src/app/features/admin/user/components/routables/{admin-user-detail/admin-user-detail.routable.scss => admin-user-detail-edit/admin-user-detail-edit.routable.scss} (100%) rename src/app/features/admin/user/components/routables/{admin-user-detail/admin-user-detail.routable.ts => admin-user-detail-edit/admin-user-detail-edit.routable.ts} (94%) rename src/app/features/deposit/components/routables/{deposit-detail/deposit-detail.routable.html => deposit-detail-edit/deposit-detail-edit.routable.html} (100%) rename src/app/features/deposit/components/routables/{deposit-detail/deposit-detail.routable.scss => deposit-detail-edit/deposit-detail-edit.routable.scss} (100%) rename src/app/features/deposit/components/routables/{deposit-detail/deposit-detail.routable.ts => deposit-detail-edit/deposit-detail-edit.routable.ts} (97%) rename src/app/features/organizational-unit/components/routables/{orgunit-detail/orgunit-detail.routable.html => orgunit-detail-edit/orgunit-detail-edit.routable.html} (100%) rename src/app/features/organizational-unit/components/routables/{orgunit-detail/orgunit-detail.routable.ts => orgunit-detail-edit/orgunit-detail-edit.routable.ts} (92%) diff --git a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html rename to src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.html diff --git a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.ts b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.ts similarity index 89% rename from src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.ts rename to src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.ts index 12e85b4e8..d73e05b0b 100644 --- a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.ts +++ b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable.ts @@ -27,12 +27,12 @@ import {LocalStateModel} from "@shared/models/local-state.model"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-funding-agency-detail-routable", - templateUrl: "./admin-funding-agencies-detail.routable.html", + selector: "dlcm-admin-funding-agency-detail-edit-routable", + templateUrl: "./admin-funding-agencies-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminFundingAgenciesDetailRoutable extends SharedAbstractDetailEditCommonRoutable<FundingAgency, AdminFundingAgenciesStateModel> { +export class AdminFundingAgenciesDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<FundingAgency, AdminFundingAgenciesStateModel> { @Select(AdminFundingAgenciesState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminFundingAgenciesState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; @Select((state: LocalStateModel) => state.shared.shared_organizationalUnit.list) listOrgUnitsObs: Observable<OrganizationalUnitExtended[]>; diff --git a/src/app/features/admin/funding-agencies/funding-agencies-routing.module.ts b/src/app/features/admin/funding-agencies/funding-agencies-routing.module.ts index 992a41e79..fbc097e7e 100644 --- a/src/app/features/admin/funding-agencies/funding-agencies-routing.module.ts +++ b/src/app/features/admin/funding-agencies/funding-agencies-routing.module.ts @@ -1,5 +1,5 @@ import {AdminFundingAgenciesCreateRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-create/admin-funding-agencies-create.routable"; -import {AdminFundingAgenciesDetailRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable"; +import {AdminFundingAgenciesDetailEditRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable"; import {AdminFundingAgenciesListRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-list/admin-funding-agencies-list.routable"; import {NgModule} from "@angular/core"; import { @@ -22,7 +22,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.fundingAgenciesDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminFundingAgenciesDetailRoutable, + component: AdminFundingAgenciesDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.funding-agencies.detail"), breadcrumbMemoizedSelector: AdminFundingAgenciesState.currentTitle, diff --git a/src/app/features/admin/funding-agencies/funding-agencies.module.ts b/src/app/features/admin/funding-agencies/funding-agencies.module.ts index b5e34b5e8..3467c4d13 100644 --- a/src/app/features/admin/funding-agencies/funding-agencies.module.ts +++ b/src/app/features/admin/funding-agencies/funding-agencies.module.ts @@ -1,7 +1,7 @@ import {AdminFundingAgencyDeleteDialog} from "@admin/funding-agencies/components/dialogs/admin-funding-agency-delete/admin-funding-agency-delete.dialog"; import {AdminFundingAgenciesFormPresentational} from "@admin/funding-agencies/components/presentationals/admin-funding-agencies-form/admin-funding-agencies-form.presentational"; import {AdminFundingAgenciesCreateRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-create/admin-funding-agencies-create.routable"; -import {AdminFundingAgenciesDetailRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable"; +import {AdminFundingAgenciesDetailEditRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-detail-edit/admin-funding-agencies-detail-edit.routable"; import {AdminFundingAgenciesListRoutable} from "@admin/funding-agencies/components/routables/admin-funding-agencies-list/admin-funding-agencies-list.routable"; import {AdminFundingAgenciesRoutingModule} from "@admin/funding-agencies/funding-agencies-routing.module"; import {AdminFundingAgenciesState} from "@admin/funding-agencies/stores/admin-funding-agencies.state"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminFundingAgenciesListRoutable, - AdminFundingAgenciesDetailRoutable, + AdminFundingAgenciesDetailEditRoutable, AdminFundingAgenciesCreateRoutable, ]; const containers = []; diff --git a/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.html b/src/app/features/admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.html rename to src/app/features/admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable.html diff --git a/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.ts b/src/app/features/admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable.ts similarity index 86% rename from src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.ts rename to src/app/features/admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable.ts index 0dfa262d9..9d86a8286 100644 --- a/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.ts +++ b/src/app/features/admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable.ts @@ -21,12 +21,12 @@ import {LocalStateEnum} from "@shared/enums/local-state.enum"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-institution-detail-routable", - templateUrl: "./admin-institution-detail.routable.html", + selector: "dlcm-admin-institution-detail-edit-routable", + templateUrl: "./admin-institution-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminInstitutionDetailRoutable extends SharedAbstractDetailEditCommonRoutable<Institution, AdminInstitutionStateModel> { +export class AdminInstitutionDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<Institution, AdminInstitutionStateModel> { @Select(AdminInstitutionState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminInstitutionState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; diff --git a/src/app/features/admin/institution/institution-routing.module.ts b/src/app/features/admin/institution/institution-routing.module.ts index 2f23385b5..bf9a92b5c 100644 --- a/src/app/features/admin/institution/institution-routing.module.ts +++ b/src/app/features/admin/institution/institution-routing.module.ts @@ -1,5 +1,5 @@ import {AdminInstitutionCreateRoutable} from "@admin/institution/components/routables/admin-institution-create/admin-institution-create.routable"; -import {AdminInstitutionDetailRoutable} from "@admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable"; +import {AdminInstitutionDetailEditRoutable} from "@admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable"; import {AdminInstitutionListRoutable} from "@admin/institution/components/routables/admin-institution-list/admin-institution-list.routable"; import {AdminInstitutionState} from "@admin/institution/stores/admin-institution.state"; import {NgModule} from "@angular/core"; @@ -22,7 +22,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.institutionDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminInstitutionDetailRoutable, + component: AdminInstitutionDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.institution.detail"), breadcrumbMemoizedSelector: AdminInstitutionState.currentTitle, diff --git a/src/app/features/admin/institution/institution.module.ts b/src/app/features/admin/institution/institution.module.ts index 66a4992ea..c97559f4d 100644 --- a/src/app/features/admin/institution/institution.module.ts +++ b/src/app/features/admin/institution/institution.module.ts @@ -1,7 +1,7 @@ import {AdminInstitutionDeleteDialog} from "@admin/institution/components/dialogs/admin-institution-delete/admin-institution-delete.dialog"; import {AdminInstitutionFormPresentational} from "@admin/institution/components/presentationals/admin-institution-form/admin-institution-form.presentational"; import {AdminInstitutionCreateRoutable} from "@admin/institution/components/routables/admin-institution-create/admin-institution-create.routable"; -import {AdminInstitutionDetailRoutable} from "@admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable"; +import {AdminInstitutionDetailEditRoutable} from "@admin/institution/components/routables/admin-institution-detail-edit/admin-institution-detail-edit.routable"; import {AdminInstitutionListRoutable} from "@admin/institution/components/routables/admin-institution-list/admin-institution-list.routable"; import {AdminInstitutionRoutingModule} from "@admin/institution/institution-routing.module"; import {AdminInstitutionState} from "@admin/institution/stores/admin-institution.state"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminInstitutionListRoutable, - AdminInstitutionDetailRoutable, + AdminInstitutionDetailEditRoutable, AdminInstitutionCreateRoutable, ]; const containers = []; diff --git a/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.html b/src/app/features/admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.html rename to src/app/features/admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable.html diff --git a/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.ts b/src/app/features/admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable.ts similarity index 87% rename from src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.ts rename to src/app/features/admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable.ts index 950888e62..820d5793b 100644 --- a/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.ts +++ b/src/app/features/admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable.ts @@ -21,12 +21,12 @@ import {LocalStateEnum} from "@shared/enums/local-state.enum"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-license-detail-routable", - templateUrl: "./admin-license-detail.routable.html", + selector: "dlcm-admin-license-detail-edit-routable", + templateUrl: "./admin-license-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminLicenseDetailRoutable extends SharedAbstractDetailEditCommonRoutable<License, AdminLicenseStateModel> { +export class AdminLicenseDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<License, AdminLicenseStateModel> { @Select(AdminLicenseState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminLicenseState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; diff --git a/src/app/features/admin/license/license-routing.module.ts b/src/app/features/admin/license/license-routing.module.ts index 31d3ba469..812798fb4 100644 --- a/src/app/features/admin/license/license-routing.module.ts +++ b/src/app/features/admin/license/license-routing.module.ts @@ -1,5 +1,5 @@ import {AdminLicenseCreateRoutable} from "@admin/license/components/routables/admin-license-create/admin-license-create.routable"; -import {AdminLicenseDetailRoutable} from "@admin/license/components/routables/admin-license-detail/admin-license-detail.routable"; +import {AdminLicenseDetailEditRoutable} from "@admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable"; import {AdminLicenseListRoutable} from "@admin/license/components/routables/admin-license-list/admin-license-list.routable"; import {AdminLicenseState} from "@admin/license/stores/admin-license.state"; import {NgModule} from "@angular/core"; @@ -30,7 +30,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.licenseDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminLicenseDetailRoutable, + component: AdminLicenseDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.license.detail"), breadcrumbMemoizedSelector: AdminLicenseState.currentTitle, diff --git a/src/app/features/admin/license/license.module.ts b/src/app/features/admin/license/license.module.ts index a1f5ae388..755f68381 100644 --- a/src/app/features/admin/license/license.module.ts +++ b/src/app/features/admin/license/license.module.ts @@ -1,10 +1,10 @@ import {AdminLicenseDeleteDialog} from "@admin/license/components/dialogs/admin-license-delete/admin-license-delete.dialog"; import {AdminLicenseFormPresentational} from "@admin/license/components/presentationals/admin-license-form/admin-license-form.presentational"; +import {AdminLicenseDetailEditRoutable} from "@admin/license/components/routables/admin-license-detail-edit/admin-license-detail-edit.routable"; import {AdminLicenseRoutingModule} from "@admin/license/license-routing.module"; import {AdminLicenseState} from "@admin/license/stores/admin-license.state"; import {NgModule} from "@angular/core"; import {AdminLicenseCreateRoutable} from "@app/features/admin/license/components/routables/admin-license-create/admin-license-create.routable"; -import {AdminLicenseDetailRoutable} from "@app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable"; import {AdminLicenseListRoutable} from "@app/features/admin/license/components/routables/admin-license-list/admin-license-list.routable"; import {SharedModule} from "@app/shared/shared.module"; import {TranslateModule} from "@ngx-translate/core"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminLicenseCreateRoutable, - AdminLicenseDetailRoutable, + AdminLicenseDetailEditRoutable, AdminLicenseListRoutable, ]; const containers = []; diff --git a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html rename to src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.html diff --git a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.ts b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.ts similarity index 86% rename from src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.ts rename to src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.ts index 454c40ba4..e07181e0b 100644 --- a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.ts +++ b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable.ts @@ -21,12 +21,12 @@ import {LocalStateEnum} from "@shared/enums/local-state.enum"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-oauth2-client-detail-routable", - templateUrl: "./admin-oauth2-client-detail.routable.html", + selector: "dlcm-admin-oauth2-client-detail-edit-routable", + templateUrl: "./admin-oauth2-client-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminOAuth2ClientDetailRoutable extends SharedAbstractDetailEditCommonRoutable<Oauth2Client, AdminOAuth2ClientStateModel> { +export class AdminOauth2ClientDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<Oauth2Client, AdminOAuth2ClientStateModel> { @Select(AdminOAuth2ClientState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminOAuth2ClientState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; diff --git a/src/app/features/admin/oauth2-client/oauth2-client-routing.module.ts b/src/app/features/admin/oauth2-client/oauth2-client-routing.module.ts index 9134377f0..a5f9af505 100644 --- a/src/app/features/admin/oauth2-client/oauth2-client-routing.module.ts +++ b/src/app/features/admin/oauth2-client/oauth2-client-routing.module.ts @@ -1,5 +1,5 @@ import {AdminOauth2ClientCreateRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-create/admin-oauth2-client-create.routable"; -import {AdminOAuth2ClientDetailRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable"; +import {AdminOauth2ClientDetailEditRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable"; import {AdminOAuth2ClientListRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-list/admin-oauth2-client-list.routable"; import {AdminOAuth2ClientState} from "@admin/oauth2-client/stores/admin-oauth2-client.state"; import {NgModule} from "@angular/core"; @@ -22,7 +22,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.oauth2clientDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminOAuth2ClientDetailRoutable, + component: AdminOauth2ClientDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.oauth2Client.detail"), breadcrumbMemoizedSelector: AdminOAuth2ClientState.currentTitle, diff --git a/src/app/features/admin/oauth2-client/oauth2-client.module.ts b/src/app/features/admin/oauth2-client/oauth2-client.module.ts index 77930dd97..defccf7e7 100644 --- a/src/app/features/admin/oauth2-client/oauth2-client.module.ts +++ b/src/app/features/admin/oauth2-client/oauth2-client.module.ts @@ -1,7 +1,7 @@ import {AdminOauth2ClientDeleteDialog} from "@admin/oauth2-client/components/dialogs/admin-oauth2-client-delete/admin-oauth2-client-delete.dialog"; import {AdminOAtuh2ClientFormPresentational} from "@admin/oauth2-client/components/presentationals/admin-oauth2-client-form/admin-oauth2-client-form.presentational"; import {AdminOauth2ClientCreateRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-create/admin-oauth2-client-create.routable"; -import {AdminOAuth2ClientDetailRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable"; +import {AdminOauth2ClientDetailEditRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-detail-edit/admin-oauth2-client-detail-edit.routable"; import {AdminOAuth2ClientListRoutable} from "@admin/oauth2-client/components/routables/admin-oauth2-client-list/admin-oauth2-client-list.routable"; import {AdminOauth2ClientRoutingModule} from "@admin/oauth2-client/oauth2-client-routing.module"; import {AdminOAuth2ClientState} from "@admin/oauth2-client/stores/admin-oauth2-client.state"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminOAuth2ClientListRoutable, - AdminOAuth2ClientDetailRoutable, + AdminOauth2ClientDetailEditRoutable, AdminOauth2ClientCreateRoutable, ]; const containers = []; diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts b/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts index 2c2201d8b..bf078a8ce 100644 --- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts +++ b/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts @@ -43,8 +43,6 @@ export class AdminOrgunitCreateRoutable extends SharedAbstractCreateRoutable<Org @Select((state: LocalStateModel) => state.admin.admin_organizationalUnit.admin_organizationalUnit_fundingAgency.selected) selectedFundingAgenciesObs: Observable<FundingAgency[]>; @Select((state: LocalStateModel) => state.admin.admin_organizationalUnit.admin_organizationalUnit_institution.selected) selectedInstitutionsObs: Observable<Institution[]>; - - constructor(protected store: Store) { super(store, LocalStateEnum.admin_organizationalUnit, adminOrgUnitActionNameSpace, LocalStateEnum.admin); } diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.html b/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.html rename to src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.html diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.ts b/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts similarity index 94% rename from src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.ts rename to src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts index 899cb4d81..13dec074f 100644 --- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.ts +++ b/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts @@ -36,12 +36,12 @@ import {LocalStateModel} from "@shared/models/local-state.model"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-orgunit-detail-routable", - templateUrl: "./admin-orgunit-detail.routable.html", + selector: "dlcm-admin-orgunit-detail-edit-routable", + templateUrl: "./admin-orgunit-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminOrgunitDetailRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnitExtended, AdminOrganizationalUnitStateModel> { +export class AdminOrgunitDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnitExtended, AdminOrganizationalUnitStateModel> { @Select(AdminOrganizationalUnitState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminOrganizationalUnitState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; @Select((state: LocalStateModel) => state.admin.admin_organizationalUnit.admin_organizationalUnit_submissionPolicy.selected) selectedSubmissionPoliciesObs: Observable<SubmissionPolicy[]>; diff --git a/src/app/features/admin/orgunit/orgunit-routing.module.ts b/src/app/features/admin/orgunit/orgunit-routing.module.ts index f4382f9f0..fc8b73d4c 100644 --- a/src/app/features/admin/orgunit/orgunit-routing.module.ts +++ b/src/app/features/admin/orgunit/orgunit-routing.module.ts @@ -1,5 +1,5 @@ import {AdminOrgunitCreateRoutable} from "@admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable"; -import {AdminOrgunitDetailRoutable} from "@admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable"; +import {AdminOrgunitDetailEditRoutable} from "@admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable"; import {AdminOrgunitListRoutable} from "@admin/orgunit/components/routables/admin-orgunit-list/admin-orgunit-list.routable"; import {AdminOrganizationalUnitState} from "@admin/orgunit/stores/admin-organizational-unit.state"; import {NgModule} from "@angular/core"; @@ -22,7 +22,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.organizationalUnitDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminOrgunitDetailRoutable, + component: AdminOrgunitDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.organizationalUnit.detail"), breadcrumbMemoizedSelector: AdminOrganizationalUnitState.currentTitle, diff --git a/src/app/features/admin/orgunit/orgunit.module.ts b/src/app/features/admin/orgunit/orgunit.module.ts index dae40d41e..a61bfbd63 100644 --- a/src/app/features/admin/orgunit/orgunit.module.ts +++ b/src/app/features/admin/orgunit/orgunit.module.ts @@ -1,7 +1,6 @@ import {AdminOrgunitDeleteDialog} from "@admin/orgunit/components/dialogs/admin-orgunit-delete/admin-orgunit-delete.dialog"; import {AdminOrgunitFormPresentational} from "@admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational"; -import {AdminOrgunitCreateRoutable} from "@admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable"; -import {AdminOrgunitDetailRoutable} from "@admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable"; +import {AdminOrgunitDetailEditRoutable} from "@admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable"; import {AdminOrgunitListRoutable} from "@admin/orgunit/components/routables/admin-orgunit-list/admin-orgunit-list.routable"; import {AdminOrgunitRoutingModule} from "@admin/orgunit/orgunit-routing.module"; import {AdminOrganizationalUnitState} from "@admin/orgunit/stores/admin-organizational-unit.state"; @@ -11,9 +10,8 @@ import {TranslateModule} from "@ngx-translate/core"; import {NgxsModule} from "@ngxs/store"; const routables = [ - AdminOrgunitDetailRoutable, + AdminOrgunitDetailEditRoutable, AdminOrgunitListRoutable, - AdminOrgunitCreateRoutable, ]; const containers = []; const dialogs = [ diff --git a/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.html b/src/app/features/admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.html rename to src/app/features/admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable.html diff --git a/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.ts b/src/app/features/admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable.ts similarity index 92% rename from src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.ts rename to src/app/features/admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable.ts index e2fdfb1b7..ba54b8cf5 100644 --- a/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.ts +++ b/src/app/features/admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable.ts @@ -30,12 +30,12 @@ import {LocalStateModel} from "@shared/models/local-state.model"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-person-detail-routable", - templateUrl: "./admin-person-detail.routable.html", + selector: "dlcm-admin-person-detail-edit-routable", + templateUrl: "./admin-person-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminPersonDetailRoutable extends SharedAbstractDetailEditCommonRoutable<PersonExtended, AdminPersonStateModel> { +export class AdminPersonDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<PersonExtended, AdminPersonStateModel> { @Select(AdminPersonState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminPersonState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; @Select((state: LocalStateModel) => state.shared.shared_institution.list) listInstitutionsObs: Observable<Institution[]>; diff --git a/src/app/features/admin/person/person-routing.module.ts b/src/app/features/admin/person/person-routing.module.ts index 698f761fd..a765513a3 100644 --- a/src/app/features/admin/person/person-routing.module.ts +++ b/src/app/features/admin/person/person-routing.module.ts @@ -1,5 +1,5 @@ import {AdminPersonCreateRoutable} from "@admin/person/components/routables/admin-person-create/admin-person-create.routable"; -import {AdminPersonDetailRoutable} from "@admin/person/components/routables/admin-person-detail/admin-person-detail.routable"; +import {AdminPersonDetailEditRoutable} from "@admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable"; import {AdminPersonListRoutable} from "@admin/person/components/routables/admin-person-list/admin-person-list.routable"; import {AdminPersonState} from "@admin/person/stores/admin-person.state"; import {NgModule} from "@angular/core"; @@ -27,7 +27,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.personDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminPersonDetailRoutable, + component: AdminPersonDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.person.detail"), breadcrumbMemoizedSelector: AdminPersonState.currentTitle, diff --git a/src/app/features/admin/person/person.module.ts b/src/app/features/admin/person/person.module.ts index e5e5fa327..1ec2376f4 100644 --- a/src/app/features/admin/person/person.module.ts +++ b/src/app/features/admin/person/person.module.ts @@ -1,7 +1,7 @@ import {AdminPersonDeleteDialog} from "@admin/person/components/dialogs/admin-person-delete/admin-person-delete.dialog"; import {AdminPersonFormPresentational} from "@admin/person/components/presentationals/admin-person-form/admin-person-form.presentational"; import {AdminPersonCreateRoutable} from "@admin/person/components/routables/admin-person-create/admin-person-create.routable"; -import {AdminPersonDetailRoutable} from "@admin/person/components/routables/admin-person-detail/admin-person-detail.routable"; +import {AdminPersonDetailEditRoutable} from "@admin/person/components/routables/admin-person-detail-edit/admin-person-detail-edit.routable"; import {AdminPersonListRoutable} from "@admin/person/components/routables/admin-person-list/admin-person-list.routable"; import {AdminPersonRoutingModule} from "@admin/person/person-routing.module"; import {AdminPersonState} from "@admin/person/stores/admin-person.state"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminPersonListRoutable, - AdminPersonDetailRoutable, + AdminPersonDetailEditRoutable, AdminPersonCreateRoutable, ]; const containers = []; diff --git a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html rename to src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.html diff --git a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.ts b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.ts similarity index 85% rename from src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.ts rename to src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.ts index f8024c6c0..b203b855d 100644 --- a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.ts +++ b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable.ts @@ -21,12 +21,12 @@ import {LocalStateEnum} from "@shared/enums/local-state.enum"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-preservation-policy-detail-routable", - templateUrl: "./admin-preservation-policy-detail.routable.html", + selector: "dlcm-admin-preservation-policy-detail-edit-routable", + templateUrl: "./admin-preservation-policy-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminPreservationPolicyDetailRoutable extends SharedAbstractDetailEditCommonRoutable<PreservationPolicy, AdminPreservationPolicyStateModel> { +export class AdminPreservationPolicyDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<PreservationPolicy, AdminPreservationPolicyStateModel> { @Select(AdminPreservationPolicyState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminPreservationPolicyState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; diff --git a/src/app/features/admin/preservation-policy/preservation-policy-routing.module.ts b/src/app/features/admin/preservation-policy/preservation-policy-routing.module.ts index 328ef586f..e13539788 100644 --- a/src/app/features/admin/preservation-policy/preservation-policy-routing.module.ts +++ b/src/app/features/admin/preservation-policy/preservation-policy-routing.module.ts @@ -1,5 +1,5 @@ import {AdminPreservationPolicyCreateRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-create/admin-preservation-policy-create.routable"; -import {AdminPreservationPolicyDetailRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable"; +import {AdminPreservationPolicyDetailEditRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable"; import {AdminPreservationPolicyListRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-list/admin-preservation-policy-list.routable"; import {NgModule} from "@angular/core"; import { @@ -22,7 +22,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.preservationPolicyDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminPreservationPolicyDetailRoutable, + component: AdminPreservationPolicyDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.preservationPolicy.detail"), breadcrumbMemoizedSelector: AdminPreservationPolicyState.currentTitle, diff --git a/src/app/features/admin/preservation-policy/preservation-policy.module.ts b/src/app/features/admin/preservation-policy/preservation-policy.module.ts index d19fd4137..72e8fc503 100644 --- a/src/app/features/admin/preservation-policy/preservation-policy.module.ts +++ b/src/app/features/admin/preservation-policy/preservation-policy.module.ts @@ -1,7 +1,7 @@ import {AdminPreservationPolicyDeleteDialog} from "@admin/preservation-policy/components/dialogs/admin-preservation-policy-delete/admin-preservation-policy-delete.dialog"; import {AdminPreservationPolicyFormPresentational} from "@admin/preservation-policy/components/presentationals/admin-preservation-policy-form/admin-preservation-policy-form.presentational"; import {AdminPreservationPolicyCreateRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-create/admin-preservation-policy-create.routable"; -import {AdminPreservationPolicyDetailRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable"; +import {AdminPreservationPolicyDetailEditRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-detail-edit/admin-preservation-policy-detail-edit.routable"; import {AdminPreservationPolicyListRoutable} from "@admin/preservation-policy/components/routables/admin-preservation-policy-list/admin-preservation-policy-list.routable"; import {AdminPreservationPolicyRoutingModule} from "@admin/preservation-policy/preservation-policy-routing.module"; import {AdminPreservationPolicyState} from "@admin/preservation-policy/stores/admin-preservation-policy.state"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminPreservationPolicyListRoutable, - AdminPreservationPolicyDetailRoutable, + AdminPreservationPolicyDetailEditRoutable, AdminPreservationPolicyCreateRoutable, ]; const containers = []; diff --git a/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.html b/src/app/features/admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.html rename to src/app/features/admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable.html diff --git a/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.ts b/src/app/features/admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable.ts similarity index 87% rename from src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.ts rename to src/app/features/admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable.ts index e378c244d..ff01a425e 100644 --- a/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.ts +++ b/src/app/features/admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable.ts @@ -21,12 +21,12 @@ import {LocalStateEnum} from "@shared/enums/local-state.enum"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-role-detail-routable", - templateUrl: "./admin-role-detail.routable.html", + selector: "dlcm-admin-role-detail-edit-routable", + templateUrl: "./admin-role-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminRoleDetailRoutable extends SharedAbstractDetailEditCommonRoutable<Role, AdminRoleStateModel> { +export class AdminRoleDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<Role, AdminRoleStateModel> { @Select(AdminRoleState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminRoleState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; diff --git a/src/app/features/admin/role/role-routing.module.ts b/src/app/features/admin/role/role-routing.module.ts index 06b1516d6..d36995f03 100644 --- a/src/app/features/admin/role/role-routing.module.ts +++ b/src/app/features/admin/role/role-routing.module.ts @@ -1,4 +1,4 @@ -import {AdminRoleDetailRoutable} from "@admin/role/components/routables/admin-role-detail/admin-role-detail.routable"; +import {AdminRoleDetailEditRoutable} from "@admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable"; import {AdminRoleListRoutable} from "@admin/role/components/routables/admin-role-list/admin-role-list.routable"; import {AdminRoleState} from "@admin/role/stores/admin-role.state"; import {NgModule} from "@angular/core"; @@ -21,7 +21,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.roleDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminRoleDetailRoutable, + component: AdminRoleDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.role.detail"), breadcrumbMemoizedSelector: AdminRoleState.currentTitle, diff --git a/src/app/features/admin/role/role.module.ts b/src/app/features/admin/role/role.module.ts index 0f6379014..fbcd2712e 100644 --- a/src/app/features/admin/role/role.module.ts +++ b/src/app/features/admin/role/role.module.ts @@ -1,5 +1,5 @@ import {AdminRoleFormPresentational} from "@admin/role/components/presentationals/admin-role-form/admin-role-form.presentational"; -import {AdminRoleDetailRoutable} from "@admin/role/components/routables/admin-role-detail/admin-role-detail.routable"; +import {AdminRoleDetailEditRoutable} from "@admin/role/components/routables/admin-role-detail-edit/admin-role-detail-edit.routable"; import {AdminRoleListRoutable} from "@admin/role/components/routables/admin-role-list/admin-role-list.routable"; import {AdminRoleRoutingModule} from "@admin/role/role-routing.module"; import {AdminRoleState} from "@admin/role/stores/admin-role.state"; @@ -10,7 +10,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminRoleListRoutable, - AdminRoleDetailRoutable, + AdminRoleDetailEditRoutable, ]; const containers = []; const dialogs = []; diff --git a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.html b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.html rename to src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.html diff --git a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.ts b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.ts similarity index 86% rename from src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.ts rename to src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.ts index 8b118976f..66855be46 100644 --- a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.ts +++ b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable.ts @@ -21,12 +21,12 @@ import {LocalStateEnum} from "@shared/enums/local-state.enum"; import {Observable} from "rxjs"; @Component({ - selector: "dlcm-admin-submission-policy-detail-routable", - templateUrl: "./admin-submission-policy-detail.routable.html", + selector: "dlcm-admin-submission-policy-detail-edit-routable", + templateUrl: "./admin-submission-policy-detail-edit.routable.html", styleUrls: ["../../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminSubmissionPolicyDetailRoutable extends SharedAbstractDetailEditCommonRoutable<SubmissionPolicy, AdminSubmissionPolicyStateModel> { +export class AdminSubmissionPolicyDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<SubmissionPolicy, AdminSubmissionPolicyStateModel> { @Select(AdminSubmissionPolicyState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminSubmissionPolicyState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; diff --git a/src/app/features/admin/submission-policy/submission-policy-routing.module.ts b/src/app/features/admin/submission-policy/submission-policy-routing.module.ts index 81b02b13b..5e7f24b12 100644 --- a/src/app/features/admin/submission-policy/submission-policy-routing.module.ts +++ b/src/app/features/admin/submission-policy/submission-policy-routing.module.ts @@ -1,5 +1,5 @@ import {AdminSubmissionPolicyCreateRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-create/admin-submission-policy-create.routable"; -import {AdminSubmissionPolicyDetailRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable"; +import {AdminSubmissionPolicyDetailEditRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable"; import {AdminSubmissionPolicyListRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-list/admin-submission-policy-list.routable"; import {AdminSubmissionPolicyState} from "@admin/submission-policy/stores/admin-submission-policy.state"; import {NgModule} from "@angular/core"; @@ -22,7 +22,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.submissionPolicyDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminSubmissionPolicyDetailRoutable, + component: AdminSubmissionPolicyDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.submissionPolicy.detail"), breadcrumbMemoizedSelector: AdminSubmissionPolicyState.currentTitle, diff --git a/src/app/features/admin/submission-policy/submission-policy.module.ts b/src/app/features/admin/submission-policy/submission-policy.module.ts index 302b09472..595a666aa 100644 --- a/src/app/features/admin/submission-policy/submission-policy.module.ts +++ b/src/app/features/admin/submission-policy/submission-policy.module.ts @@ -1,7 +1,7 @@ import {AdminSubmissionPolicyDeleteDialog} from "@admin/submission-policy/components/dialogs/admin-submission-policy-delete/admin-submission-policy-delete.dialog"; import {AdminSubmissionPolicyFormPresentational} from "@admin/submission-policy/components/presentationals/admin-submission-policy-form/admin-submission-policy-form.presentational"; import {AdminSubmissionPolicyCreateRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-create/admin-submission-policy-create.routable"; -import {AdminSubmissionPolicyDetailRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable"; +import {AdminSubmissionPolicyDetailEditRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-detail-edit/admin-submission-policy-detail-edit.routable"; import {AdminSubmissionPolicyListRoutable} from "@admin/submission-policy/components/routables/admin-submission-policy-list/admin-submission-policy-list.routable"; import {AdminSubmissionPolicyState} from "@admin/submission-policy/stores/admin-submission-policy.state"; import {AdminSubmissionPolicyRoutingModule} from "@admin/submission-policy/submission-policy-routing.module"; @@ -12,7 +12,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminSubmissionPolicyListRoutable, - AdminSubmissionPolicyDetailRoutable, + AdminSubmissionPolicyDetailEditRoutable, AdminSubmissionPolicyCreateRoutable, ]; const containers = []; diff --git a/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.html b/src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.html similarity index 100% rename from src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.html rename to src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.html diff --git a/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.scss b/src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.scss similarity index 100% rename from src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.scss rename to src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.scss diff --git a/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.ts b/src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.ts similarity index 94% rename from src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.ts rename to src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.ts index e27b68fdc..35d18a9a2 100644 --- a/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.ts +++ b/src/app/features/admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable.ts @@ -48,12 +48,12 @@ import { } from "solidify-frontend"; @Component({ - selector: "dlcm-admin-user-detail-routable", - templateUrl: "./admin-user-detail.routable.html", - styleUrls: ["./admin-user-detail.routable.scss"], + selector: "dlcm-admin-user-detail-edit-routable", + templateUrl: "./admin-user-detail-edit.routable.html", + styleUrls: ["./admin-user-detail-edit.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AdminUserDetailRoutable extends SharedAbstractDetailEditCommonRoutable<UserExtended, AdminUserStateModel> { +export class AdminUserDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<UserExtended, AdminUserStateModel> { @Select(AdminUserState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(AdminUserState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; @Select((state: LocalStateModel) => state.shared.shared_person.list) listPersonObs: Observable<Person[]>; diff --git a/src/app/features/admin/user/user-routing.module.ts b/src/app/features/admin/user/user-routing.module.ts index 8fbdd88de..a2438f036 100644 --- a/src/app/features/admin/user/user-routing.module.ts +++ b/src/app/features/admin/user/user-routing.module.ts @@ -1,5 +1,5 @@ import {AdminUserCreateRoutable} from "@admin/user/components/routables/admin-user-create/admin-user-create.routable"; -import {AdminUserDetailRoutable} from "@admin/user/components/routables/admin-user-detail/admin-user-detail.routable"; +import {AdminUserDetailEditRoutable} from "@admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable"; import {AdminUserListRoutable} from "@admin/user/components/routables/admin-user-list/admin-user-list.routable"; import {AdminUserState} from "@admin/user/stores/admin-user.state"; import {NgModule} from "@angular/core"; @@ -27,7 +27,7 @@ const routes: Routes = [ }, { path: AdminRoutesEnum.userDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: AdminUserDetailRoutable, + component: AdminUserDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.admin.user.detail"), breadcrumbMemoizedSelector: AdminUserState.currentTitle, diff --git a/src/app/features/admin/user/user.module.ts b/src/app/features/admin/user/user.module.ts index 170e8d9c0..a27d96bcf 100644 --- a/src/app/features/admin/user/user.module.ts +++ b/src/app/features/admin/user/user.module.ts @@ -2,7 +2,7 @@ import {AdminUserDeleteDialog} from "@admin/user/components/dialogs/admin-user-d import {AdminUserEditRoleCurrentUserDialog} from "@admin/user/components/dialogs/admin-user-edit-role-current-user/admin-user-edit-role-current-user.dialog"; import {AdminUserFormPresentational} from "@admin/user/components/presentationals/admin-user-form/admin-user-form.presentational"; import {AdminUserCreateRoutable} from "@admin/user/components/routables/admin-user-create/admin-user-create.routable"; -import {AdminUserDetailRoutable} from "@admin/user/components/routables/admin-user-detail/admin-user-detail.routable"; +import {AdminUserDetailEditRoutable} from "@admin/user/components/routables/admin-user-detail-edit/admin-user-detail-edit.routable"; import {AdminUserListRoutable} from "@admin/user/components/routables/admin-user-list/admin-user-list.routable"; import {AdminUserState} from "@admin/user/stores/admin-user.state"; import {AdminUserRoutingModule} from "@admin/user/user-routing.module"; @@ -13,7 +13,7 @@ import {NgxsModule} from "@ngxs/store"; const routables = [ AdminUserListRoutable, - AdminUserDetailRoutable, + AdminUserDetailEditRoutable, AdminUserCreateRoutable, ]; const containers = []; diff --git a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.html b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.html similarity index 100% rename from src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.html rename to src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.html diff --git a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.scss b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.scss similarity index 100% rename from src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.scss rename to src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.scss diff --git a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts similarity index 97% rename from src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts rename to src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts index 20eb83684..d73202599 100644 --- a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts +++ b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts @@ -66,12 +66,12 @@ import { } from "solidify-frontend"; @Component({ - selector: "dlcm-deposit-detail-routable", - templateUrl: "./deposit-detail.routable.html", - styleUrls: ["./deposit-detail.routable.scss"], + selector: "dlcm-deposit-detail-edit-routable", + templateUrl: "./deposit-detail-edit.routable.html", + styleUrls: ["./deposit-detail-edit.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class DepositDetailRoutable extends SharedAbstractDetailEditRoutable<DepositExtended, DepositStateModel> implements OnInit, OnDestroy { +export class DepositDetailEditRoutable extends SharedAbstractDetailEditRoutable<DepositExtended, DepositStateModel> implements OnInit, OnDestroy { @Select((state: LocalStateModel) => state.deposit.deposit_statusHistory.history) historyObs: Observable<StatusHistory[]>; @Select((state: LocalStateModel) => state.deposit.deposit_dataFile.numberFilesInErrors) numberFilesInErrorObs: Observable<number | undefined>; @Select((state: LocalStateModel) => state.deposit.deposit_dataFile.numberFiles) numberFilesObs: Observable<number | undefined>; diff --git a/src/app/features/deposit/deposit-routing.module.ts b/src/app/features/deposit/deposit-routing.module.ts index 0ccedefce..49f751a9b 100644 --- a/src/app/features/deposit/deposit-routing.module.ts +++ b/src/app/features/deposit/deposit-routing.module.ts @@ -1,13 +1,13 @@ import {NgModule} from "@angular/core"; import {RouterModule} from "@angular/router"; import {DepositCreateRoutable} from "@app/features/deposit/components/routables/deposit-create/deposit-create.routable"; -import {DepositDetailRoutable} from "@app/features/deposit/components/routables/deposit-detail/deposit-detail.routable"; import {DepositListRoutable} from "@app/features/deposit/components/routables/deposit-list/deposit-list.routable"; import { AppRoutesEnum, DepositRoutesEnum, } from "@app/shared/enums/routes.enum"; import {DlcmRoutes} from "@app/shared/models/dlcm-route.model"; +import {DepositDetailEditRoutable} from "@deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable"; import {DepositFileRoutable} from "@deposit/components/routables/deposit-file/deposit-file.routable"; import {DepositMetadataRoutable} from "@deposit/components/routables/deposit-metadata/deposit-metadata.routable"; import {DepositState} from "@deposit/stores/deposit.state"; @@ -29,7 +29,7 @@ const routes: DlcmRoutes = [ }, { path: DepositRoutesEnum.detail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: DepositDetailRoutable, + component: DepositDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.deposit.detail"), breadcrumbMemoizedSelector: DepositState.currentTitle, diff --git a/src/app/features/deposit/deposit.module.ts b/src/app/features/deposit/deposit.module.ts index 8127221fd..59269d783 100644 --- a/src/app/features/deposit/deposit.module.ts +++ b/src/app/features/deposit/deposit.module.ts @@ -22,12 +22,12 @@ import {TranslateModule} from "@ngx-translate/core"; import {NgxsModule} from "@ngxs/store"; import {DepositFilesUploadInProgressPresentational} from "./components/presentationals/deposit-files-upload-in-progress/deposit-files-upload-in-progress.presentational"; import {DepositCreateRoutable} from "./components/routables/deposit-create/deposit-create.routable"; -import {DepositDetailRoutable} from "./components/routables/deposit-detail/deposit-detail.routable"; +import {DepositDetailEditRoutable} from "./components/routables/deposit-detail-edit/deposit-detail-edit.routable"; const routables = [ DepositListRoutable, DepositCreateRoutable, - DepositDetailRoutable, + DepositDetailEditRoutable, DepositFileRoutable, DepositMetadataRoutable, ]; diff --git a/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.html b/src/app/features/organizational-unit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable.html similarity index 100% rename from src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.html rename to src/app/features/organizational-unit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable.html diff --git a/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.ts b/src/app/features/organizational-unit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable.ts similarity index 92% rename from src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.ts rename to src/app/features/organizational-unit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable.ts index 2ed467fea..2a40c133e 100644 --- a/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.ts +++ b/src/app/features/organizational-unit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable.ts @@ -30,12 +30,12 @@ import {SharedAbstractDetailEditCommonRoutable} from "@shared/components/routabl import {Observable} from "rxjs"; @Component({ - selector: "dlcm-orgunit-detail-routable", - templateUrl: "./orgunit-detail.routable.html", + selector: "dlcm-orgunit-detail-edit-routable", + templateUrl: "./orgunit-detail-edit.routable.html", styleUrls: ["../../../../../shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class OrgunitDetailRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnitExtended, OrganizationalUnitStateModel> implements OnInit { +export class OrgunitDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnitExtended, OrganizationalUnitStateModel> implements OnInit { @Select(OrganizationalUnitState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>; @Select(OrganizationalUnitState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>; @Select(OrganizationalUnitState.currentUserIsManager) currentUserIsManager: Observable<boolean>; diff --git a/src/app/features/organizational-unit/organizational-unit-routing.module.ts b/src/app/features/organizational-unit/organizational-unit-routing.module.ts index 0f6579e71..5d1ac2cbb 100644 --- a/src/app/features/organizational-unit/organizational-unit-routing.module.ts +++ b/src/app/features/organizational-unit/organizational-unit-routing.module.ts @@ -1,12 +1,12 @@ import {NgModule} from "@angular/core"; import {RouterModule} from "@angular/router"; -import {OrgunitDetailRoutable} from "@app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable"; import {OrgunitListRoutable} from "@app/features/organizational-unit/components/routables/orgunit-list/orgunit-list.routable"; import { AppRoutesEnum, OrganizationalUnitRoutesEnum, } from "@app/shared/enums/routes.enum"; import {DlcmRoutes} from "@app/shared/models/dlcm-route.model"; +import {OrgunitDetailEditRoutable} from "@orgunit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable"; import {OrganizationalUnitRoleGuardService} from "@shared/guards/organizational-unit-role-guard.service"; import {CanDeactivateGuard} from "@shared/services/can-deactivate-guard.service"; import {TRANSLATE} from "solidify-frontend"; @@ -20,7 +20,7 @@ const routes: DlcmRoutes = [ }, { path: OrganizationalUnitRoutesEnum.detail + AppRoutesEnum.separator + AppRoutesEnum.paramId, - component: OrgunitDetailRoutable, + component: OrgunitDetailEditRoutable, data: { breadcrumb: TRANSLATE("breadcrumb.organizationalUnit.detail"), breadcrumbMemoizedSelector: OrganizationalUnitState.currentTitle, diff --git a/src/app/features/organizational-unit/organizational-unit.module.ts b/src/app/features/organizational-unit/organizational-unit.module.ts index b925a770b..7fe163123 100644 --- a/src/app/features/organizational-unit/organizational-unit.module.ts +++ b/src/app/features/organizational-unit/organizational-unit.module.ts @@ -1,16 +1,16 @@ import {NgModule} from "@angular/core"; import {OrgunitFormPresentational} from "@app/features/organizational-unit/components/presentationals/orgunit-form/orgunit-form.presentational"; -import {OrgunitDetailRoutable} from "@app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable"; import {OrgunitListRoutable} from "@app/features/organizational-unit/components/routables/orgunit-list/orgunit-list.routable"; import {OrganizationalUnitRoutingModule} from "@app/features/organizational-unit/organizational-unit-routing.module"; import {OrganizationalUnitState} from "@app/features/organizational-unit/stores/organizational-unit.state"; import {SharedModule} from "@app/shared/shared.module"; import {TranslateModule} from "@ngx-translate/core"; import {NgxsModule} from "@ngxs/store"; +import {OrgunitDetailEditRoutable} from "@orgunit/components/routables/orgunit-detail-edit/orgunit-detail-edit.routable"; import {OrganizationalUnitPersonRoleState} from "@orgunit/stores/person-role/organizational-unit-person-role.state"; const routables = [ - OrgunitDetailRoutable, + OrgunitDetailEditRoutable, OrgunitListRoutable, ]; const containers = []; -- GitLab