Add rentableOrRentedBy query in dedicated filter (#3740)

* Add rentableOrRentedBy query in dedicated filter

* rm unwanted filters

* revert unrelated code

* Get available for filter back

* Handle not rented node error

* Fix check nodes condition

* upgrade lerna version

* discard useless github workflows changes

* Update nodeSelector.ts

* Fix filter options

* disable auto selection for dedicated nodes

Author: samaradel

packages/grid_client/src/modules/models.ts

@@ -639,6 +639,7 @@ class FilterOptions {
   @Expose() @IsOptional() @Transform(({ value }) => NodeStatus[value]) @IsEnum(NodeStatus) status?: NodeStatus;
   @Expose() @IsOptional() @IsString() region?: string;
   @Expose() @IsOptional() @IsBoolean() healthy?: boolean;
+  @Expose() @IsOptional() @IsInt() rentableOrRentedBy?: number;
   @Expose() @IsOptional() @IsBoolean() planetary?: boolean;
   @Expose() @IsOptional() @IsBoolean() mycelium?: boolean;
   @Expose() @IsOptional() @IsBoolean() wireguard?: boolean;

packages/grid_client/src/primitives/nodes.ts

@@ -460,6 +460,7 @@ class Nodes {
       healthy: options.healthy,
       sort_by: SortBy.FreeCRU,
       sort_order: SortOrder.Desc,
+      rentable_or_rented_by: options.rentableOrRentedBy,
       features: options.features,
     };
 

packages/playground/src/components/node_selector/TfAutoNodeSelector.vue

@@ -230,6 +230,7 @@ export default {
       );
 
       if (node) {
+        if (node?.dedicated && node.rentContractId === 0) return false;
         await props.loadFarm(node.farmId);
         bindModelValue(node);
         nodeInputValidateTask.value.run(node);

packages/playground/src/components/node_selector/TfNodeDetailsCard.vue

@@ -18,6 +18,7 @@
             if (status === 'Init' && node) {
               $emit('node:select', (node as NodeInfo));
             }
+            if(node?.dedicated && node.rentContractId === 0) return false
             await validateRentContract(gridStore, node as NodeInfo);
           }
         : undefined,

packages/playground/src/types/nodeSelector.ts

@@ -23,6 +23,7 @@ export interface SelectionDetailsFilters {
   certified?: boolean;
   dedicated?: boolean;
   exclusiveFor?: string;
+  rentable_or_rented_by?: number;
   planetary?: boolean;
   mycelium?: boolean;
   wireguard?: boolean;

packages/playground/src/utils/nodeSelector.ts

@@ -201,13 +201,13 @@ export function normalizeNodeFilters(
     publicIPs: filters.ipv4 || undefined,
     hasIPv6: filters.ipv6 || undefined,
     hasGPU: filters.hasGPU || undefined,
-    rentedBy: filters.dedicated ? options?.twinId : undefined,
     certified: filters.certified || undefined,
-    availableFor: options?.twinId,
+    availableFor: filters.dedicated ? undefined : options?.twinId,
     region: options?.location.region ? options?.location.region : options?.location.subregion,
     country: options?.location.country,
     gateway: options?.gateway,
     healthy: true,
+    rentableOrRentedBy: filters.dedicated ? options?.twinId : undefined,
     planetary: filters.planetary,
     mycelium: filters.mycelium,
     wireguard: filters.wireguard,
@@ -227,6 +227,9 @@ export async function validateRentContract(
   }
 
   try {
+    if (node.dedicated && node.rentedByTwinId === 0) {
+      throw `Node ${node.nodeId} is not rented`;
+    }
     if (node.rentContractId !== 0) {
       const contractInfo = await gridStore.grid.contracts.get({
         id: node.rentContractId,