mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2026-10-03 20:56:06 +08:00
* refactor: rename hotplug volume
* feat: add hotplug NIC
* feat: add hot unplug
* refactor: rename NIC
* feat: get latest status
* feat: disable not ready options
* feat: filter out system networks
* refactor: update wordings
---------
(cherry picked from commit f9bff21e84)
Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
Co-authored-by: Yiya Chen <yiya.chen@suse.com>
This commit is contained in:
co-authored by
Yiya Chen
parent
8cbb9d6b18
commit
c19341bec9
@@ -0,0 +1,212 @@
|
||||
<script>
|
||||
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||
import { mapGetters } from 'vuex';
|
||||
import { NETWORK_ATTACHMENT } from '@shell/config/types';
|
||||
import { Card } from '@components/Card';
|
||||
import { Banner } from '@components/Banner';
|
||||
import AsyncButton from '@shell/components/AsyncButton';
|
||||
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||
import { NETWORK_TYPE } from '../config/types';
|
||||
|
||||
export default {
|
||||
name: 'AddHotplugNic',
|
||||
|
||||
emits: ['close'],
|
||||
|
||||
components: {
|
||||
AsyncButton,
|
||||
Card,
|
||||
LabeledInput,
|
||||
LabeledSelect,
|
||||
Banner
|
||||
},
|
||||
|
||||
props: {
|
||||
resources: {
|
||||
type: Array,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
|
||||
async fetch() {
|
||||
try {
|
||||
this.allVMNetworks = await this.$store.dispatch('harvester/findAll', { type: NETWORK_ATTACHMENT });
|
||||
} catch (err) {
|
||||
this.errors = exceptionToErrorsArray(err);
|
||||
this.allVMNetworks = [];
|
||||
}
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
interfaceName: '',
|
||||
networkName: '',
|
||||
macAddress: '',
|
||||
allVMNetworks: [],
|
||||
errors: [],
|
||||
};
|
||||
},
|
||||
|
||||
computed: {
|
||||
...mapGetters({ t: 'i18n/t' }),
|
||||
|
||||
actionResource() {
|
||||
return this.resources?.[0];
|
||||
},
|
||||
|
||||
isFormValid() {
|
||||
return this.interfaceName !== '' && this.networkName !== '';
|
||||
},
|
||||
|
||||
vmNetworksOption() {
|
||||
return this.allVMNetworks
|
||||
.filter((network) => {
|
||||
const labels = network.metadata?.labels || {};
|
||||
const type = labels[HCI_ANNOTATIONS.NETWORK_TYPE];
|
||||
|
||||
const isValidType = [
|
||||
NETWORK_TYPE.L2VLAN,
|
||||
NETWORK_TYPE.UNTAGGED,
|
||||
NETWORK_TYPE.L2TRUNK_VLAN,
|
||||
].includes(type);
|
||||
|
||||
return isValidType && !network.isSystem;
|
||||
})
|
||||
.map((network) => {
|
||||
const label = network.isNotReady ? `${ network.id } (${ this.t('generic.notReady') })` : network.id;
|
||||
|
||||
return ({
|
||||
label,
|
||||
value: network.id || '',
|
||||
disabled: network.isNotReady,
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
close() {
|
||||
this.interfaceName = '';
|
||||
this.networkName = '';
|
||||
this.macAddress = '';
|
||||
this.errors = [];
|
||||
this.$emit('close');
|
||||
},
|
||||
|
||||
async save(buttonCb) {
|
||||
if (!this.actionResource) {
|
||||
buttonCb(false);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const payload = {
|
||||
interfaceName: this.interfaceName,
|
||||
networkName: this.networkName
|
||||
};
|
||||
|
||||
if (this.macAddress) {
|
||||
payload.macAddress = this.macAddress;
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await this.actionResource.doAction('addNic', payload);
|
||||
|
||||
if ([200, 204].includes(res?._status)) {
|
||||
this.$store.dispatch('growl/success', {
|
||||
title: this.t('generic.notification.title.succeed'),
|
||||
message: this.t('harvester.modal.hotplugNic.success', {
|
||||
interfaceName: this.interfaceName,
|
||||
vm: this.actionResource.nameDisplay
|
||||
})
|
||||
}, { root: true });
|
||||
|
||||
this.close();
|
||||
buttonCb(true);
|
||||
} else {
|
||||
this.errors = exceptionToErrorsArray(res);
|
||||
buttonCb(false);
|
||||
}
|
||||
} catch (err) {
|
||||
this.errors = exceptionToErrorsArray(err);
|
||||
buttonCb(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Card
|
||||
ref="modal"
|
||||
name="modal"
|
||||
:show-highlight-border="false"
|
||||
>
|
||||
<template #title>
|
||||
<h4
|
||||
v-clean-html="t('harvester.modal.hotplugNic.title')"
|
||||
class="text-default-text"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<template #body>
|
||||
<LabeledInput
|
||||
v-model:value="interfaceName"
|
||||
:label="t('generic.name')"
|
||||
required
|
||||
/>
|
||||
<LabeledSelect
|
||||
v-model:value="networkName"
|
||||
class="mt-20"
|
||||
:label="t('harvester.modal.hotplugNic.vmNetwork')"
|
||||
:options="vmNetworksOption"
|
||||
required
|
||||
/>
|
||||
<LabeledInput
|
||||
v-model:value="macAddress"
|
||||
class="mt-20"
|
||||
label-key="harvester.modal.hotplugNic.macAddress"
|
||||
:tooltip="t('harvester.modal.hotplugNic.macAddressTooltip', _, true)"
|
||||
/>
|
||||
<Banner
|
||||
v-for="(err, i) in errors"
|
||||
:key="i"
|
||||
:label="err"
|
||||
color="error"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<template #actions>
|
||||
<div class="actions">
|
||||
<div class="buttons">
|
||||
<button
|
||||
type="button"
|
||||
class="btn role-secondary mr-10"
|
||||
@click="close"
|
||||
>
|
||||
{{ t('generic.cancel') }}
|
||||
</button>
|
||||
|
||||
<AsyncButton
|
||||
mode="apply"
|
||||
:disabled="!isFormValid"
|
||||
@click="save"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</Card>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.actions {
|
||||
width: 100%;
|
||||
}
|
||||
.buttons {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
+3
-3
@@ -11,7 +11,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
|
||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||
|
||||
export default {
|
||||
name: 'HotplugModal',
|
||||
name: 'HotplugVolumeModal',
|
||||
|
||||
emits: ['close'],
|
||||
|
||||
@@ -90,7 +90,7 @@ export default {
|
||||
if (res._status === 200 || res._status === 204) {
|
||||
this.$store.dispatch('growl/success', {
|
||||
title: this.t('generic.notification.title.succeed'),
|
||||
message: this.t('harvester.modal.hotplug.success', { diskName: this.diskName, vm: this.actionResource.nameDisplay })
|
||||
message: this.t('harvester.modal.hotplugVolume.success', { diskName: this.diskName, vm: this.actionResource.nameDisplay })
|
||||
}, { root: true });
|
||||
|
||||
this.close();
|
||||
@@ -122,7 +122,7 @@ export default {
|
||||
>
|
||||
<template #title>
|
||||
<h4
|
||||
v-clean-html="t('harvester.modal.hotplug.title')"
|
||||
v-clean-html="t('harvester.modal.hotplugVolume.title')"
|
||||
class="text-default-text"
|
||||
/>
|
||||
</template>
|
||||
+38
-12
@@ -1,13 +1,12 @@
|
||||
<script>
|
||||
import { mapState, mapGetters } from 'vuex';
|
||||
|
||||
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||
import { Card } from '@components/Card';
|
||||
import { Banner } from '@components/Banner';
|
||||
import AsyncButton from '@shell/components/AsyncButton';
|
||||
|
||||
export default {
|
||||
name: 'HarvesterHotUnplugModal',
|
||||
name: 'HarvesterHotUnplug',
|
||||
|
||||
emits: ['close'],
|
||||
|
||||
@@ -35,8 +34,25 @@ export default {
|
||||
actionResource() {
|
||||
return this.resources[0];
|
||||
},
|
||||
diskName() {
|
||||
return this.modalData.diskName;
|
||||
|
||||
name() {
|
||||
return this.modalData.name;
|
||||
},
|
||||
|
||||
isVolume() {
|
||||
return this.modalData.type === 'volume';
|
||||
},
|
||||
|
||||
titleKey() {
|
||||
return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.title' : 'harvester.virtualMachine.hotUnplug.detachNIC.title';
|
||||
},
|
||||
|
||||
actionLabelKey() {
|
||||
return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel' : 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabel';
|
||||
},
|
||||
|
||||
successMessageKey() {
|
||||
return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.success' : 'harvester.virtualMachine.hotUnplug.detachNIC.success';
|
||||
}
|
||||
},
|
||||
|
||||
@@ -47,14 +63,20 @@ export default {
|
||||
|
||||
async save(buttonCb) {
|
||||
try {
|
||||
const res = await this.actionResource.doAction('removeVolume', { diskName: this.diskName });
|
||||
let res;
|
||||
|
||||
if (this.isVolume) {
|
||||
res = await this.actionResource.doAction('removeVolume', { diskName: this.name });
|
||||
} else {
|
||||
res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
|
||||
}
|
||||
|
||||
if (res._status === 200 || res._status === 204) {
|
||||
this.$store.dispatch(
|
||||
'growl/success',
|
||||
{
|
||||
title: this.t('generic.notification.title.succeed'),
|
||||
message: this.t('harvester.modal.hotunplug.success', { name: this.diskName })
|
||||
message: this.t(this.successMessageKey, { name: this.name })
|
||||
},
|
||||
{ root: true }
|
||||
);
|
||||
@@ -64,14 +86,14 @@ export default {
|
||||
} else {
|
||||
const error = [res?.data] || exceptionToErrorsArray(res);
|
||||
|
||||
this['errors'] = error;
|
||||
this.errors = error;
|
||||
buttonCb(false);
|
||||
}
|
||||
} catch (err) {
|
||||
const error = err?.data || err;
|
||||
const message = exceptionToErrorsArray(error);
|
||||
|
||||
this['errors'] = message;
|
||||
this.errors = message;
|
||||
buttonCb(false);
|
||||
}
|
||||
}
|
||||
@@ -87,7 +109,7 @@ export default {
|
||||
>
|
||||
<template #title>
|
||||
<h4
|
||||
v-clean-html="t('harvester.virtualMachine.unplug.title', { name: diskName })"
|
||||
v-clean-html="t(titleKey, { name })"
|
||||
class="text-default-text"
|
||||
/>
|
||||
<Banner
|
||||
@@ -111,9 +133,9 @@ export default {
|
||||
|
||||
<AsyncButton
|
||||
mode="apply"
|
||||
:action-label="t('harvester.virtualMachine.unplug.actionLabel')"
|
||||
:waiting-label="t('harvester.virtualMachine.unplug.actionLabel')"
|
||||
:success-label="t('harvester.virtualMachine.unplug.actionLabel')"
|
||||
:action-label="t(actionLabelKey)"
|
||||
:waiting-label="t(actionLabelKey)"
|
||||
:success-label="t(actionLabelKey)"
|
||||
@click="save"
|
||||
/>
|
||||
</div>
|
||||
@@ -132,4 +154,8 @@ export default {
|
||||
justify-content: flex-end;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
::v-deep(.card-title) {
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user