@rancher/shell 0.3.0 → 0.3.2

package/chart/monitoring/steps/uninstall-v1.vue

@@ -40,8 +40,8 @@ export default {
   methods: {
     uninstall(buttonCb) {
       this.$store.dispatch('cluster/promptModal', {
-        component: 'GenericPrompt',
-        resources: {
+        component:      'GenericPrompt',
+        componentProps: {
           applyMode:   'uninstall',
           applyAction: async(buttonDone) => {
             await this.$store.getters['currentCluster'].doAction('disableMonitoring');

package/cloud-credential/azure.vue

@@ -4,6 +4,9 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { azureEnvironments } from '@shell/machine-config/azure';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 
+const AZURE_ERROR_MSG_REGEX = /^.*Message=\"(.*)\"$/;
+const AZURE_ERROR_JSON_REGEX = /^.*Response body: ({.*})/;
+
 export default {
   components: { LabeledInput, LabeledSelect },
   mixins:     [CreateEditView],
@@ -53,6 +56,26 @@ export default {
 
         return true;
       } catch (e) {
+        if (e.error) {
+          // Try and parse the response from Azure a couple of ways
+          const msgMatch = e.error.match(AZURE_ERROR_MSG_REGEX);
+
+          if (msgMatch?.length === 2) {
+            return { errors: [msgMatch[1]] };
+          } else {
+            const jsonMatch = e.error.match(AZURE_ERROR_JSON_REGEX);
+
+            if (jsonMatch?.length === 2) {
+              try {
+                const errorObj = JSON.parse(jsonMatch[1]);
+
+                return { errors: [errorObj.error_description] };
+              } catch (e) {}
+            }
+          }
+        }
+
+        // Can't parse error, so go with the generic 'auth failed' error message
         return false;
       }
     },

package/cloud-credential/harvester.vue

@@ -1,19 +1,13 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
-import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { RadioGroup } from '@components/Form/Radio';
 
 import { get, set } from '@shell/utils/object';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 
-const IMPORTED = 'imported';
-
 export default {
-  components: {
-    LabeledInput, LabeledSelect, RadioGroup
-  },
-  mixins: [CreateEditView],
+  components: { LabeledSelect },
+  mixins:     [CreateEditView],
 
   async fetch() {
     this.clusters = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
@@ -22,16 +16,11 @@ export default {
   data() {
     this.$emit('validationChanged', true);
 
-    if (!this.value.decodedData.clusterType) {
-      this.value.setData('clusterType', IMPORTED);
-    }
-
     const cluster = get(this.value, 'harvestercredentialConfig.clusterId') || '';
 
     return {
       clusters: [],
       cluster,
-      IMPORTED,
     };
   },
 
@@ -44,22 +33,9 @@ export default {
         };
       });
     },
-
-    isImportCluster() {
-      return this.value.decodedData.clusterType === IMPORTED;
-    }
   },
 
   watch: {
-    'value.decodedData.clusterType': {
-      handler(neu) {
-        if (this.isCreate) {
-          this.value.setData('kubeconfigContent', '');
-          this.cluster = '';
-        }
-      },
-    },
-
     async cluster(neu) {
       if (!neu) {
         return;
@@ -78,51 +54,51 @@ export default {
       this.$nuxt.$loading.finish();
 
       this.value.setData('kubeconfigContent', kubeconfigContent);
-    }
+    },
+
+    'value.decodedData.clusterId': {
+      handler() {
+        this.emitValidation();
+      },
+      immediate: true,
+    },
+    'value.decodedData.kubeconfigContent': {
+      handler() {
+        this.emitValidation();
+      },
+      immediate: true,
+    },
   },
 
   methods: {
     test() {
       const t = this.$store.getters['i18n/t'];
 
-      if (!this.cluster && this.isImportCluster) {
+      if (!this.cluster) {
         const cluster = t('cluster.credential.harvester.cluster');
         const errors = [t('validation.required', { key: cluster })];
 
         return { errors };
+      } else {
+        return true;
       }
+    },
 
-      if (!this.value.decodedData.kubeconfigContent) {
-        const kubeconfigContent = t('cluster.credential.harvester.kubeconfigContent.label');
-
-        const errors = [t('validation.required', { key: kubeconfigContent })];
-
-        return { errors };
+    emitValidation() {
+      if (this.test() === true) {
+        this.$emit('validationChanged', true);
       } else {
-        return true;
+        this.$emit('validationChanged', false);
       }
     },
-  }
+  },
 };
 </script>
 
 <template>
   <div>
-    <div class="row mb-10">
-      <RadioGroup
-        v-model="value.decodedData.clusterType"
-        :mode="mode"
-        :disabled="isEdit"
-        name="clusterType"
-        :labels="[t('cluster.credential.harvester.import'),t('cluster.credential.harvester.external')]"
-        :options="[IMPORTED, 'external']"
-        @input="value.setData('clusterType', $event);"
-      />
-    </div>
-
     <div class="row mb-10">
       <div
-        v-if="isImportCluster"
         class="col span-6"
       >
         <LabeledSelect
@@ -134,19 +110,6 @@ export default {
           :label="t('cluster.credential.harvester.cluster')"
         />
       </div>
-
-      <div class="col span-6">
-        <LabeledInput
-          v-if="!isImportCluster"
-          :value="value.decodedData.kubeconfigContent"
-          label-key="cluster.credential.harvester.kubeconfigContent.label"
-          :required="true"
-          type="multiline"
-          :min-height="160"
-          :mode="mode"
-          @input="value.setData('kubeconfigContent', $event);"
-        />
-      </div>
     </div>
   </div>
 </template>

package/cloud-credential/pnap.vue

@@ -0,0 +1,80 @@
+<script>
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { base64Encode } from '@shell/utils/crypto';
+
+export default {
+  components: { LabeledInput },
+  mixins:     [CreateEditView],
+
+  watch: {
+    'value.decodedData.clientIdentifier'(neu) {
+      this.$emit('validationChanged', !!neu);
+    },
+    'value.decodedData.clientSecret'(neu) {
+      this.$emit('validationChanged', !!neu);
+    }
+  },
+
+  methods: {
+    async test() {
+      try {
+        const credentials = `${ this.value.decodedData.clientIdentifier }:${ this.value.decodedData.clientSecret }`;
+        const encoded = base64Encode(credentials);
+
+        const requestOptions = {
+          url:                  'meta/proxy/auth.phoenixnap.com/auth/realms/BMC/protocol/openid-connect/token/',
+          method:               'POST',
+          headers:              { 'Content-Type': 'application/x-www-form-urlencoded', 'X-API-Auth-Header': `Basic ${ encoded }` },
+          data:                 'grant_type=client_credentials',
+          redirectUnauthorized: false,
+        };
+
+        const response = await this.$store.dispatch('management/request', requestOptions);
+        const data = await response;
+
+        if (data.access_token !== undefined && data.access_token !== null && data.access_token !== '') {
+          return true;
+        }
+
+        return false;
+      } catch (e) {
+        return false;
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div>
+    <div class="row mt-20">
+      <div class="col span-6">
+        <LabeledInput
+          :value="value.decodedData.clientIdentifier"
+          label-key="cluster.credential.pnap.clientIdentifier.label"
+          placeholder-key="cluster.credential.pnap.clientIdentifier.placeholder"
+          type="text"
+          :mode="mode"
+          @input="value.setData('clientIdentifier', $event);"
+        />
+      </div>
+      <div class="col span-6">
+        <LabeledInput
+          :value="value.decodedData.clientSecret"
+          label-key="cluster.credential.pnap.clientSecret.label"
+          placeholder-key="cluster.credential.pnap.clientSecret.placeholder"
+          type="text"
+          :mode="mode"
+          @input="value.setData('clientSecret', $event);"
+        />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <p
+        class="text-muted mt-10"
+        v-html="t('cluster.credential.pnap.clientSecret.help', {}, true)"
+      />
+    </div>
+  </div>
+</template>

package/components/ActionMenu.vue

@@ -3,15 +3,16 @@ import { mapGetters } from 'vuex';
 import $ from 'jquery';
 import { AUTO, CENTER, fitOnScreen } from '@shell/utils/position';
 import { isAlternate } from '@shell/utils/platform';
+import IconOrSvg from '@shell/components/IconOrSvg';
 
 const HIDDEN = 'hide';
 const CALC = 'calculate';
 const SHOW = 'show';
 
 export default {
-  name: 'ActionMenu',
-
-  props: {
+  name:       'ActionMenu',
+  components: { IconOrSvg },
+  props:      {
     customActions: {
       // Custom actions can be used if you need the action
       // menu to work for something that is not a Kubernetes
@@ -194,7 +195,23 @@ export default {
         return;
       }
 
-      if (this.useCustomTargetElement) {
+      // this will come from extensions...
+      if (action.invoke) {
+        const fn = action.invoke;
+
+        if (fn && action.enabled) {
+          const resources = this.$store.getters['action-menu/resources'];
+          const opts = {
+            event,
+            action,
+            isAlt: isAlternate(event)
+          };
+
+          if (resources.length === 1) {
+            fn.apply(this, [opts, resources]);
+          }
+        }
+      } else if (this.useCustomTargetElement) {
         // If the state of this component is controlled
         // by props instead of Vuex, we assume you wouldn't want
         // the mutation to have a dependency on Vuex either.
@@ -247,12 +264,16 @@ export default {
         :data-testid="componentTestid + '-' + i + '-item'"
         @click="execute(opt, $event)"
       >
-        <i
-          v-if="opt.icon"
-          :class="{icon: true, [opt.icon]: true}"
+        <IconOrSvg
+          v-if="opt.icon || opt.svg"
+          :icon="opt.icon"
+          :src="opt.svg"
+          class="icon"
+          color="header"
         />
         <span v-html="opt.label" />
       </li>
+
       <li
         v-if="!hasOptions(menuOptions)"
         class="no-actions"

package/components/AdvancedSection.vue

@@ -5,10 +5,17 @@ export default {
       type:     String,
       required: true,
     },
+    isOpenByDefault: {
+      // It may be useful to keep the advanced options open
+      // if the form is in edit mode and it has non-default
+      // advanced options configured.
+      type:    Boolean,
+      default: false
+    }
   },
 
-  data() {
-    return { show: false };
+  data(props) {
+    return { show: props.isOpenByDefault };
   },
 
   methods: {

package/components/Alert.vue

@@ -8,11 +8,11 @@ const STATUS_CLASS_MAP = {
   },
   warning: {
     color: 'bg-warning',
-    icon:  'icon-error'
+    icon:  'icon-warning'
   },
   info: {
     color: 'bg-info',
-    icon:  'icon-error'
+    icon:  'icon-info'
   },
   error: {
     color: 'bg-error',

package/components/ButtonDropdown.vue

@@ -277,12 +277,10 @@ export default {
     background: transparent;
 
     .vs__actions {
-      justify-content: center;
 
       &:after {
         color: var(--link);
         line-height: 1;
-        padding-top: 5px;
       }
     }
   }

package/components/ButtonGroup.vue

@@ -76,6 +76,7 @@ export default {
       v-for="(opt,idx) in optionObjects"
       :key="idx"
       v-tooltip="opt.tooltipKey ? t(opt.tooltipKey) : opt.tooltip"
+      :data-testid="`button-group-child-${idx}`"
       type="button"
       :class="opt.class"
       :disabled="disabled || opt.disabled"

package/components/CollapsibleCard.vue

@@ -105,7 +105,6 @@ export default {
   }
 
   &-collapse-icon {
-    font-size: 24px;
     color: #B7B8BB;
   }
 

package/components/CruResource.vue

@@ -75,6 +75,14 @@ export default {
       default: () => []
     },
 
+    /**
+     * Set of maps to convert error messages to something more user friendly and apply icons
+     */
+    errorsMap: {
+      type:    Object,
+      default: null
+    },
+
     // Is the edit as yaml button allowed
     canYaml: {
       type:    Boolean,
@@ -128,6 +136,11 @@ export default {
     componentTestid: {
       type:    String,
       default: 'form'
+    },
+
+    description: {
+      type:    String,
+      default: ''
     }
   },
 
@@ -152,7 +165,7 @@ export default {
         4: '18px',
         5: '16px',
         6: '14px'
-      }
+      },
     };
   },
 
@@ -225,6 +238,19 @@ export default {
     hasErrors() {
       return this.errors?.length && Array.isArray(this.errors);
     },
+
+    /**
+     * Replace returned string with new picked value and icon
+     */
+    mappedErrors() {
+      return !this.errors ? {} : this.errorsMap || this.errors.reduce((acc, error) => ({
+        ...acc,
+        [error]: {
+          message: error,
+          icon:    null
+        }
+      }), {});
+    },
   },
 
   created() {
@@ -358,6 +384,12 @@ export default {
 <template>
   <section class="cru">
     <slot name="noticeBanner" />
+    <p
+      v-if="description"
+      class="description"
+    >
+      {{ description }}
+    </p>
     <form
       :is="(isView? 'div' : 'form')"
       class="create-resource-container cru__form"
@@ -373,8 +405,8 @@ export default {
           v-for="(err, i) in errors"
           :key="i"
           color="error"
-          :label="stringify(err)"
-          :stacked="true"
+          :label="stringify(mappedErrors[err].message)"
+          :icon="mappedErrors[err].icon"
           :closable="true"
           @close="closeError(i)"
         />
@@ -619,7 +651,7 @@ export default {
       </template>
       <!------ YAML ------>
       <section
-        v-else
+        v-else-if="showYaml"
         class="cru-resource-yaml-container resource-container cru__content"
       >
         <ResourceYaml
@@ -805,4 +837,9 @@ form.create-resource-container .cru {
   }
 }
 
+.description {
+  margin-bottom: 15px;
+  margin-top: 5px;
+}
+
 </style>

package/components/DetailTop.vue

@@ -3,11 +3,15 @@ import Tag from '@shell/components/Tag';
 import isEmpty from 'lodash/isEmpty';
 import DetailText from '@shell/components/DetailText';
 import { _VIEW } from '@shell/config/query-params';
+import { ExtensionPoint, PanelLocation } from '@shell/core/types';
+import ExtensionPanel from '@shell/components/ExtensionPanel';
 
 export const SEPARATOR = { separator: true };
 
 export default {
-  components: { DetailText, Tag },
+  components: {
+    DetailText, Tag, ExtensionPanel
+  },
 
   props: {
     value: {
@@ -22,11 +26,35 @@ export default {
       default: () => {
         return [];
       }
+    },
+
+    /**
+     * Optionally replace key/value and display tooltips for the tab
+     * Dictionary key based
+     */
+    tooltips: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+
+    /**
+     * Optionally display icons next to the tab
+     * Dictionary key based
+     */
+    icons: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
     }
   },
 
   data() {
     return {
+      extensionType:      ExtensionPoint.PANEL,
+      extensionLocation:  PanelLocation.DETAIL_TOP,
       annotationsVisible: false,
       showAllLabels:      false,
       view:               _VIEW
@@ -68,13 +96,21 @@ export default {
     },
 
     labels() {
-      if (this.showAllLabels || !this.showFilteredSystemLabels) {
+      if (!this.showFilteredSystemLabels) {
         return this.value?.labels || {};
       }
 
       return this.value?.filteredSystemLabels;
     },
 
+    internalTooltips() {
+      return this.value?.detailTopTooltips || this.tooltips;
+    },
+
+    internalIcons() {
+      return this.value?.detailTopIcons || this.icons;
+    },
+
     annotations() {
       return this.value?.annotations || {};
     },
@@ -114,7 +150,16 @@ export default {
     },
 
     showFilteredSystemLabels() {
-      return !!this.value.filteredSystemLabels;
+      // It would be nicer to use hasSystemLabels here, but not all places have implemented it
+      // Instead check that there's a discrepancy between all labels and all labels without system ones
+      if (this.value?.labels && this.value?.filteredSystemLabels) {
+        const labelCount = Object.keys(this.value.labels).length;
+        const filteredSystemLabelsCount = Object.keys(this.value.filteredSystemLabels).length;
+
+        return labelCount !== filteredSystemLabelsCount;
+      }
+
+      return false;
     },
   },
   methods: {
@@ -200,7 +245,19 @@ export default {
           v-for="(prop, key) in labels"
           :key="key + prop"
         >
-          {{ key }}<span v-if="prop">: </span>{{ prop }}
+          <i
+            v-if="internalIcons[key]"
+            class="icon"
+            :class="internalIcons[key]"
+          />
+          <span
+            v-if="internalTooltips[key]"
+            v-tooltip="prop ? `${key} : ${prop}` : key"
+          >
+            <span>{{ internalTooltips[key] ? internalTooltips[key] : key }}</span>
+            <span v-if="showAllLabels">: {{ key }}</span>
+          </span>
+          <span v-else>{{ prop ? `${key} : ${prop}` : key }}</span>
         </Tag>
         <a
           v-if="showFilteredSystemLabels"
@@ -236,6 +293,13 @@ export default {
         />
       </div>
     </div>
+
+    <!-- Extensions area -->
+    <ExtensionPanel
+      :resource="value"
+      :type="extensionType"
+      :location="extensionLocation"
+    />
   </div>
 </template>
 
@@ -304,5 +368,9 @@ export default {
         margin-bottom: $spacing;
       }
     }
+
+    .icon {
+      vertical-align: top;
+    }
   }
 </style>