diff --git a/cypress/integration/orgunit-helper.ts b/cypress/integration/orgunit-helper.ts
index c216e59be3fe977debb2c487440c66ffe330186a..d1cc3f42c08cd39518db83be531452f8b51050ca 100644
--- a/cypress/integration/orgunit-helper.ts
+++ b/cypress/integration/orgunit-helper.ts
@@ -40,7 +40,7 @@ export class OrgunitHelper {
// Go to org unit list page
TestHelper.getTestData(DataTestEnum.adminTileOrganizationalUnit).click();
- TestHelper.waitModuleLoaded(ModuleLoadedEnum.adminOrgUnitModuleLoaded);
+ TestHelper.waitModuleLoaded(ModuleLoadedEnum.adminOrganizationalUnitModuleLoaded);
TestHelper.getTestData(DataTestEnum.adminOrgUnitListSearchName).type(orgUnitName, {delay: 0, release: false});
diff --git a/cypress/integration/preservation-space/preservation-space-common.helper.ts b/cypress/integration/preservation-space/preservation-space-common.helper.ts
index 919be7839e301ae89975979594c109425e78809c..7132a961ed2f514bd38fa01d5b7d4af2cfbe8921 100644
--- a/cypress/integration/preservation-space/preservation-space-common.helper.ts
+++ b/cypress/integration/preservation-space/preservation-space-common.helper.ts
@@ -13,7 +13,7 @@ export class PreservationSpaceCommonHelper {
});
cy.wait(1000); // MANDATORY FOR NOT RANDOM ERROR...
TestHelper.waitModuleLoaded(ModuleLoadedEnum.preservationSpaceModuleLoaded);
- TestHelper.waitModuleLoaded(ModuleLoadedEnum.preservationSpaceOrgUnitModuleLoaded);
+ TestHelper.waitModuleLoaded(ModuleLoadedEnum.preservationSpaceOrganizationalUnitModuleLoaded);
}
static goToOrgUnitDetail(orgUnitName: string): void {
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
index 899fa6c691768fc97dc281e7a8e0c7fe2f864ebc..155c8257fab8c7bbc65842a046b9c8bbdcdb54cf 100644
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -42,11 +42,11 @@
"@home/*": [
"app/features/home/*"
],
- "@orgunit/*": [
- "app/features/organizational-unit/*"
+ "@preservation-space/*": [
+ "app/features/preservation-space/*"
],
- "@preservation/*": [
- "app/features/preservation/*"
+ "@preservation-planning/*": [
+ "app/features/preservation-planning/*"
],
"@order/*": [
"app/features/order/*"
diff --git a/cypress/webpack.config.js b/cypress/webpack.config.js
index 8e5ff5781b60fed6199d075b0205afaf24fc21c0..3d79af0e7386fa608a5419b16318aa883b218272 100644
--- a/cypress/webpack.config.js
+++ b/cypress/webpack.config.js
@@ -13,7 +13,6 @@ module.exports = {
'@admin': path.resolve(__dirname, '../src/app/features/admin'),
'@deposit': path.resolve(__dirname, '../src/app/features/deposit'),
'@home': path.resolve(__dirname, '../src/app/features/home'),
- '@orgunit': path.resolve(__dirname, '../src/app/features/preservation-space/organizational-unit'),
'@preservation-planning': path.resolve(__dirname, '../src/app/features/preservation-planning'),
'@preservation-space': path.resolve(__dirname, '../src/app/features/preservation-space'),
'@order': path.resolve(__dirname, '../src/app/features/order'),
diff --git a/src/app/features/admin/admin-routing.module.ts b/src/app/features/admin/admin-routing.module.ts
index e4d82bcfb7a99ebdc946111e1c5d6cbaecc077d5..3b576970c422732be08851c1815109f42d37c211 100644
--- a/src/app/features/admin/admin-routing.module.ts
+++ b/src/app/features/admin/admin-routing.module.ts
@@ -76,7 +76,7 @@ const routes: Routes = [
{
path: AdminRoutesEnum.organizationalUnit,
// @ts-ignore Dynamic import
- loadChildren: () => import("./orgunit/admin-orgunit.module").then(m => m.AdminOrgunitModule),
+ loadChildren: () => import("./organizational-unit/admin-organizational-unit.module").then(m => m.AdminOrganizationalUnitModule),
data: {
breadcrumb: MARK_AS_TRANSLATABLE("breadcrumb.admin.organizationalUnit.root"),
},
diff --git a/src/app/features/admin/admin.module.ts b/src/app/features/admin/admin.module.ts
index 7185b14e38f415e7826bd42fb6bc728ddaadf274..a249171543481ed01fd109dbeb8cc3e493c54fcb 100644
--- a/src/app/features/admin/admin.module.ts
+++ b/src/app/features/admin/admin.module.ts
@@ -9,11 +9,11 @@ import {AdminNotificationState} from "@admin/notification/stores/admin-notificat
import {AdminNotificationStatusHistoryState} from "@admin/notification/stores/status-history/admin-notification-status-history.state";
import {AdminOaiSetState} from "@admin/oai-set/stores/admin-oai-set.state";
import {AdminOAuth2ClientState} from "@admin/oauth2-client/stores/admin-oauth2-client.state";
-import {AdminOrganizationalUnitState} from "@admin/orgunit/stores/admin-organizational-unit.state";
-import {AdminOrganizationalUnitDisseminationPolicyState} from "@admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state";
-import {AdminOrganizationalUnitFundingAgencyState} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
-import {AdminOrganizationalUnitInstitutionState} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.state";
-import {AdminOrganizationalUnitPersonRoleState} from "@admin/orgunit/stores/person-role/admin-organizational-unit-person-role.state";
+import {AdminOrganizationalUnitState} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
+import {AdminOrganizationalUnitDisseminationPolicyState} from "@admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state";
+import {AdminOrganizationalUnitFundingAgencyState} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
+import {AdminOrganizationalUnitInstitutionState} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state";
+import {AdminOrganizationalUnitPersonRoleState} from "@admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.state";
import {AdminPersonState} from "@admin/person/stores/admin-person.state";
import {AdminPersonInstitutionsState} from "@admin/person/stores/institutions/admin-people-institutions.state";
import {AdminPersonOrgUnitRoleState} from "@admin/person/stores/person-role/admin-person-orgunit-role.state";
@@ -25,8 +25,8 @@ import {AdminUserState} from "@admin/user/stores/admin-user.state";
import {NgModule} from "@angular/core";
import {AdminRoutingModule} from "@app/features/admin/admin-routing.module";
import {AdminHomeRoutable} from "@app/features/admin/components/routables/admin-home/admin-home.routable";
-import {AdminOrganizationalUnitPreservationPolicyState} from "@app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state";
-import {AdminOrganizationalUnitSubmissionPolicyState} from "@app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.state";
+import {AdminOrganizationalUnitPreservationPolicyState} from "@app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state";
+import {AdminOrganizationalUnitSubmissionPolicyState} from "@app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.state";
import {AdminState} from "@app/features/admin/stores/admin.state";
import {SharedModule} from "@app/shared/shared.module";
import {TranslateModule} from "@ngx-translate/core";
diff --git a/src/app/features/admin/oauth2-client/components/dialogs/admin-oauth2-client-delete/admin-oauth2-client-delete.dialog.ts b/src/app/features/admin/oauth2-client/components/dialogs/admin-oauth2-client-delete/admin-oauth2-client-delete.dialog.ts
index 2aaf17b52e81b253452bc8924d22ef2b510e97f3..606ee697bef9aeec0bf65c5595f49f230bc0a45f 100644
--- a/src/app/features/admin/oauth2-client/components/dialogs/admin-oauth2-client-delete/admin-oauth2-client-delete.dialog.ts
+++ b/src/app/features/admin/oauth2-client/components/dialogs/admin-oauth2-client-delete/admin-oauth2-client-delete.dialog.ts
@@ -17,7 +17,7 @@ import {DeleteDialog} from "@shared/models/delete-dialog.model";
import {MARK_AS_TRANSLATABLE} from "solidify-frontend";
@Component({
- selector: "dlcm-admin-orgunit-delete-dialog",
+ selector: "dlcm-admin-organizational-unit-delete-dialog",
templateUrl: "../../../../../../shared/components/dialogs/shared-abstract-delete/shared-abstract-delete.dialog.html",
styleUrls: ["../../../../../../shared/components/dialogs/shared-abstract-delete/shared-abstract-delete.dialog.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/admin/orgunit/admin-orgunit-routing.module.ts b/src/app/features/admin/organizational-unit/admin-organizational-unit-routing.module.ts
similarity index 57%
rename from src/app/features/admin/orgunit/admin-orgunit-routing.module.ts
rename to src/app/features/admin/organizational-unit/admin-organizational-unit-routing.module.ts
index 3200862cf08a4a12a1fd7ebd59b49a4eaa54f5b6..5771b6c1563110986224ad2ca957e05f36f5f8ec 100644
--- a/src/app/features/admin/orgunit/admin-orgunit-routing.module.ts
+++ b/src/app/features/admin/organizational-unit/admin-organizational-unit-routing.module.ts
@@ -1,7 +1,7 @@
-import {AdminOrgunitCreateRoutable} from "@admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.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 {AdminOrganizationalUnitCreateRoutable} from "@admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable";
+import {AdminOrganizationalUnitListRoutable} from "@admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable";
+import {AdminOrganizationalUnitDetailEditRoutable} from "@admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable";
+import {AdminOrganizationalUnitState} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
import {NgModule} from "@angular/core";
import {
RouterModule,
@@ -18,12 +18,12 @@ import {MARK_AS_TRANSLATABLE} from "solidify-frontend";
const routes: Routes = [
{
path: AppRoutesEnum.root,
- component: AdminOrgunitListRoutable,
+ component: AdminOrganizationalUnitListRoutable,
data: {},
},
{
path: AdminRoutesEnum.organizationalUnitDetail + AppRoutesEnum.separator + AppRoutesEnum.paramId,
- component: AdminOrgunitDetailEditRoutable,
+ component: AdminOrganizationalUnitDetailEditRoutable,
data: {
breadcrumbMemoizedSelector: AdminOrganizationalUnitState.currentTitle,
},
@@ -39,7 +39,7 @@ const routes: Routes = [
},
{
path: AdminRoutesEnum.organizationalUnitCreate,
- component: AdminOrgunitCreateRoutable,
+ component: AdminOrganizationalUnitCreateRoutable,
data: {
breadcrumb: MARK_AS_TRANSLATABLE("breadcrumb.admin.organizationalUnit.create"),
},
@@ -52,8 +52,8 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
-export class AdminOrgunitRoutingModule {
+export class AdminOrganizationalUnitRoutingModule {
constructor() {
- window[ModuleLoadedEnum.adminOrgUnitModuleLoaded] = true;
+ window[ModuleLoadedEnum.adminOrganizationalUnitModuleLoaded] = true;
}
}
diff --git a/src/app/features/admin/organizational-unit/admin-organizational-unit.module.ts b/src/app/features/admin/organizational-unit/admin-organizational-unit.module.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ddf7d241ab41b99259b1bdaa681c7a2bf2e10a04
--- /dev/null
+++ b/src/app/features/admin/organizational-unit/admin-organizational-unit.module.ts
@@ -0,0 +1,50 @@
+import {AdminOrganizationalUnitRoutingModule} from "@admin/organizational-unit/admin-organizational-unit-routing.module";
+import {AdminOrganizationalUnitDeleteDialog} from "@admin/organizational-unit/components/dialogs/admin-organizational-unit-delete/admin-organizational-unit-delete.dialog";
+import {AdminOrganizationalUnitFormPresentational} from "@admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational";
+import {AdminOrganizationalUnitCreateRoutable} from "@admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable";
+import {AdminOrganizationalUnitListRoutable} from "@admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable";
+import {AdminOrganizationalUnitDetailEditRoutable} from "@admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable";
+import {AdminOrganizationalUnitState} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
+import {NgModule} from "@angular/core";
+import {SharedModule} from "@app/shared/shared.module";
+import {TranslateModule} from "@ngx-translate/core";
+import {NgxsModule} from "@ngxs/store";
+
+const routables = [
+ AdminOrganizationalUnitCreateRoutable,
+ AdminOrganizationalUnitDetailEditRoutable,
+ AdminOrganizationalUnitListRoutable,
+];
+const containers = [];
+const dialogs = [
+ AdminOrganizationalUnitDeleteDialog,
+];
+const presentationals = [
+ AdminOrganizationalUnitFormPresentational,
+];
+
+@NgModule({
+ declarations: [
+ ...routables,
+ ...containers,
+ ...dialogs,
+ ...presentationals,
+ ],
+ imports: [
+ SharedModule,
+ AdminOrganizationalUnitRoutingModule,
+ TranslateModule.forChild({}),
+ NgxsModule.forFeature([
+ AdminOrganizationalUnitState,
+ ]),
+ ],
+ entryComponents: [
+ ...dialogs,
+ ],
+ exports: [
+ ...routables,
+ ],
+ providers: [],
+})
+export class AdminOrganizationalUnitModule {
+}
diff --git a/src/app/features/admin/orgunit/components/dialogs/admin-orgunit-delete/admin-orgunit-delete.dialog.ts b/src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-delete/admin-organizational-unit-delete.dialog.ts
similarity index 72%
rename from src/app/features/admin/orgunit/components/dialogs/admin-orgunit-delete/admin-orgunit-delete.dialog.ts
rename to src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-delete/admin-organizational-unit-delete.dialog.ts
index 357382b99bbbef2a1f3d91a641c08f422cdd1ff5..410ca7db1dc19a807e62dadeb70ff2cf107e6af3 100644
--- a/src/app/features/admin/orgunit/components/dialogs/admin-orgunit-delete/admin-orgunit-delete.dialog.ts
+++ b/src/app/features/admin/organizational-unit/components/dialogs/admin-organizational-unit-delete/admin-organizational-unit-delete.dialog.ts
@@ -1,5 +1,5 @@
-import {adminOrgUnitActionNameSpace} from "@admin/orgunit/stores/admin-organizational-unit.action";
-import {AdminOrganizationalUnitStateModel} from "@admin/orgunit/stores/admin-organizational-unit.state";
+import {adminOrganizationalUnitActionNameSpace} from "@admin/organizational-unit/stores/admin-organizational-unit.action";
+import {AdminOrganizationalUnitStateModel} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
import {
ChangeDetectionStrategy,
Component,
@@ -17,20 +17,20 @@ import {DeleteDialog} from "@shared/models/delete-dialog.model";
import {MARK_AS_TRANSLATABLE} from "solidify-frontend";
@Component({
- selector: "dlcm-admin-orgunit-delete-dialog",
+ selector: "dlcm-admin-organizational-unit-delete-dialog",
templateUrl: "../../../../../../shared/components/dialogs/shared-abstract-delete/shared-abstract-delete.dialog.html",
styleUrls: ["../../../../../../shared/components/dialogs/shared-abstract-delete/shared-abstract-delete.dialog.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class AdminOrgunitDeleteDialog extends SharedAbstractDeleteDialog<OrganizationalUnit, AdminOrganizationalUnitStateModel> {
+export class AdminOrganizationalUnitDeleteDialog extends SharedAbstractDeleteDialog<OrganizationalUnit, AdminOrganizationalUnitStateModel> {
public readonly KEY_TITLE: string = MARK_AS_TRANSLATABLE("admin.organizationalUnit.dialog.delete.title");
public readonly KEY_MESSAGE: string = MARK_AS_TRANSLATABLE("admin.organizationalUnit.dialog.delete.message");
public readonly KEY_CONFIRM_BUTTON: string = MARK_AS_TRANSLATABLE("admin.organizationalUnit.dialog.delete.confirm");
public readonly KEY_CANCEL_BUTTON: string = MARK_AS_TRANSLATABLE("admin.organizationalUnit.dialog.delete.cancel");
constructor(protected store: Store,
- protected dialogRef: MatDialogRef<AdminOrgunitDeleteDialog>,
+ protected dialogRef: MatDialogRef<AdminOrganizationalUnitDeleteDialog>,
@Inject(MAT_DIALOG_DATA) public data: DeleteDialog) {
- super(store, dialogRef, data, LocalStateEnum.admin_organizationalUnit, adminOrgUnitActionNameSpace);
+ super(store, dialogRef, data, LocalStateEnum.admin_organizationalUnit, adminOrganizationalUnitActionNameSpace);
}
}
diff --git a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.html b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.html
similarity index 100%
rename from src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.html
rename to src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.html
diff --git a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.ts
similarity index 98%
rename from src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts
rename to src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.ts
index badc63957bcd6f32ff5f3abf0b303c8ee7ae6d0b..a53ff2765db68a84861d5c3dcd50ae2df748447b 100644
--- a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts
+++ b/src/app/features/admin/organizational-unit/components/presentationals/admin-organizational-unit-form/admin-organizational-unit-form.presentational.ts
@@ -62,12 +62,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-admin-orgunit-form",
- templateUrl: "./admin-orgunit-form.presentational.html",
+ selector: "dlcm-admin-organizational-unit-form",
+ templateUrl: "./admin-organizational-unit-form.presentational.html",
styleUrls: ["../../../../../../shared/components/presentationals/shared-abstract-form/shared-abstract-form.presentational.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class AdminOrgunitFormPresentational extends SharedAbstractFormPresentational<OrganizationalUnit> {
+export class AdminOrganizationalUnitFormPresentational extends SharedAbstractFormPresentational<OrganizationalUnit> {
private readonly KEY_SOURCE: keyof ResearchDomain = "source";
readonly TIME_BEFORE_DISPLAY_TOOLTIP: number = environment.timeBeforeDisplayTooltipOnInput;
formDefinition: FormComponentFormDefinition = new FormComponentFormDefinition();
diff --git a/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable.html b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable.html
new file mode 100644
index 0000000000000000000000000000000000000000..95ec33e4609c2b58fcd241cf3d155167944d8ad9
--- /dev/null
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable.html
@@ -0,0 +1,34 @@
+<lib-empty-container
+ solidifyShortCuts
+ (onEscape)="backToList()"
+>
+ <dlcm-shared-button-toolbar-detail [mode]="'create'"
+ [formPresentational]="formPresentational"
+ (backToListChange)="backToList()"
+ >
+ </dlcm-shared-button-toolbar-detail>
+
+ <div class="wrapper"
+ [dlcmSpinner]="isLoadingWithDependencyObs | async"
+ >
+ <dlcm-admin-organizational-unit-form #formPresentational
+ [solidifyFocusFirstElement]="true"
+ *ngIf="isReadyToBeDisplayedInCreateModeObs | async"
+ [listSubmissionPolicies]="listSubmissionPoliciesObs | async"
+ [listPreservationPolicies]="listPreservationPoliciesObs | async"
+ [listDisseminationPolicies]="listDisseminationPoliciesObs | async"
+ [listRole]="listRoleObs | async"
+ (submitChange)="create($event)"
+ [selectedFundingAgencies]="selectedFundingAgenciesObs | async"
+ [selectedInstitutions]="selectedInstitutionsObs | async"
+ [selectedPersonRole]="selectedPersonRole"
+ [researchDomainSources]="researchDomainSourcesObs | async"
+ [defaultPlatformLicenseId]="(systemPropertyObs | async)?.defaultLicense"
+ [urlQueryParameters]="urlQueryParameters"
+ (checkAvailableChange)="checkAvailable($event)"
+ (dirtyChange)="updateCanDeactivate($event)"
+ (navigate)="navigate($event)"
+ >
+ </dlcm-admin-organizational-unit-form>
+ </div>
+</lib-empty-container>
diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable.ts
similarity index 84%
rename from src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts
rename to src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable.ts
index 7cd608f148dfaf7a9f5daba188ce46a4654643db..60fd326f52b8f4f2907601c79c396eef99bf720f 100644
--- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.ts
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-create/admin-organizational-unit-create.routable.ts
@@ -1,11 +1,11 @@
import {PersonRole} from "@admin/models/person-role.model";
-import {adminOrgUnitActionNameSpace} from "@admin/orgunit/stores/admin-organizational-unit.action";
+import {adminOrganizationalUnitActionNameSpace} from "@admin/organizational-unit/stores/admin-organizational-unit.action";
import {
AdminOrganizationalUnitState,
AdminOrganizationalUnitStateModel,
-} from "@admin/orgunit/stores/admin-organizational-unit.state";
-import {AdminOrganizationalUnitFundingAgencyState} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
-import {AdminOrganizationalUnitInstitutionState} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.state";
+} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
+import {AdminOrganizationalUnitFundingAgencyState} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
+import {AdminOrganizationalUnitInstitutionState} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state";
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
@@ -47,12 +47,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-admin-orgunit-create-routable",
- templateUrl: "./admin-orgunit-create.routable.html",
+ selector: "dlcm-admin-organizational-unit-create-routable",
+ templateUrl: "./admin-organizational-unit-create.routable.html",
styleUrls: ["../../../../../../shared/components/routables/shared-abstract-create/shared-abstract-create.routable.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class AdminOrgunitCreateRoutable extends SharedAbstractCreateRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> implements OnInit {
+export class AdminOrganizationalUnitCreateRoutable extends SharedAbstractCreateRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> implements OnInit {
listSubmissionPoliciesObs: Observable<SubmissionPolicy[]> = MemoizedUtil.list(this._store, SharedSubmissionPolicyState);
@Select(AdminOrganizationalUnitState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminOrganizationalUnitState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
@@ -78,7 +78,7 @@ export class AdminOrgunitCreateRoutable extends SharedAbstractCreateRoutable<Org
constructor(protected readonly _store: Store,
protected readonly _actions$: Actions,
protected readonly _changeDetector: ChangeDetectorRef) {
- super(_store, _actions$, _changeDetector, LocalStateEnum.admin_organizationalUnit, adminOrgUnitActionNameSpace, LocalStateEnum.admin);
+ super(_store, _actions$, _changeDetector, LocalStateEnum.admin_organizationalUnit, adminOrganizationalUnitActionNameSpace, LocalStateEnum.admin);
}
ngOnInit(): void {
diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-list/admin-orgunit-list.routable.ts b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts
similarity index 83%
rename from src/app/features/admin/orgunit/components/routables/admin-orgunit-list/admin-orgunit-list.routable.ts
rename to src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts
index 0fc899b289842915d92b27179235a82e5b1952a9..0e528977ecccd707ec1c564a01e0c4760ced00ff 100644
--- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-list/admin-orgunit-list.routable.ts
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-list/admin-organizational-unit-list.routable.ts
@@ -1,5 +1,5 @@
-import {adminOrgUnitActionNameSpace} from "@admin/orgunit/stores/admin-organizational-unit.action";
-import {AdminOrganizationalUnitStateModel} from "@admin/orgunit/stores/admin-organizational-unit.state";
+import {adminOrganizationalUnitActionNameSpace} from "@admin/organizational-unit/stores/admin-organizational-unit.action";
+import {AdminOrganizationalUnitStateModel} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
@@ -23,12 +23,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-admin-orgunit-list-routable",
+ selector: "dlcm-admin-organizational-unit-list-routable",
templateUrl: "../../../../../../shared/components/routables/shared-abstract-list/shared-abstract-list.routable.html",
styleUrls: ["../../../../../../shared/components/routables/shared-abstract-list/shared-abstract-list.routable.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class AdminOrgunitListRoutable extends SharedAbstractListRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> {
+export class AdminOrganizationalUnitListRoutable extends SharedAbstractListRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> {
readonly KEY_CREATE_BUTTON: string = MARK_AS_TRANSLATABLE("admin.organizationalUnit.new");
readonly KEY_REFRESH_BUTTON: string = MARK_AS_TRANSLATABLE("admin.organizationalUnit.refresh");
readonly KEY_BACK_BUTTON: string | undefined = MARK_AS_TRANSLATABLE("admin.button.goBackToAdminHome");
@@ -40,7 +40,7 @@ export class AdminOrgunitListRoutable extends SharedAbstractListRoutable<Organiz
protected readonly _routerExt: RouterExtService,
protected readonly _actions$: Actions,
protected readonly _dialog: MatDialog) {
- super(_store, _changeDetector, _route, _routerExt, _actions$, _dialog, LocalStateEnum.admin_organizationalUnit, adminOrgUnitActionNameSpace, {}, LocalStateEnum.admin);
+ super(_store, _changeDetector, _route, _routerExt, _actions$, _dialog, LocalStateEnum.admin_organizationalUnit, adminOrganizationalUnitActionNameSpace, {}, LocalStateEnum.admin);
}
conditionDisplayEditButton(model: OrganizationalUnit | undefined): boolean {
diff --git a/src/app/features/admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable.html b/src/app/features/admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d68ce055329653e32b0d0af1f7333c609f97388
--- /dev/null
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable.html
@@ -0,0 +1,48 @@
+<lib-empty-container
+ cdkTrapFocus
+ solidifyShortCuts
+ [solidifyFocusFirstElement]="true"
+ (onEscape)="backToList()"
+>
+ <dlcm-shared-banner-edit-mode [isEdit]="isEdit"></dlcm-shared-banner-edit-mode>
+
+
+ <dlcm-shared-button-toolbar-detail [mode]="isEdit ? 'edit' : 'detail'"
+ [formPresentational]="formPresentational"
+ [currentModel]="currentObs | async"
+ (editChange)="edit()"
+ (deleteChange)="delete()"
+ (backToDetailChange)="backToDetail()"
+ (backToListChange)="backToList()"
+ >
+ </dlcm-shared-button-toolbar-detail>
+
+ <div class="wrapper"
+ [dlcmSpinner]="isLoadingWithDependencyObs | async"
+ >
+ <dlcm-admin-organizational-unit-form #formPresentational
+ [solidifyFocusFirstElement]="isEdit"
+ *ngIf="isReadyToBeDisplayedObs | async"
+ [model]="currentObs| async"
+ [selectedSubmissionPolicies]="selectedSubmissionPoliciesObs | async"
+ [selectedPreservationPolicies]="selectedPreservationPoliciesObs | async"
+ [selectedDisseminationPolicies]="selectedDisseminationPoliciesObs | async"
+ [selectedPersonRole]="selectedPersonRoleObs | async"
+ [selectedFundingAgencies]="selectedFundingAgenciesObs | async"
+ [selectedInstitutions]="selectedInstitutionsObs | async"
+ [listSubmissionPolicies]="listSubmissionPoliciesObs | async"
+ [listPreservationPolicies]="listPreservationPoliciesObs | async"
+ [listDisseminationPolicies]="listDisseminationPoliciesObs | async"
+ [researchDomainSources]="researchDomainSourcesObs | async"
+ [defaultPlatformLicenseId]="(systemPropertyObs | async)?.defaultLicense"
+ [listRole]="listRoleObs | async"
+ [readonly]="!isEdit"
+ [editAvailable]="editAvailable"
+ (checkAvailableChange)="checkAvailable($event)"
+ (submitChange)="update($event)"
+ (dirtyChange)="updateCanDeactivate($event)"
+ (navigate)="navigate($event)"
+ (editChange)="edit()"
+ ></dlcm-admin-organizational-unit-form>
+ </div>
+</lib-empty-container>
diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts b/src/app/features/admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable.ts
similarity index 64%
rename from src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts
rename to src/app/features/admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable.ts
index eb9bb855f57a52f114bd3064d571e573582dba3e..bdee68e700af3db7a008aca3968976479ed8bfa9 100644
--- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.ts
+++ b/src/app/features/admin/organizational-unit/components/routables/admin-orgunit-detail-edit/admin-organizational-unit-detail-edit.routable.ts
@@ -1,21 +1,21 @@
import {PersonRole} from "@admin/models/person-role.model";
-import {adminOrgUnitActionNameSpace} from "@admin/orgunit/stores/admin-organizational-unit.action";
+import {adminOrganizationalUnitActionNameSpace} from "@admin/organizational-unit/stores/admin-organizational-unit.action";
import {
AdminOrganizationalUnitState,
AdminOrganizationalUnitStateModel,
-} from "@admin/orgunit/stores/admin-organizational-unit.state";
-import {AdminOrgUnitDisseminationPolicyAction} from "@admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action";
-import {AdminOrganizationalUnitDisseminationPolicyState} from "@admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state";
-import {AdminOrgUnitFundingAgencyAction} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.action";
-import {AdminOrganizationalUnitFundingAgencyState} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
-import {AdminOrgUnitInstitutionAction} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.action";
-import {AdminOrganizationalUnitInstitutionState} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.state";
-import {AdminOrgUnitPersonRoleAction} from "@admin/orgunit/stores/person-role/admin-organizational-unit-person-role.action";
-import {AdminOrganizationalUnitPersonRoleState} from "@admin/orgunit/stores/person-role/admin-organizational-unit-person-role.state";
-import {AdminOrgUnitPreservationPolicyAction} from "@admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action";
-import {AdminOrganizationalUnitPreservationPolicyState} from "@admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state";
-import {AdminOrgUnitSubmissionPolicyAction} from "@admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.action";
-import {AdminOrganizationalUnitSubmissionPolicyState} from "@admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.state";
+} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
+import {AdminOrganizationalUnitDisseminationPolicyAction} from "@admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action";
+import {AdminOrganizationalUnitDisseminationPolicyState} from "@admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state";
+import {AdminOrganizationalUnitFundingAgencyAction} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.action";
+import {AdminOrganizationalUnitFundingAgencyState} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
+import {AdminOrganizationalUnitInstitutionAction} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.action";
+import {AdminOrganizationalUnitInstitutionState} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state";
+import {AdminOrganizationalUnitPersonRoleAction} from "@admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.action";
+import {AdminOrganizationalUnitPersonRoleState} from "@admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.state";
+import {AdminOrganizationalUnitPreservationPolicyAction} from "@admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action";
+import {AdminOrganizationalUnitPreservationPolicyState} from "@admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state";
+import {AdminOrganizationalUnitSubmissionPolicyAction} from "@admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.action";
+import {AdminOrganizationalUnitSubmissionPolicyState} from "@admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.state";
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
@@ -57,12 +57,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-admin-orgunit-detail-edit-routable",
- templateUrl: "./admin-orgunit-detail-edit.routable.html",
+ selector: "dlcm-admin-organizational-unit-detail-edit-routable",
+ templateUrl: "./admin-organizational-unit-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 AdminOrgunitDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> implements OnInit {
+export class AdminOrganizationalUnitDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnit, AdminOrganizationalUnitStateModel> implements OnInit {
@Select(AdminOrganizationalUnitState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminOrganizationalUnitState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
selectedSubmissionPoliciesObs: Observable<SubmissionPolicy[]> = MemoizedUtil.selected(this._store, AdminOrganizationalUnitSubmissionPolicyState);
@@ -88,7 +88,7 @@ export class AdminOrgunitDetailEditRoutable extends SharedAbstractDetailEditComm
protected readonly _actions$: Actions,
protected readonly _changeDetector: ChangeDetectorRef,
public _dialog: MatDialog) {
- super(_store, _route, _actions$, _changeDetector, _dialog, LocalStateEnum.admin_organizationalUnit, adminOrgUnitActionNameSpace, LocalStateEnum.admin);
+ super(_store, _route, _actions$, _changeDetector, _dialog, LocalStateEnum.admin_organizationalUnit, adminOrganizationalUnitActionNameSpace, LocalStateEnum.admin);
}
ngOnInit(): void {
@@ -97,11 +97,11 @@ export class AdminOrgunitDetailEditRoutable extends SharedAbstractDetailEditComm
}
getSubResourceWithParentId(id: string): void {
- this._store.dispatch(new AdminOrgUnitSubmissionPolicyAction.GetAll(id));
- this._store.dispatch(new AdminOrgUnitPreservationPolicyAction.GetAll(id));
- this._store.dispatch(new AdminOrgUnitDisseminationPolicyAction.GetAll(id));
- this._store.dispatch(new AdminOrgUnitPersonRoleAction.GetAll(id));
- this._store.dispatch(new AdminOrgUnitFundingAgencyAction.GetAll(id));
- this._store.dispatch(new AdminOrgUnitInstitutionAction.GetAll(id));
+ this._store.dispatch(new AdminOrganizationalUnitSubmissionPolicyAction.GetAll(id));
+ this._store.dispatch(new AdminOrganizationalUnitPreservationPolicyAction.GetAll(id));
+ this._store.dispatch(new AdminOrganizationalUnitDisseminationPolicyAction.GetAll(id));
+ this._store.dispatch(new AdminOrganizationalUnitPersonRoleAction.GetAll(id));
+ this._store.dispatch(new AdminOrganizationalUnitFundingAgencyAction.GetAll(id));
+ this._store.dispatch(new AdminOrganizationalUnitInstitutionAction.GetAll(id));
}
}
diff --git a/src/app/features/admin/orgunit/stores/admin-organizational-unit.action.ts b/src/app/features/admin/organizational-unit/stores/admin-organizational-unit.action.ts
similarity index 96%
rename from src/app/features/admin/orgunit/stores/admin-organizational-unit.action.ts
rename to src/app/features/admin/organizational-unit/stores/admin-organizational-unit.action.ts
index 1986086efcc1605571684ba27355a3ecd4d8db9b..25c1b250ec066fd4d41435cca3a371f711b68459 100644
--- a/src/app/features/admin/orgunit/stores/admin-organizational-unit.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/admin-organizational-unit.action.ts
@@ -8,7 +8,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit;
-export namespace AdminOrgUnitAction {
+export namespace AdminOrganizationalUnitAction {
@TypeDefaultAction(state)
export class LoadResource extends ResourceAction.LoadResource {
}
@@ -138,4 +138,4 @@ export namespace AdminOrgUnitAction {
}
}
-export const adminOrgUnitActionNameSpace: ResourceNameSpace = AdminOrgUnitAction;
+export const adminOrganizationalUnitActionNameSpace: ResourceNameSpace = AdminOrganizationalUnitAction;
diff --git a/src/app/features/admin/orgunit/stores/admin-organizational-unit.state.ts b/src/app/features/admin/organizational-unit/stores/admin-organizational-unit.state.ts
similarity index 69%
rename from src/app/features/admin/orgunit/stores/admin-organizational-unit.state.ts
rename to src/app/features/admin/organizational-unit/stores/admin-organizational-unit.state.ts
index 629a8a49850c077d18ca95d7c53ef900c0166ab0..873d8f0fa751293c09b21e010a6b2b1460b153c5 100644
--- a/src/app/features/admin/orgunit/stores/admin-organizational-unit.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/admin-organizational-unit.state.ts
@@ -1,37 +1,37 @@
import {
- AdminOrgUnitAction,
- adminOrgUnitActionNameSpace,
-} from "@admin/orgunit/stores/admin-organizational-unit.action";
-import {AdminOrgUnitDisseminationPolicyAction} from "@admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action";
+ AdminOrganizationalUnitAction,
+ adminOrganizationalUnitActionNameSpace,
+} from "@admin/organizational-unit/stores/admin-organizational-unit.action";
+import {AdminOrganizationalUnitDisseminationPolicyAction} from "@admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action";
import {
AdminOrganizationalUnitDisseminationPolicyState,
AdminOrganizationalUnitDisseminationPolicyStateModel,
-} from "@admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state";
-import {AdminOrgUnitFundingAgencyAction} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.action";
+} from "@admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state";
+import {AdminOrganizationalUnitFundingAgencyAction} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.action";
import {
AdminOrganizationalUnitFundingAgencyState,
AdminOrganizationalUnitFundingAgencyStateModel,
-} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
-import {AdminOrgUnitInstitutionAction} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.action";
+} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state";
+import {AdminOrganizationalUnitInstitutionAction} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.action";
import {
AdminOrganizationalUnitInstitutionState,
AdminOrganizationalUnitInstitutionStateModel,
-} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.state";
-import {AdminOrgUnitPersonRoleAction} from "@admin/orgunit/stores/person-role/admin-organizational-unit-person-role.action";
+} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state";
+import {AdminOrganizationalUnitPersonRoleAction} from "@admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.action";
import {
AdminOrganizationalUnitPersonRoleState,
AdminOrganizationalUnitPersonRoleStateModel,
-} from "@admin/orgunit/stores/person-role/admin-organizational-unit-person-role.state";
-import {AdminOrgUnitPreservationPolicyAction} from "@admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action";
+} from "@admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.state";
+import {AdminOrganizationalUnitPreservationPolicyAction} from "@admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action";
import {
AdminOrganizationalUnitPreservationPolicyState,
AdminOrganizationalUnitPreservationPolicyStateModel,
-} from "@admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state";
-import {AdminOrgUnitSubmissionPolicyAction} from "@admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.action";
+} from "@admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state";
+import {AdminOrganizationalUnitSubmissionPolicyAction} from "@admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.action";
import {
AdminOrganizationalUnitSubmissionPolicyState,
AdminOrganizationalUnitSubmissionPolicyStateModel,
-} from "@admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.state";
+} from "@admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.state";
import {Injectable} from "@angular/core";
import {DepositStateModel} from "@deposit/stores/deposit.state";
import {OrganizationalUnit} from "@models";
@@ -110,7 +110,7 @@ export class AdminOrganizationalUnitState extends ResourceState<AdminOrganizatio
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitActionNameSpace,
+ nameSpace: adminOrganizationalUnitActionNameSpace,
routeRedirectUrlAfterSuccessCreateAction: (resId: string) => RoutesEnum.adminOrganizationalUnitDetail + urlSeparator + resId,
routeRedirectUrlAfterSuccessUpdateAction: (resId: string) => RoutesEnum.adminOrganizationalUnitDetail + urlSeparator + resId,
routeRedirectUrlAfterSuccessDeleteAction: RoutesEnum.adminOrganizationalUnit,
@@ -165,8 +165,8 @@ export class AdminOrganizationalUnitState extends ResourceState<AdminOrganizatio
return true;
}
- @Action(AdminOrgUnitAction.LoadResource)
- loadResource(ctx: StateContext<DepositStateModel>, action: AdminOrgUnitAction.LoadResource): Observable<any> {
+ @Action(AdminOrganizationalUnitAction.LoadResource)
+ loadResource(ctx: StateContext<DepositStateModel>, action: AdminOrganizationalUnitAction.LoadResource): Observable<any> {
ctx.patchState({
isLoadingCounter: ctx.getState().isLoadingCounter + 1,
});
@@ -203,25 +203,25 @@ export class AdminOrganizationalUnitState extends ResourceState<AdminOrganizatio
]).pipe(
tap(success => {
if (success) {
- ctx.dispatch(new AdminOrgUnitAction.LoadResourceSuccess(action));
+ ctx.dispatch(new AdminOrganizationalUnitAction.LoadResourceSuccess(action));
} else {
- ctx.dispatch(new AdminOrgUnitAction.LoadResourceFail(action));
+ ctx.dispatch(new AdminOrganizationalUnitAction.LoadResourceFail(action));
}
}));
}
@OverrideDefaultAction()
- @Action(AdminOrgUnitAction.Create)
- create(ctx: StateContext<AdminOrganizationalUnitStateModel>, action: AdminOrgUnitAction.Create): Observable<OrganizationalUnit> {
+ @Action(AdminOrganizationalUnitAction.Create)
+ create(ctx: StateContext<AdminOrganizationalUnitStateModel>, action: AdminOrganizationalUnitAction.Create): Observable<OrganizationalUnit> {
return super.internalCreate(ctx, action)
.pipe(
tap(model => {
this.updateSubResource(model, action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new AdminOrgUnitAction.CreateSuccess(action, model));
+ ctx.dispatch(new AdminOrganizationalUnitAction.CreateSuccess(action, model));
} else {
- ctx.dispatch(new AdminOrgUnitAction.CreateFail(action));
+ ctx.dispatch(new AdminOrganizationalUnitAction.CreateFail(action));
}
});
}),
@@ -229,24 +229,24 @@ export class AdminOrganizationalUnitState extends ResourceState<AdminOrganizatio
}
@OverrideDefaultAction()
- @Action(AdminOrgUnitAction.Update)
- update(ctx: StateContext<AdminOrganizationalUnitStateModel>, action: AdminOrgUnitAction.Update): Observable<OrganizationalUnit> {
+ @Action(AdminOrganizationalUnitAction.Update)
+ update(ctx: StateContext<AdminOrganizationalUnitStateModel>, action: AdminOrganizationalUnitAction.Update): Observable<OrganizationalUnit> {
return super.internalUpdate(ctx, action)
.pipe(
tap(model => {
this.updateSubResource(model, action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new AdminOrgUnitAction.UpdateSuccess(action, model));
+ ctx.dispatch(new AdminOrganizationalUnitAction.UpdateSuccess(action, model));
} else {
- ctx.dispatch(new AdminOrgUnitAction.UpdateFail(action));
+ ctx.dispatch(new AdminOrganizationalUnitAction.UpdateFail(action));
}
});
}),
);
}
- private updateSubResource(model: OrganizationalUnit, action: AdminOrgUnitAction.Create | AdminOrgUnitAction.Update, ctx: StateContext<AdminOrganizationalUnitStateModel>): Observable<boolean> {
+ private updateSubResource(model: OrganizationalUnit, action: AdminOrganizationalUnitAction.Create | AdminOrganizationalUnitAction.Update, ctx: StateContext<AdminOrganizationalUnitStateModel>): Observable<boolean> {
const orgUnitId = model.resId;
let oldDefaultPreservationPolicyId = undefined;
@@ -279,45 +279,45 @@ export class AdminOrganizationalUnitState extends ResourceState<AdminOrganizatio
return StoreUtil.dispatchSequentialActionAndWaitForSubActionsCompletion(ctx, [
{
- action: new AdminOrgUnitPreservationPolicyAction.Update(orgUnitId, newPreservationPoliciesIds, oldDefaultPreservationPolicyId, newDefaultPreservationPolicyId),
+ action: new AdminOrganizationalUnitPreservationPolicyAction.Update(orgUnitId, newPreservationPoliciesIds, oldDefaultPreservationPolicyId, newDefaultPreservationPolicyId),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitPreservationPolicyAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitPreservationPolicyAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitPreservationPolicyAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitPreservationPolicyAction.UpdateFail)),
],
},
{
- action: new AdminOrgUnitSubmissionPolicyAction.Update(orgUnitId, newSubmissionPoliciesIds, oldDefaultSubmissionPolicyId, newDefaultSubmissionPolicyId),
+ action: new AdminOrganizationalUnitSubmissionPolicyAction.Update(orgUnitId, newSubmissionPoliciesIds, oldDefaultSubmissionPolicyId, newDefaultSubmissionPolicyId),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitSubmissionPolicyAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitSubmissionPolicyAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitSubmissionPolicyAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitSubmissionPolicyAction.UpdateFail)),
],
},
{
- action: new AdminOrgUnitDisseminationPolicyAction.Update(orgUnitId, newDisseminationPoliciesIds, oldDefaultDisseminationPolicyId, newDefaultDisseminationPolicyId),
+ action: new AdminOrganizationalUnitDisseminationPolicyAction.Update(orgUnitId, newDisseminationPoliciesIds, oldDefaultDisseminationPolicyId, newDefaultDisseminationPolicyId),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitDisseminationPolicyAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitDisseminationPolicyAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitDisseminationPolicyAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitDisseminationPolicyAction.UpdateFail)),
],
},
{
- action: new AdminOrgUnitPersonRoleAction.Update(orgUnitId, newPersonRole),
+ action: new AdminOrganizationalUnitPersonRoleAction.Update(orgUnitId, newPersonRole),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitPersonRoleAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitPersonRoleAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitPersonRoleAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitPersonRoleAction.UpdateFail)),
],
},
{
- action: new AdminOrgUnitFundingAgencyAction.Update(orgUnitId, newFundingAgencyIds),
+ action: new AdminOrganizationalUnitFundingAgencyAction.Update(orgUnitId, newFundingAgencyIds),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitFundingAgencyAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitFundingAgencyAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitFundingAgencyAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitFundingAgencyAction.UpdateFail)),
],
},
{
- action: new AdminOrgUnitInstitutionAction.Update(orgUnitId, newInstitutionsIds),
+ action: new AdminOrganizationalUnitInstitutionAction.Update(orgUnitId, newInstitutionsIds),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitInstitutionAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitInstitutionAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitInstitutionAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitInstitutionAction.UpdateFail)),
],
},
]);
diff --git a/src/app/features/admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action.ts b/src/app/features/admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action.ts
similarity index 93%
rename from src/app/features/admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action.ts
rename to src/app/features/admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action.ts
index aad44bd5dfac56622f0bce78ca23a07537c1119b..9fb40643bde3ff2b2e404b514747e215d17f137f 100644
--- a/src/app/features/admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action.ts
@@ -9,7 +9,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit_disseminationPolicy;
-export namespace AdminOrgUnitDisseminationPolicyAction {
+export namespace AdminOrganizationalUnitDisseminationPolicyAction {
@TypeDefaultAction(state)
export class GetAll extends Relation2TiersAction.GetAll {
@@ -99,4 +99,4 @@ export namespace AdminOrgUnitDisseminationPolicyAction {
}
}
-export const adminOrgUnitDisseminationPolicyActionNameSpace: Relation2TiersNameSpace = AdminOrgUnitDisseminationPolicyAction;
+export const adminOrganizationalUnitDisseminationPolicyActionNameSpace: Relation2TiersNameSpace = AdminOrganizationalUnitDisseminationPolicyAction;
diff --git a/src/app/features/admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state.ts b/src/app/features/admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state.ts
similarity index 65%
rename from src/app/features/admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state.ts
rename to src/app/features/admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state.ts
index 988d10014ba04761ae6af5e6a8806dbdf0156616..87e9b816d943ed8af38827be6165ab665293247b 100644
--- a/src/app/features/admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.state.ts
@@ -1,8 +1,8 @@
import {OrganizationalUnitDisseminationPolicy} from "@admin/models/organizational-unit-dissemination-policy.model";
import {
- AdminOrgUnitDisseminationPolicyAction,
- adminOrgUnitDisseminationPolicyActionNameSpace,
-} from "@admin/orgunit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action";
+ AdminOrganizationalUnitDisseminationPolicyAction,
+ adminOrganizationalUnitDisseminationPolicyActionNameSpace,
+} from "@admin/organizational-unit/stores/dissemination-policy/admin-organizational-unit-dissemination-policy.action";
import {Injectable} from "@angular/core";
import {DisseminationPolicy} from "@models";
@@ -53,7 +53,7 @@ export class AdminOrganizationalUnitDisseminationPolicyState extends Relation2Ti
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitDisseminationPolicyActionNameSpace,
+ nameSpace: adminOrganizationalUnitDisseminationPolicyActionNameSpace,
resourceName: ApiResourceNameEnum.DISSEMINATION_POLICY,
});
}
@@ -63,28 +63,28 @@ export class AdminOrganizationalUnitDisseminationPolicyState extends Relation2Ti
}
@OverrideDefaultAction()
- @Action(AdminOrgUnitDisseminationPolicyAction.Update)
- update(ctx: StateContext<AdminOrganizationalUnitDisseminationPolicyStateModel>, action: AdminOrgUnitDisseminationPolicyAction.Update): Observable<boolean> {
+ @Action(AdminOrganizationalUnitDisseminationPolicyAction.Update)
+ update(ctx: StateContext<AdminOrganizationalUnitDisseminationPolicyStateModel>, action: AdminOrganizationalUnitDisseminationPolicyAction.Update): Observable<boolean> {
return super.internalUpdate(ctx, action)
.pipe(
tap((isSuccess: boolean) => {
if (!isSuccess) {
- ctx.dispatch(new AdminOrgUnitDisseminationPolicyAction.UpdateFail(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitDisseminationPolicyAction.UpdateFail(action, action.parentId));
return;
}
this.updateSubResource(action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new AdminOrgUnitDisseminationPolicyAction.UpdateSuccess(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitDisseminationPolicyAction.UpdateSuccess(action, action.parentId));
} else {
- ctx.dispatch(new AdminOrgUnitDisseminationPolicyAction.UpdateFail(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitDisseminationPolicyAction.UpdateFail(action, action.parentId));
}
});
}),
);
}
- private updateSubResource(action: AdminOrgUnitDisseminationPolicyAction.Update, ctx: StateContext<AdminOrganizationalUnitDisseminationPolicyStateModel>): Observable<boolean> {
+ private updateSubResource(action: AdminOrganizationalUnitDisseminationPolicyAction.Update, ctx: StateContext<AdminOrganizationalUnitDisseminationPolicyStateModel>): Observable<boolean> {
const orgUnitId = action.parentId;
const listActionSubActionCompletionsWrapper: ActionSubActionCompletionsWrapper[] = [];
@@ -92,14 +92,14 @@ export class AdminOrganizationalUnitDisseminationPolicyState extends Relation2Ti
if (action.oldDefaultResId !== action.newDefaultResId) {
if (isNotNullNorUndefined(action.oldDefaultResId) && action.newResId.includes(action.oldDefaultResId)) {
listActionSubActionCompletionsWrapper.push({
- action: new AdminOrgUnitDisseminationPolicyAction.UpdateRelation(orgUnitId, action.oldDefaultResId, {defaultPolicy: false} as OrganizationalUnitDisseminationPolicy),
+ action: new AdminOrganizationalUnitDisseminationPolicyAction.UpdateRelation(orgUnitId, action.oldDefaultResId, {defaultPolicy: false} as OrganizationalUnitDisseminationPolicy),
subActionCompletions: this.getSubActionCompletions(),
});
}
if (isNotNullNorUndefined(action.newDefaultResId)) {
listActionSubActionCompletionsWrapper.push({
- action: new AdminOrgUnitDisseminationPolicyAction.UpdateRelation(orgUnitId, action.newDefaultResId, {defaultPolicy: true} as OrganizationalUnitDisseminationPolicy),
+ action: new AdminOrganizationalUnitDisseminationPolicyAction.UpdateRelation(orgUnitId, action.newDefaultResId, {defaultPolicy: true} as OrganizationalUnitDisseminationPolicy),
subActionCompletions: this.getSubActionCompletions(),
});
}
@@ -110,10 +110,10 @@ export class AdminOrganizationalUnitDisseminationPolicyState extends Relation2Ti
return StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, listActionSubActionCompletionsWrapper);
}
- private getSubActionCompletions(): Observable<ActionCompletion<BaseSubAction<AdminOrgUnitDisseminationPolicyAction.UpdateRelation>, Error>>[] | undefined {
+ private getSubActionCompletions(): Observable<ActionCompletion<BaseSubAction<AdminOrganizationalUnitDisseminationPolicyAction.UpdateRelation>, Error>>[] | undefined {
return [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitDisseminationPolicyAction.UpdateRelationSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitDisseminationPolicyAction.UpdateRelationFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitDisseminationPolicyAction.UpdateRelationSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitDisseminationPolicyAction.UpdateRelationFail)),
];
}
}
diff --git a/src/app/features/admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.action.ts b/src/app/features/admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.action.ts
similarity index 91%
rename from src/app/features/admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.action.ts
rename to src/app/features/admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.action.ts
index 4d9c19a5f454d2071d6bd5340c4cad498e740b18..a8742f4705d5d3dd76fa3328762560be8cfa5052 100644
--- a/src/app/features/admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.action.ts
@@ -8,7 +8,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit_fundingAgency;
-export namespace AdminOrgUnitFundingAgencyAction {
+export namespace AdminOrganizationalUnitFundingAgencyAction {
@TypeDefaultAction(state)
export class GetAll extends AssociationAction.GetAll {
@@ -83,4 +83,4 @@ export namespace AdminOrgUnitFundingAgencyAction {
}
}
-export const adminOrgUnitFundingAgencyNamespace: AssociationNameSpace = AdminOrgUnitFundingAgencyAction;
+export const adminOrganizationalUnitFundingAgencyNamespace: AssociationNameSpace = AdminOrganizationalUnitFundingAgencyAction;
diff --git a/src/app/features/admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state.ts b/src/app/features/admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state.ts
similarity index 86%
rename from src/app/features/admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state.ts
rename to src/app/features/admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state.ts
index e42ba2d742bb2e94392d1d361be8be448d8ccdc3..471603e01ed1b638f2a8938941571f83a2de0e66 100644
--- a/src/app/features/admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.state.ts
@@ -1,4 +1,4 @@
-import {adminOrgUnitFundingAgencyNamespace} from "@admin/orgunit/stores/funding-agency/admin-organizational-unit-funding-agency.action";
+import {adminOrganizationalUnitFundingAgencyNamespace} from "@admin/organizational-unit/stores/funding-agency/admin-organizational-unit-funding-agency.action";
import {Injectable} from "@angular/core";
import {FundingAgency} from "@models";
import {
@@ -33,7 +33,7 @@ export class AdminOrganizationalUnitFundingAgencyState extends AssociationState<
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitFundingAgencyNamespace,
+ nameSpace: adminOrganizationalUnitFundingAgencyNamespace,
resourceName: ApiResourceNameEnum.FUNDING_AGENCY,
});
}
diff --git a/src/app/features/admin/orgunit/stores/institution/admin-organizational-unit-institution.action.ts b/src/app/features/admin/organizational-unit/stores/institution/admin-organizational-unit-institution.action.ts
similarity index 91%
rename from src/app/features/admin/orgunit/stores/institution/admin-organizational-unit-institution.action.ts
rename to src/app/features/admin/organizational-unit/stores/institution/admin-organizational-unit-institution.action.ts
index 2283ef6c1f292732019c5f7e6db6189c3237e2b9..c6fe8e9a4eb4480d0d25d8602815546022d17e8d 100644
--- a/src/app/features/admin/orgunit/stores/institution/admin-organizational-unit-institution.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/institution/admin-organizational-unit-institution.action.ts
@@ -8,7 +8,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit_institution;
-export namespace AdminOrgUnitInstitutionAction {
+export namespace AdminOrganizationalUnitInstitutionAction {
@TypeDefaultAction(state)
export class GetAll extends AssociationAction.GetAll {
@@ -83,4 +83,4 @@ export namespace AdminOrgUnitInstitutionAction {
}
}
-export const adminOrgUnitInstitutionNamespace: AssociationNameSpace = AdminOrgUnitInstitutionAction;
+export const adminOrganizationalUnitInstitutionNamespace: AssociationNameSpace = AdminOrganizationalUnitInstitutionAction;
diff --git a/src/app/features/admin/orgunit/stores/institution/admin-organizational-unit-institution.state.ts b/src/app/features/admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state.ts
similarity index 86%
rename from src/app/features/admin/orgunit/stores/institution/admin-organizational-unit-institution.state.ts
rename to src/app/features/admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state.ts
index 4820861ef93bf271405e041f674dea79a8c07c9f..cc0a42bd44ebc955cfff40d517a41992e0b29ed4 100644
--- a/src/app/features/admin/orgunit/stores/institution/admin-organizational-unit-institution.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/institution/admin-organizational-unit-institution.state.ts
@@ -1,4 +1,4 @@
-import {adminOrgUnitInstitutionNamespace} from "@admin/orgunit/stores/institution/admin-organizational-unit-institution.action";
+import {adminOrganizationalUnitInstitutionNamespace} from "@admin/organizational-unit/stores/institution/admin-organizational-unit-institution.action";
import {Injectable} from "@angular/core";
import {Institution} from "@models";
import {
@@ -33,7 +33,7 @@ export class AdminOrganizationalUnitInstitutionState extends AssociationState<Ad
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitInstitutionNamespace,
+ nameSpace: adminOrganizationalUnitInstitutionNamespace,
resourceName: ApiResourceNameEnum.INSTITUTION,
});
}
diff --git a/src/app/features/admin/orgunit/stores/person-role/admin-organizational-unit-person-role.action.ts b/src/app/features/admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.action.ts
similarity index 94%
rename from src/app/features/admin/orgunit/stores/person-role/admin-organizational-unit-person-role.action.ts
rename to src/app/features/admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.action.ts
index 92b2f35a608677e80deb9a3ea7ece1416bc5c873..5a2d522f8809b48df764810b455c8d9515232fef 100644
--- a/src/app/features/admin/orgunit/stores/person-role/admin-organizational-unit-person-role.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.action.ts
@@ -8,7 +8,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit_personRole;
-export namespace AdminOrgUnitPersonRoleAction {
+export namespace AdminOrganizationalUnitPersonRoleAction {
@TypeDefaultAction(state)
export class GetAll extends Relation3TiersAction.GetAll {
@@ -107,4 +107,4 @@ export namespace AdminOrgUnitPersonRoleAction {
}
}
-export const adminOrgUnitPersonRoleActionNameSpace: Relation3TiersNameSpace = AdminOrgUnitPersonRoleAction;
+export const adminOrganizationalUnitPersonRoleActionNameSpace: Relation3TiersNameSpace = AdminOrganizationalUnitPersonRoleAction;
diff --git a/src/app/features/admin/orgunit/stores/person-role/admin-organizational-unit-person-role.state.ts b/src/app/features/admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.state.ts
similarity index 88%
rename from src/app/features/admin/orgunit/stores/person-role/admin-organizational-unit-person-role.state.ts
rename to src/app/features/admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.state.ts
index c47890ff60f36d8b1a2d61edc857a5e50e6db055..92166a9390040928d605aaab107468c066d1b1cd 100644
--- a/src/app/features/admin/orgunit/stores/person-role/admin-organizational-unit-person-role.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.state.ts
@@ -1,6 +1,6 @@
import {OrganizationalUnitPersonRole} from "@admin/models/organizational-unit-person-role.model";
import {PersonRole} from "@admin/models/person-role.model";
-import {adminOrgUnitPersonRoleActionNameSpace} from "@admin/orgunit/stores/person-role/admin-organizational-unit-person-role.action";
+import {adminOrganizationalUnitPersonRoleActionNameSpace} from "@admin/organizational-unit/stores/person-role/admin-organizational-unit-person-role.action";
import {Injectable} from "@angular/core";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
import {AdminResourceApiEnum} from "@app/shared/enums/api.enum";
@@ -37,7 +37,7 @@ export class AdminOrganizationalUnitPersonRoleState extends Relation3TiersState<
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitPersonRoleActionNameSpace,
+ nameSpace: adminOrganizationalUnitPersonRoleActionNameSpace,
resourceName: ApiResourceNameEnum.PERSON,
});
}
diff --git a/src/app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action.ts b/src/app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action.ts
similarity index 93%
rename from src/app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action.ts
rename to src/app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action.ts
index 41e1a13c46b45ea6fe0828805de37b7e11bd3db5..93bb41547cabc1f9974eae83431e3b5f84df8f4d 100644
--- a/src/app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action.ts
@@ -9,7 +9,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit_preservationPolicy;
-export namespace AdminOrgUnitPreservationPolicyAction {
+export namespace AdminOrganizationalUnitPreservationPolicyAction {
@TypeDefaultAction(state)
export class GetAll extends Relation2TiersAction.GetAll {
@@ -99,4 +99,4 @@ export namespace AdminOrgUnitPreservationPolicyAction {
}
}
-export const adminOrgUnitPreservationPolicyActionNameSpace: Relation2TiersNameSpace = AdminOrgUnitPreservationPolicyAction;
+export const adminOrganizationalUnitPreservationPolicyActionNameSpace: Relation2TiersNameSpace = AdminOrganizationalUnitPreservationPolicyAction;
diff --git a/src/app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state.ts b/src/app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state.ts
similarity index 65%
rename from src/app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state.ts
rename to src/app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state.ts
index 72caab25d8820d6924d54a872228a20efe45f68f..56dc053f23b09032bd5e85054b9eca11cdba6968 100644
--- a/src/app/features/admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.state.ts
@@ -1,8 +1,8 @@
import {OrganizationalUnitPreservationPolicy} from "@admin/models/organizational-unit-preservation-policy.model";
import {
- AdminOrgUnitPreservationPolicyAction,
- adminOrgUnitPreservationPolicyActionNameSpace,
-} from "@admin/orgunit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action";
+ AdminOrganizationalUnitPreservationPolicyAction,
+ adminOrganizationalUnitPreservationPolicyActionNameSpace,
+} from "@admin/organizational-unit/stores/preservation-policy/admin-organizational-unit-preservation-policy.action";
import {Injectable} from "@angular/core";
import {PreservationPolicy} from "@models";
@@ -53,7 +53,7 @@ export class AdminOrganizationalUnitPreservationPolicyState extends Relation2Tie
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitPreservationPolicyActionNameSpace,
+ nameSpace: adminOrganizationalUnitPreservationPolicyActionNameSpace,
resourceName: ApiResourceNameEnum.PRES_POLICY,
});
}
@@ -63,28 +63,28 @@ export class AdminOrganizationalUnitPreservationPolicyState extends Relation2Tie
}
@OverrideDefaultAction()
- @Action(AdminOrgUnitPreservationPolicyAction.Update)
- update(ctx: StateContext<AdminOrganizationalUnitPreservationPolicyStateModel>, action: AdminOrgUnitPreservationPolicyAction.Update): Observable<boolean> {
+ @Action(AdminOrganizationalUnitPreservationPolicyAction.Update)
+ update(ctx: StateContext<AdminOrganizationalUnitPreservationPolicyStateModel>, action: AdminOrganizationalUnitPreservationPolicyAction.Update): Observable<boolean> {
return super.internalUpdate(ctx, action)
.pipe(
tap((isSuccess: boolean) => {
if (!isSuccess) {
- ctx.dispatch(new AdminOrgUnitPreservationPolicyAction.UpdateFail(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitPreservationPolicyAction.UpdateFail(action, action.parentId));
return;
}
this.updateSubResource(action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new AdminOrgUnitPreservationPolicyAction.UpdateSuccess(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitPreservationPolicyAction.UpdateSuccess(action, action.parentId));
} else {
- ctx.dispatch(new AdminOrgUnitPreservationPolicyAction.UpdateFail(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitPreservationPolicyAction.UpdateFail(action, action.parentId));
}
});
}),
);
}
- private updateSubResource(action: AdminOrgUnitPreservationPolicyAction.Update, ctx: StateContext<AdminOrganizationalUnitPreservationPolicyStateModel>): Observable<boolean> {
+ private updateSubResource(action: AdminOrganizationalUnitPreservationPolicyAction.Update, ctx: StateContext<AdminOrganizationalUnitPreservationPolicyStateModel>): Observable<boolean> {
const orgUnitId = action.parentId;
const listActionSubActionCompletionsWrapper: ActionSubActionCompletionsWrapper[] = [];
@@ -92,14 +92,14 @@ export class AdminOrganizationalUnitPreservationPolicyState extends Relation2Tie
if (action.oldDefaultResId !== action.newDefaultResId) {
if (isNotNullNorUndefined(action.oldDefaultResId) && action.newResId.includes(action.oldDefaultResId)) {
listActionSubActionCompletionsWrapper.push({
- action: new AdminOrgUnitPreservationPolicyAction.UpdateRelation(orgUnitId, action.oldDefaultResId, {defaultPolicy: false} as OrganizationalUnitPreservationPolicy),
+ action: new AdminOrganizationalUnitPreservationPolicyAction.UpdateRelation(orgUnitId, action.oldDefaultResId, {defaultPolicy: false} as OrganizationalUnitPreservationPolicy),
subActionCompletions: this.getSubActionCompletions(),
});
}
if (isNotNullNorUndefined(action.newDefaultResId)) {
listActionSubActionCompletionsWrapper.push({
- action: new AdminOrgUnitPreservationPolicyAction.UpdateRelation(orgUnitId, action.newDefaultResId, {defaultPolicy: true} as OrganizationalUnitPreservationPolicy),
+ action: new AdminOrganizationalUnitPreservationPolicyAction.UpdateRelation(orgUnitId, action.newDefaultResId, {defaultPolicy: true} as OrganizationalUnitPreservationPolicy),
subActionCompletions: this.getSubActionCompletions(),
});
}
@@ -110,10 +110,10 @@ export class AdminOrganizationalUnitPreservationPolicyState extends Relation2Tie
return StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, listActionSubActionCompletionsWrapper);
}
- private getSubActionCompletions(): Observable<ActionCompletion<BaseSubAction<AdminOrgUnitPreservationPolicyAction.UpdateRelation>, Error>>[] | undefined {
+ private getSubActionCompletions(): Observable<ActionCompletion<BaseSubAction<AdminOrganizationalUnitPreservationPolicyAction.UpdateRelation>, Error>>[] | undefined {
return [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitPreservationPolicyAction.UpdateRelationSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitPreservationPolicyAction.UpdateRelationFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitPreservationPolicyAction.UpdateRelationSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitPreservationPolicyAction.UpdateRelationFail)),
];
}
}
diff --git a/src/app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.action.ts b/src/app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.action.ts
similarity index 93%
rename from src/app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.action.ts
rename to src/app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.action.ts
index aec5c1a65181c7b0e312494730ddd1c8146eec8f..44fa8b747eeda801987c7b37feeefdd75bae1ade 100644
--- a/src/app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.action.ts
+++ b/src/app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.action.ts
@@ -9,7 +9,7 @@ import {
const state = LocalStateEnum.admin_organizationalUnit_submissionPolicy;
-export namespace AdminOrgUnitSubmissionPolicyAction {
+export namespace AdminOrganizationalUnitSubmissionPolicyAction {
@TypeDefaultAction(state)
export class GetAll extends Relation2TiersAction.GetAll {
@@ -99,4 +99,4 @@ export namespace AdminOrgUnitSubmissionPolicyAction {
}
}
-export const adminOrgUnitSubmissionPolicyActionNameSpace: Relation2TiersNameSpace = AdminOrgUnitSubmissionPolicyAction;
+export const adminOrganizationalUnitSubmissionPolicyActionNameSpace: Relation2TiersNameSpace = AdminOrganizationalUnitSubmissionPolicyAction;
diff --git a/src/app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.state.ts b/src/app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.state.ts
similarity index 65%
rename from src/app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.state.ts
rename to src/app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.state.ts
index 096351cfd66c0d4b1c8da6e1c186c8500fb45e37..bcfa6fdafed4b86fb939212a521d72f17527dfc6 100644
--- a/src/app/features/admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.state.ts
+++ b/src/app/features/admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.state.ts
@@ -1,8 +1,8 @@
import {OrganizationalUnitSubmissionPolicy} from "@admin/models/organizational-unit-submission-policy.model";
import {
- AdminOrgUnitSubmissionPolicyAction,
- adminOrgUnitSubmissionPolicyActionNameSpace,
-} from "@admin/orgunit/stores/submission-policy/admin-organizational-unit-submission-policy.action";
+ AdminOrganizationalUnitSubmissionPolicyAction,
+ adminOrganizationalUnitSubmissionPolicyActionNameSpace,
+} from "@admin/organizational-unit/stores/submission-policy/admin-organizational-unit-submission-policy.action";
import {Injectable} from "@angular/core";
import {SubmissionPolicy} from "@models";
@@ -53,7 +53,7 @@ export class AdminOrganizationalUnitSubmissionPolicyState extends Relation2Tiers
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: adminOrgUnitSubmissionPolicyActionNameSpace,
+ nameSpace: adminOrganizationalUnitSubmissionPolicyActionNameSpace,
resourceName: ApiResourceNameEnum.SUB_POLICY,
});
}
@@ -63,28 +63,28 @@ export class AdminOrganizationalUnitSubmissionPolicyState extends Relation2Tiers
}
@OverrideDefaultAction()
- @Action(AdminOrgUnitSubmissionPolicyAction.Update)
- update(ctx: StateContext<AdminOrganizationalUnitSubmissionPolicyStateModel>, action: AdminOrgUnitSubmissionPolicyAction.Update): Observable<boolean> {
+ @Action(AdminOrganizationalUnitSubmissionPolicyAction.Update)
+ update(ctx: StateContext<AdminOrganizationalUnitSubmissionPolicyStateModel>, action: AdminOrganizationalUnitSubmissionPolicyAction.Update): Observable<boolean> {
return super.internalUpdate(ctx, action)
.pipe(
tap((isSuccess: boolean) => {
if (!isSuccess) {
- ctx.dispatch(new AdminOrgUnitSubmissionPolicyAction.UpdateFail(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitSubmissionPolicyAction.UpdateFail(action, action.parentId));
return;
}
this.updateSubResource(action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new AdminOrgUnitSubmissionPolicyAction.UpdateSuccess(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitSubmissionPolicyAction.UpdateSuccess(action, action.parentId));
} else {
- ctx.dispatch(new AdminOrgUnitSubmissionPolicyAction.UpdateFail(action, action.parentId));
+ ctx.dispatch(new AdminOrganizationalUnitSubmissionPolicyAction.UpdateFail(action, action.parentId));
}
});
}),
);
}
- private updateSubResource(action: AdminOrgUnitSubmissionPolicyAction.Update, ctx: StateContext<AdminOrganizationalUnitSubmissionPolicyStateModel>): Observable<boolean> {
+ private updateSubResource(action: AdminOrganizationalUnitSubmissionPolicyAction.Update, ctx: StateContext<AdminOrganizationalUnitSubmissionPolicyStateModel>): Observable<boolean> {
const orgUnitId = action.parentId;
const listActionSubActionCompletionsWrapper: ActionSubActionCompletionsWrapper[] = [];
@@ -92,14 +92,14 @@ export class AdminOrganizationalUnitSubmissionPolicyState extends Relation2Tiers
if (action.oldDefaultResId !== action.newDefaultResId) {
if (isNotNullNorUndefined(action.oldDefaultResId) && action.newResId.includes(action.oldDefaultResId)) {
listActionSubActionCompletionsWrapper.push({
- action: new AdminOrgUnitSubmissionPolicyAction.UpdateRelation(orgUnitId, action.oldDefaultResId, {defaultPolicy: false} as OrganizationalUnitSubmissionPolicy),
+ action: new AdminOrganizationalUnitSubmissionPolicyAction.UpdateRelation(orgUnitId, action.oldDefaultResId, {defaultPolicy: false} as OrganizationalUnitSubmissionPolicy),
subActionCompletions: this.getSubActionCompletions(),
});
}
if (isNotNullNorUndefined(action.newDefaultResId)) {
listActionSubActionCompletionsWrapper.push({
- action: new AdminOrgUnitSubmissionPolicyAction.UpdateRelation(orgUnitId, action.newDefaultResId, {defaultPolicy: true} as OrganizationalUnitSubmissionPolicy),
+ action: new AdminOrganizationalUnitSubmissionPolicyAction.UpdateRelation(orgUnitId, action.newDefaultResId, {defaultPolicy: true} as OrganizationalUnitSubmissionPolicy),
subActionCompletions: this.getSubActionCompletions(),
});
}
@@ -110,10 +110,10 @@ export class AdminOrganizationalUnitSubmissionPolicyState extends Relation2Tiers
return StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, listActionSubActionCompletionsWrapper);
}
- private getSubActionCompletions(): Observable<ActionCompletion<BaseSubAction<AdminOrgUnitSubmissionPolicyAction.UpdateRelation>, Error>>[] | undefined {
+ private getSubActionCompletions(): Observable<ActionCompletion<BaseSubAction<AdminOrganizationalUnitSubmissionPolicyAction.UpdateRelation>, Error>>[] | undefined {
return [
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitSubmissionPolicyAction.UpdateRelationSuccess)),
- this.actions$.pipe(ofActionCompleted(AdminOrgUnitSubmissionPolicyAction.UpdateRelationFail)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitSubmissionPolicyAction.UpdateRelationSuccess)),
+ this.actions$.pipe(ofActionCompleted(AdminOrganizationalUnitSubmissionPolicyAction.UpdateRelationFail)),
];
}
}
diff --git a/src/app/features/admin/orgunit/admin-orgunit.module.ts b/src/app/features/admin/orgunit/admin-orgunit.module.ts
deleted file mode 100644
index 0edc60c2f7273991c7117a1c05c6f296cd551924..0000000000000000000000000000000000000000
--- a/src/app/features/admin/orgunit/admin-orgunit.module.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import {AdminOrgunitRoutingModule} from "@admin/orgunit/admin-orgunit-routing.module";
-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 {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";
-import {SharedModule} from "@app/shared/shared.module";
-import {TranslateModule} from "@ngx-translate/core";
-import {NgxsModule} from "@ngxs/store";
-
-const routables = [
- AdminOrgunitCreateRoutable,
- AdminOrgunitDetailEditRoutable,
- AdminOrgunitListRoutable,
-];
-const containers = [];
-const dialogs = [
- AdminOrgunitDeleteDialog,
-];
-const presentationals = [
- AdminOrgunitFormPresentational,
-];
-
-@NgModule({
- declarations: [
- ...routables,
- ...containers,
- ...dialogs,
- ...presentationals,
- ],
- imports: [
- SharedModule,
- AdminOrgunitRoutingModule,
- TranslateModule.forChild({}),
- NgxsModule.forFeature([
- AdminOrganizationalUnitState,
- ]),
- ],
- entryComponents: [
- ...dialogs,
- ],
- exports: [
- ...routables,
- ],
- providers: [],
-})
-export class AdminOrgunitModule {
-}
diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.html b/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.html
deleted file mode 100644
index 0cb4e4ca6de19e415f152ea34cf467356ca69e19..0000000000000000000000000000000000000000
--- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-create/admin-orgunit-create.routable.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<lib-empty-container
- solidifyShortCuts
- (onEscape)="backToList()"
->
- <dlcm-shared-button-toolbar-detail [mode]="'create'"
- [formPresentational]="formPresentational"
- (backToListChange)="backToList()"
- >
- </dlcm-shared-button-toolbar-detail>
-
- <div class="wrapper"
- [dlcmSpinner]="isLoadingWithDependencyObs | async"
- >
- <dlcm-admin-orgunit-form #formPresentational
- [solidifyFocusFirstElement]="true"
- *ngIf="isReadyToBeDisplayedInCreateModeObs | async"
- [listSubmissionPolicies]="listSubmissionPoliciesObs | async"
- [listPreservationPolicies]="listPreservationPoliciesObs | async"
- [listDisseminationPolicies]="listDisseminationPoliciesObs | async"
- [listRole]="listRoleObs | async"
- (submitChange)="create($event)"
- [selectedFundingAgencies]="selectedFundingAgenciesObs | async"
- [selectedInstitutions]="selectedInstitutionsObs | async"
- [selectedPersonRole]="selectedPersonRole"
- [researchDomainSources]="researchDomainSourcesObs | async"
- [defaultPlatformLicenseId]="(systemPropertyObs | async)?.defaultLicense"
- [urlQueryParameters]="urlQueryParameters"
- (checkAvailableChange)="checkAvailable($event)"
- (dirtyChange)="updateCanDeactivate($event)"
- (navigate)="navigate($event)"
- >
- </dlcm-admin-orgunit-form>
- </div>
-</lib-empty-container>
diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.html b/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.html
deleted file mode 100644
index a8eb9a5f8788ffb8cdb4e28165f7a1d93e52dd02..0000000000000000000000000000000000000000
--- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail-edit/admin-orgunit-detail-edit.routable.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<lib-empty-container
- cdkTrapFocus
- solidifyShortCuts
- [solidifyFocusFirstElement]="true"
- (onEscape)="backToList()"
->
- <dlcm-shared-banner-edit-mode [isEdit]="isEdit"></dlcm-shared-banner-edit-mode>
-
-
- <dlcm-shared-button-toolbar-detail [mode]="isEdit ? 'edit' : 'detail'"
- [formPresentational]="formPresentational"
- [currentModel]="currentObs | async"
- (editChange)="edit()"
- (deleteChange)="delete()"
- (backToDetailChange)="backToDetail()"
- (backToListChange)="backToList()"
- >
- </dlcm-shared-button-toolbar-detail>
-
- <div class="wrapper"
- [dlcmSpinner]="isLoadingWithDependencyObs | async"
- >
- <dlcm-admin-orgunit-form #formPresentational
- [solidifyFocusFirstElement]="isEdit"
- *ngIf="isReadyToBeDisplayedObs | async"
- [model]="currentObs| async"
- [selectedSubmissionPolicies]="selectedSubmissionPoliciesObs | async"
- [selectedPreservationPolicies]="selectedPreservationPoliciesObs | async"
- [selectedDisseminationPolicies]="selectedDisseminationPoliciesObs | async"
- [selectedPersonRole]="selectedPersonRoleObs | async"
- [selectedFundingAgencies]="selectedFundingAgenciesObs | async"
- [selectedInstitutions]="selectedInstitutionsObs | async"
- [listSubmissionPolicies]="listSubmissionPoliciesObs | async"
- [listPreservationPolicies]="listPreservationPoliciesObs | async"
- [listDisseminationPolicies]="listDisseminationPoliciesObs | async"
- [researchDomainSources]="researchDomainSourcesObs | async"
- [defaultPlatformLicenseId]="(systemPropertyObs | async)?.defaultLicense"
- [listRole]="listRoleObs | async"
- [readonly]="!isEdit"
- [editAvailable]="editAvailable"
- (checkAvailableChange)="checkAvailable($event)"
- (submitChange)="update($event)"
- (dirtyChange)="updateCanDeactivate($event)"
- (navigate)="navigate($event)"
- (editChange)="edit()"
- ></dlcm-admin-orgunit-form>
- </div>
-</lib-empty-container>
diff --git a/src/app/features/admin/stores/admin.state.ts b/src/app/features/admin/stores/admin.state.ts
index fbde00cc0ea0c12eb70e72c5ad2b1f9c1522975e..9ffc73d96469e48f116b1f03f97fff11b574c204 100644
--- a/src/app/features/admin/stores/admin.state.ts
+++ b/src/app/features/admin/stores/admin.state.ts
@@ -37,7 +37,7 @@ import {
import {
AdminOrganizationalUnitState,
AdminOrganizationalUnitStateModel,
-} from "@admin/orgunit/stores/admin-organizational-unit.state";
+} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
import {
AdminPersonState,
AdminPersonStateModel,
diff --git a/src/app/features/home/components/dialogs/archive-restricted-request-access/archive-restricted-request-access.dialog.ts b/src/app/features/home/components/dialogs/archive-restricted-request-access/archive-restricted-request-access.dialog.ts
index db579a92d992a7a6a786c316d6b0f80c06f72b8e..9e04685015baa940ce9e0e4b4f75a2726f1b0246 100644
--- a/src/app/features/home/components/dialogs/archive-restricted-request-access/archive-restricted-request-access.dialog.ts
+++ b/src/app/features/home/components/dialogs/archive-restricted-request-access/archive-restricted-request-access.dialog.ts
@@ -26,7 +26,7 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-preservation-space-orgunit-request-access-dialog",
+ selector: "dlcm-preservation-space-organizational-unit-request-access-dialog",
templateUrl: "./archive-restricted-request-access.dialog.html",
styleUrls: ["./archive-restricted-request-access.dialog.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.html b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.html
similarity index 100%
rename from src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.html
rename to src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.html
diff --git a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.scss b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.scss
similarity index 100%
rename from src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.scss
rename to src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.scss
diff --git a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.ts b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.ts
similarity index 85%
rename from src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.ts
rename to src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.ts
index 042866b8a58a0a44840e68f60def43246ded3488..959d56030e3f92a9c79ee1320d490802c77fb53c 100644
--- a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog.ts
@@ -29,12 +29,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-preservation-space-orgunit-request-access-dialog",
- templateUrl: "./preservation-space-orgunit-request-access.dialog.html",
- styleUrls: ["./preservation-space-orgunit-request-access.dialog.scss"],
+ selector: "dlcm-preservation-space-organizational-unit-request-access-dialog",
+ templateUrl: "./preservation-space-organizational-unit-request-access.dialog.html",
+ styleUrls: ["./preservation-space-organizational-unit-request-access.dialog.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class PreservationSpaceOrgunitRequestAccessDialog extends SharedAbstractContainer implements OnInit {
+export class PreservationSpaceOrganizationalUnitRequestAccessDialog extends SharedAbstractContainer implements OnInit {
isLoadingObs: Observable<boolean> = MemoizedUtil.isLoading(this._store, SharedNotificationState);
listRoleObs: Observable<Role[]> = MemoizedUtil.list(this._store, SharedRoleState);
@@ -43,7 +43,7 @@ export class PreservationSpaceOrgunitRequestAccessDialog extends SharedAbstractC
constructor(private readonly _store: Store,
private readonly _actions$: Actions,
- private readonly _dialogRef: MatDialogRef<PreservationSpaceOrgunitRequestAccessDialog>,
+ private readonly _dialogRef: MatDialogRef<PreservationSpaceOrganizationalUnitRequestAccessDialog>,
private readonly _fb: FormBuilder) {
super();
}
diff --git a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.html b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.html
similarity index 100%
rename from src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.html
rename to src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.html
diff --git a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.scss b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.scss
similarity index 100%
rename from src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.scss
rename to src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.scss
diff --git a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.ts b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.ts
similarity index 83%
rename from src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.ts
rename to src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.ts
index 5a039e3abdb8174dc3d7db73dff9f6764ed00413..4dd545c5e68080414b1c6058b70df4c935bb81c2 100644
--- a/src/app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog.ts
@@ -27,12 +27,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-preservation-space-orgunit-request-creation-dialog",
- templateUrl: "./preservation-space-orgunit-request-creation.dialog.html",
- styleUrls: ["./preservation-space-orgunit-request-creation.dialog.scss"],
+ selector: "dlcm-preservation-space-organizational-unit-request-creation-dialog",
+ templateUrl: "./preservation-space-organizational-unit-request-creation.dialog.html",
+ styleUrls: ["./preservation-space-organizational-unit-request-creation.dialog.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class PreservationSpaceOrgunitRequestCreationDialog extends SharedAbstractContainer implements OnInit {
+export class PreservationSpaceOrganizationalUnitRequestCreationDialog extends SharedAbstractContainer implements OnInit {
isLoadingObs: Observable<boolean> = MemoizedUtil.isLoading(this._store, SharedNotificationState);
form: FormGroup;
@@ -40,7 +40,7 @@ export class PreservationSpaceOrgunitRequestCreationDialog extends SharedAbstrac
constructor(private readonly _store: Store,
private readonly _actions$: Actions,
- private readonly _dialogRef: MatDialogRef<PreservationSpaceOrgunitRequestCreationDialog>,
+ private readonly _dialogRef: MatDialogRef<PreservationSpaceOrganizationalUnitRequestCreationDialog>,
private readonly _fb: FormBuilder) {
super();
}
diff --git a/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/preservation-space-orgunit-form.presentational.html b/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.html
similarity index 100%
rename from src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/preservation-space-orgunit-form.presentational.html
rename to src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.html
diff --git a/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/preservation-space-orgunit-form.presentational.ts b/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.ts
similarity index 96%
rename from src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/preservation-space-orgunit-form.presentational.ts
rename to src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.ts
index 1960ecfd4c7ad4e06d3201103fae1b9fd2d359ff..6ac9b1b66e6f8e02911de86696d5dea3e551a7d4 100644
--- a/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/preservation-space-orgunit-form.presentational.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational.ts
@@ -56,12 +56,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-preservation-space-orgunit-form",
- templateUrl: "./preservation-space-orgunit-form.presentational.html",
+ selector: "dlcm-preservation-space-organizational-unit-form",
+ templateUrl: "./preservation-space-organizational-unit-form.presentational.html",
styleUrls: ["../../../../../../shared/components/presentationals/shared-abstract-form/shared-abstract-form.presentational.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class PreservationSpaceOrgunitFormPresentational extends SharedAbstractFormPresentational<OrganizationalUnit> {
+export class PreservationSpaceOrganizationalUnitFormPresentational extends SharedAbstractFormPresentational<OrganizationalUnit> {
private readonly KEY_SOURCE: keyof ResearchDomain = "source";
readonly TIME_BEFORE_DISPLAY_TOOLTIP: number = environment.timeBeforeDisplayTooltipOnInput;
formDefinition: FormComponentFormDefinition = new FormComponentFormDefinition();
diff --git a/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable.html b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable.html
new file mode 100644
index 0000000000000000000000000000000000000000..de1c63dfb61b055a531c6ca7b162907228214e7c
--- /dev/null
+++ b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable.html
@@ -0,0 +1,42 @@
+<lib-empty-container (keydown.escape)="isEdit ? backToDetail() : backToList()">
+ <dlcm-shared-banner-edit-mode [isEdit]="isEdit"></dlcm-shared-banner-edit-mode>
+
+
+ <dlcm-shared-button-toolbar-detail [mode]="isEdit ? 'edit' : 'detail'"
+ [formPresentational]="formPresentational"
+ [solidifyFocusFirstElement]="true"
+ [currentModel]="currentObs | async"
+ [editAvailable]="currentUserIsManager | async | isTrue"
+ [deleteAvailable]="deleteAvailable"
+ (editChange)="edit()"
+ (backToDetailChange)="backToDetail()"
+ (backToListChange)="backToList()"
+ >
+ </dlcm-shared-button-toolbar-detail>
+
+ <div class="wrapper"
+ [dlcmSpinner]="isLoadingWithDependencyObs | async"
+ >
+ <dlcm-preservation-space-organizational-unit-form #formPresentational
+ *ngIf="isReadyToBeDisplayedObs | async"
+ [model]="currentObs| async"
+ [isManager]="currentUserIsManager | async"
+ [listSubmissionPolicies]="listSubmissionPoliciesObs | async"
+ [listPreservationPolicies]="listPreservationPoliciesObs | async"
+ [listRole]="listRoleObs | async"
+ [selectedPersonRole]="selectedPersonRoleObs | async"
+ [readonly]="!isEdit"
+ [editAvailable]="editAvailable"
+ [researchDomainSources]="researchDomainSourcesObs | async"
+ [urlQueryParameters]="urlQueryParameters"
+ (submitChange)="update($event)"
+ (checkAvailableChange)="checkAvailable($event)"
+ (dirtyChange)="updateCanDeactivate($event)"
+ (navigate)="navigate($event)"
+ (navigateWithQueryParam)="navigateWithQueryParam($event)"
+ (requestToBeMemberChange)="requestToBeMember()"
+ (editChange)="edit()"
+ >
+ </dlcm-preservation-space-organizational-unit-form>
+ </div>
+</lib-empty-container>
diff --git a/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable.ts b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable.ts
similarity index 84%
rename from src/app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable.ts
rename to src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable.ts
index 90d822b9ec7bba5514bf6fc02d86bbdec2258414..e413fc957c1395a3159c29a62b2b2c40ee6b45a9 100644
--- a/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable.ts
@@ -7,12 +7,8 @@ import {
} from "@angular/core";
import {MatDialog} from "@angular/material/dialog";
import {ActivatedRoute} from "@angular/router";
-import {
- OrgunitRequestAccessDialogResult,
- PreservationSpaceOrgunitRequestAccessDialog,
-} from "@app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog";
import {PreservationSpaceOrganizationalUnitPersonRoleState} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state";
-import {preservationSpaceOrgUnitActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
+import {preservationSpaceOrganizationalUnitActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
import {
PreservationSpaceOrganizationalUnitState,
PreservationSpaceOrganizationalUnitStateModel,
@@ -31,6 +27,10 @@ import {
Select,
Store,
} from "@ngxs/store";
+import {
+ OrgunitRequestAccessDialogResult,
+ PreservationSpaceOrganizationalUnitRequestAccessDialog,
+} from "@preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog";
import {SharedAbstractDetailEditCommonRoutable} from "@shared/components/routables/shared-abstract-detail-edit-common/shared-abstract-detail-edit-common.routable";
import {SharedNotificationAction} from "@shared/stores/notification/shared-notification.action";
import {sharedOrgUnitActionNameSpace} from "@shared/stores/organizational-unit/shared-organizational-unit.action";
@@ -49,12 +49,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-preservation-space-orgunit-detail-edit-routable",
- templateUrl: "./preservation-space-orgunit-detail-edit.routable.html",
+ selector: "dlcm-preservation-space-organizational-unit-detail-edit-routable",
+ templateUrl: "./preservation-space-organizational-unit-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 PreservationSpaceOrgunitDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnit, PreservationSpaceOrganizationalUnitStateModel> implements OnInit {
+export class PreservationSpaceOrganizationalUnitDetailEditRoutable extends SharedAbstractDetailEditCommonRoutable<OrganizationalUnit, PreservationSpaceOrganizationalUnitStateModel> implements OnInit {
@Select(PreservationSpaceOrganizationalUnitState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(PreservationSpaceOrganizationalUnitState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
currentUserIsManager: Observable<boolean> = MemoizedUtil.select(this._store, PreservationSpaceOrganizationalUnitState, state => state.currentUserIsManager);
@@ -77,7 +77,7 @@ export class PreservationSpaceOrgunitDetailEditRoutable extends SharedAbstractDe
protected readonly _actions$: Actions,
protected readonly _changeDetector: ChangeDetectorRef,
public _dialog: MatDialog) {
- super(_store, _route, _actions$, _changeDetector, _dialog, LocalStateEnum.preservationSpace_organizationalUnit, preservationSpaceOrgUnitActionNameSpace, LocalStateEnum.preservationSpace);
+ super(_store, _route, _actions$, _changeDetector, _dialog, LocalStateEnum.preservationSpace_organizationalUnit, preservationSpaceOrganizationalUnitActionNameSpace, LocalStateEnum.preservationSpace);
}
ngOnInit(): void {
@@ -89,7 +89,7 @@ export class PreservationSpaceOrgunitDetailEditRoutable extends SharedAbstractDe
}
requestToBeMember(): void {
- this.subscribe(this._dialog.open(PreservationSpaceOrgunitRequestAccessDialog, {
+ this.subscribe(this._dialog.open(PreservationSpaceOrganizationalUnitRequestAccessDialog, {
minWidth: "500px",
}).afterClosed().pipe(
tap((result: OrgunitRequestAccessDialogResult | undefined) => {
diff --git a/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-list/preservation-space-orgunit-list.routable.ts b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts
similarity index 87%
rename from src/app/features/preservation-space/organizational-unit/components/routables/orgunit-list/preservation-space-orgunit-list.routable.ts
rename to src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts
index c7441a20573eece74bd171eca9af8d0989e54574..906ba55f96a9540314ea6ee916c4b9f67b43093e 100644
--- a/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-list/preservation-space-orgunit-list.routable.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable.ts
@@ -5,15 +5,7 @@ import {
} from "@angular/core";
import {MatDialog} from "@angular/material/dialog";
import {ActivatedRoute} from "@angular/router";
-import {
- OrgunitRequestAccessDialogResult,
- PreservationSpaceOrgunitRequestAccessDialog,
-} from "@app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog";
-import {
- OrgunitRequestCreationDialogResult,
- PreservationSpaceOrgunitRequestCreationDialog,
-} from "@app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog";
-import {preservationSpaceOrgUnitActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
+import {preservationSpaceOrganizationalUnitActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
import {PreservationSpaceOrganizationalUnitStateModel} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state";
import {AppUserState} from "@app/stores/user/app-user.state";
import {Enums} from "@enums";
@@ -23,6 +15,14 @@ import {
Actions,
Store,
} from "@ngxs/store";
+import {
+ OrgunitRequestAccessDialogResult,
+ PreservationSpaceOrganizationalUnitRequestAccessDialog,
+} from "@preservation-space/organizational-unit/components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog";
+import {
+ OrgunitRequestCreationDialogResult,
+ PreservationSpaceOrganizationalUnitRequestCreationDialog,
+} from "@preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog";
import {SharedAbstractListRoutable} from "@shared/components/routables/shared-abstract-list/shared-abstract-list.routable";
import {DataTestEnum} from "@shared/enums/data-test.enum";
import {FieldTypeEnum} from "@shared/enums/field-type.enum";
@@ -42,12 +42,12 @@ import {
} from "solidify-frontend";
@Component({
- selector: "dlcm-preservation-space-orgunit-list-routable",
+ selector: "dlcm-preservation-space-organizational-unit-list-routable",
templateUrl: "../../../../../../shared/components/routables/shared-abstract-list/shared-abstract-list.routable.html",
styleUrls: ["../../../../../../shared/components/routables/shared-abstract-list/shared-abstract-list.routable.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class PreservationSpaceOrgunitListRoutable extends SharedAbstractListRoutable<OrganizationalUnit, PreservationSpaceOrganizationalUnitStateModel> {
+export class PreservationSpaceOrganizationalUnitListRoutable extends SharedAbstractListRoutable<OrganizationalUnit, PreservationSpaceOrganizationalUnitStateModel> {
readonly KEY_CREATE_BUTTON: string = MARK_AS_TRANSLATABLE("organizationalUnit.new");
readonly KEY_REFRESH_BUTTON: string = MARK_AS_TRANSLATABLE("organizationalUnit.refresh");
readonly KEY_BACK_BUTTON: string | undefined = undefined;
@@ -60,7 +60,7 @@ export class PreservationSpaceOrgunitListRoutable extends SharedAbstractListRout
protected readonly _actions$: Actions,
protected readonly _dialog: MatDialog,
private readonly _securityService: SecurityService) {
- super(_store, _changeDetector, _route, _routerExt, _actions$, _dialog, LocalStateEnum.preservationSpace_organizationalUnit, preservationSpaceOrgUnitActionNameSpace, {
+ super(_store, _changeDetector, _route, _routerExt, _actions$, _dialog, LocalStateEnum.preservationSpace_organizationalUnit, preservationSpaceOrganizationalUnitActionNameSpace, {
canCreate: false,
canGoBack: false,
listExtraButtons: [
@@ -77,7 +77,7 @@ export class PreservationSpaceOrgunitListRoutable extends SharedAbstractListRout
}
requestCreationOrgUnit(): void {
- this.subscribe(this._dialog.open(PreservationSpaceOrgunitRequestCreationDialog, {
+ this.subscribe(this._dialog.open(PreservationSpaceOrganizationalUnitRequestCreationDialog, {
minWidth: "500px",
}).afterClosed().pipe(
tap((result: OrgunitRequestCreationDialogResult | undefined) => {
@@ -178,7 +178,7 @@ export class PreservationSpaceOrgunitListRoutable extends SharedAbstractListRout
}
requestToBeMember(orgUnitResId: string): void {
- this.subscribe(this._dialog.open(PreservationSpaceOrgunitRequestAccessDialog, {
+ this.subscribe(this._dialog.open(PreservationSpaceOrganizationalUnitRequestAccessDialog, {
minWidth: "500px",
}).afterClosed().pipe(
tap((result: OrgunitRequestAccessDialogResult | undefined) => {
diff --git a/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable.html b/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable.html
deleted file mode 100644
index eae9aafec5a7d621cd61c7311a28c71d4c9aaec5..0000000000000000000000000000000000000000
--- a/src/app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<lib-empty-container (keydown.escape)="isEdit ? backToDetail() : backToList()">
- <dlcm-shared-banner-edit-mode [isEdit]="isEdit"></dlcm-shared-banner-edit-mode>
-
-
- <dlcm-shared-button-toolbar-detail [mode]="isEdit ? 'edit' : 'detail'"
- [formPresentational]="formPresentational"
- [solidifyFocusFirstElement]="true"
- [currentModel]="currentObs | async"
- [editAvailable]="currentUserIsManager | async | isTrue"
- [deleteAvailable]="deleteAvailable"
- (editChange)="edit()"
- (backToDetailChange)="backToDetail()"
- (backToListChange)="backToList()"
- >
- </dlcm-shared-button-toolbar-detail>
-
- <div class="wrapper"
- [dlcmSpinner]="isLoadingWithDependencyObs | async"
- >
- <dlcm-preservation-space-orgunit-form #formPresentational
- *ngIf="isReadyToBeDisplayedObs | async"
- [model]="currentObs| async"
- [isManager]="currentUserIsManager | async"
- [listSubmissionPolicies]="listSubmissionPoliciesObs | async"
- [listPreservationPolicies]="listPreservationPoliciesObs | async"
- [listRole]="listRoleObs | async"
- [selectedPersonRole]="selectedPersonRoleObs | async"
- [readonly]="!isEdit"
- [editAvailable]="editAvailable"
- [researchDomainSources]="researchDomainSourcesObs | async"
- [urlQueryParameters]="urlQueryParameters"
- (submitChange)="update($event)"
- (checkAvailableChange)="checkAvailable($event)"
- (dirtyChange)="updateCanDeactivate($event)"
- (navigate)="navigate($event)"
- (navigateWithQueryParam)="navigateWithQueryParam($event)"
- (requestToBeMemberChange)="requestToBeMember()"
- (editChange)="edit()"
- >
- </dlcm-preservation-space-orgunit-form>
- </div>
-</lib-empty-container>
diff --git a/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit-routing.module.ts b/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit-routing.module.ts
index 94ec56235bb43f7d376c9733cc7356c363f3124f..705b68f14dc23ca8877d5636e566e77d39abddc7 100644
--- a/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit-routing.module.ts
+++ b/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit-routing.module.ts
@@ -1,7 +1,7 @@
import {NgModule} from "@angular/core";
import {RouterModule} from "@angular/router";
-import {PreservationSpaceOrgunitDetailEditRoutable} from "@app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable";
-import {PreservationSpaceOrgunitListRoutable} from "@app/features/preservation-space/organizational-unit/components/routables/orgunit-list/preservation-space-orgunit-list.routable";
+import {PreservationSpaceOrganizationalUnitDetailEditRoutable} from "@preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable";
+import {PreservationSpaceOrganizationalUnitListRoutable} from "@preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable";
import {
AppRoutesEnum,
OrganizationalUnitRoutesEnum,
@@ -16,12 +16,12 @@ import {PreservationSpaceOrganizationalUnitState} from "./stores/preservation-sp
const routes: DlcmRoutes = [
{
path: "",
- component: PreservationSpaceOrgunitListRoutable,
+ component: PreservationSpaceOrganizationalUnitListRoutable,
data: {},
},
{
path: OrganizationalUnitRoutesEnum.detail + AppRoutesEnum.separator + AppRoutesEnum.paramId,
- component: PreservationSpaceOrgunitDetailEditRoutable,
+ component: PreservationSpaceOrganizationalUnitDetailEditRoutable,
data: {
breadcrumbMemoizedSelector: PreservationSpaceOrganizationalUnitState.currentTitle,
},
diff --git a/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit.module.ts b/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit.module.ts
index dc6a14457985069866853aef6631a7a6c327c6fc..19b95f207021bc7cbfccc384f335080fca08f9d2 100644
--- a/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit.module.ts
+++ b/src/app/features/preservation-space/organizational-unit/preservation-space-organizational-unit.module.ts
@@ -1,28 +1,28 @@
import {NgModule} from "@angular/core";
-import {PreservationSpaceOrgunitRequestCreationDialog} from "@app/features/preservation-space/organizational-unit/components/dialogs/orgunit-request-creation/preservation-space-orgunit-request-creation.dialog";
-import {PreservationSpaceOrgunitFormPresentational} from "@app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/preservation-space-orgunit-form.presentational";
-import {PreservationSpaceOrgunitDetailEditRoutable} from "@app/features/preservation-space/organizational-unit/components/routables/orgunit-detail-edit/preservation-space-orgunit-detail-edit.routable";
-import {PreservationSpaceOrgunitListRoutable} from "@app/features/preservation-space/organizational-unit/components/routables/orgunit-list/preservation-space-orgunit-list.routable";
import {PreservationSpaceOrganizationalUnitRoutingModule} from "@app/features/preservation-space/organizational-unit/preservation-space-organizational-unit-routing.module";
import {PreservationSpaceOrganizationalUnitPersonRoleState} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state";
import {PreservationSpaceOrganizationalUnitState} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state";
import {TranslateModule} from "@ngx-translate/core";
import {NgxsModule} from "@ngxs/store";
+import {PreservationSpaceOrganizationalUnitRequestCreationDialog} from "@preservation-space/organizational-unit/components/dialogs/organizational-unit-request-creation/preservation-space-organizational-unit-request-creation.dialog";
+import {PreservationSpaceOrganizationalUnitFormPresentational} from "@preservation-space/organizational-unit/components/presentationals/organizational-unit-form/preservation-space-organizational-unit-form.presentational";
+import {PreservationSpaceOrganizationalUnitDetailEditRoutable} from "@preservation-space/organizational-unit/components/routables/organizational-unit-detail-edit/preservation-space-organizational-unit-detail-edit.routable";
+import {PreservationSpaceOrganizationalUnitListRoutable} from "@preservation-space/organizational-unit/components/routables/organizational-unit-list/preservation-space-organizational-unit-list.routable";
import {ModuleLoadedEnum} from "@shared/enums/module-loaded.enum";
import {SharedModule} from "@shared/shared.module";
-import {PreservationSpaceOrgunitRequestAccessDialog} from "./components/dialogs/orgunit-request-access/preservation-space-orgunit-request-access.dialog";
+import {PreservationSpaceOrganizationalUnitRequestAccessDialog} from "./components/dialogs/organizational-unit-request-access/preservation-space-organizational-unit-request-access.dialog";
const routables = [
- PreservationSpaceOrgunitDetailEditRoutable,
- PreservationSpaceOrgunitListRoutable,
+ PreservationSpaceOrganizationalUnitDetailEditRoutable,
+ PreservationSpaceOrganizationalUnitListRoutable,
];
const containers = [];
const dialogs = [
- PreservationSpaceOrgunitRequestAccessDialog,
- PreservationSpaceOrgunitRequestCreationDialog,
+ PreservationSpaceOrganizationalUnitRequestAccessDialog,
+ PreservationSpaceOrganizationalUnitRequestCreationDialog,
];
const presentationals = [
- PreservationSpaceOrgunitFormPresentational,
+ PreservationSpaceOrganizationalUnitFormPresentational,
];
@NgModule({
@@ -51,6 +51,6 @@ const presentationals = [
})
export class PreservationSpaceOrganizationalUnitModule {
constructor() {
- window[ModuleLoadedEnum.preservationSpaceOrgUnitModuleLoaded] = true;
+ window[ModuleLoadedEnum.preservationSpaceOrganizationalUnitModuleLoaded] = true;
}
}
diff --git a/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action.ts b/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action.ts
index 63b865bfddff37a6c625b86ff5c66f5473d198ff..1bac81f86c6fbd1eb8c8dd0a4b16ac92e1fbbe5b 100644
--- a/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action.ts
+++ b/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action.ts
@@ -8,7 +8,7 @@ import {
const state = LocalStateEnum.preservationSpace_organizationalUnit_personRole;
-export namespace PreservationSpaceOrgUnitPersonRoleAction {
+export namespace PreservationSpaceOrganizationalUnitPersonRoleAction {
@TypeDefaultAction(state)
export class GetAll extends Relation3TiersAction.GetAll {
@@ -107,4 +107,4 @@ export namespace PreservationSpaceOrgUnitPersonRoleAction {
}
}
-export const preservationSpaceOrgUnitPersonRoleActionNameSpace: Relation3TiersNameSpace = PreservationSpaceOrgUnitPersonRoleAction;
+export const preservationSpaceOrganizationalUnitPersonRoleActionNameSpace: Relation3TiersNameSpace = PreservationSpaceOrganizationalUnitPersonRoleAction;
diff --git a/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state.ts b/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state.ts
index fa1f6e2f040d9a1e993f3fccf595d754c25fcab0..1866123f23b7a8c64b1bff8ac32665c77224ba73 100644
--- a/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state.ts
+++ b/src/app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state.ts
@@ -1,7 +1,7 @@
import {OrganizationalUnitPersonRole} from "@admin/models/organizational-unit-person-role.model";
import {PersonRole} from "@admin/models/person-role.model";
import {Injectable} from "@angular/core";
-import {preservationSpaceOrgUnitPersonRoleActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action";
+import {preservationSpaceOrganizationalUnitPersonRoleActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
import {AdminResourceApiEnum} from "@app/shared/enums/api.enum";
import {LocalStateEnum} from "@app/shared/enums/local-state.enum";
@@ -37,7 +37,7 @@ export class PreservationSpaceOrganizationalUnitPersonRoleState extends Relation
protected notificationService: NotificationService,
protected actions$: Actions) {
super(apiService, store, notificationService, actions$, {
- nameSpace: preservationSpaceOrgUnitPersonRoleActionNameSpace,
+ nameSpace: preservationSpaceOrganizationalUnitPersonRoleActionNameSpace,
resourceName: ApiResourceNameEnum.PERSON,
});
}
diff --git a/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action.ts b/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action.ts
index 87cfc0aaf282d22dd80b9290508a5a4643892a6b..ad6956434352cebe2342c21db2526078d69dda74 100644
--- a/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action.ts
+++ b/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action.ts
@@ -8,7 +8,7 @@ import {
const state = LocalStateEnum.preservationSpace_organizationalUnit;
-export namespace PreservationSpaceOrgUnitAction {
+export namespace PreservationSpaceOrganizationalUnitAction {
@TypeDefaultAction(state)
export class LoadResource extends ResourceAction.LoadResource {
}
@@ -159,4 +159,4 @@ export namespace PreservationSpaceOrgUnitAction {
}
}
-export const preservationSpaceOrgUnitActionNameSpace: ResourceNameSpace = PreservationSpaceOrgUnitAction;
+export const preservationSpaceOrganizationalUnitActionNameSpace: ResourceNameSpace = PreservationSpaceOrganizationalUnitAction;
diff --git a/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state.ts b/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state.ts
index eabc7e2db63d05107732fee18bb8217a1624ac0d..c5d2dcd49fe8cc3babca0acdd1130d3dbb8a1dbe 100644
--- a/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state.ts
+++ b/src/app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state.ts
@@ -1,12 +1,12 @@
import {Injectable} from "@angular/core";
-import {PreservationSpaceOrgUnitPersonRoleAction} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action";
+import {PreservationSpaceOrganizationalUnitPersonRoleAction} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.action";
import {
PreservationSpaceOrganizationalUnitPersonRoleState,
PreservationSpaceOrganizationalUnitPersonRoleStateModel,
} from "@app/features/preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state";
import {
- PreservationSpaceOrgUnitAction,
- preservationSpaceOrgUnitActionNameSpace,
+ PreservationSpaceOrganizationalUnitAction,
+ preservationSpaceOrganizationalUnitActionNameSpace,
} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
import {
AccessResourceApiEnum,
@@ -77,7 +77,7 @@ export class PreservationSpaceOrganizationalUnitState extends ResourceState<Pres
protected errorsSkipperService: ErrorsSkipperService,
private _securityService: SecurityService) {
super(apiService, store, notificationService, actions$, {
- nameSpace: preservationSpaceOrgUnitActionNameSpace,
+ nameSpace: preservationSpaceOrganizationalUnitActionNameSpace,
routeRedirectUrlAfterSuccessCreateAction: (resId: string) => RoutesEnum.preservationSpaceOrganizationalUnitDetail + urlSeparator + resId,
routeRedirectUrlAfterSuccessUpdateAction: (resId: string) => RoutesEnum.preservationSpaceOrganizationalUnitDetail + urlSeparator + resId,
routeRedirectUrlAfterSuccessDeleteAction: RoutesEnum.preservationSpaceOrganizationalUnit,
@@ -135,8 +135,8 @@ export class PreservationSpaceOrganizationalUnitState extends ResourceState<Pres
&& (isFalse(this.currentUserIsManager(state)) || !isNullOrUndefined(state.preservationSpace_organizationalUnit_personRole.selected));
}
- @Action(PreservationSpaceOrgUnitAction.LoadResource)
- loadResource(ctx: StateContext<DepositStateModel>, action: PreservationSpaceOrgUnitAction.LoadResource): Observable<any> {
+ @Action(PreservationSpaceOrganizationalUnitAction.LoadResource)
+ loadResource(ctx: StateContext<DepositStateModel>, action: PreservationSpaceOrganizationalUnitAction.LoadResource): Observable<any> {
ctx.patchState({
isLoadingCounter: ctx.getState().isLoadingCounter + 1,
});
@@ -152,62 +152,62 @@ export class PreservationSpaceOrganizationalUnitState extends ResourceState<Pres
]).pipe(
tap(success => {
if (success) {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.LoadResourceSuccess(action));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.LoadResourceSuccess(action));
} else {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.LoadResourceFail(action));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.LoadResourceFail(action));
}
}),
);
}
@OverrideDefaultAction()
- @Action(PreservationSpaceOrgUnitAction.GetByIdSuccess)
- getByIdSuccess(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrgUnitAction.GetByIdSuccess): void {
+ @Action(PreservationSpaceOrganizationalUnitAction.GetByIdSuccess)
+ getByIdSuccess(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrganizationalUnitAction.GetByIdSuccess): void {
ctx.patchState({
current: action.model,
isLoadingCounter: ctx.getState().isLoadingCounter - 1,
});
- ctx.dispatch(new PreservationSpaceOrgUnitAction.ComputeCurrentUserIsManager());
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.ComputeCurrentUserIsManager());
}
- @Action(PreservationSpaceOrgUnitAction.ComputeCurrentUserIsManager)
- computeCurrentUserIsManager(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrgUnitAction.ComputeCurrentUserIsManager): void | Observable<any> {
+ @Action(PreservationSpaceOrganizationalUnitAction.ComputeCurrentUserIsManager)
+ computeCurrentUserIsManager(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrganizationalUnitAction.ComputeCurrentUserIsManager): void | Observable<any> {
return this._securityService.isManagerOfOrgUnit(ctx.getState().current.resId).pipe(
tap(isManager => {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.SaveCurrentUserIsManagerAndRetrievePersonRoleIfManager(isManager));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManagerAndRetrievePersonRoleIfManager(isManager));
}),
);
}
- @Action(PreservationSpaceOrgUnitAction.SaveCurrentUserIsManager)
- saveCurrentUserIsManager(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrgUnitAction.SaveCurrentUserIsManager): void {
+ @Action(PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManager)
+ saveCurrentUserIsManager(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManager): void {
ctx.patchState({
currentUserIsManager: action.isManager,
});
}
- @Action(PreservationSpaceOrgUnitAction.SaveCurrentUserIsManagerAndRetrievePersonRoleIfManager)
- saveCurrentUserIsManagerAndRetrievePersonRoleIfManager(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrgUnitAction.SaveCurrentUserIsManagerAndRetrievePersonRoleIfManager): void {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.SaveCurrentUserIsManager(action.isManager));
+ @Action(PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManagerAndRetrievePersonRoleIfManager)
+ saveCurrentUserIsManagerAndRetrievePersonRoleIfManager(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManagerAndRetrievePersonRoleIfManager): void {
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManager(action.isManager));
if (isTrue(action.isManager)) {
const orgUnitId = ctx.getState().current.resId;
- this.store.dispatch(new PreservationSpaceOrgUnitPersonRoleAction.GetAll(orgUnitId));
+ this.store.dispatch(new PreservationSpaceOrganizationalUnitPersonRoleAction.GetAll(orgUnitId));
}
}
@OverrideDefaultAction()
- @Action(PreservationSpaceOrgUnitAction.Create)
- create(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrgUnitAction.Create): Observable<OrganizationalUnit> {
+ @Action(PreservationSpaceOrganizationalUnitAction.Create)
+ create(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrganizationalUnitAction.Create): Observable<OrganizationalUnit> {
return super.internalCreate(ctx, action)
.pipe(
tap(model => {
this.updateSubResource(model, action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.CreateSuccess(action, model));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.CreateSuccess(action, model));
} else {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.CreateFail(action));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.CreateFail(action));
}
});
}),
@@ -215,24 +215,24 @@ export class PreservationSpaceOrganizationalUnitState extends ResourceState<Pres
}
@OverrideDefaultAction()
- @Action(PreservationSpaceOrgUnitAction.Update)
- update(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrgUnitAction.Update): Observable<OrganizationalUnit> {
+ @Action(PreservationSpaceOrganizationalUnitAction.Update)
+ update(ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>, action: PreservationSpaceOrganizationalUnitAction.Update): Observable<OrganizationalUnit> {
return super.internalUpdate(ctx, action)
.pipe(
tap(model => {
this.updateSubResource(model, action, ctx)
.subscribe(success => {
if (success) {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.UpdateSuccess(action, model));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.UpdateSuccess(action, model));
} else {
- ctx.dispatch(new PreservationSpaceOrgUnitAction.UpdateFail(action));
+ ctx.dispatch(new PreservationSpaceOrganizationalUnitAction.UpdateFail(action));
}
});
}),
);
}
- private updateSubResource(model: OrganizationalUnit, action: PreservationSpaceOrgUnitAction.Create | PreservationSpaceOrgUnitAction.Update, ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>): Observable<boolean> {
+ private updateSubResource(model: OrganizationalUnit, action: PreservationSpaceOrganizationalUnitAction.Create | PreservationSpaceOrganizationalUnitAction.Update, ctx: StateContext<PreservationSpaceOrganizationalUnitStateModel>): Observable<boolean> {
const orgUnitId = model.resId;
const newPersonRole = action.modelFormControlEvent.formControl.get("personRole").value as Relation3TiersForm[];
newPersonRole.forEach((elem) => {
@@ -243,10 +243,10 @@ export class PreservationSpaceOrganizationalUnitState extends ResourceState<Pres
return StoreUtil.dispatchSequentialActionAndWaitForSubActionsCompletion(ctx, [
{
- action: new PreservationSpaceOrgUnitPersonRoleAction.Update(orgUnitId, newPersonRole),
+ action: new PreservationSpaceOrganizationalUnitPersonRoleAction.Update(orgUnitId, newPersonRole),
subActionCompletions: [
- this.actions$.pipe(ofActionCompleted(PreservationSpaceOrgUnitPersonRoleAction.UpdateSuccess)),
- this.actions$.pipe(ofActionCompleted(PreservationSpaceOrgUnitPersonRoleAction.UpdateFail)),
+ this.actions$.pipe(ofActionCompleted(PreservationSpaceOrganizationalUnitPersonRoleAction.UpdateSuccess)),
+ this.actions$.pipe(ofActionCompleted(PreservationSpaceOrganizationalUnitPersonRoleAction.UpdateFail)),
],
},
]);
diff --git a/src/app/features/preservation-space/preservation-space.module.ts b/src/app/features/preservation-space/preservation-space.module.ts
index 2885e0084594b12de0531249775c0bb0ea85ff21..1feb580dcf1ef182c803362eebd69b9c42399ba6 100644
--- a/src/app/features/preservation-space/preservation-space.module.ts
+++ b/src/app/features/preservation-space/preservation-space.module.ts
@@ -7,10 +7,10 @@ import {PreservationSpaceState} from "@app/features/preservation-space/stores/pr
import {SharedModule} from "@app/shared/shared.module";
import {TranslateModule} from "@ngx-translate/core";
import {NgxsModule} from "@ngxs/store";
-import {PreservationSpaceOrganizationalUnitPersonRoleState} from "@orgunit/stores/person-role/preservation-space-organizational-unit-person-role.state";
-import {PreservationSpaceOrganizationalUnitState} from "@orgunit/stores/preservation-space-organizational-unit.state";
import {PreservationSpaceContributorDepositState} from "@preservation-space/contributor/stores/contributor-deposit/preservation-space-contributor-deposit.state";
import {PreservationSpaceContributorState} from "@preservation-space/contributor/stores/preservation-space-contributor.state";
+import {PreservationSpaceOrganizationalUnitPersonRoleState} from "@preservation-space/organizational-unit/stores/person-role/preservation-space-organizational-unit-person-role.state";
+import {PreservationSpaceOrganizationalUnitState} from "@preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state";
import {ModuleLoadedEnum} from "@shared/enums/module-loaded.enum";
const routables = [
diff --git a/src/app/features/preservation-space/stores/preservation-space.state.ts b/src/app/features/preservation-space/stores/preservation-space.state.ts
index d254e092bbde30f898e19d615b5777c1ec65beab..28b9ce8e79461a9be280144f68bb7a9c64600003 100644
--- a/src/app/features/preservation-space/stores/preservation-space.state.ts
+++ b/src/app/features/preservation-space/stores/preservation-space.state.ts
@@ -8,14 +8,14 @@ import {
State,
Store,
} from "@ngxs/store";
-import {
- PreservationSpaceOrganizationalUnitState,
- PreservationSpaceOrganizationalUnitStateModel,
-} from "@orgunit/stores/preservation-space-organizational-unit.state";
import {
PreservationSpaceContributorState,
PreservationSpaceContributorStateModel,
} from "@preservation-space/contributor/stores/preservation-space-contributor.state";
+import {
+ PreservationSpaceOrganizationalUnitState,
+ PreservationSpaceOrganizationalUnitStateModel,
+} from "@preservation-space/organizational-unit/stores/preservation-space-organizational-unit.state";
import {
BaseStateModel,
defaultResourceStateInitValue,
diff --git a/src/app/shared/enums/module-loaded.enum.ts b/src/app/shared/enums/module-loaded.enum.ts
index 1b4987f146acf8acf746ba6cf57b9d6d6adc7184..2935b0c08254db290a7f53350143e2bc41b02805 100644
--- a/src/app/shared/enums/module-loaded.enum.ts
+++ b/src/app/shared/enums/module-loaded.enum.ts
@@ -1,8 +1,8 @@
export enum ModuleLoadedEnum {
preservationSpaceModuleLoaded = "preservationSpaceModuleLoaded",
- preservationSpaceOrgUnitModuleLoaded = "preservationSpaceOrgUnitModuleLoaded",
+ preservationSpaceOrganizationalUnitModuleLoaded = "preservationSpaceOrganizationalUnitModuleLoaded",
depositModuleLoaded = "depositModuleLoaded",
adminModuleLoaded = "adminModuleLoaded",
- adminOrgUnitModuleLoaded = "adminOrgUnitModuleLoaded",
+ adminOrganizationalUnitModuleLoaded = "adminOrganizationalUnitModuleLoaded",
preservationPlanningModuleLoaded = "preservationPlanningModuleLoaded"
}
diff --git a/src/app/shared/guards/organizational-unit-compute-is-manager.service.ts b/src/app/shared/guards/organizational-unit-compute-is-manager.service.ts
index 4350fab576d2c6b164be34f12910399e315d8a9c..7557df7e2b7745c26510496e25bd43223245a361 100644
--- a/src/app/shared/guards/organizational-unit-compute-is-manager.service.ts
+++ b/src/app/shared/guards/organizational-unit-compute-is-manager.service.ts
@@ -4,7 +4,7 @@ import {
CanActivate,
Router,
} from "@angular/router";
-import {PreservationSpaceOrgUnitAction} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
+import {PreservationSpaceOrganizationalUnitAction} from "@app/features/preservation-space/organizational-unit/stores/preservation-space-organizational-unit.action";
import {
Actions,
Store,
@@ -33,7 +33,7 @@ export class OrganizationalUnitComputeIsManagerGuardService implements CanActiva
canActivate(route: ActivatedRouteSnapshot): Observable<boolean> {
return this._securityService.isManagerOfOrgUnit(route.params[AppRoutesEnum.paramIdWithoutPrefixParam]).pipe(
map(authorized => {
- this.store.dispatch(new PreservationSpaceOrgUnitAction.SaveCurrentUserIsManager(authorized));
+ this.store.dispatch(new PreservationSpaceOrganizationalUnitAction.SaveCurrentUserIsManager(authorized));
return true;
}));
}
diff --git a/src/app/shared/utils/store-dialog.util.ts b/src/app/shared/utils/store-dialog.util.ts
index 7d852da36acd1f80dcdd64aa8186c96b9166150a..e5025d40aed359ca6c8c7ba751220bc510bbd0c3 100644
--- a/src/app/shared/utils/store-dialog.util.ts
+++ b/src/app/shared/utils/store-dialog.util.ts
@@ -6,7 +6,7 @@ import {AdminLicenseDeleteDialog} from "@admin/license/components/dialogs/admin-
import {AdminMetadataTypeDeleteDialog} from "@admin/metadata-type/components/dialogs/admin-metadata-type-delete/admin-metadata-type-delete.dialog";
import {AdminOaiSetDeleteDialog} from "@admin/oai-set/components/dialogs/admin-oai-set-delete/admin-oai-set-delete.dialog";
import {AdminOauth2ClientDeleteDialog} from "@admin/oauth2-client/components/dialogs/admin-oauth2-client-delete/admin-oauth2-client-delete.dialog";
-import {AdminOrgunitDeleteDialog} from "@admin/orgunit/components/dialogs/admin-orgunit-delete/admin-orgunit-delete.dialog";
+import {AdminOrganizationalUnitDeleteDialog} from "@admin/organizational-unit/components/dialogs/admin-organizational-unit-delete/admin-organizational-unit-delete.dialog";
import {AdminPersonDeleteDialog} from "@admin/person/components/dialogs/admin-person-delete/admin-person-delete.dialog";
import {AdminPreservationPolicyDeleteDialog} from "@admin/preservation-policy/components/dialogs/admin-preservation-policy-delete/admin-preservation-policy-delete.dialog";
import {AdminResearchDomainDeleteDialog} from "@admin/research-domain/components/dialogs/admin-research-domain-delete/admin-research-domain-delete.dialog";
@@ -14,10 +14,10 @@ import {AdminSubmissionPolicyDeleteDialog} from "@admin/submission-policy/compon
import {AdminUserDeleteDialog} from "@admin/user/components/dialogs/admin-user-delete/admin-user-delete.dialog";
import {Component} from "@angular/core";
import {OrderAllOrderDeleteDialog} from "@app/features/order/features/all-order/components/dialogs/all-order-delete/order-all-order-delete.dialog";
-import {PreservationPlanningJobDeleteDialog} from "@preservation-planning/job/components/dialogs/job-delete/preservation-planning-job-delete.dialog";
import {LocalStateEnum} from "@app/shared/enums/local-state.enum";
import {DepositDeleteDialog} from "@deposit/components/dialogs/deposit-delete/deposit-delete.dialog";
import {OrderMyOrderDeleteDialog} from "@order/features/my-order/components/dialogs/my-order-delete/order-my-order-delete.dialog";
+import {PreservationPlanningJobDeleteDialog} from "@preservation-planning/job/components/dialogs/job-delete/preservation-planning-job-delete.dialog";
import {StringUtil} from "solidify-frontend";
export class StoreDialogUtil {
@@ -28,7 +28,7 @@ export class StoreDialogUtil {
return DepositDeleteDialog as Component;
}
if (state === LocalStateEnum.admin_organizationalUnit) {
- return AdminOrgunitDeleteDialog as Component;
+ return AdminOrganizationalUnitDeleteDialog as Component;
}
if (state === LocalStateEnum.admin_submissionPolicy) {
return AdminSubmissionPolicyDeleteDialog as Component;
diff --git a/src/app/stores/cart/order/app-cart-order.state.ts b/src/app/stores/cart/order/app-cart-order.state.ts
index 6c2150620d0dae61cb5605be48e4786a93fdb428..55bafc4efd4dd3264b871850d5ae49269dc20d3f 100644
--- a/src/app/stores/cart/order/app-cart-order.state.ts
+++ b/src/app/stores/cart/order/app-cart-order.state.ts
@@ -1,4 +1,4 @@
-import {AdminOrganizationalUnitStateModel} from "@admin/orgunit/stores/admin-organizational-unit.state";
+import {AdminOrganizationalUnitStateModel} from "@admin/organizational-unit/stores/admin-organizational-unit.state";
import {Injectable} from "@angular/core";
import {AppCartAction} from "@app/stores/cart/app-cart.action";
import {
diff --git a/tsconfig.json b/tsconfig.json
index 3173eeb88452d925a45dc4e9ff3dc942b6d84bc3..40d235cfe3c3e6e50aa704fc1bb1a3e738eeb232 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,9 +21,6 @@
"@home/*": [
"app/features/home/*"
],
- "@orgunit/*": [
- "app/features/preservation-space/organizational-unit/*"
- ],
"@preservation-space/*": [
"app/features/preservation-space/*"
],