00133 going back

src/components/account/AccountTable.vue

@@ -132,7 +132,7 @@ export default defineComponent({
     return {
       isTouchDevice,
       isMediumScreen,
-      accounts: props.controller.pageRows as ComputedRef<AccountInfo[]>,
+      accounts: props.controller.rows as ComputedRef<AccountInfo[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/account/AccountTableController.ts

@@ -18,50 +18,35 @@
  *
  */
 
-import {TableController} from "@/utils/table/TableController";
 import {AccountInfo, AccountsResponse} from "@/schemas/HederaSchemas";
-import {Ref} from "vue";
+import {ComputedRef} from "vue";
 import axios, {AxiosResponse} from "axios";
+import {KeyOperator, SortOrder, TableController} from "@/utils/table/TableController";
+import {Router} from "vue-router";
 
 export class AccountTableController extends TableController<AccountInfo, string> {
 
     //
     // Public
     //
 
-    public constructor(pageSize: Ref<number>) {
-        super(pageSize, 10 * pageSize.value, 5000, 10, 100);
+    public constructor(router: Router, pageSize: ComputedRef<number>) {
+        super(router, pageSize, 10 * pageSize.value, 5000, 10, 100);
     }
 
     //
     // TableController
     //
 
-    public async loadAfter(accountId: string | null, limit: number): Promise<AccountInfo[] | null> {
-        return this.load(accountId, "lt", limit)
-    }
-
-    public async loadBefore(accountId: string, limit: number): Promise<AccountInfo[] | null> {
-        return this.load(accountId, "gte", limit)
-    }
-
-    public keyFor(row: AccountInfo): string {
-        return row.account ?? ""
-    }
-
-    //
-    // Private
-    //
-
-    private load(accountId: string | null, operator: string, limit: number): Promise<AccountInfo[] | null> {
+    public async load(accountId: string | null, operator: KeyOperator, order: SortOrder, limit: number): Promise<AccountInfo[] | null> {
 
         const params = {} as {
             limit: number
             "account.id": string | undefined
             order: string
         }
         params.limit = limit
-        params.order = 'desc'
+        params.order = order
         if (accountId !== null) {
             params["account.id"] = operator + ":" + accountId
         }
@@ -71,4 +56,16 @@ export class AccountTableController extends TableController<AccountInfo, string>
 
         return  axios.get<AccountsResponse>("api/v1/accounts", {params: params}).then(cb)
     }
+
+    public keyFor(row: AccountInfo): string {
+        return row.account ?? ""
+    }
+
+    public stringFromKey(account: string): string {
+        return account
+    }
+
+    public keyFromString(s: string): string|null {
+        return s
+    }
 }

src/components/block/BlockTable.vue

@@ -128,7 +128,7 @@ export default defineComponent({
     return {
       isTouchDevice,
       isMediumScreen,
-      blocks: props.controller.pageRows as ComputedRef<Block[]>,
+      blocks: props.controller.rows as ComputedRef<Block[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/block/BlockTableController.ts

@@ -18,50 +18,35 @@
  *
  */
 
-import {TableController} from "@/utils/table/TableController";
 import {Block, BlocksResponse} from "@/schemas/HederaSchemas";
-import {Ref} from "vue";
+import {ComputedRef} from "vue";
 import axios, {AxiosResponse} from "axios";
+import {KeyOperator, SortOrder, TableController} from "@/utils/table/TableController";
+import {Router} from "vue-router";
 
 export class BlockTableController extends TableController<Block, number> {
 
     //
     // Public
     //
 
-    public constructor(pageSize: Ref<number>) {
-        super(pageSize, 10 * pageSize.value, 5000, 10, 100);
+    public constructor(router: Router, pageSize: ComputedRef<number>) {
+        super(router, pageSize, 10 * pageSize.value, 5000, 10, 100);
     }
 
     //
     // TableController
     //
 
-    public async loadAfter(blockNb: number | null, limit: number): Promise<Block[] | null> {
-        return this.load(blockNb, "lt", limit)
-    }
-
-    public async loadBefore(blockNb: number, limit: number): Promise<Block[] | null> {
-        return this.load(blockNb, "gte", limit)
-    }
-
-    public keyFor(row: Block): number {
-        return row.number ?? -1
-    }
-
-    //
-    // Private
-    //
-
-    private load(blockNb: number | null, operator: string, limit: number): Promise<Block[] | null> {
+    public async load(blockNb: number | null, operator: KeyOperator, order: SortOrder, limit: number): Promise<Block[] | null> {
 
         const params = {} as {
             limit: number
             "block.number": string
             order: string
         }
         params.limit = limit
-        params.order = 'desc'
+        params.order = order
         if (blockNb !== null) {
             params["block.number"] = operator + ":" + blockNb
         }
@@ -71,4 +56,16 @@ export class BlockTableController extends TableController<Block, number> {
 
         return  axios.get<BlocksResponse>("api/v1/blocks", {params: params}).then(cb)
     }
+
+    public keyFor(row: Block): number {
+        return row.number ?? -1
+    }
+
+    public stringFromKey(key: number): string {
+        return key.toString()
+    }
+
+    public keyFromString(s: string): number | null {
+        return Number(s)
+    }
 }

src/components/contract/ContractTable.vue

@@ -115,7 +115,7 @@ export default defineComponent({
     return {
       isTouchDevice,
       isMediumScreen,
-      contracts: props.controller.pageRows as ComputedRef<Contract[]>,
+      contracts: props.controller.rows as ComputedRef<Contract[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/contract/ContractTableController.ts

@@ -18,50 +18,35 @@
  *
  */
 
-import {TableController} from "@/utils/table/TableController";
 import {Contract, ContractsResponse} from "@/schemas/HederaSchemas";
-import {Ref} from "vue";
+import {ComputedRef} from "vue";
 import axios, {AxiosResponse} from "axios";
+import {KeyOperator, SortOrder, TableController} from "@/utils/table/TableController";
+import {Router} from "vue-router";
 
 export class ContractTableController extends TableController<Contract, string> {
 
     //
     // Public
     //
 
-    public constructor(pageSize: Ref<number>) {
-        super(pageSize, 10 * pageSize.value, 5000, 10, 100);
+    public constructor(router: Router, pageSize: ComputedRef<number>) {
+        super(router, pageSize, 10 * pageSize.value, 5000, 10, 100);
     }
 
     //
     // TableController
     //
 
-    public async loadAfter(contractId: string | null, limit: number): Promise<Contract[] | null> {
-        return this.load(contractId, "lt", limit)
-    }
-
-    public async loadBefore(contractId: string, limit: number): Promise<Contract[] | null> {
-        return this.load(contractId, "gte", limit)
-    }
-
-    public keyFor(row: Contract): string {
-        return row.contract_id ?? ""
-    }
-
-    //
-    // Private
-    //
-
-    private load(contractId: string | null, operator: string, limit: number): Promise<Contract[] | null> {
+    public async load(contractId: string | null, operator: KeyOperator, order: SortOrder, limit: number): Promise<Contract[] | null> {
 
         const params = {} as {
             limit: number
             "contract.id": string | undefined
             order: string
         }
         params.limit = limit
-        params.order = 'desc'
+        params.order = order
         if (contractId !== null) {
             params["contract.id"] = operator + ":" + contractId
         }
@@ -71,4 +56,16 @@ export class ContractTableController extends TableController<Contract, string> {
 
         return  axios.get<ContractsResponse>("api/v1/contracts", {params: params}).then(cb)
     }
+
+    public keyFor(row: Contract): string {
+        return row.contract_id ?? ""
+    }
+
+    public stringFromKey(key: string): string {
+        return key;
+    }
+
+    public keyFromString(s: string): string | null {
+        return s;
+    }
 }

src/components/contract/ContractTransactionTable.vue

@@ -93,7 +93,7 @@ import TransactionLabel from "@/components/values/TransactionLabel.vue";
 import HbarAmount from "@/components/values/HbarAmount.vue";
 import {ORUGA_MOBILE_BREAKPOINT} from '@/App.vue';
 import EmptyTable from "@/components/EmptyTable.vue";
-import {TransactionTableController} from "@/components/transaction/TransactionTableController";
+import {TransactionTableControllerXL} from "@/components/transaction/TransactionTableControllerXL";
 
 export default defineComponent({
   name: 'ContractTransactionTable',
@@ -102,7 +102,7 @@ export default defineComponent({
 
   props: {
     controller: {
-      type: Object as PropType<TransactionTableController>,
+      type: Object as PropType<TransactionTableControllerXL>,
       required: true
     }
   },
@@ -118,7 +118,7 @@ export default defineComponent({
     return {
       isTouchDevice,
       isMediumScreen,
-      transactions: props.controller.pageRows as ComputedRef<Transaction[]>,
+      transactions: props.controller.rows as ComputedRef<Transaction[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/dashboard/ContractCallTransactionTable.vue

@@ -101,7 +101,7 @@ export default defineComponent({
     }
 
     return {
-      transactions: props.controller.pageRows as ComputedRef<Transaction[]>,
+      transactions: props.controller.rows as ComputedRef<Transaction[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/dashboard/CryptoTransactionTable.vue

@@ -100,7 +100,7 @@ export default defineComponent({
     }
 
     return {
-      transactions: props.controller.pageRows as ComputedRef<Transaction[]>,
+      transactions: props.controller.rows as ComputedRef<Transaction[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/dashboard/MessageTransactionTable.vue

@@ -104,7 +104,7 @@ export default defineComponent({
     }
 
     return {
-      transactions: props.controller.pageRows as ComputedRef<Transaction[]>,
+      transactions: props.controller.rows as ComputedRef<Transaction[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,

src/components/staking/RewardsTransactionTable.vue

@@ -117,7 +117,7 @@ export default defineComponent({
     return {
       isTouchDevice,
       isMediumScreen,
-      transactions: props.controller.pageRows as ComputedRef<Transaction[]>,
+      transactions: props.controller.rows as ComputedRef<Transaction[]>,
       loading: props.controller.loading as ComputedRef<boolean>,
       total: props.controller.totalRowCount as ComputedRef<number>,
       currentPage: props.controller.currentPage as Ref<number>,