Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# UTMStack 10.5.14 Release Notes
# UTMStack 10.5.15 Release Notes
## Bugfix
- Remove memory usage indicator
- Sorting not working on any column in index management view
2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
<dependency>
<groupId>com.utmstack</groupId>
<artifactId>opensearch-connector</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {SortEvent} from '../../shared/directives/sortable/type/sort-event';
import {ElasticSearchIndexService} from '../../shared/services/elasticsearch/elasticsearch-index.service';
import {ElasticsearchIndexInfoType} from '../../shared/types/elasticsearch/elasticsearch-index-info.type';
import {IndexDeleteComponent} from './index-delete/index-delete.component';
import {UtmAccountModule} from "../../account/account.module";
import {UtmToastService} from "../../shared/alert/utm-toast.service";

@Component({
selector: 'app-index-management',
Expand All @@ -23,7 +25,8 @@ export class IndexManagementComponent implements OnInit {
req: any;

constructor(private elasticIndexService: ElasticSearchIndexService,
private modalService: NgbModal) {
private modalService: NgbModal,
private toastService: UtmToastService,) {
}

ngOnInit() {
Expand All @@ -43,7 +46,23 @@ export class IndexManagementComponent implements OnInit {
}

onSortBy($event: SortEvent) {
this.req.sort = $event.column + ',' + $event.direction;
switch ($event.column) {
case 'creationDate':
this.req.sort = 'creation.date.string' + ',' + $event.direction;
break;

case 'docsCount':
this.req.sort = 'docs.count' + ',' + $event.direction;
break;

case 'size':
this.req.sort = 'store.size' + ',' + $event.direction;
break;

default:
this.req.sort = $event.column + ',' + $event.direction;
break;
}
this.getIndexes();
}

Expand Down Expand Up @@ -97,6 +116,7 @@ export class IndexManagementComponent implements OnInit {
}

private onError(error) {
// this.alertService.error(error.error, error.message, null);
this.toastService.showError('Error', 'An error occurred while listing the indexes');
this.loading = false;
}
}
2 changes: 1 addition & 1 deletion version.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 10.5.14
version: 10.5.15