Skip to content

Commit

Permalink
Merge pull request #12672 from codyrancher/error-template
Browse files Browse the repository at this point in the history
Removing the unused `templates/error.vue` and `popstate` references
  • Loading branch information
codyrancher authored Dec 3, 2024
2 parents bb1f8c2 + a5ff16e commit 20be22a
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 161 deletions.
131 changes: 0 additions & 131 deletions shell/components/templates/error.vue

This file was deleted.

13 changes: 0 additions & 13 deletions shell/config/router/navigation-guards/history.js

This file was deleted.

3 changes: 1 addition & 2 deletions shell/config/router/navigation-guards/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { install as installAuthentication } from '@shell/config/router/navigatio
import { install as installRuntimeExtensionRoute } from '@shell/config/router/navigation-guards/runtime-extension-route';
import { install as installI18N } from '@shell/config/router/navigation-guards/i18n';
import { install as installProducts } from '@shell/config/router/navigation-guards/products';
import { install as installHistory } from '@shell/config/router/navigation-guards/history';
import { install as installClusters } from '@shell/config/router/navigation-guards/clusters';
import { install as installHandleInstallRedirect } from '@shell/config/router/navigation-guards/install-redirect';
import { install as installPageTitle } from '@shell/config/router/navigation-guards/page-title';
Expand All @@ -17,7 +16,7 @@ export function installNavigationGuards(router, context) {
// NOTE: the order of the installation matters.
// Be intentional when adding, removing or modifying the guards that are installed.

const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installHistory, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installServerUpgradeGrowl];
const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installServerUpgradeGrowl];

navigationGuardInstallers.forEach((installer) => installer(router, context));
}
13 changes: 3 additions & 10 deletions shell/initialize/App.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<script>
import NuxtError from '@shell/components/templates/error.vue';
import NuxtLoading from '@shell/components/nav/GlobalLoading.vue';
import '@shell/assets/styles/app.scss';
export default {
data: () => ({
isOnline: true,
showErrorPage: false,
}),
data: () => ({ isOnline: true }),
created() {
// add to window so we can listen when ready
Expand Down Expand Up @@ -60,18 +55,16 @@ export default {
},
},
components: { NuxtLoading, NuxtError }
components: { NuxtLoading }
};
</script>
<template>
<div id="__nuxt">
<NuxtLoading ref="loading" />
<div
id="__layout"
:key="showErrorPage"
>
<NuxtError v-if="showErrorPage" />
<router-view v-else />
<router-view />
</div>
</div>
</template>
3 changes: 1 addition & 2 deletions shell/initialize/install-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import axios from '@shell/utils/axios';
import cookieUniversal from '@shell/utils/cookie-universal';
import config from '@shell/utils/config';
import axiosShell from '@shell/plugins/axios';
import backButton from '@shell/plugins/back-button';
import codeMirror from '@shell/plugins/codemirror-loader';
import { InstallCodeMirror } from 'codemirror-editor-vue3';
import * as intNumber from '@shell/directives/int-number';
Expand All @@ -42,7 +41,7 @@ export async function installPlugins(vueApp) {
}

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

const installations = pluginDefinitions.map(async(pluginDefinition) => {
if (typeof pluginDefinition === 'function') {
Expand Down
3 changes: 0 additions & 3 deletions shell/plugins/back-button.js

This file was deleted.

0 comments on commit 20be22a

Please sign in to comment.