kdb-bot/src/bot_graphql/abc/query_abc.py

@@ -182,10 +182,10 @@ class QueryABC(ObjectType):
         if filter is not None:
             collection = filter.filter(collection)
 
-        if sort is not None:
-            collection = sort.filter(collection)
-
         if page is not None:
             collection = page.filter(collection)
 
+        if sort is not None:
+            collection = sort.filter(collection)
+
         return collection

kdb-web/src/app/modules/shared/components/history-btn/history-btn.component.ts

@@ -11,15 +11,15 @@ export class HistoryBtnComponent implements OnInit {
   @Input() history: History[] = [];
   @Input() translationKey: string = "";
 
-  public showSidebar: boolean = false;
+  showSidebar = false;
 
-  public constructor() {
+  constructor() {
   }
 
-  public ngOnInit(): void {
+  ngOnInit(): void {
   }
 
-  public openHistory(): void {
+  openHistory(): void {
     this.showSidebar = true;
     let oldHistory: Partial<History> = {};
     for (const history of this.history) {
@@ -36,7 +36,7 @@ export class HistoryBtnComponent implements OnInit {
     }
   }
 
-  public getAttributeTranslationKey(key: string): string {
+  getAttributeTranslationKey(key: string) {
     return `common.history.${key}`;
   }