From cfa2b7e14a0732a019ee8b1a8e728e6980c69ef9 Mon Sep 17 00:00:00 2001
From: Florent Poittevin <florent.poittevin@unige.ch>
Date: Wed, 10 Jul 2019 09:36:13 +0200
Subject: [PATCH] Fix organizational unit submission policy url
---
.../organizational-unit/organizational-unit.state.ts | 3 ++-
.../organizational-unit-submission-policy.state.ts | 9 ++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/app/shared/stores/organizational-unit/organizational-unit.state.ts b/src/app/shared/stores/organizational-unit/organizational-unit.state.ts
index 778b44d72..f6da7d7b8 100644
--- a/src/app/shared/stores/organizational-unit/organizational-unit.state.ts
+++ b/src/app/shared/stores/organizational-unit/organizational-unit.state.ts
@@ -1,3 +1,4 @@
+import {StateModel} from "@app/shared/models/state.model";
import {AppStateModel} from "@app/stores/app.state";
import {ApiService} from "@app/core/http/api.service";
@@ -48,7 +49,7 @@ export class OrganizationalUnitState extends ResourceState<OrganizationalUnitsMo
}
defineUrlResource(): ResourceApiEnum {
- const isLoggedId = this.store.selectSnapshot((state) => (state[StateEnum.application] as AppStateModel).isLoggedIn);
+ const isLoggedId = this.store.selectSnapshot((state: StateModel) => state[StateEnum.application].isLoggedIn);
if (isLoggedId) {
return AdminResourceApiEnum.organizationalUnits;
}
diff --git a/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts b/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts
index 47f2e44c1..f092486c6 100644
--- a/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts
+++ b/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts
@@ -8,9 +8,8 @@ import {
} from "@app/core/stores/relation-2-tiers/relation-2-tiers.state";
import {OrganizationalUnitsModel, SubmissionPoliciesModel} from "@app/generated-api";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
-import {AccessResourceApiEnum, AdminResourceApiEnum, ResourceApiEnum} from "@app/shared/enums/api.enum";
+import {AdminResourceApiEnum, ResourceApiEnum} from "@app/shared/enums/api.enum";
import {StateEnum} from "@app/shared/enums/state.enum";
-import {StateModel} from "@app/shared/models/state.model";
import {
OrgUnitSubmissionPolicyAction,
orgUnitSubmissionPolicyActionNameSpace,
@@ -51,11 +50,7 @@ export class OrganizationalUnitSubmissionPolicyState extends Relation2TiersState
}
defineUrlResource(): ResourceApiEnum {
- const isLoggedId = this.store.selectSnapshot((state: StateModel) => state[StateEnum.application].isLoggedIn);
- if (isLoggedId) {
- return AdminResourceApiEnum.organizationalUnits;
- }
- return AccessResourceApiEnum.organizationalUnits;
+ return AdminResourceApiEnum.organizationalUnits;
}
defineState(): StateEnum {
--
GitLab