Latest changes from Harvester master - d7d9d4af8a88d677695d7aff47a81d52041dfcca

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
This commit is contained in:
Francesco Torchia
2024-11-12 11:50:17 +01:00
parent d04cd35a08
commit dc74441d26
46 changed files with 1290 additions and 1624 deletions
@@ -206,7 +206,7 @@ export default {
<Banner
v-if="errors.length"
color="warning"
color="error"
>
{{ errors }}
</Banner>
-2
View File
@@ -6,7 +6,6 @@ import { AGE, ROLE, STATE, PRINCIPAL } from '@shell/config/table-headers';
import Banner from '@components/Banner/Banner.vue';
import Tabbed from '@shell/components/Tabbed/index.vue';
import Tab from '@shell/components/Tabbed/Tab.vue';
import SortableTable from '@shell/components/SortableTable';
import { mapGetters } from 'vuex';
import { allHash } from '@shell/utils/promise';
@@ -19,7 +18,6 @@ export default {
ResourceTable,
Tabbed,
Tab,
SortableTable
},
props: {
+4 -4
View File
@@ -124,8 +124,8 @@ export default {
<span v-if="setting.customized" class="modified">
Modified
</span>
<span v-if="setting.technicalPreview" v-clean-tooltip="t('advancedSettings.technicalPreview')" class="technical-preview">
Technical Preview
<span v-if="setting.experimental" v-clean-tooltip="t('advancedSettings.experimental')" class="experimental">
Experimental
</span>
</h1>
<h2 v-clean-html="t(setting.description, {}, true)">
@@ -216,9 +216,9 @@ export default {
font-size: 12px;
}
.technical-preview {
.experimental {
margin-left: 10px;
border: 1px solid var(--warning);
border: 1px solid var(--error);
border-radius: 5px;
padding: 2px 10px;
font-size: 12px;
@@ -7,6 +7,8 @@ import ModalWithCard from '@shell/components/ModalWithCard';
const PREFERED_SHORTCUT_KEYS = 'prefered-shortcut-keys';
export default {
name: 'NovncConsoleCustomKeys',
emits: ['close'],
components: {
@@ -102,10 +104,6 @@ export default {
},
methods: {
show() {
this.$refs.recordShortcutKeys.open();
},
closeRecordingModal() {
window.removeEventListener('keydown', this.handleShortcut);
this.$emit('close');
@@ -172,7 +170,10 @@ export default {
</script>
<template>
<ModalWithCard ref="recordShortcutKeys" name="recordShortcutKeys" :width="550">
<ModalWithCard
name="recordShortcutKeys"
:width="550"
>
<template #title>
<t k="harvester.virtualMachine.detail.console.customShortcutKeys" />
</template>
@@ -104,6 +104,7 @@ const F_KEYS = {
};
export default {
name: 'NovncConsoleWrapper',
components: {
NovncConsole, NovncConsoleItem, NovncConsoleCustomKeys
},
@@ -262,9 +263,6 @@ export default {
showKeysModal() {
this.renderKeysModal = true;
this.$nextTick(() => {
this.$refs.keysModal.show();
});
},
hideKeysModal() {
@@ -326,7 +324,11 @@ export default {
</template>
</v-dropdown>
<NovncConsoleCustomKeys v-if="renderKeysModal" ref="keysModal" :current-user="currentUser" @close="hideKeysModal" />
<NovncConsoleCustomKeys
v-if="renderKeysModal"
:current-user="currentUser"
@close="hideKeysModal"
/>
</div>
<NovncConsole v-if="url && !isDown" ref="novncConsole" :url="url" />
<p v-if="isDown">
@@ -5,7 +5,7 @@ import InfoBox from '@shell/components/InfoBox';
import { allHash } from '@shell/utils/promise';
import { CSI_DRIVER, VOLUME_SNAPSHOT_CLASS } from '../../types';
const LONGHORN_DRIVER = 'driver.longhorn.io';
import { LONGHORN_DRIVER } from '@shell/config/types';
export default {
name: 'HarvesterCsiDriver',