Merge pull request #777 from threefoldtech/development_fix_node_filter

fix typo.
threefoldtech · Jul 9, 2023 · 63c24d7 · 63c24d7
2 parents 0c14573 + 3cb4dc5
commit 63c24d7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/packages/dashboard/src/explorer/store/actions.ts b/packages/dashboard/src/explorer/store/actions.ts
@@ -30,7 +30,7 @@ export default {
     let url = `${window.configs.APP_GRIDPROXY_URL}/nodes?ret_count=true`;
     url += `&size=${state.nodesTablePageSize}`;
     url += `&page=${state.nodesTablePageNumber}`;
-    url += `&status=${state.nodeStatusFilter}`;
+    url += `&status=${state.nodeStatusFilter.toLocaleLowerCase()}`;
 
     if (state.nodesGatewayFilter) url += "&ipv4=true&domain=true";
     if (state.nodesGPUFilter) url += "&has_gpu=true";

diff --git a/packages/dashboard/src/explorer/store/mutations.ts b/packages/dashboard/src/explorer/store/mutations.ts
@@ -1,7 +1,7 @@
 import { byInternet } from "country-code-lookup";
 
 import { GetDataQueryType } from "../graphql/api";
-import { NodeSatusFilter } from "../types/FilterOptions";
+import { NodeStatusFilter } from "../types/FilterOptions";
 import { INode } from "./../graphql/api";
 import { IState } from "./state";
 
@@ -126,7 +126,7 @@ export default {
   setGPUFilter(state: IState, payload: boolean) {
     state.nodesGPUFilter = payload;
   },
-  setNodeStatusFilter(state: IState, status: NodeSatusFilter) {
+  setNodeStatusFilter(state: IState, status: NodeStatusFilter) {
     state.nodeStatusFilter = status;
   },
   setNodesFilter(state: IState, payload: { key: string; value: any }) {

diff --git a/packages/dashboard/src/explorer/store/state.ts b/packages/dashboard/src/explorer/store/state.ts
@@ -1,5 +1,5 @@
 import { GetDataQueryType, IFarm, INode } from "../graphql/api";
-import { NodeSatusFilter } from "../types/FilterOptions";
+import { NodeStatusFilter } from "../types/FilterOptions";
 
 interface IInFilter {
   enabled: boolean;
@@ -92,7 +92,7 @@ export interface IState {
   nodesTablePageNumber: number;
   nodesTablePageSize: number;
   nodesGatewayFilter: boolean;
-  nodeStatusFilter: NodeSatusFilter;
+  nodeStatusFilter: NodeStatusFilter;
   nodesGPUFilter: boolean;
 
   /* Refactored Data */
@@ -158,7 +158,7 @@ export default {
   nodesCount: 0,
   nodesTablePageNumber: 1,
   nodesTablePageSize: 10,
-  nodeStatusFilter: NodeSatusFilter.up,
+  nodeStatusFilter: NodeStatusFilter.up,
   nodesGatewayFilter: false,
   nodesGPUFilter: false,
   /* Refactored data */

diff --git a/packages/dashboard/src/explorer/types/FilterOptions.ts b/packages/dashboard/src/explorer/types/FilterOptions.ts
@@ -13,8 +13,8 @@ export default interface IFilterOptions {
   getValue?: (filter: IFilterOptions) => any;
 }
 
-export enum NodeSatusFilter {
-  up = "up",
-  down = "down",
-  standBy = "standby",
+export enum NodeStatusFilter {
+  up = "Up",
+  down = "Down",
+  standBy = "Standby",
 }
diff --git a/packages/dashboard/src/explorer/views/Nodes.vue b/packages/dashboard/src/explorer/views/Nodes.vue
@@ -144,7 +144,7 @@ import NodeFilter from "../components/NodeFilter.vue";
 import { INode } from "../graphql/api";
 import { ActionTypes } from "../store/actions";
 import { MutationTypes } from "../store/mutations";
-import { NodeSatusFilter } from "../types/FilterOptions";
+import { NodeStatusFilter } from "../types/FilterOptions";
 
 @Component({
   components: {
@@ -169,7 +169,7 @@ export default class Nodes extends Vue {
     { text: "Status", value: "status", align: "center", customAlign: "text-center" },
   ];
 
-  statusFilter = NodeSatusFilter;
+  statusFilter = NodeStatusFilter;
   filters = [
     {
       label: "Node ID",
@@ -291,12 +291,12 @@ export default class Nodes extends Vue {
   }
 
   getStatus(node: { status: string }) {
-    if (node.status === NodeSatusFilter.up) {
-      return { color: "green", status: NodeSatusFilter.up };
-    } else if (node.status === NodeSatusFilter.standBy) {
-      return { color: "#dc9123", status: NodeSatusFilter.standBy };
+    if (node.status === NodeStatusFilter.up.toLocaleLowerCase()) {
+      return { color: "green", status: NodeStatusFilter.up };
+    } else if (node.status === NodeStatusFilter.standBy.toLocaleLowerCase()) {
+      return { color: "#dc9123", status: NodeStatusFilter.standBy };
     } else {
-      return { color: "red", status: NodeSatusFilter.down };
+      return { color: "red", status: NodeStatusFilter.down };
     }
   }