mirror of https://github.com/rancher/dashboard.git
OS Image doesn't need to be lazy
This commit is contained in:
parent
0d62b6d70f
commit
f7521a94c0
|
|
@ -4,10 +4,9 @@ import { sortBy } from '@/utils/sort';
|
|||
import { findBy } from '@/utils/array';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import Select from '@/components/form/Select';
|
||||
import LazyImage from '@/components/LazyImage';
|
||||
|
||||
export default {
|
||||
components: { LazyImage, Select },
|
||||
components: { Select },
|
||||
|
||||
computed: {
|
||||
...mapState(['isMultiCluster']),
|
||||
|
|
@ -42,7 +41,7 @@ export default {
|
|||
id: x.id,
|
||||
label: x.nameDisplay,
|
||||
ready: x.isReady,
|
||||
osLogo: x.providerOSLogo,
|
||||
osLogo: x.providerOsLogo,
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -71,7 +70,7 @@ export default {
|
|||
>
|
||||
<template #selected-option="opt">
|
||||
<span class="cluster-label-container">
|
||||
<LazyImage class="cluster-switcher-os-logo" :src="currentCluster.providerOSLogo" />
|
||||
<img v-if="currentCluster" class="cluster-switcher-os-logo" :src="currentCluster.providerOsLogo" />
|
||||
<span class="cluster-label">
|
||||
{{ opt.label }}
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,6 @@
|
|||
import { CATALOG } from '@/config/labels-annotations';
|
||||
import { FLEET } from '@/config/types';
|
||||
import { insertAt, findBy } from '@/utils/array';
|
||||
|
||||
export const OS_LOGOS = [
|
||||
{
|
||||
id: 'linux',
|
||||
logo: require(`~/assets/images/logo-linux.svg`)
|
||||
},
|
||||
{
|
||||
id: 'windows',
|
||||
logo: require(`~/assets/images/logo-windows.svg`)
|
||||
},
|
||||
];
|
||||
import { insertAt } from '@/utils/array';
|
||||
|
||||
export default {
|
||||
_availableActions() {
|
||||
|
|
@ -69,19 +58,16 @@ export default {
|
|||
};
|
||||
},
|
||||
|
||||
providerOSLogo() {
|
||||
const providerOSOptions = OS_LOGOS;
|
||||
const provider = this.status.provider || '';
|
||||
let match = findBy(providerOSOptions, 'id', 'linux');
|
||||
let { logo } = match;
|
||||
|
||||
if (provider === 'rke.windows') {
|
||||
match = findBy(providerOSOptions, 'id', 'windows');
|
||||
|
||||
logo = match.logo;
|
||||
providerOs() {
|
||||
if ( this.status?.provider === 'rke.windows' ) {
|
||||
return 'windows';
|
||||
}
|
||||
|
||||
return logo;
|
||||
return 'linux';
|
||||
},
|
||||
|
||||
providerOsLogo() {
|
||||
return require(`~/assets/images/logo-${ this.providerOs }.svg`);
|
||||
},
|
||||
|
||||
scope() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue