Merge branch 'new-subgraph-query' into qos-dashboard

vincenttaglia · Oct 13, 2024 · 172a945 · 172a945
2 parents d931c91 + 00dcd8f
commit 172a945
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/store/allocations.js b/src/store/allocations.js
@@ -433,6 +433,7 @@ export const useAllocationStore = defineStore('allocationStore', {
             subgraphDeployment{
               versions(first:1, orderBy:version, orderDirection:desc){
                 subgraph{
+                  id
                   metadata{
                     image
                     displayName

diff --git a/src/store/newAllocationSetter.js b/src/store/newAllocationSetter.js
@@ -211,8 +211,8 @@ export const useNewAllocationSetterStore = defineStore('allocationSetter', {
             customPOI = `${state.customPOIs[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash]} true `;
           }
         }
-        if(Object.keys(state.newAllocations).includes(allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash)){
-          if(BigNumber(allocationStore.getSelectedAllocations[i].allocatedTokens).dividedBy(10**18) > BigNumber(state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash])){
+        if(subgraphStore.selected.includes(allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash)){
+          if(BigNumber(allocationStore.getSelectedAllocations[i].allocatedTokens).dividedBy(10**18).gt(BigNumber(state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash]))){
             reallocate += `graph indexer actions queue reallocate ${allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash} ${allocationStore.getSelectedAllocations[i].id} ${state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash]} ${customPOI}--network ${chainStore.getActiveChain.id}\n`;
           } else{
             reallocate2 += `graph indexer actions queue reallocate ${allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash} ${allocationStore.getSelectedAllocations[i].id} ${state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash]} ${customPOI}--network ${chainStore.getActiveChain.id}\n`;
@@ -239,7 +239,7 @@ export const useNewAllocationSetterStore = defineStore('allocationSetter', {
           //console.log("CHECK");
           //console.log(BigNumber(allocationStore.getSelectedAllocations[i].allocatedTokens).dividedBy(10**18).toString());
           //console.log(state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash]);
-          if(BigNumber(allocationStore.getSelectedAllocations[i].allocatedTokens).dividedBy(10**18) > BigNumber(state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash])){
+          if(BigNumber(allocationStore.getSelectedAllocations[i].allocatedTokens).dividedBy(10**18).gt(BigNumber(state.newAllocations[allocationStore.getSelectedAllocations[i].subgraphDeployment.ipfsHash]))){
             allo = {
               status: 'queued',
               type: 'reallocate',

diff --git a/src/views/ActionQueueManager.vue b/src/views/ActionQueueManager.vue
@@ -21,7 +21,7 @@
   <br>
   <div class="d-flex justify-space-between">
     <div class="d-flex mr-auto flex-1-1-0 align-center">
-      <v-btn text="Refresh actions" prepend-icon="mdi-refresh" @click="queryActions()" class="mx-5 my-6 d-inline-block align-self-center justify-center" v-if="accountStore.getAgentConnectStatus" stacked></v-btn>
+      <v-btn text="Refresh actions" prepend-icon="mdi-refresh" @click="queryActions()" class="mx-5 my-6" v-if="accountStore.getAgentConnectStatus" stacked></v-btn>
       <v-select
           v-model="managerSettingStore.settings.statusFilter"
           :items="[{title: 'Queued', value: 'queued'}, {title:'Approved', value: 'approved'}, {title: 'Pending', value: 'pending'}, {title: 'Success', value: 'success'}, {title: 'Failed', value: 'failed'}, {title: 'Canceled', value: 'canceled'}]"