Added Node features to Farms request (#4276)

* feat: added node_features to farm filter options

* fix: fixed reload issue

* refactor: used ignore instead of manual check for node_features

* fix: used a copy of filters in reloadfarms to avoid filters reload on adding node_features option

Author: fatmaebrahim

packages/grid_client/src/modules/models.ts

@@ -675,6 +675,10 @@ class FarmFilterOptions {
   @Expose() @IsOptional() @IsBoolean() randomize?: boolean;
   @Expose() @IsOptional() @IsBoolean() ret_count?: boolean;
   @Expose() @IsOptional() @IsString() region?: string;
+  @Expose() @IsOptional() @IsBoolean() planetary?: boolean;
+  @Expose() @IsOptional() @IsBoolean() mycelium?: boolean;
+  @Expose() @IsOptional() @IsBoolean() wireguard?: boolean;
+  @Expose() @IsOptional() node_features?: Features[];
 }
 
 class CalculatorModel {

packages/grid_client/src/primitives/nodes.ts

@@ -387,9 +387,10 @@ class Nodes {
     }
     return nodes;
   }
-  async filterFarms(options: FilterOptions = {}, url = ""): Promise<FarmInfo[]> {
+  async filterFarms(options: FarmFilterOptions = {}, url = ""): Promise<FarmInfo[]> {
     let farms: FarmInfo[] = [];
     url = url || this.proxyURL;
+    options.node_features = this.getFeaturesFromFilters(options);
     const query = this.getFarmUrlQuery(options);
     farms = await send("get", urlJoin(url, `/farms?${query}`), "", {});
     return farms;
@@ -403,8 +404,9 @@ class Nodes {
    * @returns A Promise that resolves to the count of available farms as a number.
    * @throws Error if there is an issue with the HTTP request or response.
    */
-  async getFarmsCount(options: FilterOptions = {}, url = ""): Promise<number> {
+  async getFarmsCount(options: FarmFilterOptions = {}, url = ""): Promise<number> {
     const _options = { ...options };
+    _options.node_features = this.getFeaturesFromFilters(options);
     url = url || this.proxyURL;
     _options.ret_count = true;
     _options.page = 1;
@@ -504,6 +506,7 @@ class Nodes {
       randomize: options.randomize,
       ret_count: options.ret_count,
       region: options.region,
+      node_features: options.node_features,
     };
 
     return convertObjectToQueryString(params);

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

@@ -147,12 +147,12 @@ export default {
     const pageCountTask = useAsync(getFarmPageCount, { default: 1, shouldRun: () => props.validFilters });
     const pagination = usePagination();
 
-    const reloadFarms = () => farmsTask.value.run(gridStore, filters.value, props.filters.exclusiveFor);
+    const reloadFarms = () => farmsTask.value.run(gridStore, { ...filters.value }, props.filters.exclusiveFor);
 
-    useWatchDeep(filters, farmsTask.value.reset, { ignoreFields: ["page"] });
     useWatchDeep(
       filters,
       async filters => {
+        farmsTask.value.reset();
         await pageCountTask.value.run(gridStore, filters);
         pagination.value.reset(pageCountTask.value.data as number);
         await nextTick();

packages/playground/src/utils/nodeSelector.ts

@@ -107,6 +107,9 @@ export function normalizeFarmFilters(
     nodeCertified: filters.certified || undefined,
     nodeHasGPU: filters.hasGPU || undefined,
     nodeHasIPv6: filters.ipv6 || undefined,
+    planetary: filters.planetary,
+    mycelium: filters.mycelium,
+    wireguard: filters.wireguard,
   };
 }