@rancher/shell 0.3.4 → 0.3.6

package/edit/resources.cattle.io.backup.vue

@@ -296,7 +296,7 @@ export default {
           v-else
           color="error"
         >
-          <span v-html="t('backupRestoreOperator.noResourceSet')" />
+          <span v-clean-html="t('backupRestoreOperator.noResourceSet')" />
         </Banner>
       </template>
     </CruResource>

package/edit/service.vue

@@ -390,7 +390,7 @@ export default {
         <div class="row">
           <div class="col span-12">
             <Banner :color="(matchingPods.none ? 'warning' : 'success')">
-              <span v-html="t('servicesPage.selectors.matchingPods.matchesSome', matchingPods)" />
+              <span v-clean-html="t('servicesPage.selectors.matchingPods.matchesSome', matchingPods)" />
             </Banner>
           </div>
         </div>

package/edit/storage.k8s.io.storageclass/provisioners/driver.harvesterhci.io.vue

@@ -45,10 +45,10 @@ export default {
     ...mapGetters(['currentCluster']),
 
     isSatisfiesVersion() {
-      const kubernetesVersion = this.currentCluster.kubernetesVersion;
+      const kubernetesVersion = this.currentCluster.kubernetesVersion || '';
       const kubernetesVersionExtension = this.currentCluster.kubernetesVersionExtension;
 
-      if (kubernetesVersionExtension.startsWith('rke2')) {
+      if (kubernetesVersionExtension.startsWith('+rke2')) {
         const charts = ((this.rke2Versions?.data || []).find(v => v.id === kubernetesVersion) || {}).charts;
         let csiVersion = charts?.['harvester-csi-driver']?.version || '';
 

package/edit/workload/__tests__/Job.test.ts

@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils';
 import Job from '@shell/edit/workload/Job.vue';
 import { _EDIT } from '@shell/config/query-params';
 import { WORKLOAD_TYPES } from '@shell/config/types';
+import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 
 describe('component: Job', () => {
   describe('given CronJob types', () => {
@@ -10,7 +11,8 @@ describe('component: Job', () => {
       'failed',
     ])('should emit an update on %p input', (field) => {
       const wrapper = mount(Job, {
-        propsData: {
+        directives: { cleanHtmlDirective },
+        propsData:  {
           mode: _EDIT,
           type: WORKLOAD_TYPES.CRON_JOB
         }

package/edit/workload/index.vue

@@ -36,9 +36,15 @@ export default {
      * Find error exceptions to be mapped for each case
      */
     mapError(error) {
+      const isObject = error && typeof error === 'object' && !Array.isArray(error);
+      // We have just 2 cases, so we'll set a ternary operation:
+      // - one is for when we submit a YAML edited form (object - YAMLexceptions)
+      // - other is for a string message
+      const errorMessage = isObject ? error.message || '' : error || '';
+
       switch (true) {
-      case error.includes('violates PodSecurity'): {
-        const match = error.match(/\"(.*?)\"/gi);
+      case errorMessage.includes('violates PodSecurity'): {
+        const match = errorMessage.match(/\"(.*?)\"/gi);
         const name = match[0];
         const policy = match[1];
 
@@ -47,7 +53,6 @@ export default {
           icon:    'icon-pod_security'
         };
       }
-
       default:
         break;
       }

package/edit/workload/mixins/workload.js

@@ -11,6 +11,7 @@ import {
   SERVICE_ACCOUNT,
   CAPI,
   POD,
+  LIST_WORKLOAD_TYPES,
 } from '@shell/config/types';
 import Tab from '@shell/components/Tabbed/Tab';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -490,21 +491,19 @@ export default {
       return this.$store.getters['cluster/schemaFor'](this.type);
     },
 
-    workloadTypes() {
-      return omitBy(WORKLOAD_TYPES, (type) => {
+    // array of id, label, description, initials for type selection step
+    workloadSubTypes() {
+      const workloadTypes = omitBy(LIST_WORKLOAD_TYPES, (type) => {
         return (
           type === WORKLOAD_TYPES.REPLICA_SET ||
           type === WORKLOAD_TYPES.REPLICATION_CONTROLLER
         );
       });
-    },
 
-    // array of id, label, description, initials for type selection step
-    workloadSubTypes() {
       const out = [];
 
-      for (const prop in this.workloadTypes) {
-        const type = this.workloadTypes[prop];
+      for (const prop in workloadTypes) {
+        const type = workloadTypes[prop];
         const subtype = {
           id:          type,
           description: `workload.typeDescriptions.'${ type }'`,
@@ -766,9 +765,25 @@ export default {
 
       this.fixNodeAffinity(nodeAffinity);
       this.fixPodAffinity(podAffinity);
+
+      // The fields are being removed because they are not allowed to be editabble
+      if (this.mode === _EDIT) {
+        if (template?.spec?.affinity && Object.keys(template?.spec?.affinity).length === 0) {
+          delete template.spec.affinity;
+        }
+
+        // Removing `affinity` fixes the issue with setting the `imagePullSecrets`
+        // However, this field should not be set. Therefore this is explicitly removed.
+        if (template?.spec?.imagePullSecrets && template?.spec?.imagePullSecrets.length === 0) {
+          delete template.spec.imagePullSecrets;
+        }
+      }
+
       this.fixPodAffinity(podAntiAffinity);
       this.fixPodSecurityContext(this.podTemplateSpec);
 
+      template.metadata.namespace = this.value.metadata.namespace;
+
       // delete this.value.kind;
       if (this.container && !this.container.name) {
         this.$set(this.container, 'name', this.value.metadata.name);

package/edit/workload/storage/Mount.vue

@@ -138,13 +138,13 @@ export default {
 <style lang='scss'>
 .mount-headers, .mount-rows{
   display: grid;
-  grid-template-columns: 35% 35% auto auto;
+  grid-template-columns: 42% 42% 5% auto;
   grid-gap: $column-gutter;
   margin-bottom: 10px;
   align-items: center;
 
-  .remove {
-    text-align: right;
+  .remove BUTTON {
+    padding: 0px;
   }
 }
 

package/initialize/App.js

@@ -0,0 +1,206 @@
+import Vue from 'vue';
+
+import {
+  getMatchedComponentsInstances, getChildrenComponentInstancesUsingFetch, promisify, globalHandleError, sanitizeComponent
+} from '../utils/nuxt';
+import NuxtError from '../layouts/error.vue';
+import NuxtLoading from '../components/nav/GlobalLoading.vue';
+
+import '../assets/styles/app.scss';
+
+import blank from '../layouts/blank.vue';
+import defaultLayout from '../layouts/default.vue';
+import home from '../layouts/home.vue';
+import plain from '../layouts/plain.vue';
+import unauthenticated from '../layouts/unauthenticated.vue';
+import standalone from '../layouts/standalone.vue';
+
+const layouts = {
+  _blank: sanitizeComponent(blank), _default: sanitizeComponent(defaultLayout), _home: sanitizeComponent(home), _plain: sanitizeComponent(plain), _unauthenticated: sanitizeComponent(unauthenticated), _standalone: sanitizeComponent(standalone)
+};
+
+export default {
+  render(h) {
+    const loadingEl = h('NuxtLoading', { ref: 'loading' });
+
+    const layoutEl = h(this.layout || 'nuxt');
+    const templateEl = h('div', {
+      domProps: { id: '__layout' },
+      key:      this.layoutName
+    }, [layoutEl]);
+
+    const transitionEl = h('transition', {
+      props: {
+        name: 'layout',
+        mode: 'out-in'
+      },
+      on: {
+        beforeEnter(el) {
+          // Ensure to trigger scroll event after calling scrollBehavior
+          window.$nuxt.$nextTick(() => {
+            window.$nuxt.$emit('triggerScroll');
+          });
+        }
+      }
+    }, [templateEl]);
+
+    return h('div', { domProps: { id: '__nuxt' } }, [
+      loadingEl,
+      // h(NuxtBuildIndicator), // The build indicator doesn't work as is right now and emits an error in the console so I'm leaving it out for now
+      transitionEl
+    ]);
+  },
+
+  data: () => ({
+    isOnline: true,
+
+    layout:     null,
+    layoutName: '',
+
+    nbFetching: 0
+  }),
+
+  beforeCreate() {
+    Vue.util.defineReactive(this, 'nuxt', this.$options.nuxt);
+  },
+  created() {
+    // Add this.$nuxt in child instances
+    this.$root.$options.$nuxt = this;
+
+    if (process.client) {
+      // add to window so we can listen when ready
+      window.$nuxt = this;
+
+      this.refreshOnlineStatus();
+      // Setup the listeners
+      window.addEventListener('online', this.refreshOnlineStatus);
+      window.addEventListener('offline', this.refreshOnlineStatus);
+    }
+    // Add $nuxt.error()
+    this.error = this.nuxt.error;
+    // Add $nuxt.context
+    this.context = this.$options.context;
+  },
+
+  mounted() {
+    this.$loading = this.$refs.loading;
+  },
+
+  watch: { 'nuxt.err': 'errorChanged' },
+
+  computed: {
+    isOffline() {
+      return !this.isOnline;
+    },
+
+    isFetching() {
+      return this.nbFetching > 0;
+    },
+  },
+
+  methods: {
+    refreshOnlineStatus() {
+      if (process.client) {
+        if (typeof window.navigator.onLine === 'undefined') {
+          // If the browser doesn't support connection status reports
+          // assume that we are online because most apps' only react
+          // when they now that the connection has been interrupted
+          this.isOnline = true;
+        } else {
+          this.isOnline = window.navigator.onLine;
+        }
+      }
+    },
+
+    async refresh() {
+      const pages = getMatchedComponentsInstances(this.$route);
+
+      if (!pages.length) {
+        return;
+      }
+      this.$loading.start();
+
+      const promises = pages.map((page) => {
+        const p = [];
+
+        // Old fetch
+        if (page.$options.fetch && page.$options.fetch.length) {
+          p.push(promisify(page.$options.fetch, this.context));
+        }
+        if (page.$fetch) {
+          p.push(page.$fetch());
+        } else {
+          // Get all component instance to call $fetch
+          for (const component of getChildrenComponentInstancesUsingFetch(page.$vnode.componentInstance)) {
+            p.push(component.$fetch());
+          }
+        }
+
+        if (page.$options.asyncData) {
+          p.push(
+            promisify(page.$options.asyncData, this.context)
+              .then((newData) => {
+                for (const key in newData) {
+                  Vue.set(page.$data, key, newData[key]);
+                }
+              })
+          );
+        }
+
+        return Promise.all(p);
+      });
+
+      try {
+        await Promise.all(promises);
+      } catch (error) {
+        this.$loading.fail(error);
+        globalHandleError(error);
+        this.error(error);
+      }
+      this.$loading.finish();
+    },
+    errorChanged() {
+      if (this.nuxt.err) {
+        if (this.$loading) {
+          if (this.$loading.fail) {
+            this.$loading.fail(this.nuxt.err);
+          }
+          if (this.$loading.finish) {
+            this.$loading.finish();
+          }
+        }
+
+        let errorLayout = (NuxtError.options || NuxtError).layout;
+
+        if (typeof errorLayout === 'function') {
+          errorLayout = errorLayout(this.context);
+        }
+
+        this.setLayout(errorLayout);
+      }
+    },
+
+    setLayout(layout) {
+      if (layout && typeof layout !== 'string') {
+        throw new Error('[nuxt] Avoid using non-string value as layout property.');
+      }
+
+      if (!layout || !layouts[`_${ layout }`]) {
+        layout = 'default';
+      }
+      this.layoutName = layout;
+      this.layout = layouts[`_${ layout }`];
+
+      return this.layout;
+    },
+    loadLayout(layout) {
+      if (!layout || !layouts[`_${ layout }`]) {
+        layout = 'default';
+      }
+
+      return Promise.resolve(layouts[`_${ layout }`]);
+    },
+  },
+
+  components: { NuxtLoading }
+};