merge

packages/playground/src/components/deployment_data_dialog.vue

@@ -9,7 +9,6 @@
               <v-btn> JSON</v-btn>
             </v-btn-toggle>
           </div>
-
           <v-tabs v-model="activeTab" align-tabs="center" class="my-4 mx-auto" v-if="showType === 0">
             <v-tab
               v-for="(item, index) in contracts"
@@ -228,7 +227,8 @@ async function getGrafanaUrl() {
   }
   isLoading.value = false;
 }
-getGrafanaUrl();
+
+onMounted(async () => await getGrafanaUrl());
 
 async function getGPUInfo() {
   loadingCard.value = true;
@@ -320,6 +320,7 @@ function getTooltipText(contract: any, index: number) {
 
 <script lang="ts">
 import type { GridClient } from "@threefold/grid_client";
+import { onMounted } from "vue";
 
 import { ContractType } from "@/utils/contracts";
 import { createCustomToast, ToastType } from "@/utils/custom_toast";
@@ -339,4 +340,3 @@ export default {
   },
 };
 </script>
-@/utils/get_metrics_url

packages/playground/src/components/manage_caprover_worker_dialog.vue

@@ -114,7 +114,7 @@ async function deploy(layout: any) {
 
     await layout.validateBalance(grid);
 
-    const vm = await addMachine(grid!, {
+    const vms = await addMachine(grid!, {
       name: worker.value.name,
       deploymentName: props.master.name,
       cpu: worker.value.solution!.cpu,
@@ -144,10 +144,7 @@ async function deploy(layout: any) {
       }),
     });
 
-    const [leader, ...workers] = vm;
-    leader.workers = workers;
-    leader.projectName = props.projectName;
-    leader.deploymentName = leader.name;
+    const leader = setCaproverWorkers(vms, props.projectName);
     caproverData.value = leader;
     deployedDialog.value = true;
     layout.setStatus("success", `Successfully add a new worker to Caprover('${props.master.name}') Instance.`);
@@ -159,8 +156,6 @@ async function deploy(layout: any) {
 async function onDelete(cb: (workers: any[]) => void) {
   deleting.value = true;
   for (const worker of selectedWorkers.value) {
-    console.log(props.master.name, worker.name);
-
     try {
       await deleteMachine(grid!, {
         deploymentName: props.master.name,
@@ -185,6 +180,8 @@ async function onDelete(cb: (workers: any[]) => void) {
 <script lang="ts">
 import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 
+import { setCaproverWorkers } from "@/utils/deploy_helpers";
+
 import CaproverWorker, { createWorker } from "../components/caprover_worker.vue";
 import ListTable from "../components/list_table.vue";
 import { updateGrid } from "../utils/grid";

packages/playground/src/components/node_selector/TfDomainName.vue

@@ -147,7 +147,7 @@ export default {
       size: window.env.PAGE_SIZE,
       page: Math.max(1, pagination.value.page),
       farmId: enableCustomDomain.value ? props.farm?.farmId : undefined,
-      availableFor: gridStore.client.twinId,
+      availableFor: gridStore.client?.twinId,
     }));
     const selectedDomain = ref<NodeInfo | null>(null);
     const loadDomains = () => domainsTask.value.run(gridStore, filters.value);

packages/playground/src/components/vm_deployment_table.vue

@@ -257,19 +257,17 @@ async function loadDeployments() {
 
     const vms = mergeLoadedDeployments(chunk1, chunk2, chunk3 as any);
     failedDeployments.value = vms.failedDeployments;
-
     count.value = vms.count;
-    items.value = vms.items
-      .map((vm: any) => {
-        if (props.projectName.toLowerCase() === ProjectName.Caprover.toLowerCase()) {
-          const [leader, ...workers] = vm;
-          leader.workers = workers;
-          return leader;
-        }
-
-        return vm;
-      })
-      .flat();
+    const updatedVMS = vms.items.map((_vms: any) => {
+      const leader = setCaproverWorkers(_vms);
+      return leader || _vms;
+    });
+
+    const has_leader = updatedVMS.filter(vm => vm.env && vm.env["SWM_NODE_MODE"] === "leader").length > 0;
+
+    if (has_leader) {
+      items.value = updatedVMS;
+    }
   } catch (err) {
     errorMessage.value = `Failed to load Deployments: ${err}`;
   } finally {
@@ -460,6 +458,7 @@ defineExpose({ loadDeployments });
 
 <script lang="ts">
 import toHumanDate from "@/utils/date";
+import { setCaproverWorkers } from "@/utils/deploy_helpers";
 
 import { ProjectName } from "../types";
 import { migrateModule } from "../utils/migration";

packages/playground/src/dashboard/components/create_farm.vue

@@ -21,10 +21,10 @@
           <v-card-text>
             <form-validator v-model="valid">
               <input-validator
-                :value="$props.name"
+                :value="farmName"
                 :rules="[
                   validators.required('Farm name is required.'),
-                  name => validators.isAlpha('Farm name must start with an alphabet char.')(name[0]),
+                  (farmName: string) => validators.isAlpha('Farm name must start with an alphabet char.')(farmName[0]),
                   validators.minLength('Farm name minimum length is 3 chars.', 3),
                   validators.maxLength('Farm name maximum length is 40 chars.', 40),
                   validators.pattern('Farm name should not contain whitespaces.', {
@@ -34,13 +34,7 @@
                 :async-rules="[validateFarmName]"
                 #="{ props }"
               >
-                <v-text-field
-                  :model-value="$props.name"
-                  v-bind:="props"
-                  @update:model-value="$emit('update:name', $event)"
-                  outlined
-                  label="Farm name"
-                ></v-text-field>
+                <v-text-field v-model="farmName" v-bind:="props" outlined label="Farm name"></v-text-field>
               </input-validator>
             </form-validator>
           </v-card-text>
@@ -65,26 +59,20 @@ import { createCustomToast, ToastType } from "../../utils/custom_toast";
 
 export default {
   name: "CreateFarm",
-  props: {
-    name: {
-      type: String,
-      required: true,
-    },
-  },
-
-  setup(props, context) {
+  setup() {
     const showDialogue = ref(false);
     const isCreating = ref(false);
     const gridStore = useGrid();
     const valid = ref(false);
+    const farmName = ref("");
 
     async function createFarm() {
       try {
         isCreating.value = true;
-        await gridStore.grid.farms.create({ name: props.name });
+        await gridStore.grid.farms.create({ name: farmName.value });
         createCustomToast("Farm created successfully.", ToastType.success);
         showDialogue.value = false;
-        context.emit("farm-created");
+        farmName.value = "";
         notifyDelaying();
       } catch (error) {
         console.log(error);
@@ -109,6 +97,7 @@ export default {
       showDialogue,
       isCreating,
       valid,
+      farmName,
       createFarm,
       validateFarmName,
     };

packages/playground/src/dashboard/components/public_ips_table.vue

@@ -1,6 +1,18 @@
 <template>
   <div>
-    <ListTable :headers="headers" :items="publicIps" :loading="loading" :deleting="isRemoving" v-model="selectedItems">
+    <ListTable
+      :headers="headers"
+      :items="publicIps"
+      :loading="loading"
+      :items-per-page-options="[
+        { value: 5, title: '5' },
+        { value: 10, title: '10' },
+        { value: 20, title: '20' },
+        { value: 50, title: '50' },
+      ]"
+      :deleting="isRemoving"
+      v-model="selectedItems"
+    >
       <template v-slot:top>
         <v-alert>
           <h4 class="text-center font-weight-medium">Public IPs</h4>
@@ -16,23 +28,21 @@
       <template #[`item.contractId`]="{ item }">
         {{ item.contractId ?? "-" }}
       </template>
-      <template #bottom>
-        <div v-if="publicIps.length > 0" class="d-flex align-end justify-end">
-          <v-btn
-            class="ma-3"
-            color="error"
-            prepend-icon="mdi-delete"
-            :disabled="selectedItems.length === 0 || isRemoving"
-            @click="showDialogue = true"
-          >
-            Delete
-          </v-btn>
-        </div>
-        <div v-else>
-          <p class="my-4">No IPs added on this farm.</p>
-        </div>
-      </template>
     </ListTable>
+    <div v-if="publicIps.length > 0" class="d-flex align-end justify-end">
+      <v-btn
+        class="ma-3"
+        color="error"
+        prepend-icon="mdi-delete"
+        :disabled="selectedItems.length === 0 || isRemoving"
+        @click="showDialogue = true"
+      >
+        Delete
+      </v-btn>
+    </div>
+    <div v-else>
+      <p class="my-4">No IPs added on this farm.</p>
+    </div>
     <v-dialog v-model="showDialogue" max-width="600" attach="#modals">
       <v-card>
         <v-card-title class="text-subtitle-1">

packages/playground/src/dashboard/farms_view.vue

@@ -5,7 +5,7 @@
       <v-card-title class="pa-0">Farms</v-card-title>
     </v-card>
 
-    <CreateFarm v-model:name="name" class="mt-4" @farm-created="farmsReload = true" />
+    <CreateFarm class="mt-4" @farm-created="farmsReload = true" />
     <UserFarms ref="userFarms" :reloadFarms="farmsReload" />
     <UserNodes />
   </div>
@@ -17,7 +17,6 @@ import { ref } from "vue";
 import CreateFarm from "./components/create_farm.vue";
 import UserFarms from "./components/user_farms.vue";
 import UserNodes from "./components/user_nodes.vue";
-
 export default {
   name: "DashboardFarms",
   components: {
@@ -26,11 +25,9 @@ export default {
     CreateFarm,
   },
   setup() {
-    const name = ref<string>("");
     const farmsReload = ref<boolean>(false);
 
     return {
-      name,
       farmsReload,
     };
   },

packages/playground/src/router/index.ts

@@ -609,7 +609,7 @@ function createDeployRoutes(): RouteRecordRaw[] {
         {
           path: DashboardRoutes.Deploy.Domains,
           component: () => import("@/views/domains_view.vue"),
-          meta: { title: "Domains", publicPath: true },
+          meta: { title: "Domains" },
         },
         {
           path: DashboardRoutes.Deploy.NodeFinder,

packages/playground/src/utils/deploy_helpers.ts

@@ -1,4 +1,4 @@
-import { NetworkModel } from "@threefold/grid_client";
+import { NetworkModel, type ZmachineData } from "@threefold/grid_client";
 
 import { generateName } from "./strings";
 
@@ -11,6 +11,30 @@ export function createNetwork(network: Network = {}): NetworkModel {
   return nw;
 }
 
+export function setCaproverWorkers(vms: ZmachineData[], projectName: string | undefined = undefined): ZmachineData {
+  let leader: any = null;
+  const workers: any[] = [];
+
+  vms.forEach((vm: any) => {
+    if (vm.env["SWM_NODE_MODE"] === "leader") {
+      leader = vm;
+    } else if (vm.env["SWM_NODE_MODE"] === "worker") {
+      workers.push(vm);
+    }
+
+    if (projectName && leader) {
+      vm.projectName = projectName;
+      vm.deploymentName = leader.name;
+    }
+  });
+
+  if (leader) {
+    leader.workers = workers;
+  }
+
+  return leader as ZmachineData;
+}
+
 export interface Network {
   name?: string;
   ipRange?: string;

packages/playground/src/utils/manual.ts

@@ -5,7 +5,7 @@ export const manual = {
   tft_bridges: `${BASE}/documentation/threefold_token/tft_bridges/tft_bridges.html`,
   buy_sell_tft: `${BASE}/documentation/threefold_token/buy_sell_tft/buy_sell_tft.html`,
   farmers: `${BASE}/documentation/farmers/farmers.html`,
-  governance: `${BASE}/knowledge_base/about/governance.html`,
+  governance: `${BASE}/documentation/dashboard/tfchain/tf_dao.html`,
   pricing: `${BASE}/knowledge_base/cloud/pricing/pricing.html`,
   dao: `${BASE}/documentation/dashboard/tfchain/tf_dao.html`,
   caprover: `${BASE}/documentation/dashboard/solutions/caprover.html`,

packages/tfchain_client/src/interfaces/chain/augment-api-consts.ts

@@ -69,6 +69,10 @@ declare module "@polkadot/api-base/types/consts" {
        * Max Authorities in use
        **/
       maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of nominators for each validator.
+       **/
+      maxNominators: u32 & AugmentedConst<ApiType>;
       /**
        * The maximum number of entries to keep in the set id to session index mapping.
        *

packages/tfchain_client/src/interfaces/chain/augment-api-errors.ts

@@ -81,6 +81,10 @@ declare module "@polkadot/api-base/types/errors" {
        * Account is not a member
        **/
       NotMember: AugmentedError<ApiType>;
+      /**
+       * Prime account is not a member
+       **/
+      PrimeAccountNotMember: AugmentedError<ApiType>;
       /**
        * Proposal must exist
        **/
@@ -245,6 +249,7 @@ declare module "@polkadot/api-base/types/errors" {
       CanOnlyIncreaseFrequency: AugmentedError<ApiType>;
       ContractIsNotUnique: AugmentedError<ApiType>;
       ContractNotExists: AugmentedError<ApiType>;
+      ContractPaymentStateNotExists: AugmentedError<ApiType>;
       ContractWrongBillingLoopIndex: AugmentedError<ApiType>;
       FailedToFreeIPs: AugmentedError<ApiType>;
       FailedToReserveIP: AugmentedError<ApiType>;
@@ -274,6 +279,7 @@ declare module "@polkadot/api-base/types/errors" {
       OffchainSignedTxCannotSign: AugmentedError<ApiType>;
       OffchainSignedTxNoLocalAccountAvailable: AugmentedError<ApiType>;
       PricingPolicyNotExists: AugmentedError<ApiType>;
+      RewardDistributionError: AugmentedError<ApiType>;
       ServiceContractApprovalNotAllowed: AugmentedError<ApiType>;
       ServiceContractBillingNotApprovedByBoth: AugmentedError<ApiType>;
       ServiceContractBillingVariableAmountTooHigh: AugmentedError<ApiType>;