@rancher/shell 0.3.29 → 0.5.0

package/initialize/client.js

@@ -19,7 +19,7 @@ import {
   isSamePath,
   urlJoin
 } from '../utils/nuxt.js';
-import { createApp, NuxtError } from './index.js';
+import { createApp } from './index.js';
 import fetchMixin from '../mixins/fetch.client';
 import NuxtLink from '../components/nuxt/nuxt-link.client.js'; // should be included after ./index.js
 
@@ -92,17 +92,6 @@ if (debug) {
         if (nuxtApp && vm.$root[nuxtApp].error && info !== 'render function') {
           const currentApp = vm.$root[nuxtApp];
 
-          // Load error layout
-          let layout = (NuxtError.options || NuxtError).layout;
-
-          if (typeof layout === 'function') {
-            layout = layout(currentApp.context);
-          }
-          if (layout) {
-            await currentApp.loadLayout(layout).catch(() => {});
-          }
-          currentApp.setLayout(layout);
-
           currentApp.error(err);
         }
       }
@@ -126,50 +115,7 @@ if (debug) {
 const errorHandler = Vue.config.errorHandler || console.error; // eslint-disable-line no-console
 
 // Create and mount App
-createApp(null, nuxt.publicRuntimeConfig).then(mountApp).catch(errorHandler); // eslint-disable-line no-undef
-
-function componentOption(component, key, ...args) {
-  if (!component || !component.options || !component.options[key]) {
-    return {};
-  }
-  const option = component.options[key];
-
-  if (typeof option === 'function') {
-    return option(...args);
-  }
-
-  return option;
-}
-
-function mapTransitions(toComponents, to, from) {
-  const componentTransitions = (component) => {
-    const transition = componentOption(component, 'transition', to, from) || {};
-
-    return (typeof transition === 'string' ? { name: transition } : transition);
-  };
-
-  const fromComponents = from ? getMatchedComponents(from) : [];
-  const maxDepth = Math.max(toComponents.length, fromComponents.length);
-
-  const mergedTransitions = [];
-
-  for (let i = 0; i < maxDepth; i++) {
-    // Clone original objects to prevent overrides
-    const toTransitions = Object.assign({}, componentTransitions(toComponents[i]));
-    const transitions = Object.assign({}, componentTransitions(fromComponents[i]));
-
-    // Combine transitions & prefer `leave` properties of "from" route
-    Object.keys(toTransitions)
-      .filter((key) => typeof toTransitions[key] !== 'undefined' && !key.toLowerCase().includes('leave'))
-      .forEach((key) => {
-        transitions[key] = toTransitions[key];
-      });
-
-    mergedTransitions.push(transitions);
-  }
-
-  return mergedTransitions;
-}
+createApp(nuxt.publicRuntimeConfig).then(mountApp).catch(errorHandler); // eslint-disable-line no-undef
 
 async function loadAsyncComponents(to, from, next) {
   // Check if route changed (this._routeChanged), only if the page is not an error (for validate())
@@ -230,16 +176,6 @@ async function loadAsyncComponents(to, from, next) {
   }
 }
 
-function applySSRData(Component, ssrData) {
-  if (NUXT.serverRendered && ssrData) {
-    applyAsyncData(Component, ssrData);
-  }
-
-  Component._Ctor = Component;
-
-  return Component;
-}
-
 // Get matched components
 function resolveComponents(route) {
   return flatMapComponents(route, async(Component, _, match, key, index) => {
@@ -247,32 +183,25 @@ function resolveComponents(route) {
     if (typeof Component === 'function' && !Component.options) {
       Component = await Component();
     }
+
     // Sanitize it and save it
-    const _Component = applySSRData(sanitizeComponent(Component), NUXT.data ? NUXT.data[index] : null);
+    Component._Ctor = sanitizeComponent(Component);
 
-    match.components[key] = _Component;
+    match.components[key] = Component;
 
-    return _Component;
+    return Component;
   });
 }
 
-function callMiddleware(Components, context, layout) {
+function callMiddleware(Components, context) {
   let midd = ['i18n'];
   let unknownMiddleware = false;
 
-  // If layout is undefined, only call global middleware
-  if (typeof layout !== 'undefined') {
-    midd = []; // Exclude global middleware if layout defined (already called before)
-    layout = sanitizeComponent(layout);
-    if (layout.options.middleware) {
-      midd = midd.concat(layout.options.middleware);
+  Components.forEach((Component) => {
+    if (Component.options.middleware) {
+      midd = midd.concat(Component.options.middleware);
     }
-    Components.forEach((Component) => {
-      if (Component.options.middleware) {
-        midd = midd.concat(Component.options.middleware);
-      }
-    });
-  }
+  });
 
   midd = midd.map((name) => {
     if (typeof name === 'function') {
@@ -342,25 +271,20 @@ async function render(to, from, next) {
 
   // If no Components matched, generate 404
   if (!Components.length) {
-    // Default layout
-    await callMiddleware.call(this, Components, app.context);
-    if (nextCalled) {
-      return;
-    }
+    // Call the authenticated middleware. This used to attempt to load the error layout but because it was missing it would:
+    // 1. load the default layout instead
+    // 2. then call the authenticated middleware
+    // 3. Authenticated middleware would then load plugins and check to see if there was a valid route and navigate to that if it existed
+    // 4. This would allow harvester cluster pages to load on page reload
+    // We should really make authenticated middleware do less...
+    await callMiddleware.call(this, [{ options: { middleware: ['authenticated'] } }], app.context);
 
-    // Load layout for error page
-    const errorLayout = (NuxtError.options || NuxtError).layout;
-    const layout = await this.loadLayout(
-      typeof errorLayout === 'function' ? errorLayout.call(NuxtError, app.context) : errorLayout
-    );
-
-    await callMiddleware.call(this, Components, app.context, layout);
     if (nextCalled) {
       return;
     }
 
     // Show error page
-    app.context.error({ statusCode: 404, message: 'This page could not be found' });
+    this.error({ statusCode: 404, message: 'This page could not be found' });
 
     return next();
   }
@@ -373,9 +297,6 @@ async function render(to, from, next) {
     }
   });
 
-  // Apply transitions
-  this.setTransitions(mapTransitions(Components, to, from));
-
   try {
     // Call middleware
     await callMiddleware.call(this, Components, app.context);
@@ -386,16 +307,8 @@ async function render(to, from, next) {
       return next();
     }
 
-    // Set layout
-    let layout = Components[0].options.layout;
-
-    if (typeof layout === 'function') {
-      layout = layout(app.context);
-    }
-    layout = await this.loadLayout(layout);
-
     // Call middleware for layout
-    await callMiddleware.call(this, Components, app.context, layout);
+    await callMiddleware.call(this, Components, app.context);
     if (nextCalled) {
       return;
     }
@@ -536,14 +449,6 @@ async function render(to, from, next) {
 
     globalHandleError(error);
 
-    // Load error layout
-    let layout = (NuxtError.options || NuxtError).layout;
-
-    if (typeof layout === 'function') {
-      layout = layout(app.context);
-    }
-    await this.loadLayout(layout);
-
     this.error(error);
     this.$nuxt.$emit('routeChanged', to, from, error);
     next();
@@ -564,22 +469,6 @@ function normalizeComponents(to, ___) {
   });
 }
 
-function setLayoutForNextPage(to) {
-  // Set layout
-  let hasError = Boolean(this.$options.nuxt.err);
-
-  if (this._hadError && this._dateLastError === this.$options.nuxt.dateErr) {
-    hasError = false;
-  }
-  let layout = hasError ? (NuxtError.options || NuxtError).layout : to.matched[0].components.default.options.layout;
-
-  if (typeof layout === 'function') {
-    layout = layout(app.context);
-  }
-
-  this.setLayout(layout);
-}
-
 function checkForErrors(app) {
   // Hide error component if no error
   if (app._hadError && app._dateLastError === app.$options.nuxt.dateErr) {
@@ -723,31 +612,7 @@ function addHotReload($component, depth) {
 
     callMiddleware.call(this, Components, context)
       .then(() => {
-      // If layout changed
-        if (depth !== 0) {
-          return;
-        }
-
-        let layout = Component.options.layout || 'default';
-
-        if (typeof layout === 'function') {
-          layout = layout(context);
-        }
-        if (this.layoutName === layout) {
-          return;
-        }
-        const promise = this.loadLayout(layout);
-
-        promise.then(() => {
-          this.setLayout(layout);
-          Vue.nextTick(() => hotReloadAPI(this));
-        });
-
-        return promise;
-      })
-
-      .then(() => {
-        return callMiddleware.call(this, Components, context, this.layout);
+        return callMiddleware.call(this, Components, context);
       })
 
       .then(() => {
@@ -795,8 +660,6 @@ async function mountApp(__app) {
     // Add afterEach router hooks
     router.afterEach(normalizeComponents);
 
-    router.afterEach(setLayoutForNextPage.bind(_app));
-
     router.afterEach(fixPrepatch.bind(_app));
 
     // Listen for first Vue update
@@ -814,10 +677,7 @@ async function mountApp(__app) {
   // Resolve route components
   const Components = await Promise.all(resolveComponents(app.context.route));
 
-  // Enable transitions
-  _app.setTransitions = _app.$options.nuxt.setTransitions.bind(_app);
   if (Components.length) {
-    _app.setTransitions(mapTransitions(Components, router.currentRoute));
     _lastPaths = router.currentRoute.matched.map((route) => compile(route.path)(router.currentRoute.params));
   }
 
@@ -842,7 +702,6 @@ async function mountApp(__app) {
   // First render on client-side
   const clientFirstMount = () => {
     normalizeComponents(router.currentRoute, router.currentRoute);
-    setLayoutForNextPage.call(_app, router.currentRoute);
     checkForErrors(_app);
     // Don't call fixPrepatch.call(_app, router.currentRoute, router.currentRoute) since it's first render
     mount();

package/initialize/index.js

@@ -1,19 +1,16 @@
 // Taken from @nuxt/vue-app/template/index.js
+// This file was generated during Nuxt migration
 
 import Vue from 'vue';
-import Meta from 'vue-meta';
-import ClientOnly from 'vue-client-only';
-import NoSsr from 'vue-no-ssr';
 import { createRouter } from '../config/router.js';
 import NuxtChild from '../components/nuxt/nuxt-child.js';
-import NuxtError from '../layouts/error.vue';
 import Nuxt from '../components/nuxt/nuxt.js';
 import App from './App.js';
 import { setContext, getLocation, getRouteData, normalizeError } from '../utils/nuxt';
 import { createStore } from '../config/store.js';
 
 /* Plugins */
-
+import { loadDirectives } from '@shell/plugins';
 import '../plugins/portal-vue.js';
 import cookieUniversalNuxt from '../utils/cookie-universal-nuxt.js';
 import axios from '../utils/axios.js';
@@ -21,12 +18,7 @@ import plugins from '../core/plugins.js';
 import pluginsLoader from '../core/plugins-loader.js';
 import axiosShell from '../plugins/axios';
 import '../plugins/tooltip';
-import '../plugins/clean-tooltip-directive';
-import '../plugins/vue-clipboard2';
 import '../plugins/v-select';
-import '../plugins/directives';
-import '../plugins/clean-html-directive';
-import '../plugins/transitions';
 import '../plugins/vue-js-modal';
 import '../plugins/js-yaml';
 import '../plugins/resize';
@@ -47,22 +39,28 @@ import '../plugins/formatters';
 import version from '../plugins/version';
 import steveCreateWorker from '../plugins/steve-create-worker';
 
-// Component: <ClientOnly>
-Vue.component(ClientOnly.name, ClientOnly);
-
-// TODO: Remove in Nuxt 3: <NoSsr>
-Vue.component(NoSsr.name, {
-  ...NoSsr,
-  render(h, ctx) {
-    if (process.client && !NoSsr._warned) {
-      NoSsr._warned = true;
+// Prevent extensions from overriding existing directives
+// Hook into Vue.directive and keep track of the directive names that have been added
+// and prevent an existing directive from being overwritten
+const directiveNames = {};
+const vueDirective = Vue.directive;
 
-      console.warn('<no-ssr> has been deprecated and will be removed in Nuxt 3, please use <client-only> instead'); // eslint-disable-line no-console
-    }
+Vue.directive = function(name) {
+  if (directiveNames[name]) {
+    console.log(`Can not override directive: ${ name }`); // eslint-disable-line no-console
 
-    return NoSsr.render(h, ctx);
+    return;
   }
-});
+
+  directiveNames[name] = true;
+
+  vueDirective.apply(Vue, arguments);
+};
+
+// Load the directives from the plugins - we do this with a function so we know
+// these are initialized here, after the code above which keeps track of them and
+// prevents over-writes
+loadDirectives();
 
 // Component: <NuxtChild>
 Vue.component(NuxtChild.name, NuxtChild);
@@ -77,7 +75,7 @@ Object.defineProperty(Vue.prototype, '$nuxt', {
   get() {
     const globalNuxt = this.$root.$options.$nuxt;
 
-    if (process.client && !globalNuxt && typeof window !== 'undefined') {
+    if (!globalNuxt && typeof window !== 'undefined') {
       return window.$nuxt;
     }
 
@@ -86,18 +84,10 @@ Object.defineProperty(Vue.prototype, '$nuxt', {
   configurable: true
 });
 
-Vue.use(Meta, {
-  keyName: 'head', attribute: 'data-n-head', ssrAttribute: 'data-n-head-ssr', tagIDKeyName: 'hid'
-});
+async function createApp(config = {}) {
+  const router = await createRouter(config);
 
-const defaultTransition = {
-  name: 'page', mode: 'out-in', appear: true, appearClass: 'appear', appearActiveClass: 'appear-active', appearToClass: 'appear-to'
-};
-
-async function createApp(ssrContext, config = {}) {
-  const router = await createRouter(ssrContext, config);
-
-  const store = createStore(ssrContext);
+  const store = createStore();
 
   // Add this.$router into store actions/mutations
   store.$router = router;
@@ -107,40 +97,9 @@ async function createApp(ssrContext, config = {}) {
   // here we inject the router and store to all child components,
   // making them available everywhere as `this.$router` and `this.$store`.
   const app = {
-    head: {
-      title: 'dashboard',
-      meta:  [{ charset: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' }, {
-        hid: 'description', name: 'description', content: 'Rancher Dashboard'
-      }],
-      style:  [],
-      script: []
-    },
-
     store,
     router,
     nuxt: {
-      defaultTransition,
-      transitions: [defaultTransition],
-      setTransitions(transitions) {
-        if (!Array.isArray(transitions)) {
-          transitions = [transitions];
-        }
-        transitions = transitions.map((transition) => {
-          if (!transition) {
-            transition = defaultTransition;
-          } else if (typeof transition === 'string') {
-            transition = Object.assign({}, defaultTransition, { name: transition });
-          } else {
-            transition = Object.assign({}, defaultTransition, transition);
-          }
-
-          return transition;
-        });
-        this.$options.nuxt.transitions = transitions;
-
-        return transitions;
-      },
-
       err:     null,
       dateErr: null,
       error(err) {
@@ -154,10 +113,6 @@ async function createApp(ssrContext, config = {}) {
         }
         nuxt.dateErr = Date.now();
         nuxt.err = err;
-        // Used in src/server.js
-        if (ssrContext) {
-          ssrContext.nuxt.error = err;
-        }
 
         return err;
       }
@@ -168,29 +123,21 @@ async function createApp(ssrContext, config = {}) {
   // Make app available into store via this.app
   store.app = app;
 
-  const next = ssrContext ? ssrContext.next : (location) => app.router.push(location);
+  const next = (location) => app.router.push(location);
   // Resolve route
-  let route;
 
-  if (ssrContext) {
-    route = router.resolve(ssrContext.url).route;
-  } else {
-    const path = getLocation(router.options.base, router.options.mode);
-
-    route = router.resolve(path).route;
-  }
+  const path = getLocation(router.options.base, router.options.mode);
+  const route = router.resolve(path).route;
 
   // Set context to app.context
   await setContext(app, {
     store,
     route,
     next,
-    error:           app.nuxt.error.bind(app),
-    payload:         ssrContext ? ssrContext.payload : undefined,
-    req:             ssrContext ? ssrContext.req : undefined,
-    res:             ssrContext ? ssrContext.res : undefined,
-    beforeRenderFns: ssrContext ? ssrContext.beforeRenderFns : undefined,
-    ssrContext
+    error:   app.nuxt.error.bind(app),
+    payload: undefined,
+    req:     undefined,
+    res:     undefined
   });
 
   function inject(key, value) {
@@ -234,20 +181,11 @@ async function createApp(ssrContext, config = {}) {
   // Inject runtime config as $config
   inject('config', config);
 
-  if (process.client) {
-    // Replace store state before plugins execution
-    if (window.__NUXT__ && window.__NUXT__.state) {
-      store.replaceState(window.__NUXT__.state);
-    }
+  // Replace store state before plugins execution
+  if (window.__NUXT__ && window.__NUXT__.state) {
+    store.replaceState(window.__NUXT__.state);
   }
 
-  // Add enablePreview(previewData = {}) in context for plugins
-  if (process.static && process.client) {
-    app.context.enablePreview = function(previewData = {}) {
-      app.previewData = Object.assign({}, previewData);
-      inject('preview', previewData);
-    };
-  }
   // Plugin execution
 
   // if (typeof nuxt_plugin_portalvue_6babae27 === 'function') {
@@ -274,15 +212,15 @@ async function createApp(ssrContext, config = {}) {
     await axiosShell(app.context, inject);
   }
 
-  if (process.client && typeof intNumber === 'function') {
+  if (typeof intNumber === 'function') {
     await intNumber(app.context, inject);
   }
 
-  if (process.client && typeof positiveIntNumber === 'function') {
+  if (typeof positiveIntNumber === 'function') {
     await positiveIntNumber(app.context, inject);
   }
 
-  if (process.client && typeof nuxtClientInit === 'function') {
+  if (typeof nuxtClientInit === 'function') {
     await nuxtClientInit(app.context, inject);
   }
 
@@ -294,43 +232,31 @@ async function createApp(ssrContext, config = {}) {
     await backButton(app.context, inject);
   }
 
-  if (process.client && typeof plugin === 'function') {
+  if (typeof plugin === 'function') {
     await plugin(app.context, inject);
   }
 
-  if (process.client && typeof codeMirror === 'function') {
+  if (typeof codeMirror === 'function') {
     await codeMirror(app.context, inject);
   }
 
-  if (process.client && typeof version === 'function') {
+  if (typeof version === 'function') {
     await version(app.context, inject);
   }
 
-  if (process.client && typeof steveCreateWorker === 'function') {
+  if (typeof steveCreateWorker === 'function') {
     await steveCreateWorker(app.context, inject);
   }
 
-  // if (process.client && typeof formatters === 'function') {
-  //   await formatters(app.context, inject);
-  // }
-
-  // Lock enablePreview in context
-  if (process.static && process.client) {
-    app.context.enablePreview = function() {
-      console.warn('You cannot call enablePreview() outside a plugin.'); // eslint-disable-line no-console
-    };
-  }
-
   // Wait for async component to be resolved first
   await new Promise((resolve, reject) => {
     // Ignore 404s rather than blindly replacing URL in browser
-    if (process.client) {
-      const { route } = router.resolve(app.context.route.fullPath);
+    const { route } = router.resolve(app.context.route.fullPath);
 
-      if (!route.matched.length) {
-        return resolve();
-      }
+    if (!route.matched.length) {
+      return resolve();
     }
+
     router.replace(app.context.route.fullPath, resolve, (err) => {
       // https://github.com/vuejs/vue-router/blob/v3.4.3/src/util/errors.js
       if (!err._isRouter) {
@@ -342,9 +268,6 @@ async function createApp(ssrContext, config = {}) {
 
       // navigated to a different route in router guard
       const unregister = router.afterEach(async(to, from) => {
-        if (process.server && ssrContext && ssrContext.url) {
-          ssrContext.url = to.fullPath;
-        }
         app.context.route = await getRouteData(to);
         app.context.params = to.params || {};
         app.context.query = to.query || {};
@@ -361,4 +284,4 @@ async function createApp(ssrContext, config = {}) {
   };
 }
 
-export { createApp, NuxtError };
+export { createApp };

package/list/management.cattle.io.feature.vue

@@ -44,13 +44,7 @@ export default {
       this.serverUrl = this.serverUrlSetting.value;
     } else {
       this.noUrlSet = true;
-      if ( process.server ) {
-        const { req } = this.$nuxt.context;
-
-        this.serverUrl = req.headers.host;
-      } else {
-        this.serverUrl = window.location.origin;
-      }
+      this.serverUrl = window.location.origin;
     }
   },
 

package/list/node.vue

@@ -167,6 +167,7 @@ export default {
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+      data-testid="cluster-node-list"
       v-on="$listeners"
     >
       <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">