Use gridStore instead of profile and some refactor to code

threefoldtech · Dec 16, 2024 · ddaea05 · ddaea05
1 parent ec10e33
commit ddaea05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/packages/playground/src/components/node_selector/TfAutoNodeSelector.vue b/packages/playground/src/components/node_selector/TfAutoNodeSelector.vue
@@ -221,6 +221,7 @@ export default {
 
     async function _setValidNode(oldNodeId?: number) {
       const node = await selectValidNode(
+        gridStore,
         props.getFarm,
         _loadedNodes.value,
         props.selectedMachines,

diff --git a/packages/playground/src/utils/nodeSelector.ts b/packages/playground/src/utils/nodeSelector.ts
@@ -8,7 +8,7 @@ import { z } from "zod";
 
 import { gqlClient, gridProxyClient } from "../clients";
 import type { usePagination } from "../hooks";
-import { type useGrid, useProfileManager } from "../stores";
+import { type useGrid } from "../stores";
 import type {
   Locations,
   NormalizeFarmFiltersOptions,
@@ -324,33 +324,21 @@ export function isNodeValid(
 }
 
 export async function selectValidNode(
+  gridStore: ReturnType<typeof useGrid>,
   getFarm: GetFarmFn,
   nodes: NodeInfo[],
   selectedMachines: SelectedMachine[],
   filters: FilterOptions,
   oldSelectedNodeId?: number,
   nodesLock?: AwaitLock,
 ): Promise<NodeInfo | void> {
-  let locked = true;
-  if (nodesLock && !nodesLock.acquired) {
-    locked = false;
-    await nodesLock.acquireAsync();
-  }
-  const profileManager = useProfileManager();
-  let node;
-  node = nodes.find(n => {
-    return n.rentedByTwinId === profileManager?.profile?.twinId;
-  });
+  const locked = true;
 
-  if (node && isNodeValid(getFarm, node, selectedMachines, filters)) {
-    if (nodesLock && !locked) {
-      release(nodesLock);
-    }
-    return node;
-  }
-
-  if (oldSelectedNodeId) {
-    node = nodes.find(n => n.nodeId === oldSelectedNodeId);
+  const rentedNode = nodes.find(n => {
+    return n.rentedByTwinId === gridStore.grid.twinId;
+  });
+  if (oldSelectedNodeId || rentedNode) {
+    const node = rentedNode || nodes.find(n => n.nodeId === oldSelectedNodeId);
 
     if (node && isNodeValid(getFarm, node, selectedMachines, filters)) {
       if (nodesLock && !locked) {