From 95a5305b419d55d339b72bf32ee382a7c907ad0f Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Wed, 5 Jun 2024 16:46:12 +0300
Subject: [PATCH 1/4] Filter by up & standby nodes

---
 packages/gridproxy_client/src/builders/gateways.ts | 1 +
 packages/gridproxy_client/src/builders/nodes.ts    | 2 +-
 packages/playground/src/views/nodes.vue            | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/gridproxy_client/src/builders/gateways.ts b/packages/gridproxy_client/src/builders/gateways.ts
index 0672c70755..c319affdbd 100644
--- a/packages/gridproxy_client/src/builders/gateways.ts
+++ b/packages/gridproxy_client/src/builders/gateways.ts
@@ -5,6 +5,7 @@ export enum NodeStatus {
   Up = "up",
   Down = "down",
   Standby = "standby",
+  UpStandby = "up,standby",
 }
 
 export interface GatewaysQuery {
diff --git a/packages/gridproxy_client/src/builders/nodes.ts b/packages/gridproxy_client/src/builders/nodes.ts
index 35776811c7..d990341b7b 100644
--- a/packages/gridproxy_client/src/builders/nodes.ts
+++ b/packages/gridproxy_client/src/builders/nodes.ts
@@ -129,7 +129,7 @@ const NODES_VALIDATOR: BuilderValidator<NodesQuery> = {
   freeGpu: assertNatural,
   freeIps: assertNatural,
   status(value) {
-    assertIn(value, [NodeStatus.Up, NodeStatus.Down, NodeStatus.Standby]);
+    assertIn(value, [NodeStatus.Up, NodeStatus.Down, NodeStatus.Standby, NodeStatus.UpStandby]);
   },
   city: assertString,
   country: assertString,
diff --git a/packages/playground/src/views/nodes.vue b/packages/playground/src/views/nodes.vue
index 880a13ed14..6ebf74605e 100644
--- a/packages/playground/src/views/nodes.vue
+++ b/packages/playground/src/views/nodes.vue
@@ -46,6 +46,7 @@
                 { title: 'Up', value: NodeStatus.Up },
                 { title: 'Down', value: NodeStatus.Down },
                 { title: 'Standby', value: NodeStatus.Standby },
+                { title: 'Up & Standby', value: NodeStatus.UpStandby },
               ]"
               label="Select Nodes Status"
               item-title="title"
@@ -528,6 +529,7 @@ export default {
       loading.value = true;
       if (retCount) page.value = 1;
       try {
+        console.log("filters.value.status", filters.value.status);
         const { count, data } = await requestNodes(
           {
             page: page.value,

From 81db7b192294747806de2dcb83af43d3a2c61642 Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Wed, 5 Jun 2024 16:51:14 +0300
Subject: [PATCH 2/4] Remove log

---
 packages/playground/src/views/nodes.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/playground/src/views/nodes.vue b/packages/playground/src/views/nodes.vue
index 6ebf74605e..fa993d0b19 100644
--- a/packages/playground/src/views/nodes.vue
+++ b/packages/playground/src/views/nodes.vue
@@ -529,7 +529,6 @@ export default {
       loading.value = true;
       if (retCount) page.value = 1;
       try {
-        console.log("filters.value.status", filters.value.status);
         const { count, data } = await requestNodes(
           {
             page: page.value,

From 280f1f1b792f98d7d2375de165b93ccffdb53c9f Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Wed, 5 Jun 2024 18:06:35 +0300
Subject: [PATCH 3/4] Fix build

---
 packages/gridproxy_client/src/builders/gateways.ts |  6 ++++++
 packages/gridproxy_client/src/builders/nodes.ts    | 11 ++++++++---
 packages/playground/src/views/nodes.vue            | 14 +++++++-------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/gridproxy_client/src/builders/gateways.ts b/packages/gridproxy_client/src/builders/gateways.ts
index c319affdbd..971aca9356 100644
--- a/packages/gridproxy_client/src/builders/gateways.ts
+++ b/packages/gridproxy_client/src/builders/gateways.ts
@@ -5,6 +5,12 @@ export enum NodeStatus {
   Up = "up",
   Down = "down",
   Standby = "standby",
+}
+
+export enum UnifiedNodeStatus {
+  Up = "up",
+  Down = "down",
+  Standby = "standby",
   UpStandby = "up,standby",
 }
 
diff --git a/packages/gridproxy_client/src/builders/nodes.ts b/packages/gridproxy_client/src/builders/nodes.ts
index d990341b7b..0e5585fda7 100644
--- a/packages/gridproxy_client/src/builders/nodes.ts
+++ b/packages/gridproxy_client/src/builders/nodes.ts
@@ -1,6 +1,6 @@
 import { assertBoolean, assertId, assertIn, assertInt, assertNatural, assertPattern, assertString } from "../utils";
 import { AbstractBuilder, BuilderMapper, BuilderMethods, BuilderValidator } from "./abstract_builder";
-import { ID_PATTERN, NodeStatus } from "./gateways";
+import { ID_PATTERN, UnifiedNodeStatus } from "./gateways";
 
 export enum SortBy {
   NodeId = "node_id",
@@ -47,7 +47,7 @@ export interface NodesQuery {
   totalSru: number;
   totalHru: number;
   freeIps: number;
-  status: NodeStatus;
+  status: UnifiedNodeStatus;
   city: string;
   country: string;
   region: string;
@@ -129,7 +129,12 @@ const NODES_VALIDATOR: BuilderValidator<NodesQuery> = {
   freeGpu: assertNatural,
   freeIps: assertNatural,
   status(value) {
-    assertIn(value, [NodeStatus.Up, NodeStatus.Down, NodeStatus.Standby, NodeStatus.UpStandby]);
+    assertIn(value, [
+      UnifiedNodeStatus.Up,
+      UnifiedNodeStatus.Down,
+      UnifiedNodeStatus.Standby,
+      UnifiedNodeStatus.UpStandby,
+    ]);
   },
   city: assertString,
   country: assertString,
diff --git a/packages/playground/src/views/nodes.vue b/packages/playground/src/views/nodes.vue
index fa993d0b19..f01adfa4b4 100644
--- a/packages/playground/src/views/nodes.vue
+++ b/packages/playground/src/views/nodes.vue
@@ -43,10 +43,10 @@
               :model-value="filters.status || undefined"
               @update:model-value="filters.status = $event || ''"
               :items="[
-                { title: 'Up', value: NodeStatus.Up },
-                { title: 'Down', value: NodeStatus.Down },
-                { title: 'Standby', value: NodeStatus.Standby },
-                { title: 'Up & Standby', value: NodeStatus.UpStandby },
+                { title: 'Up', value: UnifiedNodeStatus.Up },
+                { title: 'Down', value: UnifiedNodeStatus.Down },
+                { title: 'Standby', value: UnifiedNodeStatus.Standby },
+                { title: 'Up & Standby', value: UnifiedNodeStatus.UpStandby },
               ]"
               label="Select Nodes Status"
               item-title="title"
@@ -444,7 +444,7 @@
 </template>
 
 <script lang="ts">
-import { type GridNode, NodeStatus, SortBy, SortOrder } from "@threefold/gridproxy_client";
+import { type GridNode, SortBy, SortOrder, UnifiedNodeStatus } from "@threefold/gridproxy_client";
 import { sortBy } from "lodash";
 import { computed, onMounted, ref } from "vue";
 import { useRoute } from "vue-router";
@@ -539,7 +539,7 @@ export default {
             farmName: filters.value.farmName || undefined,
             country: filters.value.country,
             region: filters.value.region,
-            status: (filters.value.status as NodeStatus) || undefined,
+            status: (filters.value.status as UnifiedNodeStatus) || undefined,
             freeHru: convertToBytes(filters.value.freeHDD),
             freeMru: convertToBytes(filters.value.freeRAM),
             freeSru: convertToBytes(filters.value.freeSSD),
@@ -606,7 +606,7 @@ export default {
       requestNodes,
       isDialogOpened,
       filters,
-      NodeStatus,
+      UnifiedNodeStatus,
       size,
       page,
       loadNodes,

From 8bfa4c35a4aeb35dd11f72d21846d8f28c2ffed8 Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Thu, 6 Jun 2024 10:35:20 +0300
Subject: [PATCH 4/4] Change status order

---
 packages/playground/src/views/nodes.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/views/nodes.vue b/packages/playground/src/views/nodes.vue
index f01adfa4b4..6a46b9321b 100644
--- a/packages/playground/src/views/nodes.vue
+++ b/packages/playground/src/views/nodes.vue
@@ -44,9 +44,9 @@
               @update:model-value="filters.status = $event || ''"
               :items="[
                 { title: 'Up', value: UnifiedNodeStatus.Up },
-                { title: 'Down', value: UnifiedNodeStatus.Down },
                 { title: 'Standby', value: UnifiedNodeStatus.Standby },
                 { title: 'Up & Standby', value: UnifiedNodeStatus.UpStandby },
+                { title: 'Down', value: UnifiedNodeStatus.Down },
               ]"
               label="Select Nodes Status"
               item-title="title"