From 846c7b8acf9dd2c4b389d87003f20f68afce61c4 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Sun, 21 Apr 2024 17:15:56 +0200
Subject: [PATCH 1/8] Remove delete btn and add delete all action

---
 .../dashboard/components/public_ips_table.vue | 77 +++++++++++--------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/packages/playground/src/dashboard/components/public_ips_table.vue b/packages/playground/src/dashboard/components/public_ips_table.vue
index 8111952924..2ac720069e 100644
--- a/packages/playground/src/dashboard/components/public_ips_table.vue
+++ b/packages/playground/src/dashboard/components/public_ips_table.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-data-table-server
+    <v-data-table
       :loading="loadingIps"
       loading-text="Loading farm IPs..."
       :headers="headers"
@@ -14,14 +14,21 @@
         { value: 20, title: '20' },
         { value: 50, title: '50' },
       ]"
+      :footer-props="{
+        itemsPerPageText: 'Items per page',
+        itemsPerPageAllText: 'All',
+        showFirstLastPage: true,
+      }"
       :page="page"
       @update:items-per-page="size => updateIPPageSize(size)"
       @update:page="page => updateIPPage(page)"
       class="elevation-1 v-data-table-header"
-      density="compact"
       :disable-sort="true"
       hide-default-header
       :hover="true"
+      show-select
+      v-model="itemsToDelete"
+      :deleting="deleting"
     >
       <template v-slot:top>
         <v-alert class="pa-5" style="height: 20px">
@@ -38,30 +45,35 @@
       <template #[`item.contract_id`]="{ item }">
         {{ item.value.contract_id || "-" }}
       </template>
-      <template #[`item.actions`]="{ item, index }">
-        <v-btn
-          class="text-subtitle-2"
-          size="small"
-          color="error"
-          @click="
-            () => {
-              showDialogue = true;
-              itemToDelete = { ip: item.raw.ip, index };
-            }
-          "
-          :disabled="loading"
-          :loading="loading"
-        >
-          Delete
-        </v-btn>
+      <template #bottom>
+        <div class="d-flex align-end justify-end">
+          <v-btn
+            class="ma-5"
+            color="error"
+            variant="outlined"
+            prepend-icon="mdi-delete"
+            :disabled="itemsToDelete.length === 0 || deleting"
+            @click="showDialogue = true"
+          >
+            Delete
+          </v-btn>
+        </div>
       </template>
-    </v-data-table-server>
+    </v-data-table>
+
     <v-dialog v-model="showDialogue" max-width="600">
       <v-card>
         <v-toolbar color="primary" class="custom-toolbar">
           <p class="mb-5">Delete IP</p>
         </v-toolbar>
-        <v-card-text class="text-subtitle-1">Delete IP {{ itemToDelete?.ip }}? </v-card-text>
+        <v-card-title class="text-subtitle-1">
+          <strong>Delete the following IPs?</strong>
+        </v-card-title>
+        <v-card-text>
+          <v-chip class="ma-1" color="primary" v-for="item in itemsToDelete" :key="item.deploymentName">
+            {{ item.ip }}
+          </v-chip>
+        </v-card-text>
         <v-card-actions class="justify-end px-5 pb-5 pt-0">
           <v-btn @click="showDialogue = false" variant="outlined" color="anchor">Close</v-btn>
           <v-btn
@@ -70,7 +82,7 @@
             color="error"
             :loading="isRemoving"
             :disabled="isRemoving"
-            @click="removeFarmIp({ farmId: $props.farmId, ip: itemToDelete?.ip }, itemToDelete?.index)"
+            @click="removeFarmIp()"
           ></v-btn>
         </v-card-actions>
       </v-card>
@@ -79,7 +91,6 @@
 </template>
 
 <script lang="ts">
-import type { RemoveFarmIPModel } from "@threefold/grid_client";
 import type { PublicIp } from "@threefold/tfchain_client";
 import { onMounted, ref, watch } from "vue";
 
@@ -117,7 +128,6 @@ export default {
         align: "center",
         key: "contractId",
       },
-      { title: "Actions", align: "center", sortable: false, key: "actions" },
     ] as any;
     const publicIps = ref<PublicIp[]>([]);
     const copyPublicIps = ref<PublicIp[]>([]);
@@ -129,9 +139,10 @@ export default {
     const toPublicIP = ref();
     const gateway = ref();
     const isRemoving = ref(false);
-    const itemToDelete = ref();
     const size = ref(5);
     const page = ref(1);
+    const itemsToDelete = ref<any[]>([]);
+    const deleting = ref(false);
 
     onMounted(async () => {
       await getFarmByID(props.farmId);
@@ -163,19 +174,24 @@ export default {
       }
       loadingIps.value = false;
     }
-    async function removeFarmIp(options: RemoveFarmIPModel, index: number) {
+    async function removeFarmIp() {
       try {
         isRemoving.value = true;
-        await gridStore.grid.farms.removeFarmIp({ ip: options.ip, farmId: options.farmId });
-        createCustomToast("IP is deleted successfully!", ToastType.success);
-        publicIps.value.splice(index, 1);
+        for (const item of itemsToDelete.value) {
+          await gridStore.grid.farms.removeFarmIp({
+            ip: item.ip,
+            farmId: props.farmId,
+          });
+          createCustomToast("IP is deleted successfully!", ToastType.success);
+          await getFarmByID(props.farmId);
+        }
       } catch (error) {
         console.log(error);
         createCustomToast("Failed to delete IP!", ToastType.danger);
       } finally {
         isRemoving.value = false;
         showDialogue.value = false;
-        itemToDelete.value = undefined;
+        itemsToDelete.value = [];
       }
     }
     watch(
@@ -196,7 +212,7 @@ export default {
       loading,
       showDialogue,
       isRemoving,
-      itemToDelete,
+      itemsToDelete,
       removeFarmIp,
       page,
       size,
@@ -204,6 +220,7 @@ export default {
       copyPublicIps,
       loadingIps,
       updateIPPageSize,
+      deleting,
     };
   },
 };

From abaf078d7877a8b4fef86d68660686f3bd578c74 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Sun, 21 Apr 2024 17:19:41 +0200
Subject: [PATCH 2/8] rm unwanted footer props

---
 .../playground/src/dashboard/components/public_ips_table.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/playground/src/dashboard/components/public_ips_table.vue b/packages/playground/src/dashboard/components/public_ips_table.vue
index 2ac720069e..de200b7653 100644
--- a/packages/playground/src/dashboard/components/public_ips_table.vue
+++ b/packages/playground/src/dashboard/components/public_ips_table.vue
@@ -14,11 +14,6 @@
         { value: 20, title: '20' },
         { value: 50, title: '50' },
       ]"
-      :footer-props="{
-        itemsPerPageText: 'Items per page',
-        itemsPerPageAllText: 'All',
-        showFirstLastPage: true,
-      }"
       :page="page"
       @update:items-per-page="size => updateIPPageSize(size)"
       @update:page="page => updateIPPage(page)"

From 8f5280e6575563a5a62b8463754932195b2509a2 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Tue, 23 Apr 2024 13:34:40 +0200
Subject: [PATCH 3/8] code enhancement

---
 .../dashboard/components/public_ips_table.vue | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/packages/playground/src/dashboard/components/public_ips_table.vue b/packages/playground/src/dashboard/components/public_ips_table.vue
index de200b7653..d16463b768 100644
--- a/packages/playground/src/dashboard/components/public_ips_table.vue
+++ b/packages/playground/src/dashboard/components/public_ips_table.vue
@@ -30,6 +30,27 @@
           <h4 class="text-center font-weight-medium">Public IPs</h4>
         </v-alert>
       </template>
+      <template #[`item.data-table-select`]="{ item }">
+        <div class="d-flex align-center justify-space-between">
+          <div class="d-flex" @click.stop>
+            <v-progress-circular
+              v-if="isRemoving && itemsToDelete.includes(item?.value)"
+              class="ml-3"
+              color="error"
+              :width="2"
+              :size="20"
+              indeterminate
+            />
+            <v-checkbox-btn
+              v-else
+              color="primary"
+              :disabled="deleting || isRemoving"
+              :model-value="itemsToDelete.includes(item.value)"
+            />
+          </div>
+        </div>
+      </template>
+
       <template #[`item.ip`]="{ item }">
         {{ item.value.ip || "-" }}
       </template>
@@ -47,7 +68,8 @@
             color="error"
             variant="outlined"
             prepend-icon="mdi-delete"
-            :disabled="itemsToDelete.length === 0 || deleting"
+            :loading="deleting"
+            :disabled="itemsToDelete.length === 0 || isRemoving"
             @click="showDialogue = true"
           >
             Delete
@@ -71,14 +93,7 @@
         </v-card-text>
         <v-card-actions class="justify-end px-5 pb-5 pt-0">
           <v-btn @click="showDialogue = false" variant="outlined" color="anchor">Close</v-btn>
-          <v-btn
-            variant="outlined"
-            text="Confirm"
-            color="error"
-            :loading="isRemoving"
-            :disabled="isRemoving"
-            @click="removeFarmIp()"
-          ></v-btn>
+          <v-btn variant="outlined" text="Confirm" color="error" @click="removeFarmIps"></v-btn>
         </v-card-actions>
       </v-card>
     </v-dialog>
@@ -106,6 +121,7 @@ export default {
   setup(props) {
     const gridStore = useGrid();
     const headers = [
+      { title: "PLACEHOLDER", key: "data-table-select" },
       {
         title: "IP",
         align: "center",
@@ -169,23 +185,23 @@ export default {
       }
       loadingIps.value = false;
     }
-    async function removeFarmIp() {
+    async function removeFarmIps() {
       try {
+        showDialogue.value = false;
         isRemoving.value = true;
         for (const item of itemsToDelete.value) {
           await gridStore.grid.farms.removeFarmIp({
             ip: item.ip,
             farmId: props.farmId,
           });
-          createCustomToast("IP is deleted successfully!", ToastType.success);
-          await getFarmByID(props.farmId);
         }
+        createCustomToast("IPs is deleted successfully!", ToastType.success);
+        await getFarmByID(props.farmId);
       } catch (error) {
         console.log(error);
         createCustomToast("Failed to delete IP!", ToastType.danger);
       } finally {
         isRemoving.value = false;
-        showDialogue.value = false;
         itemsToDelete.value = [];
       }
     }
@@ -208,7 +224,7 @@ export default {
       showDialogue,
       isRemoving,
       itemsToDelete,
-      removeFarmIp,
+      removeFarmIps,
       page,
       size,
       updateIPPage,

From fd73d4d6018578513df76047bec2c1aff5e6c2c7 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Wed, 24 Apr 2024 18:07:04 +0200
Subject: [PATCH 4/8] create removeFarmIps function

---
 packages/grid_client/src/modules/farms.ts     |  7 ++
 .../dashboard/components/public_ips_table.vue | 77 ++++++-------------
 packages/tfchain_client/src/farms.ts          | 12 ++-
 3 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/packages/grid_client/src/modules/farms.ts b/packages/grid_client/src/modules/farms.ts
index b2e57ff221..97c2286083 100644
--- a/packages/grid_client/src/modules/farms.ts
+++ b/packages/grid_client/src/modules/farms.ts
@@ -39,6 +39,13 @@ class Farms {
     return (await this.client.farms.removeFarmIp(options)).apply();
   }
 
+  @expose
+  @validateInput
+  @checkBalance
+  async removeFarmIps(options: RemoveFarmIPModel[]) {
+    return await this.client.farms.removeFarmIps(options);
+  }
+
   @expose
   @validateInput
   @checkBalance
diff --git a/packages/playground/src/dashboard/components/public_ips_table.vue b/packages/playground/src/dashboard/components/public_ips_table.vue
index d16463b768..740973ec87 100644
--- a/packages/playground/src/dashboard/components/public_ips_table.vue
+++ b/packages/playground/src/dashboard/components/public_ips_table.vue
@@ -7,50 +7,21 @@
       :items="copyPublicIps"
       :items-length="publicIps.length"
       :items-per-page="size"
-      :items-per-page-options="[
-        { value: 5, title: '5' },
-        { value: 10, title: '10' },
-        { value: 15, title: '15' },
-        { value: 20, title: '20' },
-        { value: 50, title: '50' },
-      ]"
       :page="page"
       @update:items-per-page="size => updateIPPageSize(size)"
       @update:page="page => updateIPPage(page)"
       class="elevation-1 v-data-table-header"
       :disable-sort="true"
       hide-default-header
-      :hover="true"
+      hover
       show-select
-      v-model="itemsToDelete"
-      :deleting="deleting"
+      v-model="selectedItems"
     >
       <template v-slot:top>
         <v-alert class="pa-5" style="height: 20px">
           <h4 class="text-center font-weight-medium">Public IPs</h4>
         </v-alert>
       </template>
-      <template #[`item.data-table-select`]="{ item }">
-        <div class="d-flex align-center justify-space-between">
-          <div class="d-flex" @click.stop>
-            <v-progress-circular
-              v-if="isRemoving && itemsToDelete.includes(item?.value)"
-              class="ml-3"
-              color="error"
-              :width="2"
-              :size="20"
-              indeterminate
-            />
-            <v-checkbox-btn
-              v-else
-              color="primary"
-              :disabled="deleting || isRemoving"
-              :model-value="itemsToDelete.includes(item.value)"
-            />
-          </div>
-        </div>
-      </template>
-
       <template #[`item.ip`]="{ item }">
         {{ item.value.ip || "-" }}
       </template>
@@ -68,8 +39,7 @@
             color="error"
             variant="outlined"
             prepend-icon="mdi-delete"
-            :loading="deleting"
-            :disabled="itemsToDelete.length === 0 || isRemoving"
+            :disabled="selectedItems.length === 0 || isRemoving"
             @click="showDialogue = true"
           >
             Delete
@@ -77,23 +47,27 @@
         </div>
       </template>
     </v-data-table>
-
     <v-dialog v-model="showDialogue" max-width="600">
       <v-card>
         <v-toolbar color="primary" class="custom-toolbar">
-          <p class="mb-5">Delete IP</p>
+          <p class="mb-5">Delete IPs</p>
         </v-toolbar>
         <v-card-title class="text-subtitle-1">
           <strong>Delete the following IPs?</strong>
         </v-card-title>
         <v-card-text>
-          <v-chip class="ma-1" color="primary" v-for="item in itemsToDelete" :key="item.deploymentName">
+          <v-chip class="ma-1" color="primary" v-for="item in selectedItems" :key="item">
             {{ item.ip }}
           </v-chip>
         </v-card-text>
         <v-card-actions class="justify-end px-5 pb-5 pt-0">
           <v-btn @click="showDialogue = false" variant="outlined" color="anchor">Close</v-btn>
-          <v-btn variant="outlined" text="Confirm" color="error" @click="removeFarmIps"></v-btn>
+          <v-btn
+            variant="outlined"
+            :text="isRemoving ? 'Deleting..' : 'Confirm'"
+            color="error"
+            @click="removeFarmIps"
+          ></v-btn>
         </v-card-actions>
       </v-card>
     </v-dialog>
@@ -101,6 +75,7 @@
 </template>
 
 <script lang="ts">
+import { RemoveFarmIPModel } from "@threefold/grid_client";
 import type { PublicIp } from "@threefold/tfchain_client";
 import { onMounted, ref, watch } from "vue";
 
@@ -121,7 +96,6 @@ export default {
   setup(props) {
     const gridStore = useGrid();
     const headers = [
-      { title: "PLACEHOLDER", key: "data-table-select" },
       {
         title: "IP",
         align: "center",
@@ -152,8 +126,8 @@ export default {
     const isRemoving = ref(false);
     const size = ref(5);
     const page = ref(1);
-    const itemsToDelete = ref<any[]>([]);
-    const deleting = ref(false);
+    const selectedItems = ref<any[]>([]);
+    const items = ref<RemoveFarmIPModel[]>([]);
 
     onMounted(async () => {
       await getFarmByID(props.farmId);
@@ -187,22 +161,21 @@ export default {
     }
     async function removeFarmIps() {
       try {
-        showDialogue.value = false;
         isRemoving.value = true;
-        for (const item of itemsToDelete.value) {
-          await gridStore.grid.farms.removeFarmIp({
-            ip: item.ip,
-            farmId: props.farmId,
-          });
-        }
-        createCustomToast("IPs is deleted successfully!", ToastType.success);
+        items.value = selectedItems.value.map(item => ({
+          ip: item.ip,
+          farmId: props.farmId,
+        }));
+        await gridStore.grid.farms.removeFarmIps(items.value);
+        createCustomToast("IP is deleted successfully!", ToastType.success);
         await getFarmByID(props.farmId);
       } catch (error) {
         console.log(error);
         createCustomToast("Failed to delete IP!", ToastType.danger);
       } finally {
         isRemoving.value = false;
-        itemsToDelete.value = [];
+        showDialogue.value = false;
+        selectedItems.value = [];
       }
     }
     watch(
@@ -212,6 +185,7 @@ export default {
       },
       { deep: true },
     );
+
     return {
       gridStore,
       headers,
@@ -223,15 +197,14 @@ export default {
       loading,
       showDialogue,
       isRemoving,
-      itemsToDelete,
       removeFarmIps,
       page,
       size,
+      updateIPPageSize,
       updateIPPage,
       copyPublicIps,
+      selectedItems,
       loadingIps,
-      updateIPPageSize,
-      deleting,
     };
   },
 };
diff --git a/packages/tfchain_client/src/farms.ts b/packages/tfchain_client/src/farms.ts
index 5194a4fdb4..f2d90c33d0 100644
--- a/packages/tfchain_client/src/farms.ts
+++ b/packages/tfchain_client/src/farms.ts
@@ -1,4 +1,5 @@
 import { Client, QueryClient } from "./client";
+import type { ExtrinsicResult } from "./types";
 import { checkConnection } from "./utils";
 
 enum Certification {
@@ -89,7 +90,16 @@ class Farms extends QueryFarms {
   @checkConnection
   async removeFarmIp(options: RemoveFarmIPOptions) {
     const extrinsic = this.client.api.tx.tfgridModule.removeFarmIp(options.farmId, options.ip);
-    return this.client.patchExtrinsic(extrinsic);
+    return this.client.patchExtrinsic<void>(extrinsic);
+  }
+
+  @checkConnection
+  async removeFarmIps(options: RemoveFarmIPOptions[]) {
+    const extrinsics: ExtrinsicResult<void>[] = [];
+    for (const option of options) {
+      extrinsics.push(await this.removeFarmIp(option));
+    }
+    await this.client.applyAllExtrinsics<void>(extrinsics);
   }
 
   @checkConnection

From b038d1c89c7111ac25cd488ce0b5c7b6c0bfa81f Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Thu, 2 May 2024 14:42:18 +0300
Subject: [PATCH 5/8] Add removeFarmIps function in tf grid

---
 .../grid_client/src/clients/tf-grid/client.ts     |  3 ++-
 packages/grid_client/src/clients/tf-grid/farms.ts | 15 +++++++++++++++
 packages/grid_client/src/clients/tf-grid/index.ts |  1 +
 .../src/dashboard/components/public_ips_table.vue |  1 +
 packages/tfchain_client/src/farms.ts              | 11 +----------
 5 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 packages/grid_client/src/clients/tf-grid/farms.ts

diff --git a/packages/grid_client/src/clients/tf-grid/client.ts b/packages/grid_client/src/clients/tf-grid/client.ts
index b3a8d9b320..d1d4eac503 100644
--- a/packages/grid_client/src/clients/tf-grid/client.ts
+++ b/packages/grid_client/src/clients/tf-grid/client.ts
@@ -4,6 +4,7 @@ import { ValidationError } from "@threefold/types";
 import { KeypairType } from "../../zos/deployment";
 import { TFBalances } from "./balances";
 import { TFContracts } from "./contracts";
+import { TFFarms } from "./farms";
 import { TFKVStore } from "./kvstore";
 import { TFTermsAndConditions } from "./terms_and_conditions";
 import { TFTBridge } from "./tftBridge";
@@ -18,7 +19,7 @@ class TFClient extends Client {
   kvStore: TFKVStore = new TFKVStore(this);
   termsAndConditions: TFTermsAndConditions = new TFTermsAndConditions(this);
   tftBridge: TFTBridge = new TFTBridge(this);
-
+  farms: TFFarms = new TFFarms(this);
   constructor(
     public url: string,
     public mnemonic: string,
diff --git a/packages/grid_client/src/clients/tf-grid/farms.ts b/packages/grid_client/src/clients/tf-grid/farms.ts
new file mode 100644
index 0000000000..45c9d48542
--- /dev/null
+++ b/packages/grid_client/src/clients/tf-grid/farms.ts
@@ -0,0 +1,15 @@
+import { ExtrinsicResult, Farm, Farms } from "@threefold/tfchain_client";
+
+import { RemoveFarmIPModel } from "../../modules";
+
+class TFFarms extends Farms {
+  async removeFarmIps(options: RemoveFarmIPModel[]) {
+    const extrinsics: ExtrinsicResult<Farm>[] = [];
+    for (const option of options) {
+      extrinsics.push(await this.removeFarmIp(option));
+    }
+    await this.client.applyAllExtrinsics(extrinsics);
+  }
+}
+
+export { TFFarms };
diff --git a/packages/grid_client/src/clients/tf-grid/index.ts b/packages/grid_client/src/clients/tf-grid/index.ts
index 3ef33641a9..16e0a1b157 100644
--- a/packages/grid_client/src/clients/tf-grid/index.ts
+++ b/packages/grid_client/src/clients/tf-grid/index.ts
@@ -6,3 +6,4 @@ export * from "./balances";
 export * from "./tftPrice";
 export * from "./terms_and_conditions";
 export * from "./tftBridge";
+export * from "./farms";
diff --git a/packages/playground/src/dashboard/components/public_ips_table.vue b/packages/playground/src/dashboard/components/public_ips_table.vue
index 740973ec87..83c7aa7e77 100644
--- a/packages/playground/src/dashboard/components/public_ips_table.vue
+++ b/packages/playground/src/dashboard/components/public_ips_table.vue
@@ -66,6 +66,7 @@
             variant="outlined"
             :text="isRemoving ? 'Deleting..' : 'Confirm'"
             color="error"
+            :disabled="isRemoving"
             @click="removeFarmIps"
           ></v-btn>
         </v-card-actions>
diff --git a/packages/tfchain_client/src/farms.ts b/packages/tfchain_client/src/farms.ts
index f2d90c33d0..71130aef5a 100644
--- a/packages/tfchain_client/src/farms.ts
+++ b/packages/tfchain_client/src/farms.ts
@@ -90,16 +90,7 @@ class Farms extends QueryFarms {
   @checkConnection
   async removeFarmIp(options: RemoveFarmIPOptions) {
     const extrinsic = this.client.api.tx.tfgridModule.removeFarmIp(options.farmId, options.ip);
-    return this.client.patchExtrinsic<void>(extrinsic);
-  }
-
-  @checkConnection
-  async removeFarmIps(options: RemoveFarmIPOptions[]) {
-    const extrinsics: ExtrinsicResult<void>[] = [];
-    for (const option of options) {
-      extrinsics.push(await this.removeFarmIp(option));
-    }
-    await this.client.applyAllExtrinsics<void>(extrinsics);
+    return this.client.patchExtrinsic<Farm>(extrinsic);
   }
 
   @checkConnection

From c760be043970f9ebfc1cc1203572eb21da63b057 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Thu, 9 May 2024 12:39:07 +0300
Subject: [PATCH 6/8] Document removeFarmIps methods

---
 packages/grid_client/src/clients/tf-grid/farms.ts | 8 +++++++-
 packages/grid_client/src/modules/farms.ts         | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/grid_client/src/clients/tf-grid/farms.ts b/packages/grid_client/src/clients/tf-grid/farms.ts
index 45c9d48542..a65cfbcd48 100644
--- a/packages/grid_client/src/clients/tf-grid/farms.ts
+++ b/packages/grid_client/src/clients/tf-grid/farms.ts
@@ -1,7 +1,13 @@
 import { ExtrinsicResult, Farm, Farms } from "@threefold/tfchain_client";
 
 import { RemoveFarmIPModel } from "../../modules";
-
+/**
+ * Removes farm IPs
+ *
+ * @param {RemoveFarmIPModel[]} options - An array of options to remove farm IPs
+ * @returns {Promise<void>} A promise that resolves when all extrinsics have been applied
+ * @see {applyAllExtrinsics} - The method used to apply all extrinsics
+ */
 class TFFarms extends Farms {
   async removeFarmIps(options: RemoveFarmIPModel[]) {
     const extrinsics: ExtrinsicResult<Farm>[] = [];
diff --git a/packages/grid_client/src/modules/farms.ts b/packages/grid_client/src/modules/farms.ts
index 97c2286083..377ece1fd3 100644
--- a/packages/grid_client/src/modules/farms.ts
+++ b/packages/grid_client/src/modules/farms.ts
@@ -39,6 +39,13 @@ class Farms {
     return (await this.client.farms.removeFarmIp(options)).apply();
   }
 
+  /**
+   * Removes farm IPs
+   *
+   * @param {RemoveFarmIPModel[]} options - An array of options to remove farm IPs
+   * @returns {Promise<void>} A promise that resolves when all farm IPs have been removed
+   */
+
   @expose
   @validateInput
   @checkBalance

From a2639b35a33582b499d517a411a8ab2b9bf887f7 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Thu, 9 May 2024 12:56:39 +0300
Subject: [PATCH 7/8] add type keyword

---
 .../playground/src/dashboard/components/public_ips_table.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/dashboard/components/public_ips_table.vue b/packages/playground/src/dashboard/components/public_ips_table.vue
index 83c7aa7e77..8033da0f06 100644
--- a/packages/playground/src/dashboard/components/public_ips_table.vue
+++ b/packages/playground/src/dashboard/components/public_ips_table.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script lang="ts">
-import { RemoveFarmIPModel } from "@threefold/grid_client";
+import type { RemoveFarmIPModel } from "@threefold/grid_client";
 import type { PublicIp } from "@threefold/tfchain_client";
 import { onMounted, ref, watch } from "vue";
 

From dc5d6849f8f05a03d54a7b2b9f5b0783d7873103 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Thu, 9 May 2024 14:25:39 +0300
Subject: [PATCH 8/8] Update removeFarmIps methods documentation

---
 packages/grid_client/src/clients/tf-grid/farms.ts | 14 +++++++++-----
 packages/grid_client/src/modules/farms.ts         | 13 ++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/grid_client/src/clients/tf-grid/farms.ts b/packages/grid_client/src/clients/tf-grid/farms.ts
index a65cfbcd48..8d2e266638 100644
--- a/packages/grid_client/src/clients/tf-grid/farms.ts
+++ b/packages/grid_client/src/clients/tf-grid/farms.ts
@@ -1,14 +1,18 @@
 import { ExtrinsicResult, Farm, Farms } from "@threefold/tfchain_client";
 
 import { RemoveFarmIPModel } from "../../modules";
+
 /**
- * Removes farm IPs
- *
- * @param {RemoveFarmIPModel[]} options - An array of options to remove farm IPs
- * @returns {Promise<void>} A promise that resolves when all extrinsics have been applied
- * @see {applyAllExtrinsics} - The method used to apply all extrinsics
+ * `TFFarms` is a subclass of `Farms` that provides additional functionality.
  */
 class TFFarms extends Farms {
+  /**
+   * Removes farm IPs
+   *
+   * @param {RemoveFarmIPModel[]} options - An array of options used to remove farm IPs
+   * @returns {Promise<void>} A promise that resolves when all extrinsics have been applied
+   * @see {applyAllExtrinsics} - The method used to apply all extrinsics
+   */
   async removeFarmIps(options: RemoveFarmIPModel[]) {
     const extrinsics: ExtrinsicResult<Farm>[] = [];
     for (const option of options) {
diff --git a/packages/grid_client/src/modules/farms.ts b/packages/grid_client/src/modules/farms.ts
index 377ece1fd3..1060aa68bc 100644
--- a/packages/grid_client/src/modules/farms.ts
+++ b/packages/grid_client/src/modules/farms.ts
@@ -39,17 +39,16 @@ class Farms {
     return (await this.client.farms.removeFarmIp(options)).apply();
   }
 
-  /**
-   * Removes farm IPs
-   *
-   * @param {RemoveFarmIPModel[]} options - An array of options to remove farm IPs
-   * @returns {Promise<void>} A promise that resolves when all farm IPs have been removed
-   */
-
   @expose
   @validateInput
   @checkBalance
   async removeFarmIps(options: RemoveFarmIPModel[]) {
+    /**
+     * Removes farm IPs
+     *
+     * @param {RemoveFarmIPModel[]} options - An array of options used to remove farm IPs
+     * @returns {Promise<void>} A promise that resolves when all farm IPs have been removed
+     */
     return await this.client.farms.removeFarmIps(options);
   }