Skip to content

Commit a29bf78

Browse files
authored
Bugfix/10.4/659 the ad auditor module does not process logs for the current day (#662)
* Fixed filter change in event-timeline.component.html * Fixed AD auditor is not capturing all user creation events (#474) * Fixed AD auditor is not capturing all user creation events (#659) * Fixed AD auditor is not capturing all user creation events (#659) * Fixed AD auditor is not capturing all user creation events (#659) * Implemented sorting option for user list
1 parent 762826f commit a29bf78

File tree

20 files changed

+119
-87
lines changed

20 files changed

+119
-87
lines changed

backend/src/main/java/com/park/utmstack/web/rest/user_auditor/UtmAuditorUsersResource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,11 @@ public ResponseEntity<List<UtmAuditorUsersDTO>> getAllUtmAuditorUsers(Pageable p
109109
urlParams.put("page", String.valueOf(pageable.getPageNumber()));
110110
urlParams.put("size", String.valueOf(pageable.getPageSize()));
111111
urlParams.put("id", String.valueOf(sourceId));
112+
urlParams.put("sort", "name,asc");
112113

113114
RestTemplate restTemplate = new RestTemplate();
114115

115-
String uri = microServiceUrl.concat("/utm-auditor-users-by-src?page={page}&size={size}&id={id}");
116+
String uri = microServiceUrl.concat("/utm-auditor-users-by-src?page={page}&size={size}&sort={sort}&id={id}");
116117

117118
HttpHeaders headers = new HttpHeaders();
118119
headers.setContentType(MediaType.APPLICATION_JSON);

frontend/src/app/active-directory/active-directory.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="vul-container container-fluid pr-3 pl-3 pt-2">
1+
<div style="height: 89vh;" class="vul-container container-fluid pr-3 pl-3 pt-2">
22
<div class="d-flex justify-content-between align-items-center mb-2 tab-header">
33
<h5 class="card-title mb-0 text-uppercase label-header">
44
Users with Activity

frontend/src/app/active-directory/shared/components/active-directory-event/active-directory-event.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.message-container {
22
overflow-y: auto;
3-
height: 90vh;
3+
height: 70vh;
44
}
55

66
.card-detail {

frontend/src/app/active-directory/shared/components/active-directory-tree/active-directory-tree.component.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
placement="left"
1919
tooltipClass="utm-tooltip"></i>
2020
</div>-->
21-
</div>
22-
<div class="w-100 h-100 p-1 ad-container">
21+
2322
<app-utm-search-input (searchFor)="searchInTree($event)"
2423
*ngIf="tree && tree.length>0"
2524
[searching]="searching"
2625
placeholder="Search"></app-utm-search-input>
26+
</div>
27+
<div class="w-100 h-100 p-1 ad-container">
2728
<div *ngIf="tree.length===0" class="loading-tree pt-5">
2829
<app-utm-spinner [height]="'35px'"
2930
[label]="'Loading tree'"

frontend/src/app/active-directory/shared/components/active-directory-tree/active-directory-tree.component.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.ad-container {
99
height: 100%;
1010
overflow-y: auto;
11-
max-height: 90vh;
11+
max-height: 75vh;
1212

1313
ul {
1414
min-width: 250px;
@@ -89,3 +89,7 @@
8989
}
9090
}
9191
}
92+
93+
.input-search{
94+
position: fixed;
95+
}

frontend/src/app/active-directory/shared/components/active-directory-tree/active-directory-tree.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ getAllInfo() {
5757
this.tree = arrayToTree(temArr,
5858
{parentId: 'parentId', id: 'id', dataField: null});
5959
this.tree = this.tree.filter( t => t.children.length > 0);
60-
console.log('TREE:', this.tree);
60+
this.deploy(this.tree[0]);
6161
});
6262
} else {
6363
this.noDataFound = true;
@@ -153,7 +153,8 @@ getAllInfo() {
153153
}
154154
}
155155

156-
deploy(item: ActiveDirectoryTreeType) {
156+
deploy(item: TreeItem) {
157+
console.log(item);
157158
const index = this.deployed.findIndex(value => value === item.id);
158159
if (index === -1) {
159160
this.deployed.push(item.id);

frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ <h6 class="card-title font-weight-light pb-0 text-blue-800">Events timeline</h6>
55
<app-elastic-filter-time (timeFilterChange)="onFilterTimeChange($event)"
66
[changeOnInit]="'YES'"
77
[container]="'body'"
8-
[formatInstant]="true"
98
[invertContent]="true"
109
[timeDefault]="sevenDaysRange"></app-elastic-filter-time>
1110
</div>
1211
</div>
13-
<div class="card-body p-2 h-10">
12+
<div class="card-body mt-4 p-2 h-10">
1413
<div *ngIf="items.length>0 && !loading"
1514
class="event-timeline-container h-100" id="eventsTimeline">
1615
<div class="main">

frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
.main {
1212
width: 100%;
13-
height: 90vh;
13+
height: 70vh;
1414
//max-height: 380px;
1515
min-height: 370px;
1616
box-sizing: border-box;

frontend/src/app/active-directory/view/active-directory-view/active-directory-view.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="d-flex active-directory-tree flex-nowrap">
2-
<div [ngStyle]="{'width':treeWidth, 'min-height':treeHeight+'px'}"
2+
<div [ngStyle]="{'width':treeWidth}"
33
mwlResizable
44
[enableGhostResize]="true"
55
[resizeEdges]="{ bottom: false, right: true, top: false, left: false }"

frontend/src/app/active-directory/view/active-directory-view/active-directory-view.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
.active-directory-tree {
1010
//max-height: 90vh;
11-
min-height: 90vh;
11+
min-height: 82vh;
1212
//height: 90vh;
1313
}
1414

0 commit comments

Comments
 (0)