Merge pull request #2225 from threefoldtech/development_314_sync

Sync development_314 with development
threefoldtech · Feb 22, 2024 · 358435b · 358435b
2 parents a5fd7a7 + 4dc4ac2
commit 358435b
Show file tree

Hide file tree

Showing 43 changed files with 1,013 additions and 142 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "npmClient": "yarn"
 }
diff --git a/packages/UI/package.json b/packages/UI/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "private": false,
   "main": "dist/threefold-ui.umd.js",
   "publishConfig": {

diff --git a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.3.0-alpha11"
+appVersion: "v2.3.0-alpha12"
diff --git a/packages/dashboard/charts/tfgrid-dashboard/values.yaml b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/threefoldtech/dashboard
   pullPolicy: Always
-  tag: "2.3.0-alpha11"
+  tag: "2.3.0-alpha12"
 
   env:
     - name: "STELLAR_NETWORK"

diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/dashboard",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,8 +19,8 @@
     "@polkadot/extension-dapp": "0.45.1",
     "@polkadot/ui-keyring": "^2.2.1",
     "@popperjs/core": "^2.11.5",
-    "@threefold/grid_client": "^2.3.0-alpha11",
-    "@threefold/tfchain_client": "^2.3.0-alpha11",
+    "@threefold/grid_client": "^2.3.0-alpha12",
+    "@threefold/tfchain_client": "^2.3.0-alpha12",
     "@types/ip": "^1.1.0",
     "@types/md5": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",

diff --git a/packages/graphql_client/package.json b/packages/graphql_client/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@threefold/graphql_client",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "scripts": {
     "build": "tsc"
   },
   "dependencies": {
-    "@threefold/types": "^2.3.0-alpha11",
+    "@threefold/types": "^2.3.0-alpha12",
     "ts-mixer": "^6.0.2"
   },
   "devDependencies": {

diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,9 +14,9 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.3.0-alpha11",
-    "@threefold/tfchain_client": "^2.3.0-alpha11",
-    "@threefold/types": "^2.3.0-alpha11",
+    "@threefold/rmb_direct_client": "^2.3.0-alpha12",
+    "@threefold/tfchain_client": "^2.3.0-alpha12",
+    "@threefold/types": "^2.3.0-alpha12",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "await-lock": "^2.2.2",

diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
@@ -386,7 +386,6 @@ class Nodes {
       free_ips: options.publicIPs ? 1 : "",
       ipv4: options.accessNodeV4,
       ipv6: options.accessNodeV6,
-      gateway: options.gateway,
       certification_type: options.certified ? "Certified" : "",
       farm_ids: options.farmId ? [options.farmId] : options.farmIds,
       farm_name: options.farmName,

diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
   "repository": {
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.3.0-alpha11",
+    "@threefold/grid_client": "^2.3.0-alpha12",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"

diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
   "repository": {
@@ -12,12 +12,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.3.0-alpha11",
-    "@threefold/rmb_peer_server": "^2.3.0-alpha11",
+    "@threefold/grid_client": "^2.3.0-alpha12",
+    "@threefold/rmb_peer_server": "^2.3.0-alpha12",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.3.0-alpha11",
+    "@threefold/rmb_peer_client": "^2.3.0-alpha12",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",

diff --git a/packages/gridproxy_client/package.json b/packages/gridproxy_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/gridproxy_client",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "description": "gridproxy_client help to interact with gridproxy based on network",
   "main": "dist/public_api.js",
   "types": "dist/public_api.d.ts",

diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/monitoring",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "description": "Threefold monitoring package",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/rmb_direct_client": "^2.3.0-alpha11",
-    "@threefold/tfchain_client": "^2.3.0-alpha11",
-    "@threefold/types": "^2.3.0-alpha11",
+    "@threefold/rmb_direct_client": "^2.3.0-alpha12",
+    "@threefold/tfchain_client": "^2.3.0-alpha12",
+    "@threefold/types": "^2.3.0-alpha12",
     "axios": "^0.27.2",
     "chalk": "4.1.2",
     "ts-node": "^10.9.1",

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.3.0-alpha11",
+  "version": "2.3.0-alpha12",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/graphql_client": "^2.3.0-alpha11",
-    "@threefold/grid_client": "^2.3.0-alpha11",
-    "@threefold/gridproxy_client": "^2.3.0-alpha11",
-    "@threefold/types": "^2.3.0-alpha11",
+    "@threefold/graphql_client": "^2.3.0-alpha12",
+    "@threefold/grid_client": "^2.3.0-alpha12",
+    "@threefold/gridproxy_client": "^2.3.0-alpha12",
+    "@threefold/types": "^2.3.0-alpha12",
     "await-lock": "^2.2.2",
     "bip39": "^3.1.0",
     "chart.js": "^4.4.0",

diff --git a/packages/playground/playground-charts/Chart.yaml b/packages/playground/playground-charts/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.3.0-alpha11"
+appVersion: "v2.3.0-alpha12"
diff --git a/packages/playground/playground-charts/values.yaml b/packages/playground/playground-charts/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/playground
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.3.0-alpha11"
+  tag: "2.3.0-alpha12"
 
   env:
     - name: "MODE"

diff --git a/packages/playground/public/config.js b/packages/playground/public/config.js
@@ -9,6 +9,7 @@ window.env = {
   STELLAR_NETWORK: "test",
   STELLAR_HORIZON_URL: "https://horizon-testnet.stellar.org",
   TFT_ASSET_ISSUER: "GA47YZA3PKFUZMPLQ3B5F2E3CJIB57TGGU7SPCQT2WAEYKN766PWIMB3",
+  STATS_URL: "https://stats.dev.grid.tf",
   MINTING_URL: "",
   TIMEOUT: +"10000",
   PAGE_SIZE: +"20",

diff --git a/packages/playground/scripts/build-env.sh b/packages/playground/scripts/build-env.sh
@@ -6,6 +6,7 @@ STELLAR_NETWORK="${STELLAR_NETWORK:=test}"
 TIMEOUT="${TIMEOUT:=10000}"
 PAGE_SIZE="${PAGE_SIZE:=20}"
 MINTING_URL="https://alpha.minting.tfchain.grid.tf"
+STATS_URL="https://stats.grid.tf"
 
 # Env vars must provide in `custom` mode
 REQUIRED_ENV_VARS=(
@@ -31,6 +32,7 @@ case $MODE in
     ACTIVATION_SERVICE_URL='https://activation.dev.grid.tf/activation/activate'
     RELAY_DOMAIN='wss://relay.dev.grid.tf'
     BRIDGE_TFT_ADDRESS=GDHJP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6BCFG
+    STATS_URL='https://stats.dev.grid.tf'
     STELLAR_NETWORK=test
   ;;
 
@@ -41,6 +43,7 @@ case $MODE in
     ACTIVATION_SERVICE_URL='https://activation.qa.grid.tf/activation/activate'
     RELAY_DOMAIN='wss://relay.qa.grid.tf'
     BRIDGE_TFT_ADDRESS=GAQH7XXFBRWXT2SBK6AHPOLXDCLXVFAKFSOJIRMRNCDINWKHGI6UYVKM
+    STATS_URL='https://stats.qa.grid.tf'
     STELLAR_NETWORK=test
   ;;
 
@@ -51,6 +54,7 @@ case $MODE in
     ACTIVATION_SERVICE_URL='https://activation.test.grid.tf/activation/activate'
     RELAY_DOMAIN='wss://relay.test.grid.tf'
     BRIDGE_TFT_ADDRESS=GA2CWNBUHX7NZ3B5GR4I23FMU7VY5RPA77IUJTIXTTTGKYSKDSV6LUA4
+    STATS_URL='https://stats.test.grid.tf'
     STELLAR_NETWORK=main
   ;;
 
@@ -110,6 +114,7 @@ window.env = {
   STELLAR_HORIZON_URL: '$STELLAR_HORIZON_URL',
   TFT_ASSET_ISSUER: '$TFT_ASSET_ISSUER',
   MINTING_URL: '$MINTING_URL',
+  STATS_URL: '$STATS_URL',
   TIMEOUT: +'$TIMEOUT',
   PAGE_SIZE: +'$PAGE_SIZE'
 };

diff --git a/packages/playground/src/components/connect_wallet_landing.vue b/packages/playground/src/components/connect_wallet_landing.vue
@@ -56,9 +56,7 @@
         </div>
 
         <div class="d-flex justify-center mt-5">
-          <v-btn color="primary" target="_blank" @click="$router.push(DashboardRoutes.TFGrid.NodeStatistics)">
-            Explore ThreeFold Grid Capacity
-          </v-btn>
+          <v-btn color="primary" target="_blank" :href="statsUrl"> Explore ThreeFold Grid Capacity </v-btn>
         </div>
       </div>
       <div class="text-center">
@@ -87,47 +85,26 @@
 
 <script lang="ts">
 import { computed } from "vue";
-import { useRoute, useRouter } from "vue-router";
+import { useRoute } from "vue-router";
 import { useTheme } from "vuetify";
 
 import { DashboardRoutes } from "@/router/routes";
-
+import { useStatsStore } from "@/stores/stats";
 export default {
   name: "ConnectWalletLanding",
   setup() {
     const theme = useTheme();
     const baseUrl = import.meta.env.BASE_URL;
     const route = useRoute();
-    const $router = useRouter();
     const pageTitle = computed(() => route.meta.title);
+    const statsStore = useStatsStore();
     return {
       theme,
       pageTitle,
       DashboardRoutes,
-      stats: [
-        {
-          label: "Capacity",
-          value: "33.46PB",
-          image: "capacity.png",
-        },
-        {
-          label: "Nodes",
-          value: "2420",
-          image: "nodes.png",
-        },
-        {
-          label: "Countries",
-          value: "60",
-          image: "countries.png",
-        },
-        {
-          label: "Cores",
-          value: "56,530",
-          image: "cores.png",
-        },
-      ],
+      stats: computed(() => statsStore.stats),
+      statsUrl: window.env.STATS_URL || "https://stats.grid.tf",
       baseUrl,
-      $router,
     };
   },
 };

diff --git a/packages/playground/src/components/k8s_deployment_table.vue b/packages/playground/src/components/k8s_deployment_table.vue
@@ -104,7 +104,7 @@
       </template>
 
       <template #no-data-text>
-        <div v-if="true || failedDeployments.length > 0" class="text-center">
+        <div v-if="failedDeployments.length > 0" class="text-center">
           <p v-text="'Couldn\'t load any of your Kubernetes deployments.'" />
           <VBtn
             class="mt-4"

diff --git a/packages/playground/src/components/logged_in_landing.vue b/packages/playground/src/components/logged_in_landing.vue
@@ -99,6 +99,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useTheme } from "vuetify";
 
 import { DashboardRoutes } from "@/router/routes";
+import { useStatsStore } from "@/stores/stats";
 
 import { useProfileManager } from "../stores";
 export default {
@@ -110,6 +111,7 @@ export default {
     const $router = useRouter();
     const pageTitle = computed(() => route.meta.title);
     const profileManager = useProfileManager();
+    const statsStore = useStatsStore();
 
     const cards = [
       {
@@ -154,29 +156,7 @@ export default {
       pageTitle,
       cards,
       profileManager,
-
-      stats: [
-        {
-          label: "Capacity",
-          value: "33.46PB",
-          image: "capacity.png",
-        },
-        {
-          label: "Nodes",
-          value: "2420",
-          image: "nodes.png",
-        },
-        {
-          label: "Countries",
-          value: "60",
-          image: "countries.png",
-        },
-        {
-          label: "Cores",
-          value: "56,530",
-          image: "cores.png",
-        },
-      ],
+      stats: computed(() => statsStore.stats),
       baseUrl,
       $router,
     };

diff --git a/packages/playground/src/components/logger.vue b/packages/playground/src/components/logger.vue
@@ -192,6 +192,7 @@ export default {
         debugOpened.value = undefined;
         page.value = 1;
         logs.value = [];
+        document?.querySelector("html")?.style.removeProperty("overflow");
         logsCount.value.run();
       },
     });