Skip to content

Commit d56e3b2

Browse files
author
Romain Jamet
committed
fix(iam): fix logs redirection rules
ref: #MANAGER-17514 Signed-off-by: Romain Jamet <[email protected]>
1 parent e07d370 commit d56e3b2

File tree

3 files changed

+30
-11
lines changed

3 files changed

+30
-11
lines changed

packages/manager/modules/iam/src/logs/access-policy/access-policy-logs.routing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default /* @ngInject */ ($stateProvider) => {
1616
.then(
1717
(accessPolicyLogsAvailability) =>
1818
!accessPolicyLogsAvailability && {
19-
state: 'iam',
19+
state: 'iam.logs',
2020
},
2121
),
2222
resolve: {

packages/manager/modules/iam/src/logs/audit/audit-logs.routing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default /* @ngInject */ ($stateProvider) => {
1616
.then(
1717
(auditLogAvailability) =>
1818
!auditLogAvailability && {
19-
state: 'iam',
19+
state: 'iam.logs',
2020
},
2121
),
2222
resolve: {

packages/manager/modules/iam/src/logs/logs.routing.js

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,35 @@ const redirectTo = (transition) =>
88
.all([
99
transition.injector().getAsync('logsAvailability'),
1010
transition.injector().getAsync('auditLogsAvailability'),
11+
transition.injector().getAsync('activityLogsAvailability'),
12+
transition.injector().getAsync('accessPolicyLogsAvailability'),
1113
])
12-
.then(([logsAvailability, auditLogsAvailability]) => {
13-
let state = 'iam.logs.audit';
14-
if (!logsAvailability) {
15-
state = 'iam';
16-
} else if (!auditLogsAvailability) {
17-
state = 'iam.logs.access-policy';
18-
}
19-
return state;
20-
});
14+
.then(
15+
([
16+
logsAvailability,
17+
auditLogsAvailability,
18+
activityLogsAvailability,
19+
accessPolicyLogsAvailability,
20+
]) => {
21+
if (!logsAvailability) {
22+
return 'iam';
23+
}
24+
25+
if (auditLogsAvailability) {
26+
return 'iam.logs.audit';
27+
}
28+
29+
if (activityLogsAvailability) {
30+
return 'iam.logs.activity';
31+
}
32+
33+
if (accessPolicyLogsAvailability) {
34+
return 'iam.logs.access-policy';
35+
}
36+
37+
return 'iam';
38+
},
39+
);
2140

2241
export default /* @ngInject */ ($stateProvider) => {
2342
$stateProvider.state('iam.logs', {

0 commit comments

Comments
 (0)