@rancher/shell 3.0.0-rc.4 → 3.0.0-rc.5

package/assets/styles/global/_tooltip.scss

@@ -141,7 +141,7 @@
 .v-popper__popper.v-popper--theme-dropdown {
   z-index: z-index('tooltip');
 
-  &.containerLogsDropdown {
+  &.containerLogsDropdown, &.fleet-summary-tooltip{
     .v-popper__arrow-container {
       display: none;
     }

package/components/fleet/FleetStatus.vue

@@ -150,7 +150,7 @@ function toPercent(value, min, max) {
           {{ title }}
         </div>
         <div
-          class="dropdwon resources-dropdown"
+          class="resources-dropdown"
           tabindex="0"
           @blur="showMenu(false)"
           @click="showMenu(true)"
@@ -158,12 +158,13 @@ function toPercent(value, min, max) {
         >
           <v-dropdown
             ref="popover"
-            placement="bottom-end"
+            placement="bottom"
             offset="-10"
             :triggers="[]"
             :delay="{show: 0, hide: 0}"
             :flip="false"
             :container="false"
+            popper-class="fleet-summary-tooltip"
           >
             <div class="meta-title">
               {{ meta.readyCount }} / {{ meta.total }} {{ title }} ready <i class="icon toggle icon-chevron-down" />

package/components/nav/Header.vue

@@ -958,6 +958,28 @@ export default {
         }
       }
 
+      :deep(.actions) {
+        align-items: center;
+        cursor: pointer;
+        display: flex;
+
+        > I {
+          font-size: 18px;
+          padding: 6px;
+          &:hover {
+            color: var(--link);
+          }
+        }
+
+        :deep(.v-popper:focus) {
+          outline: 0;
+        }
+
+        .dropdown {
+          margin: 0 -10px;
+        }
+      }
+
       .header-spacer {
         background-color: var(--header-bg);
         position: relative;

package/components/nav/HeaderPageActionMenu.vue

@@ -77,7 +77,7 @@ const handleBlurEvent = (event: KeyboardEvent) => {
   </v-dropdown>
 </template>
 
-<class lang="scss" scoped>
+<style lang="scss" scoped>
   .v-popper__popper {
     .v-popper__wrapper {
       .v-popper__arrow-container {
@@ -131,28 +131,6 @@ const handleBlurEvent = (event: KeyboardEvent) => {
     }
   }
 
-  .actions {
-    align-items: center;
-    cursor: pointer;
-    display: flex;
-
-    > I {
-      font-size: 18px;
-      padding: 6px;
-      &:hover {
-        color: var(--link);
-      }
-    }
-
-    :deep(.v-popper:focus) {
-      outline: 0;
-    }
-
-    .dropdown {
-      margin: 0 -10px;
-    }
-  }
-
   .list-unstyled {
     li {
       a {
@@ -170,4 +148,4 @@ const handleBlurEvent = (event: KeyboardEvent) => {
       }
     }
   }
-</class>
+</style>

package/models/management.cattle.io.cluster.js

@@ -118,7 +118,7 @@ export default class MgmtCluster extends SteveModel {
     // Provisioner is the "<something>Config" in the model
     const provisioner = KONTAINER_TO_DRIVER[(this.provisioner || '').toLowerCase()] || this.provisioner;
 
-    if ( provisioner === 'rancherKubernetesEngine' ) {
+    if ( provisioner === 'rancherKubernetesEngine' || provisioner === 'rke') {
       // Look for a cloud provider in one of the node templates
       if ( this.machinePools?.[0] ) {
         provider = this.machinePools[0]?.nodeTemplate?.spec?.driver || null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.5",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -121,13 +121,13 @@
     "unfetch": "4.2.0",
     "url-parse": "1.5.10",
     "vue": "~3.2.13",
-    "vue3-resize": "0.2.0",
     "vue-router": "4.4.3",
     "vue-select": "4.0.0-beta.6",
     "vue-server-renderer": "2.7.16",
     "vue-template-compiler": "2.7.16",
+    "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
-    "vuedraggable": "2.24.3",
+    "vuedraggable": "4.1.0",
     "vuex": "~4.0.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-virtual-modules": "0.4.3",

package/scripts/publish-shell.sh

@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 
+set -eo pipefail
+
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(
-  cd $SCRIPT_DIR && cd ../.. &
-  pwd
-)"
+BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 SHELL_DIR=$BASE_DIR/shell/
 CREATORS_DIR=$BASE_DIR/creators/extension
 PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY $NPM_TAG"

package/scripts/typegen.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
+BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 SHELL_DIR=$BASE_DIR/shell
 
 echo "Generating typescript definitions"

package/types/shell/index.d.ts

@@ -0,0 +1,22 @@
+// Auto-generated type definitions for shell
+// Do not modify this file as changes will get overwritten
+declare module '*.vue' {
+  import Vue from 'vue';
+  export default Vue;
+}
+
+// This is required to keep typescript from complaining. It is required for
+// our i18n plugin. For more info see:
+// https://v2.vuejs.org/v2/guide/typescript.html?redirect=true#Augmenting-Types-for-Use-with-Plugins
+declare module 'vue/types/vue' {
+  // eslint-disable-next-line no-unused-vars
+  interface Vue {
+      /**
+       * Lookup a given string with the given arguments
+       * @param raw if set, do not do HTML escaping.
+       */
+      t: (key: string, args?: Record<string, any>, raw?: boolean) => string,
+  }
+}
+
+declare module 'js-yaml';

package/shell/types/shell/index.d.ts

@@ -1,2 +0,0 @@
-// Auto-generated type definitions for shell
-// Do not modify this file as changes will get overwritten