From b75e7c34762d548c02ac5a702d6e48f8b228d91b Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Thu, 30 May 2024 17:40:22 +0300
Subject: [PATCH 01/13] Add compute capacity unit tests

---
 .../tests/modules/compute_capacity.test.ts    | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 packages/grid_client/tests/modules/compute_capacity.test.ts

diff --git a/packages/grid_client/tests/modules/compute_capacity.test.ts b/packages/grid_client/tests/modules/compute_capacity.test.ts
new file mode 100644
index 0000000000..fe1d31f498
--- /dev/null
+++ b/packages/grid_client/tests/modules/compute_capacity.test.ts
@@ -0,0 +1,60 @@
+import { ComputeCapacity } from "../../src";
+
+let computeCapacity: ComputeCapacity;
+
+beforeEach(() => {
+  computeCapacity = new ComputeCapacity();
+});
+describe("Compute Capacity module", () => {
+  test("Compute Capacity instance is of type ComputeCapacity.", () => {
+    expect(computeCapacity).toBeInstanceOf(ComputeCapacity);
+  });
+
+  test("Min values for cpu & memory.", () => {
+    const cpu = 0;
+    const mem = 255 * 1024 ** 2;
+
+    computeCapacity.cpu = cpu;
+    computeCapacity.memory = mem;
+
+    const result = () => computeCapacity.challenge();
+
+    expect(result).toThrow();
+  });
+
+  test("Max values for cpu & memory.", () => {
+    const cpu = 33;
+    const mem = 255 * 1024 ** 4;
+
+    computeCapacity.cpu = cpu;
+    computeCapacity.memory = mem;
+
+    const result = () => computeCapacity.challenge();
+
+    expect(result).toThrow();
+  });
+
+  test("cpu & memory doesn't accept decimal values.", () => {
+    const cpu = 1.5;
+    const mem = 1.2;
+
+    computeCapacity.cpu = cpu;
+    computeCapacity.memory = mem;
+
+    const result = () => computeCapacity.challenge();
+
+    expect(result).toThrow();
+  });
+
+  test("An error should be thrown if cpu & memory negative values.", () => {
+    const negative_cpu = -1;
+    const negative_mem = -1;
+
+    computeCapacity.cpu = negative_cpu;
+    computeCapacity.memory = negative_mem;
+
+    const result = () => computeCapacity.challenge();
+
+    expect(result).toThrow();
+  });
+});

From 73ca47223ef63bef9017d86d4e8301d443caa35f Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Thu, 30 May 2024 17:53:28 +0300
Subject: [PATCH 02/13] Test cpu & mem empty values

---
 packages/grid_client/tests/modules/compute_capacity.test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/grid_client/tests/modules/compute_capacity.test.ts b/packages/grid_client/tests/modules/compute_capacity.test.ts
index fe1d31f498..08c0de91b9 100644
--- a/packages/grid_client/tests/modules/compute_capacity.test.ts
+++ b/packages/grid_client/tests/modules/compute_capacity.test.ts
@@ -46,6 +46,12 @@ describe("Compute Capacity module", () => {
     expect(result).toThrow();
   });
 
+  test("cpu & memory empty values.", () => {
+    const result = () => computeCapacity.challenge();
+
+    expect(result).toThrow();
+  });
+
   test("An error should be thrown if cpu & memory negative values.", () => {
     const negative_cpu = -1;
     const negative_mem = -1;

From 88244ede2f494e381b514a8fedd6d13ef39af2d1 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Wed, 12 Jun 2024 10:32:46 +0300
Subject: [PATCH 03/13] Update grid client version in nightly workflow

---
 .github/workflows/grid_client_nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/grid_client_nightly.yml b/.github/workflows/grid_client_nightly.yml
index c6f40644d9..417cd45885 100644
--- a/.github/workflows/grid_client_nightly.yml
+++ b/.github/workflows/grid_client_nightly.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
         if: ${{ env.NETWORK == 'qa' }}
         with:
-          ref: refs/tags/v2.4.3
+          ref: refs/tags/v2.5.0-rc2
       - uses: actions/checkout@v4
         if: ${{ env.NETWORK == 'test' }}
         with:

From b5fde6b5460189494d4362e5310a0a22b6303437 Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Wed, 12 Jun 2024 15:52:25 +0300
Subject: [PATCH 04/13] Fix: reload gateway nodes - add reload node logic, and
 reset the gateway field

---
 .../components/node_selector/TfDomainName.vue | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/packages/playground/src/components/node_selector/TfDomainName.vue b/packages/playground/src/components/node_selector/TfDomainName.vue
index 432058b470..56d38bb7cf 100644
--- a/packages/playground/src/components/node_selector/TfDomainName.vue
+++ b/packages/playground/src/components/node_selector/TfDomainName.vue
@@ -52,7 +52,7 @@
               <template #append-item v-if="pagination.page !== -1">
                 <VContainer>
                   <VBtn
-                    @click="reloadDomains()"
+                    @click="loadDomains()"
                     block
                     color="secondary"
                     variant="tonal"
@@ -149,26 +149,28 @@ export default {
       farmId: enableCustomDomain.value ? props.farm?.farmId : undefined,
       availableFor: gridStore.client.twinId,
     }));
+    const selectedDomain = ref<NodeInfo | null>(null);
+    const loadDomains = () => domainsTask.value.run(gridStore, filters.value);
+
+    const reloadDomains = async (_filters: FilterOptions = filters.value) => {
+      if (selectedDomain.value) {
+        selectedDomain.value = null;
+        bindModelValue();
+        bindStatus();
+      }
+      await pageCountTask.value.run(gridStore, _filters);
+      pagination.value.reset(pageCountTask.value.data as number);
+      await nextTick();
+      loadedDomains.value = [];
+      return loadDomains();
+    };
 
-    const reloadDomains = () => domainsTask.value.run(gridStore, filters.value);
-
-    useWatchDeep(
-      filters,
-      async filters => {
-        await pageCountTask.value.run(gridStore, filters);
-        pagination.value.reset(pageCountTask.value.data as number);
-        await nextTick();
-        loadedDomains.value = [];
-        return reloadDomains();
-      },
-      {
-        immediate: true,
-        deep: true,
-        ignoreFields: ["page"],
-      },
-    );
+    useWatchDeep(filters, reloadDomains, {
+      immediate: true,
+      deep: true,
+      ignoreFields: ["page"],
+    });
     const customDomain = ref("");
-    const selectedDomain = ref<NodeInfo | null>(null);
 
     const domainNameValid = ref<boolean | null>(null);
     watch(domainNameValid, valid => {
@@ -235,6 +237,7 @@ export default {
       domainsTask,
       loadedDomains,
       selectedDomain,
+      loadDomains,
       reloadDomains,
 
       disableSelectedDomain,

From b4861f572313a29d9b53f4f9a2b12b772abc9285 Mon Sep 17 00:00:00 2001
From: Thunder <mahmmoud.hassanein@gmail.com>
Date: Thu, 13 Jun 2024 11:12:32 +0300
Subject: [PATCH 05/13] fix: Remove the available for query from the nodes
 filters (#2975)

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

diff --git a/packages/playground/src/views/nodes.vue b/packages/playground/src/views/nodes.vue
index 02ca59f2f0..a8a3662685 100644
--- a/packages/playground/src/views/nodes.vue
+++ b/packages/playground/src/views/nodes.vue
@@ -559,8 +559,7 @@ export default {
             sortBy: SortBy.Status,
             sortOrder: SortOrder.Asc,
             numGpu: +filters.value.numGpu || undefined,
-            rentable: filters.value.rentable && profileManager.profile ? filters.value.rentable : undefined,
-            availableFor: filters.value.rentable && profileManager.profile ? profileManager.profile.twinId : undefined,
+            rentable: filters.value.rentable ? filters.value.rentable : undefined,
             hasIPv6: filters.value.ipv6 ? filters.value.ipv6 : undefined,
           },
           { loadFarm: true },

From aac6f64ddb833020ef655fce4fd1cd1ee8d1ba1a Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Thu, 13 Jun 2024 12:10:52 +0300
Subject: [PATCH 06/13] Fix: update accessing the nodeId as it becomes of type
 `NormalizedContracts` this is necessary now after changes in #2872

---
 .../src/components/contracts_list/contracts_table.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index c319801afe..3e5ce53db4 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -346,7 +346,7 @@ const isNodeInRentContracts = computed(() => {
       .map(contract => contract.details.nodeId)
       .filter(nodeId => nodeId !== undefined) as number[];
     if (contractLocked.value && contractLocked.value.amountLocked === 0) {
-      return nodeIds.includes(selectedItem.value.nodeId);
+      return nodeIds.includes(selectedItem.value.details.nodeId);
     }
   }
   return false;

From adcc8313c07c8d2e27b7eb4763ef000bb46e2462 Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Thu, 13 Jun 2024 12:12:59 +0300
Subject: [PATCH 07/13] Feat: enhance isNodeInRentContract Make the nodeIds as
 Set to avoid node ids redundancy

---
 .../src/components/contracts_list/contracts_table.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index 3e5ce53db4..c2e4409eab 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -342,11 +342,11 @@ const getAmountLocked = computed(() => {
 
 const isNodeInRentContracts = computed(() => {
   if (props.contractsType == ContractType.Node && selectedItem.value) {
-    const nodeIds = props.contracts.value
-      .map(contract => contract.details.nodeId)
-      .filter(nodeId => nodeId !== undefined) as number[];
+    const nodeIds = new Set(
+      props.contracts.value.map(contract => contract.details.nodeId).filter(nodeId => nodeId !== undefined) as number[],
+    );
     if (contractLocked.value && contractLocked.value.amountLocked === 0) {
-      return nodeIds.includes(selectedItem.value.details.nodeId);
+      return nodeIds.has(selectedItem.value.details.nodeId);
     }
   }
   return false;

From a42fa719ab343a276680b63750b7e8adcce625f4 Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Thu, 13 Jun 2024 12:38:15 +0300
Subject: [PATCH 08/13] Feat: apply comment-remove parentheses

---
 .../playground/src/components/node_selector/TfDomainName.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/playground/src/components/node_selector/TfDomainName.vue b/packages/playground/src/components/node_selector/TfDomainName.vue
index 56d38bb7cf..13c708b621 100644
--- a/packages/playground/src/components/node_selector/TfDomainName.vue
+++ b/packages/playground/src/components/node_selector/TfDomainName.vue
@@ -52,7 +52,7 @@
               <template #append-item v-if="pagination.page !== -1">
                 <VContainer>
                   <VBtn
-                    @click="loadDomains()"
+                    @click="loadDomains"
                     block
                     color="secondary"
                     variant="tonal"
@@ -65,7 +65,7 @@
               </template>
               <template v-slot:append>
                 <v-slide-x-reverse-transition mode="out-in">
-                  <v-icon icon="mdi-reload" @click="reloadDomains()"></v-icon>
+                  <v-icon icon="mdi-reload" @click="reloadDomains"></v-icon>
                 </v-slide-x-reverse-transition>
               </template>
             </VAutocomplete>

From 16a53e0a6bf16d9a3939fb32e629e3b7591c7780 Mon Sep 17 00:00:00 2001
From: khaledyoussef24 <mahmoudk@incubaid.com>
Date: Thu, 13 Jun 2024 13:11:20 +0300
Subject: [PATCH 09/13] fixing auto issue creation

---
 .github/workflows/grid_client_nightly.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/grid_client_nightly.yml b/.github/workflows/grid_client_nightly.yml
index 07623b11be..a17d5414a7 100644
--- a/.github/workflows/grid_client_nightly.yml
+++ b/.github/workflows/grid_client_nightly.yml
@@ -134,7 +134,12 @@ jobs:
           steps.deleteall.outcome != 'success' 
         run: exit 1
 
+      - name: Get the day of the week
+        id: dayofweek
+        run: echo "DAY_OF_WEEK=$(date +%u)" >> $GITHUB_ENV
+
       - name: Create GitHub Issue on Failure
+        if: needs.teststatus.result == 'failure' && env.DAY_OF_WEEK != '5' && env.DAY_OF_WEEK != '6'
         uses: dacbd/create-issue-action@main
         with:
           token: ${{ github.token }}
@@ -151,7 +156,6 @@ jobs:
             - Commit: ${{ github.sha }}
             - Network: `${{ env.NETWORK }}`
   
-
             Dynamic Single Vm: ${{ steps.dynamicsinglevm.outcome }}
             Multiple Vm: ${{ steps.multiplevm.outcome }}
             Kubernetes: ${{ steps.kubernetes.outcome }}
@@ -160,5 +164,4 @@ jobs:
             Kvstore: ${{ steps.kvstore.outcome }}
             Zdb: ${{ steps.zdb.outcome }}
             Delete all contracts: ${{ steps.deleteall.outcome }}
-          labels: type_bug , grid_client                 
-
+          labels: type_bug, grid_client

From a58fb6802d99af90f569a900811f4a8f8f43ac01 Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Thu, 13 Jun 2024 14:12:14 +0300
Subject: [PATCH 10/13] Fix: restore unlock contracts logic, the line was
 deleted by mistake

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

diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
index cf6c5193b5..779e9a778a 100644
--- a/packages/playground/src/weblets/tf_contracts_list.vue
+++ b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -310,7 +310,7 @@ async function loadContracts(type?: ContractType) {
         loadContractsByType(ContractType.Rent, rentContracts),
       ]);
     }
-
+    await getContractsLockDetails();
     contracts.value = [...nodeContracts.value, ...nameContracts.value, ...rentContracts.value];
 
     // Update the total cost of the contracts.

From be4047b2c324d5fd5f9039b7ad50d51f39449683 Mon Sep 17 00:00:00 2001
From: AhmedHanafy725 <41957921+AhmedHanafy725@users.noreply.github.com>
Date: Thu, 13 Jun 2024 14:35:51 +0300
Subject: [PATCH 11/13] Update grid client version in the nightly workflow to
 2.5.0-rc2

---
 .github/workflows/grid_client_nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/grid_client_nightly.yml b/.github/workflows/grid_client_nightly.yml
index 417cd45885..b80d5edcb7 100644
--- a/.github/workflows/grid_client_nightly.yml
+++ b/.github/workflows/grid_client_nightly.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
         if: ${{ env.NETWORK == 'test' }}
         with:
-          ref: refs/tags/v2.4.3
+          ref: refs/tags/v2.5.0-rc2
       - uses: actions/checkout@v4
         if: ${{ env.NETWORK == 'main' }}
         with:

From d651b2d372cdad060affc329af73a0edcf225e6d Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Thu, 20 Jun 2024 12:54:17 +0300
Subject: [PATCH 12/13] Style: align card actions to right add margin to unlock
 all contracts btn

---
 .../src/components/contracts_list/contracts_table.vue       | 6 +++---
 packages/playground/src/weblets/tf_contracts_list.vue       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index c2e4409eab..0aa55d1a80 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -166,7 +166,7 @@
           above.</v-alert
         >
 
-        <v-card-actions>
+        <v-card-actions class="justify-end mb-1 mr-2">
           <v-btn color="anchor" class="mr-2 px-3" @click="contractStateDialog = false"> Close </v-btn>
           <v-tooltip
             :text="
@@ -246,7 +246,7 @@
         <v-chip class="ma-1" label v-for="c in selectedContracts" :key="c.contract_id">
           {{ c.contract_id }}
         </v-chip>
-        <v-card-actions>
+        <v-card-actions class="justify-end mb-1 mr-2">
           <v-btn color="anchor" @click="unlockDialog = false"> Cancel </v-btn>
           <v-tooltip
             :text="
@@ -377,7 +377,7 @@ const profileManagerController = useProfileManagerController();
 const balance = profileManagerController.balance;
 const freeBalance = computed(() => balance.value?.free ?? 0 - (balance.value?.locked ?? 0));
 const unlockContractLoading = ref(false);
-const unlockDialog = ref(false);
+const unlockDialog = ref(true);
 const selectedLockedContracts = computed(() => {
   if (selectedContracts.value.length == 0) return false;
   for (const contract of selectedContracts.value) {
diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
index 779e9a778a..bc84bc93b1 100644
--- a/packages/playground/src/weblets/tf_contracts_list.vue
+++ b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -119,6 +119,7 @@
                 color="warning"
                 @click="unlockAllContracts"
                 :loading="unlockContractLoading"
+                class="ml-2"
               >
                 Unlock contracts
               </v-btn>

From 49e2f4fc580ff203a1da9c632f8f33c00da24a48 Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Thu, 20 Jun 2024 12:58:03 +0300
Subject: [PATCH 13/13] Fix: revert debug line

---
 .../src/components/contracts_list/contracts_table.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index 0aa55d1a80..d1f341bd56 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -377,7 +377,7 @@ const profileManagerController = useProfileManagerController();
 const balance = profileManagerController.balance;
 const freeBalance = computed(() => balance.value?.free ?? 0 - (balance.value?.locked ?? 0));
 const unlockContractLoading = ref(false);
-const unlockDialog = ref(true);
+const unlockDialog = ref(false);
 const selectedLockedContracts = computed(() => {
   if (selectedContracts.value.length == 0) return false;
   for (const contract of selectedContracts.value) {