@rancher/shell 0.3.2 → 0.3.3

package/assets/translations/en-us.yaml

@@ -2074,9 +2074,10 @@ fleet:
       empty: The root of the repo is used by default.  To use one or more different directories, add them here.
     repo:
       label: Repository URL
-      placeholder: 'e.g. https://github.com/rancher/fleet-examples.git'
+      placeholder: e.g. https://github.com/rancher/fleet-examples.git or git@github.com:rancher/fleet-examples.git
       addRepo: Add Repository
       noRepos: No repositories have been added
+      protocolBanner: Enter a valid HTTPS or SSH URL to a git repository.
     add:
       steps:
         repoInfo:

package/components/form/InputWithSelect.vue

@@ -4,6 +4,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import Select from '@shell/components/form/Select';
 export default {
+  name:       'InputWithSelect',
   components: {
     LabeledInput,
     LabeledSelect,

package/config/harvester-manager-types.js

@@ -0,0 +1 @@
+export const NAME = 'harvesterManager';

package/edit/fleet.cattle.io.gitrepo.vue

@@ -232,8 +232,7 @@ export default {
 
     stepOneRequires() {
       return !!this.value.metadata.name && !!this.refValue;
-    }
-
+    },
   },
 
   watch: {
@@ -497,6 +496,17 @@ export default {
         @change="onUpdateRepoName"
       />
 
+      <div class="row">
+        <div class="col span-6">
+          <Banner
+            color="info col span-6"
+          >
+            <div>
+              {{ t('fleet.gitRepo.repo.protocolBanner') }}
+            </div>
+          </Banner>
+        </div>
+      </div>
       <div
         class="row"
         :class="{'mt-20': isView}"
@@ -523,7 +533,6 @@ export default {
           />
         </div>
       </div>
-
       <SelectOrCreateAuthSecret
         :value="value.spec.clientSecretName"
         :register-before-hook="registerBeforeHook"

package/edit/provisioning.cattle.io.cluster/import.vue

@@ -10,7 +10,7 @@ import { CAPI, HCI } from '@shell/config/types';
 import ClusterMembershipEditor from '@shell/components/form/Members/ClusterMembershipEditor';
 import { Banner } from '@components/Banner';
 import { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor.vue';
-import { NAME as HARVESTER_MANAGER } from '@/pkg/harvester-manager/config/harvester-manager';
+import { NAME as HARVESTER_MANAGER } from '@shell/config/harvester-manager-types';
 import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
 import { addObject } from '@shell/utils/array';
 import { HIDE_DESC, mapPref } from '@shell/store/prefs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -138,6 +138,7 @@
     "vue-server-renderer": "2.6.14",
     "vue-shortkey": "3.1.7",
     "vue-template-compiler": "2.6.14",
+    "vue-virtual-scroll-list": "^2.3.4",
     "vue2-transitions": "0.3.0",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.2",

package/pages/c/_cluster/uiplugins/PluginInfoPanel.vue

@@ -148,7 +148,7 @@ export default {
               class="slideIn__header"
               data-testid="extension-details-title"
             >
-              {{ info.name }}
+              {{ info.label }}
             </h2>
             <p class="plugin-description">
               {{ info.description }}
@@ -230,8 +230,11 @@ export default {
         </div>
         <div v-if="!info.versions.length">
           <h3>
-            {{ t('plugins.version', { version: info.displayVersion }) }}
+            {{ t('plugins.info.versions') }}
           </h3>
+          <div class="version-link version-active version-builtin">
+            {{ info.displayVersion }}
+          </div>
         </div>
       </div>
     </div>
@@ -352,6 +355,10 @@ export default {
           color: var(--link-text);
           background: var(--link);
         }
+
+        &.version-builtin {
+          display: inline-block;
+        }
       }
 
       &__header {

package/pages/c/_cluster/uiplugins/index.vue

@@ -221,10 +221,12 @@ export default {
         const chart = all.find(c => c.name === p.name);
 
         if (!chart) {
-          // A pluign is loaded, but there is no chart, so add an item so that it shows up
+          // A plugin is loaded, but there is no chart, so add an item so that it shows up
+          const rancher = typeof p.metadata?.rancher === 'object' ? p.metadata.rancher : {};
+          const label = rancher[UI_PLUGIN_CHART_ANNOTATIONS.DISPLAY_NAME] || p.name;
           const item = {
             name:           p.name,
-            label:          p.name,
+            label,
             description:    p.metadata?.description,
             icon:           p.metadata?.icon,
             id:             p.id,
@@ -880,7 +882,6 @@ export default {
         width: 40px;
         -o-object-fit: contain;
         object-fit: contain;
-        position: relative;
         top: 2px;
         left: 2px;
       }

package/store/prefs.js

@@ -136,12 +136,13 @@ export const state = function() {
   return {
     cookiesLoaded: false,
     data:          {},
+    definitions,
   };
 };
 
 export const getters = {
   get: state => (key) => {
-    const definition = definitions[key];
+    const definition = state.definitions[key];
 
     if (!definition) {
       throw new Error(`Unknown preference: ${ key }`);
@@ -159,7 +160,7 @@ export const getters = {
   },
 
   defaultValue: state => (key) => {
-    const definition = definitions[key];
+    const definition = state.definitions[key];
 
     if (!definition) {
       throw new Error(`Unknown preference: ${ key }`);
@@ -169,7 +170,7 @@ export const getters = {
   },
 
   options: state => (key) => {
-    const definition = definitions[key];
+    const definition = state.definitions[key];
 
     if (!definition) {
       throw new Error(`Unknown preference: ${ key }`);
@@ -252,19 +253,25 @@ export const mutations = {
   },
 
   reset(state) {
-    for (const key in definitions) {
-      if ( definitions[key]?.asCookie ) {
+    for (const key in state.definitions) {
+      if ( state.definitions[key]?.asCookie ) {
         continue;
       }
       delete state.data[key];
     }
-  }
+  },
+
+  setDefinition(state, { name, definition = {} }) {
+    state.definitions[name] = definition;
+  },
 };
 
 export const actions = {
-  async set({ dispatch, commit, rootGetters }, opt) {
+  async set({
+    dispatch, commit, rootGetters, state
+  }, opt) {
     let { key, value } = opt; // eslint-disable-line prefer-const
-    const definition = definitions[key];
+    const definition = state.definitions[key];
     let server;
 
     if ( opt.val ) {
@@ -326,8 +333,8 @@ export const actions = {
       return;
     }
 
-    for (const key in definitions) {
-      const definition = definitions[key];
+    for (const key in state.definitions) {
+      const definition = state.definitions[key];
 
       if ( !definition.asCookie ) {
         continue;
@@ -441,8 +448,8 @@ export const actions = {
       prefsBeforeLogin = {};
     }
 
-    for (const key in definitions) {
-      const definition = definitions[key];
+    for (const key in state.definitions) {
+      const definition = state.definitions[key];
       let value = clone(server.data[key]);
 
       if (value === undefined && definition.inheritFrom) {