Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/components/templates/standalone.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</template>

<style lang="scss">
body, #__nuxt, #__layout {
body, #__root, #__layout {
height: 100%;
}
</style>
8 changes: 4 additions & 4 deletions shell/initialize/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import NuxtLoading from '@shell/components/nav/GlobalLoading.vue';
import GlobalLoading from '@shell/components/nav/GlobalLoading.vue';

import '@shell/assets/styles/app.scss';

Expand Down Expand Up @@ -55,12 +55,12 @@ export default {
},
},

components: { NuxtLoading }
components: { GlobalLoading }
};
</script>
<template>
<div id="__nuxt">
<NuxtLoading ref="loading" />
<div id="__root">
<GlobalLoading ref="loading" />
<div
id="__layout"
>
Expand Down
19 changes: 17 additions & 2 deletions shell/initialize/install-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import axiosShell from '@shell/plugins/axios';
import codeMirror from '@shell/plugins/codemirror-loader';
import { InstallCodeMirror } from 'codemirror-editor-vue3';
import * as intNumber from '@shell/directives/int-number';
import nuxtClientInit from '@shell/plugins/nuxt-client-init';
import dashboardClientInit from '@shell/plugins/dashboard-client-init';
import plugin from '@shell/plugins/plugin';
import plugins from '@shell/core/plugins.js';
import pluginsLoader from '@shell/core/plugins-loader.js';
Expand Down Expand Up @@ -48,7 +48,22 @@ export async function installPlugins(vueApp) {
}

export async function installInjectedPlugins(app, vueApp) {
const pluginDefinitions = [config, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin, dynamicContent];
const pluginDefinitions = [
config,
axios,
plugins,
pluginsLoader,
axiosShell,
intNumber,
codeMirror,
dashboardClientInit,
replaceAll,
plugin,
steveCreateWorker,
emberCookie,
internalApiPlugin,
dynamicContent,
];

const installations = pluginDefinitions.map(async(pluginDefinition) => {
if (typeof pluginDefinition === 'function') {
Expand Down
3 changes: 3 additions & 0 deletions shell/plugins/dashboard-client-init.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default async(context) => {
await context.store.dispatch('dashboardClientInit', context);
};
3 changes: 0 additions & 3 deletions shell/plugins/nuxt-client-init.js

This file was deleted.

8 changes: 4 additions & 4 deletions shell/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1251,10 +1251,10 @@ export const actions = {
}
},

nuxtClientInit({ dispatch, commit, rootState }, nuxt) {
commit('setRouter', nuxt.app.router);
commit('setRoute', nuxt.route);
commit('setPlugin', nuxt.app.$plugin);
dashboardClientInit({ dispatch, commit, rootState }, context) {
commit('setRouter', context.app.router);
commit('setRoute', context.route);
commit('setPlugin', context.app.$plugin);

dispatch('management/rehydrateSubscribe');
dispatch('cluster/rehydrateSubscribe');
Expand Down
Loading