Enhance Node selector toggles (#3952)

* Feature[nodSelector]: toggle rented by me on GPU * chore[nodeSelector]: rename retned by me and rentable nodes
threefoldtech · Feb 27, 2025 · 260fc7b · 260fc7b
1 parent 0a86125
commit 260fc7b
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 65 deletions.
diff --git a/packages/playground/src/components/caprover_worker.vue b/packages/playground/src/components/caprover_worker.vue
@@ -32,16 +32,10 @@
       v-model:wireguard="$props.modelValue.wireguard"
     />
     <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-    <v-switch
-      color="primary"
-      inset
-      label="Nodes rented by me (only)"
-      v-model="$props.modelValue.rentedByMe"
-      hide-details
-    />
+    <v-switch color="primary" inset label="Rented By Me" v-model="$props.modelValue.rentedByMe" hide-details />
     <!-- </input-tooltip> -->
     <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-      <v-switch color="primary" inset label="Rentable nodes" v-model="$props.modelValue.dedicated" hide-details />
+      <v-switch color="primary" inset label="Rentable" v-model="$props.modelValue.dedicated" hide-details />
     </input-tooltip>
     <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">
       <v-switch color="primary" inset label="Certified" v-model="$props.modelValue.certified" hide-details />

diff --git a/packages/playground/src/components/k8s_worker.vue b/packages/playground/src/components/k8s_worker.vue
@@ -77,16 +77,10 @@
     />
 
     <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-    <v-switch
-      color="primary"
-      inset
-      label="Nodes rented by me (only)"
-      v-model="$props.modelValue.rentedByMe"
-      hide-details
-    />
+    <v-switch color="primary" inset label="Rented By Me" v-model="$props.modelValue.rentedByMe" hide-details />
     <!-- </input-tooltip> -->
     <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-      <v-switch color="primary" inset label="Rentable nodes" v-model="$props.modelValue.dedicated" hide-details />
+      <v-switch color="primary" inset label="Rentable" v-model="$props.modelValue.dedicated" hide-details />
     </input-tooltip>
 
     <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/freeflow.vue b/packages/playground/src/weblets/freeflow.vue
@@ -58,10 +58,10 @@
         require-domain
       />
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/full_vm.vue b/packages/playground/src/weblets/full_vm.vue
@@ -63,10 +63,10 @@
           <v-switch color="primary" inset label="GPU" v-model="hasGPU" hide-details />
         </input-tooltip>
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">
@@ -222,9 +222,9 @@ function addDisk() {
 }
 
 watch(
-  dedicated,
-  dedicated => {
-    if (dedicated === false) {
+  [dedicated, rentedByMe],
+  ([dedicated, rentedByMe]) => {
+    if (dedicated === false && rentedByMe === false) {
       hasGPU.value = dedicated;
     }
   },
@@ -236,6 +236,7 @@ watch(
   hasGPU => {
     if (hasGPU) {
       dedicated.value = true;
+      rentedByMe.value = true;
     }
   },
   { immediate: true },

diff --git a/packages/playground/src/weblets/jenkins.vue b/packages/playground/src/weblets/jenkins.vue
@@ -80,10 +80,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/micro_vm.vue b/packages/playground/src/weblets/micro_vm.vue
@@ -57,11 +57,11 @@
         />
 
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
 
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_algorand.vue b/packages/playground/src/weblets/tf_algorand.vue
@@ -69,10 +69,10 @@
       </AlgorandCapacity>
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_casperlabs.vue b/packages/playground/src/weblets/tf_casperlabs.vue
@@ -48,10 +48,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_discourse.vue b/packages/playground/src/weblets/tf_discourse.vue
@@ -70,10 +70,10 @@
         />
 
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_funkwhale.vue b/packages/playground/src/weblets/tf_funkwhale.vue
@@ -100,10 +100,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_gitea.vue b/packages/playground/src/weblets/tf_gitea.vue
@@ -58,10 +58,10 @@
         />
 
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_jitsi.vue b/packages/playground/src/weblets/tf_jitsi.vue
@@ -49,10 +49,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_mattermost.vue b/packages/playground/src/weblets/tf_mattermost.vue
@@ -54,10 +54,10 @@
         />
 
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_nextcloud.vue b/packages/playground/src/weblets/tf_nextcloud.vue
@@ -47,10 +47,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_node_pilot.vue b/packages/playground/src/weblets/tf_node_pilot.vue
@@ -48,10 +48,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_nostr.vue b/packages/playground/src/weblets/tf_nostr.vue
@@ -49,10 +49,10 @@
           require-domain
         />
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_owncloud.vue b/packages/playground/src/weblets/tf_owncloud.vue
@@ -90,10 +90,10 @@
           :has-smtp="smtp.enabled"
         />
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_peertube.vue b/packages/playground/src/weblets/tf_peertube.vue
@@ -74,10 +74,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_presearch.vue b/packages/playground/src/weblets/tf_presearch.vue
@@ -67,10 +67,10 @@
         />
 
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">
           <v-switch color="primary" inset label="Certified" v-model="certified" hide-details />

diff --git a/packages/playground/src/weblets/tf_staticwebsite.vue b/packages/playground/src/weblets/tf_staticwebsite.vue
@@ -73,10 +73,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_subsquid.vue b/packages/playground/src/weblets/tf_subsquid.vue
@@ -62,10 +62,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_taiga.vue b/packages/playground/src/weblets/tf_taiga.vue
@@ -103,10 +103,10 @@
         />
 
         <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-        <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+        <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
         <!-- </input-tooltip> -->
         <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-          <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+          <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
         </input-tooltip>
 
         <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_umbrel.vue b/packages/playground/src/weblets/tf_umbrel.vue
@@ -84,10 +84,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">

diff --git a/packages/playground/src/weblets/tf_wordpress.vue b/packages/playground/src/weblets/tf_wordpress.vue
@@ -101,10 +101,10 @@
       />
 
       <!-- <input-tooltip inline tooltip="" :href="manual"> -->
-      <v-switch color="primary" inset label="Nodes rented by me (only)" v-model="rentedByMe" hide-details />
+      <v-switch color="primary" inset label="Rented By Me" v-model="rentedByMe" hide-details />
       <!-- </input-tooltip> -->
       <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-        <v-switch color="primary" inset label="Rentable nodes" v-model="dedicated" hide-details />
+        <v-switch color="primary" inset label="Rentable" v-model="dedicated" hide-details />
       </input-tooltip>
 
       <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">