@rancher/shell 0.3.14 → 0.3.15

package/assets/images/providers/nutanix.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0px" y="0px" viewBox="0 0 70.7 48.2" style="enable-background:new 0 0 70.7 48.2;" xml:space="preserve"> <style type="text/css"> .st0{fill:#A8CB3A;} .st1{fill:#174489;} </style> <title>nutanix logo</title> <g> <path id="Fill-1" class="st0" d="M15.6,47.8c-0.2,0.2-0.4,0.3-0.7,0.3H1.1c-0.4,0-0.9-0.2-1-0.6c-0.2-0.5-0.1-1,0.3-1.3L25.5,25 c0.6-0.5,0.6-1.3,0-1.8L0.4,2C0.1,1.7-0.1,1.3,0,0.9C0.1,0.4,0.6,0,1.1,0h13.2c0.3,0,0.5,0.1,0.7,0.3l27.3,23l0.2,0.2 c0.4,0.4,0.4,1,0,1.4l-0.3,0.2L15.6,47.8"></path> <path id="Fill-8" class="st1" d="M46.6,20.2c0.4,0.4,1.1,0.4,1.5,0L70,2c0.3-0.3,0.5-0.7,0.4-1C70.3,0.4,69.8,0,69.3,0H56.1 c-0.3,0-0.5,0.1-0.7,0.3L40,12.8c-0.6,0.5-0.6,1.3,0,1.8L46.6,20.2"></path> <path id="Fill-9" class="st1" d="M46.5,28.1c0.4-0.4,1.1-0.4,1.5,0l22.2,18.2c0.3,0.3,0.5,0.7,0.4,1c-0.1,0.5-0.6,0.9-1.1,0.9H56.3 c-0.3,0-0.5-0.1-0.7-0.3L40.4,35.3c-0.6-0.5-0.6-1.3,0-1.8L46.5,28.1"></path> </g> </svg> 

package/assets/translations/en-us.yaml

@@ -73,6 +73,7 @@ generic:
   techPreview: Tech Preview
   type: Type
   unknown: Unknown
+  upload: Upload
   provisioning: '—'
   key: Key
   value: Value
@@ -117,6 +118,7 @@ locale:
   none: (None)
 
 nav:
+  harvesterDashboard: Harvester Dashboard
   backToRancher: Cluster Manager
   clusterTools: Cluster Tools
   kubeconfig:
@@ -179,6 +181,7 @@ nav:
     multiCluster: Global Apps
     legacy: Legacy Apps
     configuration: Configuration
+    hci: HCI
   search:
     placeholder: Type to search clusters
     noResults: No matching clusters
@@ -4007,6 +4010,7 @@ plugins:
     host: This Extension is not compatible with this application
     version: This Extension is not compatible with this version of Rancher
     load: An error occurred loading the code for this Extension
+    developerPkg: This Extension has been loaded internally, so we won't load the external version
   success:
     title: Loaded extension {name}
     message: Extension was loaded successfully
@@ -5583,8 +5587,8 @@ validation:
       tooLongPrefix: '"{key}" cannot have a prefix longer than {max} characters'
   minLength: '"{key}" must contain more than {min} characters'
   maxLength: '"{key}" must contain less than {max} characters'
-  minValue: '"{key}" must be higher than {min}'
-  maxValue: '"{key}" must be lower than {max}'
+  minValue: '"{key}" must be equal or higher than {min}'
+  maxValue: '"{key}" must be equal or lower than {max}'
   betweenLengths: '"{key}" must contain between {min} and {max} characters'
   betweenValues: '"{key}" must be between {min} and {max}'
   noSchema: No schema found to validate
@@ -7168,6 +7172,7 @@ resourceQuota:
     resourceType: Resource Type
   helpText: Configure how much of the resources the namespace as a whole can consume.
   helpTextDetail: The amount of resources the namespace as a whole can consume.
+  helpTextHarvester: VMs need to reserve additional memory overhead.
   configMaps: Config Maps
   limitsCpu: CPU Limit
   limitsMemory: Memory Limit
@@ -7325,6 +7330,82 @@ vncConsole:
   error:
     message: Web VNC console connection is disconnected
 
+gitPicker:
+  github:
+    label: GitHub
+    tableHeaders:
+      choose:
+        label: Select
+      sha:
+        label: SHA
+      author:
+        label: Author
+        unknown: Unknown
+      message:
+        label: Message
+      date:
+        label: Date
+    username:
+      label: Username / Organization
+      inputLabel: Username / Organization
+      tooltip: Username / Organization of the Git Repository
+    branch:
+      label: Branch
+      inputLabel: Branch
+      tooltip: Branch to deploy
+    repo:
+      label: Repository
+      inputLabel: Repository
+      tooltip: Branch to deploy from
+    commits:
+      label: Commits
+      tooltip: Commits to deploy from
+    commit:
+      label: Commit
+      inputLabel: Commit
+    commitMessage:
+      label: Commit Message
+    errors:
+      noAccount: No GitHub account or Organization found. Please review your query and try again.
+      noBranch: No branch found. Please review your query and try again."
+  gitlab:
+    label: GitLab
+    tableHeaders:
+      choose:
+        label: Select
+      sha:
+        label: SHA
+      author:
+        label: Author
+        unknown: Unknown
+      message:
+        label: Message
+      date:
+        label: Date
+    username:
+      label: Username / Organization
+      inputLabel: Username / Organization
+      tooltip: Username / Organization of the Git Repository
+    branch:
+      label: Branch
+      inputLabel: Branch
+      tooltip: Branch to deploy
+    repo:
+      label: Repository
+      inputLabel: Repository
+      tooltip: Branch to deploy from
+    commits:
+      label: Commits
+      tooltip: Commits to deploy from
+    commit:
+      label: Commit
+      inputLabel: Commit
+    commitMessage:
+      label: Commit Message
+    errors:
+      noAccount: No GitLab account or Organization found. Please review your query and try again.
+      noBranch: No branch found. Please review your query and try again."
+
 networkAttachmentDefinition:
   tabs:
     config: Config

package/chart/gatekeeper.vue

@@ -25,13 +25,13 @@ export default {
     ...mapGetters(['currentCluster']),
     crdValues: {
       get() {
-        const crdInfo = this.autoInstallInfo.find(info => info.chart.name.includes('crd'));
+        const crdInfo = this.autoInstallInfo.find((info) => info.chart.name.includes('crd'));
 
         // values are defaults from the chart; allValues are defaults + anything set on previous install if this is an update/upgrade
         return crdInfo ? crdInfo.allValues : null;
       },
       set(values) {
-        const crdInfo = this.autoInstallInfo.find(info => info.chart.name.includes('crd'));
+        const crdInfo = this.autoInstallInfo.find((info) => info.chart.name.includes('crd'));
 
         this.$set(crdInfo, 'allValues', values);
       }

package/chart/monitoring/alerting/index.vue

@@ -47,9 +47,9 @@ export default {
 
       return secrets
         .filter(
-          sec => sec.metadata.namespace === DEFAULT_MONITORING_NAMESPACE
+          (sec) => sec.metadata.namespace === DEFAULT_MONITORING_NAMESPACE
         )
-        .map(sec => ({ label: sec.metadata.name, value: sec.metadata.name }));
+        .map((sec) => ({ label: sec.metadata.name, value: sec.metadata.name }));
     },
 
     canUseExistingSecret() {
@@ -63,7 +63,7 @@ export default {
 
     existingSecret() {
       return this.secrets.find(
-        sec => sec?.metadata?.name ===
+        (sec) => sec?.metadata?.name ===
             'alertmanager-rancher-monitoring-alertmanager' &&
           sec?.metadata?.namespace === DEFAULT_MONITORING_NAMESPACE
       );

package/chart/monitoring/index.vue

@@ -62,7 +62,7 @@ export default {
     });
 
     await Promise.all(
-      Object.values(WORKLOAD_TYPES).map(type => this.$store.dispatch('cluster/findAll', { type })
+      Object.values(WORKLOAD_TYPES).map((type) => this.$store.dispatch('cluster/findAll', { type })
       )
     );
 
@@ -113,7 +113,7 @@ export default {
       return this.currentCluster.status.provider.toLowerCase();
     },
     workloads() {
-      return Object.values(WORKLOAD_TYPES).flatMap(type => this.$store.getters['cluster/all'](type)
+      return Object.values(WORKLOAD_TYPES).flatMap((type) => this.$store.getters['cluster/all'](type)
       );
     },
   },

package/chart/monitoring/prometheus/index.vue

@@ -88,7 +88,7 @@ export default {
         workloads = workloads.filter((workload) => {
           if (
             !isEmpty(workload?.spec?.template?.spec?.containers) &&
-            (workload.spec.template.spec.containers.find(c => c.image.includes('quay.io/coreos/prometheus-operator') ||
+            (workload.spec.template.spec.containers.find((c) => c.image.includes('quay.io/coreos/prometheus-operator') ||
               c.image.includes('rancher/coreos-prometheus-operator'))
             )
           ) {

package/chart/rancher-backup/index.vue

@@ -67,11 +67,11 @@ export default {
 
   computed: {
     defaultStorageClass() {
-      return this.storageClasses.filter(sc => sc.metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS] && sc.metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS] !== 'false' )[0] || '';
+      return this.storageClasses.filter((sc) => sc.metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS] && sc.metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS] !== 'false' )[0] || '';
     },
 
     availablePVs() {
-      return this.persistentVolumes.filter(pv => pv.status.phase.toLowerCase() !== 'bound');
+      return this.persistentVolumes.filter((pv) => pv.status.phase.toLowerCase() !== 'bound');
     },
 
     radioOptions() {

package/cloud-credential/harvester.vue

@@ -26,7 +26,7 @@ export default {
 
   computed: {
     clusterOptions() {
-      return this.clusters.filter(c => c.status?.provider === VIRTUAL_HARVESTER_PROVIDER).map( (cluster) => {
+      return this.clusters.filter((c) => c.status?.provider === VIRTUAL_HARVESTER_PROVIDER).map( (cluster) => {
         return {
           value: cluster.id,
           label: cluster.nameDisplay
@@ -45,7 +45,7 @@ export default {
         set(this.value, 'harvestercredentialConfig.clusterId', neu);
       }
 
-      const currentCluster = this.$store.getters['management/all'](MANAGEMENT.CLUSTER).find(x => x.id === neu);
+      const currentCluster = this.$store.getters['management/all'](MANAGEMENT.CLUSTER).find((x) => x.id === neu);
 
       this.$nuxt.$loading.start();
 

package/components/AssignTo.vue

@@ -34,7 +34,7 @@ export default {
     ...mapGetters(['workspace']),
 
     workspaceOptions() {
-      const out = this.allWorkspaces.map(x => x.metadata?.name).filter(x => !!x && x !== 'fleet-local');
+      const out = this.allWorkspaces.map((x) => x.metadata?.name).filter((x) => !!x && x !== 'fleet-local');
 
       return out;
     },

package/components/AwsComplianceBanner.vue

@@ -17,7 +17,7 @@ export default {
     // The notification will always come from the csp-adapter component & there will be no more than one
     // Backend will remove the notification when its no longer relevant
     awsNotification() {
-      return this.notifications.find(notification => notification.componentName === 'csp-adapter');
+      return this.notifications.find((notification) => notification.componentName === 'csp-adapter');
     }
   }
 };

package/components/BackLink.vue

@@ -16,6 +16,13 @@ export default {
   >
     <i class="icon icon-chevron-left" /> {{ t('generic.back') }}
   </nuxt-link>
+  <nuxt-link
+    v-else
+    to="/"
+    class="back-link"
+  >
+    <i class="icon icon-chevron-left" /> {{ t('nav.home') }}
+  </nuxt-link>
 </template>
 
 <style lang="scss" scoped>

package/components/BrandImage.vue

@@ -21,19 +21,19 @@ export default {
     ...mapGetters({ theme: 'prefs/theme' }),
 
     brand() {
-      const setting = this.managementSettings.filter(setting => setting.id === SETTING.BRAND)[0] || {};
+      const setting = this.managementSettings.filter((setting) => setting.id === SETTING.BRAND)[0] || {};
 
       return setting.value;
     },
 
     uiLogoLight() {
-      const setting = this.managementSettings.filter(setting => setting.id === SETTING.LOGO_LIGHT)[0] || {};
+      const setting = this.managementSettings.filter((setting) => setting.id === SETTING.LOGO_LIGHT)[0] || {};
 
       return setting.value;
     },
 
     uiLogoDark() {
-      const setting = this.managementSettings.filter(setting => setting.id === SETTING.LOGO_DARK)[0] || {};
+      const setting = this.managementSettings.filter((setting) => setting.id === SETTING.LOGO_DARK)[0] || {};
 
       return setting.value;
     },

package/components/ClusterProviderIcon.vue

@@ -33,7 +33,7 @@ export default {
       {{ cluster.badge.iconText }}
     </div>
     <!-- eslint-disable -->
-    <svg v-else-if="cluster.isLocal" class="cluster-local-logo" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+    <svg v-else-if="cluster.isLocal && !cluster.isHarvester" class="cluster-local-logo" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
       <g>
         <g>
           <path class="rancher-icon-fill" d="M26.0862026,44.4953918H8.6165142c-5.5818157,0-9.3979139-4.6252708-8.4802637-10.1311035l2.858391-17.210701

package/components/CommunityLinks.vue

@@ -28,7 +28,7 @@ export default {
   mixins: [Closeable],
 
   async fetch() {
-    this.links = await fetchLinks(this.$store, this.hasSupport, this.isSupportPage, str => this.t(str));
+    this.links = await fetchLinks(this.$store, this.hasSupport, this.isSupportPage, (str) => this.t(str));
   },
 
   data() {
@@ -72,7 +72,7 @@ export default {
       }
 
       if (this.links.defaults) {
-        all.push(...this.links.defaults.filter(link => link.enabled));
+        all.push(...this.links.defaults.filter((link) => link.enabled));
       }
 
       return all;

package/components/ConsumptionGauge.vue

@@ -41,7 +41,7 @@ export default {
      */
     numberFormatter: {
       type:    Function,
-      default: value => Number.isInteger(value) ? value : value.toFixed(2)
+      default: (value) => Number.isInteger(value) ? value : value.toFixed(2)
     },
 
     /**
@@ -106,7 +106,10 @@ export default {
           {{ resourceName }}
         </h4>
         <span v-else>{{ t('node.detail.glance.consumptionGauge.used') }}</span>
-        <span>{{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }} <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}</span></span>
+        <span class="numbers-stats">
+          {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
+          <span class="percentage"><i>/&nbsp;</i>{{ formattedPercentage }}</span>
+        </span>
       </slot>
     </div>
     <div class="mt-10">
@@ -125,8 +128,20 @@ export default {
     flex-direction: row;
     justify-content: space-between;
 
+    &-stats {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      gap: 10px;
+      align-self: baseline;
+
+    }
+
     .percentage {
       font-weight: bold;
+      i {
+        margin-right: 10px;
+      }
     }
   }
 }

package/components/CruResource.vue

@@ -184,7 +184,7 @@ export default {
       const { validationPassed, showAsForm, steps } = this;
 
       if (showAsForm && steps?.length) {
-        return validationPassed && this.steps.every(step => step.ready);
+        return validationPassed && this.steps.every((step) => step.ready);
       }
 
       // Don't apply validation rules if the form is not shown.
@@ -412,6 +412,7 @@ export default {
     </p>
     <form
       :is="(isView? 'div' : 'form')"
+      data-testid="cru-form"
       class="create-resource-container cru__form"
       @submit.prevent
       @keydown.enter="onPressEnter($event)"

package/components/DashboardMetrics.vue

@@ -26,6 +26,12 @@ export default {
       type:    Boolean,
       default: true,
     },
+    // change the grafana url prefix for local clusters in certain monitoring versions
+    // project monitoring (projectHelmCharts) supply a grafana url that never needs to be modified in this way
+    modifyPrefix: {
+      type:    Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -74,6 +80,7 @@ export default {
         :range="graphOptions.range"
         :url="detailUrl"
         :vars="vars"
+        :modify-prefix="modifyPrefix"
       />
       <GrafanaDashboard
         v-else
@@ -85,6 +92,7 @@ export default {
         :range="graphOptions.range"
         :url="summaryUrl"
         :vars="vars"
+        :modify-prefix="modifyPrefix"
       />
     </div>
   </div>

package/components/DetailTop.vue

@@ -72,7 +72,7 @@ export default {
       const items = [
         ...(this.moreDetails || []),
         ...(this.value?.details || []),
-      ].filter(x => x.separator || (!!`${ x.content }` && x.content !== undefined && x.content !== null));
+      ].filter((x) => x.separator || (!!`${ x.content }` && x.content !== undefined && x.content !== null));
 
       const groups = [];
       let currentGroup = [];

package/components/ExplorerMembers.vue

@@ -70,7 +70,7 @@ export default {
     }
 
     this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT })
-      .then(projects => this.$set(this, 'projects', projects));
+      .then((projects) => this.$set(this, 'projects', projects));
 
     const hydration = {
       normanPrincipals:  this.$store.dispatch('rancher/findAll', { type: NORMAN.PRINCIPAL }),
@@ -123,11 +123,11 @@ export default {
   computed: {
     ...mapGetters(['currentCluster']),
     clusterRoleTemplateBindings() {
-      return this.normanClusterRoleTemplateBindings.map(b => b.clusterroletemplatebinding) ;
+      return this.normanClusterRoleTemplateBindings.map((b) => b.clusterroletemplatebinding) ;
     },
     filteredClusterRoleTemplateBindings() {
       return this.clusterRoleTemplateBindings.filter(
-        b => b?.clusterName === this.$store.getters['currentCluster'].id
+        (b) => b?.clusterName === this.$store.getters['currentCluster'].id
       );
     },
     filteredProjects() {
@@ -222,10 +222,10 @@ export default {
       return this.$store.getters['currentCluster'].isLocal;
     },
     canEditProjectMembers() {
-      return this.normanProjectRTBSchema?.collectionMethods.find(x => x.toLowerCase() === 'post');
+      return this.normanProjectRTBSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
     },
     canEditClusterMembers() {
-      return this.normanClusterRTBSchema?.collectionMethods.find(x => x.toLowerCase() === 'post');
+      return this.normanClusterRTBSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
     },
   },
   methods: {
@@ -250,12 +250,12 @@ export default {
     },
 
     getProjectRoleBinding(row, role) {
-      // Each row is a combination of user/group and project
-      // So find the specfic roleBindingTemplate corresponding to the specific role + project
+      // Each row is a combination of project, role and user/group
+      // So find the specfic roleBindingTemplate corresponding to the specific project, role + user/group
       const userOrGroupKey = row.userId ? 'userId' : 'groupPrincipalId';
 
       return this.projectRoleTemplateBindings.find((r) => {
-        return r.roleTemplateId === role.id && r[userOrGroupKey] === row[userOrGroupKey];
+        return r.projectId === row.projectId && r.roleTemplateId === role.id && r[userOrGroupKey] === row[userOrGroupKey];
       });
     },
 

package/components/ExplorerProjectsNamespaces.vue

@@ -1,6 +1,6 @@
 <script>
 import { mapGetters } from 'vuex';
-import ResourceTable from '@shell/components/ResourceTable';
+import ResourceTable, { defaultTableSortGenerationFn } from '@shell/components/ResourceTable';
 import { STATE, AGE, NAME } from '@shell/config/table-headers';
 import { uniq } from '@shell/utils/array';
 import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES } from '@shell/config/types';
@@ -8,7 +8,7 @@ import { PROJECT_ID, FLAT_VIEW } from '@shell/config/query-params';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import { mapPref, GROUP_RESOURCES, ALL_NAMESPACES } from '@shell/store/prefs';
 import MoveModal from '@shell/components/MoveModal';
-import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
+
 import { NAMESPACE_FILTER_ALL_ORPHANS } from '@shell/utils/namespace-filter';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import DOMPurify from 'dompurify';
@@ -97,12 +97,12 @@ export default {
         NAME,
         this.groupPreference === 'none' ? project : null,
         AGE
-      ].filter(h => h);
+      ].filter((h) => h);
     },
     projectIdsWithNamespaces() {
       const ids = this.rows
-        .map(row => row.projectId)
-        .filter(id => id);
+        .map((row) => row.projectId)
+        .filter((id) => id);
 
       return uniq(ids);
     },
@@ -117,13 +117,13 @@ export default {
         return this.$store.getters[`${ this.currentProduct.inStore }/filterProject`];
       }
 
-      const clustersInProjects = projectsInAllClusters.filter(project => project.spec.clusterName === clusterId);
+      const clustersInProjects = projectsInAllClusters.filter((project) => project.spec.clusterName === clusterId);
 
       return clustersInProjects;
     },
     projectsWithoutNamespaces() {
       return this.activeProjects.filter((project) => {
-        return !this.projectIdsWithNamespaces.find(item => project?.id?.endsWith(`/${ item }`));
+        return !this.projectIdsWithNamespaces.find((item) => project?.id?.endsWith(`/${ item }`));
       });
     },
     // We're using this because we need to show projects as groups even if the project doesn't have any namespaces.
@@ -226,7 +226,7 @@ export default {
         return false;
       }
 
-      const someNamespacesAreNotInProject = !this.rows.some(row => !row.project);
+      const someNamespacesAreNotInProject = !this.rows.some((row) => !row.project);
 
       // Hide the "Not in a Project" group if the user is filtering
       // for specific namespaces or projects.
@@ -250,7 +250,7 @@ export default {
       const dictionary = row.psaTooltipsDescription;
       const list = Object.values(dictionary)
         .sort()
-        .map(text => `<li>${ text }</li>`).join('');
+        .map((text) => `<li>${ text }</li>`).join('');
       const title = `<p>${ this.t('podSecurityAdmission.name') }: </p>`;
 
       return `${ title }<ul class="psa-tooltip">${ list }</ul>`;

package/components/FixedBanner.vue

@@ -41,7 +41,7 @@ export default {
     handleLineBreaksConsentText(banner) {
       if (banner.text?.length) {
         // split text by newline char
-        const textArray = banner.text.split(/\\n/).filter(element => element);
+        const textArray = banner.text.split(/\\n/).filter((element) => element);
 
         if (textArray.length > 1) {
           textArray.forEach((str, i) => {

package/components/GlobalRoleBindings.vue

@@ -120,7 +120,7 @@ export default {
   },
   methods: {
     getRoleType(role) {
-      if (this.globalPermissions.find(p => p === role.id)) {
+      if (this.globalPermissions.find((p) => p === role.id)) {
         return 'global';
       } else if (role.builtin) {
         return 'builtin';
@@ -159,7 +159,7 @@ export default {
 
         Object.values(this.sortedRoles).forEach((roles) => {
           roles.forEach((mappedRole) => {
-            const boundRole = boundRoles.find(boundRole => boundRole.globalRoleName === mappedRole.id);
+            const boundRole = boundRoles.find((boundRole) => boundRole.globalRoleName === mappedRole.id);
 
             if (!!boundRole) {
               this.selectedRoles.push(mappedRole.id);
@@ -184,10 +184,10 @@ export default {
     },
     checkboxChanged() {
       const addRoles = this.selectedRoles
-        .filter(selected => !this.startingSelectedRoles.find(startingRole => startingRole.roleId === selected));
+        .filter((selected) => !this.startingSelectedRoles.find((startingRole) => startingRole.roleId === selected));
       const removeBindings = this.startingSelectedRoles
-        .filter(startingRole => !this.selectedRoles.find(selected => selected === startingRole.roleId))
-        .map(startingRole => startingRole.bindingId);
+        .filter((startingRole) => !this.selectedRoles.find((selected) => selected === startingRole.roleId))
+        .map((startingRole) => startingRole.bindingId);
 
       this.roleChanges = {
         initialRoles: this.startingSelectedRoles,
@@ -210,22 +210,22 @@ export default {
       } else {
         requestOptions.userName = userId || this.userId;
       }
-      const newBindings = await Promise.all(this.roleChanges.addRoles.map(role => this.$store.dispatch(`management/create`, {
+      const newBindings = await Promise.all(this.roleChanges.addRoles.map((role) => this.$store.dispatch(`management/create`, {
         ...requestOptions,
         globalRoleName: role,
       })));
 
       // Save all changes (and ensure user isn't logged out if they don't have permissions to make a change)
-      await Promise.all(newBindings.map(newBinding => newBinding.save({ redirectUnauthorized: false })));
+      await Promise.all(newBindings.map((newBinding) => newBinding.save({ redirectUnauthorized: false })));
     },
     async saveRemovedRoles() {
-      const existingBindings = await Promise.all(this.roleChanges.removeBindings.map(bindingId => this.$store.dispatch('management/find', {
+      const existingBindings = await Promise.all(this.roleChanges.removeBindings.map((bindingId) => this.$store.dispatch('management/find', {
         type: MANAGEMENT.GLOBAL_ROLE_BINDING,
         id:   bindingId
       })));
 
       // Save all changes (and ensure user isn't logged out if they don't have permissions to make a change)
-      await Promise.all(existingBindings.map(existingBinding => existingBinding.remove({ redirectUnauthorized: false })));
+      await Promise.all(existingBindings.map((existingBinding) => existingBinding.remove({ redirectUnauthorized: false })));
     },
     /**
      * userId is optional, used when a user has just been created
@@ -250,7 +250,7 @@ export default {
         });
       });
 
-      return allRolesRules.some(rule => this.isRuleValid(rule));
+      return allRolesRules.some((rule) => this.isRuleValid(rule));
     },
     isRuleValid(rule) {
       // Brought over from Ember
@@ -281,7 +281,7 @@ export default {
 
         if (isArray(verbs) && verbs.length > 1) {
           // console.log(`verbsRequiredForLogin status 1: `, restrictedTarget.every(rt => verbs.includes(rt)), verbs);
-          return restrictedTarget.every(rt => verbs.includes(rt));
+          return restrictedTarget.every((rt) => verbs.includes(rt));
         }
 
         // console.log(`verbsRequiredForLogin status 2: `, verbsRequiredForLogin.includes(verbs[0]), verbsRequiredForLogin, verbs);

package/components/GrafanaDashboard.vue

@@ -23,6 +23,12 @@ export default {
       type:    String,
       default: null
     },
+    // change the grafana url prefix for local clusters in certain monitoring versions
+    // project monitoring (projectHelmCharts) supply a grafana url that never needs to be modified in this way
+    modifyPrefix: {
+      type:    Boolean,
+      default: true
+    },
     backgroundColor: {
       type:    String,
       default: '#1b1c21'
@@ -138,7 +144,7 @@ export default {
       const clusterId = this.$store.getters['currentCluster'].id;
       const params = this.computeParams();
 
-      return computeDashboardUrl(this.monitoringVersion, embedUrl, clusterId, params);
+      return computeDashboardUrl(this.monitoringVersion, embedUrl, clusterId, params, this.modifyPrefix);
     },
     computeParams() {
       const params = {};