@rancher/shell 0.3.11 → 0.3.13

package/pages/c/_cluster/apps/charts/chart.vue

@@ -116,7 +116,6 @@ export default {
   <Loading v-if="$fetchState.pending" />
   <div v-else>
     <TypeDescription resource="chart" />
-
     <div
       v-if="chart"
       class="chart-header"
@@ -139,6 +138,7 @@ export default {
         <button
           v-if="!requires.length"
           type="button"
+          data-testid="btn-chart-install"
           class="btn role-primary"
           @click.prevent="install"
         >

package/pages/c/_cluster/apps/charts/install.vue

@@ -1120,6 +1120,7 @@ export default {
         Refer to the developer docs at docs/developer/helm-chart-apps.md
         for details on what values are injected and where they come from.
       */
+
       this.addGlobalValuesTo(values);
 
       const form = JSON.parse(JSON.stringify(this.value));
@@ -1510,6 +1511,7 @@ export default {
         <div class="step__values__controls">
           <ButtonGroup
             v-model="preFormYamlOption"
+            data-testid="btn-group-options-view"
             :options="formYamlOptions"
             inactive-class="bg-disabled btn-sm"
             active-class="bg-primary btn-sm"
@@ -1979,7 +1981,7 @@ export default {
   display: flex;
   flex-direction: column;
   padding: 0;
-  height: calc(100% - 112px);
+  overflow: auto;
 }
 
 .header {
@@ -2052,10 +2054,11 @@ export default {
 }
 
 .os-label {
-  position: absolute;
+  position: relative;
   background-color: var(--warning-banner-bg);
   color:var(--warning);
   margin-top: 5px;
+  top: 21px;
 }
 
 </style>

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

@@ -4,10 +4,10 @@ import isEmpty from 'lodash/isEmpty';
 import InstallRedirect from '@shell/utils/install-redirect';
 import AlertTable from '@shell/components/AlertTable';
 import { NAME, CHART_NAME } from '@shell/config/product/monitoring';
-import { ENDPOINTS, MONITORING } from '@shell/config/types';
+import { CATALOG, ENDPOINTS, MONITORING } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { findBy } from '@shell/utils/array';
-
+import { getClusterPrefix } from '@shell/utils/grafana';
 import { Banner } from '@components/Banner';
 import LazyImage from '@shell/components/LazyImage';
 import SimpleBox from '@shell/components/SimpleBox';
@@ -58,7 +58,7 @@ export default {
           iconSrc:     grafanaSrc,
           label:       'monitoring.overview.linkedList.grafana.label',
           description: 'monitoring.overview.linkedList.grafana.description',
-          link:        `/k8s/clusters/${ currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy`,
+          link:        '',
         },
         {
           enabled:     false,
@@ -94,10 +94,13 @@ export default {
   methods: {
     async fetchDeps() {
       const { $store, externalLinks } = this;
+      const currentCluster = this.$store.getters['currentCluster'];
 
       this.v1Installed = await haveV1MonitoringWorkloads($store);
-
-      const hash = await allHash({ endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }) });
+      const hash = await allHash({
+        endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }),
+        app:       $store.dispatch(`cluster/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' })
+      });
 
       if (!isEmpty(hash.endpoints)) {
         const amMatch = findBy(externalLinks, 'group', 'alertmanager');
@@ -105,6 +108,8 @@ export default {
         const promeMatch = externalLinks.filter(
           el => el.group === 'prometheus'
         );
+
+        grafanaMatch.link = `${ getClusterPrefix(hash.app?.currentVersion || '', currentCluster.id) }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
         const alertmanager = findBy(
           hash.endpoints,
           'id',

package/pages/c/_cluster/settings/performance.vue

@@ -174,6 +174,7 @@ export default {
           <div class="ml-20">
             <LabeledInput
               v-model="value.inactivity.threshold"
+              data-testid="inactivity-threshold"
               :mode="mode"
               :label="t('performance.inactivity.inputLabel')"
               :disabled="!value.inactivity.enabled"
@@ -382,6 +383,7 @@ export default {
     </template>
     <div v-if="mode === 'edit'">
       <AsyncButton
+        data-testid="performance__save-btn"
         class="pull-right mt-20"
         mode="apply"
         :disabled="!canSave"