fix: Remove the SortOrderContracts enum and used the SortOrder import…

…ed from the nodes file.
threefoldtech · Jul 29, 2024 · a3be963 · a3be963
1 parent 75c8645
commit a3be963
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/packages/gridproxy_client/src/builders/contracts.ts b/packages/gridproxy_client/src/builders/contracts.ts
@@ -1,5 +1,6 @@
 import { assertBoolean, assertId, assertIn, assertNatural, assertString } from "../utils";
 import { AbstractBuilder, BuilderMapper, BuilderMethods, BuilderValidator } from "./abstract_builder";
+import { SortOrder } from "./nodes";
 
 export enum ContractType {
   Node = "node",
@@ -21,11 +22,6 @@ export enum SortByContracts {
   State = "state",
 }
 
-export enum SortOrderContracts {
-  DESC = "desc",
-  ASC = "asc",
-}
-
 export interface ContractsQuery {
   page: number;
   size: number;
@@ -40,7 +36,7 @@ export interface ContractsQuery {
   deploymentHash: string;
   numberOfPublicIps: number;
   sortBy: SortByContracts;
-  sortOrder: SortOrderContracts;
+  sortOrder: SortOrder;
 }
 
 const CONTRACTS_MAPPER: BuilderMapper<ContractsQuery> = {
@@ -90,7 +86,7 @@ const CONTRACTS_VALIDATOR: BuilderValidator<ContractsQuery> = {
   },
   sortOrder(value) {
     assertString(value);
-    assertIn(value, Object.values(SortOrderContracts));
+    assertIn(value, Object.values(SortOrder));
   },
 };
 

diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -203,13 +203,7 @@
 
 <script lang="ts" setup>
 import type { GridClient, LockContracts } from "@threefold/grid_client";
-import {
-  type Contract,
-  ContractState,
-  NodeStatus,
-  SortByContracts,
-  SortOrderContracts,
-} from "@threefold/gridproxy_client";
+import { type Contract, ContractState, NodeStatus, SortByContracts, SortOrder } from "@threefold/gridproxy_client";
 import { Decimal } from "decimal.js";
 import { computed, defineComponent, onMounted, type Ref, ref } from "vue";
 
@@ -305,7 +299,7 @@ async function loadContractsByType(
       type: contractType,
       retCount: true,
       sortBy: options && options.sort.length ? (options?.sort[0].key as SortByContracts) : undefined,
-      sortOrder: options && options.sort.length ? (options?.sort[0].order as SortOrderContracts) : undefined,
+      sortOrder: options && options.sort.length ? (options?.sort[0].order as SortOrder) : undefined,
     });
 
     table.count.value = response.count ?? 0;