mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-17 02:53:18 +01:00
UI(vue) + extras: fix bugs/spelling and standardize (#12073)
This commit is contained in:
parent
cfe96026dc
commit
78f9e6584b
2
.github/linters/codespell.txt
vendored
2
.github/linters/codespell.txt
vendored
@ -255,7 +255,6 @@ ingore
|
|||||||
initalize
|
initalize
|
||||||
initator
|
initator
|
||||||
inspite
|
inspite
|
||||||
instace
|
|
||||||
instal
|
instal
|
||||||
instnace
|
instnace
|
||||||
intefaces
|
intefaces
|
||||||
@ -376,7 +375,6 @@ renabling
|
|||||||
reponse
|
reponse
|
||||||
reqest
|
reqest
|
||||||
reqiured
|
reqiured
|
||||||
requried
|
|
||||||
reserv
|
reserv
|
||||||
reserverd
|
reserverd
|
||||||
reseted
|
reseted
|
||||||
|
|||||||
@ -26,7 +26,7 @@ using System.Threading.Tasks;
|
|||||||
// C# versions of certain CloudStack types to simplify JSON serialisation.
|
// C# versions of certain CloudStack types to simplify JSON serialisation.
|
||||||
// Limit to the number of types, because they are written and maintained manually.
|
// Limit to the number of types, because they are written and maintained manually.
|
||||||
// JsonProperty used to identify property name when serialised, which allows
|
// JsonProperty used to identify property name when serialised, which allows
|
||||||
// later adoption of C# naming conventions if requried.
|
// later adoption of C# naming conventions if required.
|
||||||
namespace HypervResource
|
namespace HypervResource
|
||||||
{
|
{
|
||||||
public class PrimaryDataStoreTO
|
public class PrimaryDataStoreTO
|
||||||
|
|||||||
@ -458,7 +458,7 @@ public class ApiResponseHelperTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private UnmanagedInstanceTO getUnmanagedInstaceForTests() {
|
private UnmanagedInstanceTO getUnmanagedInstanceForTests() {
|
||||||
UnmanagedInstanceTO instance = Mockito.mock(UnmanagedInstanceTO.class);
|
UnmanagedInstanceTO instance = Mockito.mock(UnmanagedInstanceTO.class);
|
||||||
Mockito.when(instance.getPowerState()).thenReturn(UnmanagedInstanceTO.PowerState.PowerOff);
|
Mockito.when(instance.getPowerState()).thenReturn(UnmanagedInstanceTO.PowerState.PowerOff);
|
||||||
Mockito.when(instance.getClusterName()).thenReturn("CL1");
|
Mockito.when(instance.getClusterName()).thenReturn("CL1");
|
||||||
@ -477,7 +477,7 @@ public class ApiResponseHelperTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateUnmanagedInstanceResponseVmwareDcVms() {
|
public void testCreateUnmanagedInstanceResponseVmwareDcVms() {
|
||||||
UnmanagedInstanceTO instance = getUnmanagedInstaceForTests();
|
UnmanagedInstanceTO instance = getUnmanagedInstanceForTests();
|
||||||
UnmanagedInstanceResponse response = apiResponseHelper.createUnmanagedInstanceResponse(instance, null, null);
|
UnmanagedInstanceResponse response = apiResponseHelper.createUnmanagedInstanceResponse(instance, null, null);
|
||||||
Assert.assertEquals(1, response.getDisks().size());
|
Assert.assertEquals(1, response.getDisks().size());
|
||||||
Assert.assertEquals(1, response.getNics().size());
|
Assert.assertEquals(1, response.getNics().size());
|
||||||
|
|||||||
@ -802,7 +802,7 @@ class TestNetScalerSharedMode(cloudstackTestCase):
|
|||||||
|
|
||||||
# Validate the following
|
# Validate the following
|
||||||
# 1. Add another netscaler device and spawn a new VM again
|
# 1. Add another netscaler device and spawn a new VM again
|
||||||
# 2. VM deployement should be successful
|
# 2. VM deployment should be successful
|
||||||
|
|
||||||
self.debug("Adding another netscaler device: %s" %
|
self.debug("Adding another netscaler device: %s" %
|
||||||
self.services["netscaler_2"]["ipaddress"])
|
self.services["netscaler_2"]["ipaddress"])
|
||||||
@ -1672,7 +1672,7 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
|
|||||||
# LB rules
|
# LB rules
|
||||||
# 5. Deploy instance with dedicated network offering in account 3.
|
# 5. Deploy instance with dedicated network offering in account 3.
|
||||||
# Create Lb rules.
|
# Create Lb rules.
|
||||||
# 6. Configure another instace of netscaler in dedicated mode
|
# 6. Configure another instance of netscaler in dedicated mode
|
||||||
# 7. upgrade networkj for user 1 to dedicated network offering.
|
# 7. upgrade networkj for user 1 to dedicated network offering.
|
||||||
# Create LB rules. LB rule creation should be successful
|
# Create LB rules. LB rule creation should be successful
|
||||||
|
|
||||||
@ -2063,7 +2063,7 @@ class TestNwOffDToSUpgrade(cloudstackTestCase):
|
|||||||
# LB rules
|
# LB rules
|
||||||
# 5. Deploy instance with dedicated network offering in account 3.
|
# 5. Deploy instance with dedicated network offering in account 3.
|
||||||
# Create Lb rules.
|
# Create Lb rules.
|
||||||
# 6. Configure another instace of netscaler in dedicated mode
|
# 6. Configure another instance of netscaler in dedicated mode
|
||||||
# 7. upgrade networkj for user 1 to dedicated network offering.
|
# 7. upgrade networkj for user 1 to dedicated network offering.
|
||||||
# Create LB rules. LB rule creation should be successful
|
# Create LB rules. LB rule creation should be successful
|
||||||
|
|
||||||
|
|||||||
@ -1274,7 +1274,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.fail("Failed to deploy the virtual instance: %s" % e)
|
self.fail("Failed to deploy the virtual instance: %s" % e)
|
||||||
|
|
||||||
self.debug("Verify the deployment of virtual instace")
|
self.debug("Verify the deployment of virtual instance")
|
||||||
vms = VirtualMachine.list(
|
vms = VirtualMachine.list(
|
||||||
self.apiclient,
|
self.apiclient,
|
||||||
id=vm.id,
|
id=vm.id,
|
||||||
|
|||||||
@ -67,7 +67,7 @@ export default {
|
|||||||
props: {
|
props: {
|
||||||
error: {
|
error: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
requried: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
|
|||||||
@ -1589,7 +1589,7 @@ export default {
|
|||||||
})
|
})
|
||||||
this.fetchBootTypes()
|
this.fetchBootTypes()
|
||||||
this.fetchBootModes()
|
this.fetchBootModes()
|
||||||
this.fetchInstaceGroups()
|
this.fetchInstanceGroups()
|
||||||
this.fetchIoPolicyTypes()
|
this.fetchIoPolicyTypes()
|
||||||
nextTick().then(() => {
|
nextTick().then(() => {
|
||||||
['name', 'keyboard', 'boottype', 'bootmode', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
|
['name', 'keyboard', 'boottype', 'bootmode', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
|
||||||
@ -1640,7 +1640,7 @@ export default {
|
|||||||
{ id: 'storage_specific', description: 'storage_specific' }
|
{ id: 'storage_specific', description: 'storage_specific' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
fetchInstaceGroups () {
|
fetchInstanceGroups () {
|
||||||
this.options.instanceGroups = []
|
this.options.instanceGroups = []
|
||||||
getAPI('listInstanceGroups', {
|
getAPI('listInstanceGroups', {
|
||||||
account: this.$store.getters.project?.id ? null : this.$store.getters.userInfo.account,
|
account: this.$store.getters.project?.id ? null : this.$store.getters.userInfo.account,
|
||||||
@ -2467,12 +2467,12 @@ export default {
|
|||||||
configuration.cpunumber = 0
|
configuration.cpunumber = 0
|
||||||
configuration.cpuspeed = 0
|
configuration.cpuspeed = 0
|
||||||
configuration.memory = 0
|
configuration.memory = 0
|
||||||
for (var harwareItem of configuration.hardwareItems) {
|
for (var hardwareItem of configuration.hardwareItems) {
|
||||||
if (harwareItem.resourceType === 'Processor') {
|
if (hardwareItem.resourceType === 'Processor') {
|
||||||
configuration.cpunumber = harwareItem.virtualQuantity
|
configuration.cpunumber = hardwareItem.virtualQuantity
|
||||||
configuration.cpuspeed = harwareItem.reservation
|
configuration.cpuspeed = hardwareItem.reservation
|
||||||
} else if (harwareItem.resourceType === 'Memory') {
|
} else if (hardwareItem.resourceType === 'Memory') {
|
||||||
configuration.memory = harwareItem.virtualQuantity
|
configuration.memory = hardwareItem.virtualQuantity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
configurations.push(configuration)
|
configurations.push(configuration)
|
||||||
|
|||||||
@ -40,7 +40,7 @@
|
|||||||
v-if="taggedUsage[item]"
|
v-if="taggedUsage[item]"
|
||||||
class="list-item__collapse"
|
class="list-item__collapse"
|
||||||
@change="handleCollapseChange(item)">
|
@change="handleCollapseChange(item)">
|
||||||
<a-collapse-panel key="1" :header="collpaseActive[item] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + this.tagData[item].tagsasstring">
|
<a-collapse-panel key="1" :header="collapseActive[item] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + this.tagData[item].tagsasstring">
|
||||||
<a-list
|
<a-list
|
||||||
size="small"
|
size="small"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
@ -96,7 +96,7 @@ export default {
|
|||||||
],
|
],
|
||||||
taggedUsage: {},
|
taggedUsage: {},
|
||||||
tagData: {},
|
tagData: {},
|
||||||
collpaseActive: {}
|
collapseActive: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
@ -168,11 +168,11 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCollapseChange (type) {
|
handleCollapseChange (type) {
|
||||||
if (this.collpaseActive[type]) {
|
if (this.collapseActive[type]) {
|
||||||
this.collpaseActive[type] = null
|
this.collapseActive[type] = null
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.collpaseActive[type] = true
|
this.collapseActive[type] = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,7 +43,7 @@
|
|||||||
v-if="item.taggedresource && item.taggedresource.length > 0"
|
v-if="item.taggedresource && item.taggedresource.length > 0"
|
||||||
class="tagged-limit-collapse"
|
class="tagged-limit-collapse"
|
||||||
@change="handleCollapseChange(item.resourcetypename)">
|
@change="handleCollapseChange(item.resourcetypename)">
|
||||||
<a-collapse-panel key="1" :header="collpaseActive[item.resourcetypename] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + item.tagsasstring">
|
<a-collapse-panel key="1" :header="collapseActive[item.resourcetypename] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + item.tagsasstring">
|
||||||
<div v-for="(subItem, subItemIndex) in item.taggedresource" :key="subItemIndex">
|
<div v-for="(subItem, subItemIndex) in item.taggedresource" :key="subItemIndex">
|
||||||
<a-form-item
|
<a-form-item
|
||||||
:v-bind="subItem.resourcetypename"
|
:v-bind="subItem.resourcetypename"
|
||||||
@ -94,7 +94,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
formLoading: false,
|
formLoading: false,
|
||||||
dataResource: [],
|
dataResource: [],
|
||||||
collpaseActive: {},
|
collapseActive: {},
|
||||||
resourceTypeIdNames: {}
|
resourceTypeIdNames: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -259,11 +259,11 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleCollapseChange (type) {
|
handleCollapseChange (type) {
|
||||||
if (this.collpaseActive[type]) {
|
if (this.collapseActive[type]) {
|
||||||
this.collpaseActive[type] = null
|
this.collapseActive[type] = null
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.collpaseActive[type] = true
|
this.collapseActive[type] = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -126,7 +126,7 @@ export default {
|
|||||||
collapseKey: undefined,
|
collapseKey: undefined,
|
||||||
loading: false,
|
loading: false,
|
||||||
testDeliveryInterval: null,
|
testDeliveryInterval: null,
|
||||||
testDeliveryIntervalCouter: 0
|
testDeliveryIntervalCounter: 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeCreate () {
|
beforeCreate () {
|
||||||
@ -154,8 +154,8 @@ export default {
|
|||||||
return (duration > 0 ? duration / 1000.0 : 0) + ''
|
return (duration > 0 ? duration / 1000.0 : 0) + ''
|
||||||
},
|
},
|
||||||
computedOverlayStyle () {
|
computedOverlayStyle () {
|
||||||
var opacity = this.testDeliveryIntervalCouter <= 10.0 ? 0 : 0.3
|
var opacity = this.testDeliveryIntervalCounter <= 10.0 ? 0 : 0.3
|
||||||
var width = this.testDeliveryIntervalCouter
|
var width = this.testDeliveryIntervalCounter
|
||||||
return 'opacity: ' + opacity + '; width: ' + width + '%;'
|
return 'opacity: ' + opacity + '; width: ' + width + '%;'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -168,7 +168,7 @@ export default {
|
|||||||
if (this.testDeliveryInterval) {
|
if (this.testDeliveryInterval) {
|
||||||
clearInterval(this.testDeliveryInterval)
|
clearInterval(this.testDeliveryInterval)
|
||||||
}
|
}
|
||||||
this.testDeliveryIntervalCouter = 0
|
this.testDeliveryIntervalCounter = 0
|
||||||
},
|
},
|
||||||
testWebhookDelivery () {
|
testWebhookDelivery () {
|
||||||
this.resetTestDeliveryInterval()
|
this.resetTestDeliveryInterval()
|
||||||
@ -223,8 +223,8 @@ export default {
|
|||||||
this.resetTestDeliveryInterval()
|
this.resetTestDeliveryInterval()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.testDeliveryIntervalCouter = this.testDeliveryIntervalCouter + 1
|
this.testDeliveryIntervalCounter = this.testDeliveryIntervalCounter + 1
|
||||||
if (this.testDeliveryIntervalCouter >= 100) {
|
if (this.testDeliveryIntervalCounter >= 100) {
|
||||||
this.executeTestWebhookDeliveryOrReset()
|
this.executeTestWebhookDeliveryOrReset()
|
||||||
}
|
}
|
||||||
}, this.timedDeliveryWait / 100)
|
}, this.timedDeliveryWait / 100)
|
||||||
|
|||||||
@ -85,10 +85,10 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
fetchData () {
|
fetchData () {
|
||||||
const isoFiters = ['featured', 'community', 'selfexecutable']
|
const isoFilters = ['featured', 'community', 'selfexecutable']
|
||||||
this.loading = true
|
this.loading = true
|
||||||
const promises = []
|
const promises = []
|
||||||
isoFiters.forEach((filter) => {
|
isoFilters.forEach((filter) => {
|
||||||
promises.push(this.fetchIsos(filter))
|
promises.push(this.fetchIsos(filter))
|
||||||
})
|
})
|
||||||
Promise.all(promises).then(() => {
|
Promise.all(promises).then(() => {
|
||||||
|
|||||||
@ -3172,12 +3172,12 @@ export default {
|
|||||||
configuration.cpunumber = 0
|
configuration.cpunumber = 0
|
||||||
configuration.cpuspeed = 0
|
configuration.cpuspeed = 0
|
||||||
configuration.memory = 0
|
configuration.memory = 0
|
||||||
for (var harwareItem of configuration.hardwareItems) {
|
for (var hardwareItem of configuration.hardwareItems) {
|
||||||
if (harwareItem.resourceType === 'Processor') {
|
if (hardwareItem.resourceType === 'Processor') {
|
||||||
configuration.cpunumber = harwareItem.virtualQuantity
|
configuration.cpunumber = hardwareItem.virtualQuantity
|
||||||
configuration.cpuspeed = harwareItem.reservation
|
configuration.cpuspeed = hardwareItem.reservation
|
||||||
} else if (harwareItem.resourceType === 'Memory') {
|
} else if (hardwareItem.resourceType === 'Memory') {
|
||||||
configuration.memory = harwareItem.virtualQuantity
|
configuration.memory = hardwareItem.virtualQuantity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
configurations.push(configuration)
|
configurations.push(configuration)
|
||||||
|
|||||||
@ -1920,7 +1920,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.fetchBootTypes()
|
this.fetchBootTypes()
|
||||||
this.fetchBootModes()
|
this.fetchBootModes()
|
||||||
this.fetchInstaceGroups()
|
this.fetchInstanceGroups()
|
||||||
this.fetchIoPolicyTypes()
|
this.fetchIoPolicyTypes()
|
||||||
nextTick().then(() => {
|
nextTick().then(() => {
|
||||||
['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
|
['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
|
||||||
@ -1976,7 +1976,7 @@ export default {
|
|||||||
{ id: 'storage_specific', description: 'storage_specific' }
|
{ id: 'storage_specific', description: 'storage_specific' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
fetchInstaceGroups () {
|
fetchInstanceGroups () {
|
||||||
this.options.instanceGroups = []
|
this.options.instanceGroups = []
|
||||||
getAPI('listInstanceGroups', {
|
getAPI('listInstanceGroups', {
|
||||||
account: this.$store.getters.project?.id ? null : this.$store.getters.userInfo.account,
|
account: this.$store.getters.project?.id ? null : this.$store.getters.userInfo.account,
|
||||||
@ -3224,12 +3224,12 @@ export default {
|
|||||||
configuration.cpunumber = 0
|
configuration.cpunumber = 0
|
||||||
configuration.cpuspeed = 0
|
configuration.cpuspeed = 0
|
||||||
configuration.memory = 0
|
configuration.memory = 0
|
||||||
for (var harwareItem of configuration.hardwareItems) {
|
for (var hardwareItem of configuration.hardwareItems) {
|
||||||
if (harwareItem.resourceType === 'Processor') {
|
if (hardwareItem.resourceType === 'Processor') {
|
||||||
configuration.cpunumber = harwareItem.virtualQuantity
|
configuration.cpunumber = hardwareItem.virtualQuantity
|
||||||
configuration.cpuspeed = harwareItem.reservation
|
configuration.cpuspeed = hardwareItem.reservation
|
||||||
} else if (harwareItem.resourceType === 'Memory') {
|
} else if (hardwareItem.resourceType === 'Memory') {
|
||||||
configuration.memory = harwareItem.virtualQuantity
|
configuration.memory = hardwareItem.virtualQuantity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
configurations.push(configuration)
|
configurations.push(configuration)
|
||||||
|
|||||||
@ -1761,7 +1761,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.fetchBootTypes()
|
this.fetchBootTypes()
|
||||||
this.fetchBootModes()
|
this.fetchBootModes()
|
||||||
this.fetchInstaceGroups()
|
this.fetchInstanceGroups()
|
||||||
this.fetchIoPolicyTypes()
|
this.fetchIoPolicyTypes()
|
||||||
nextTick().then(() => {
|
nextTick().then(() => {
|
||||||
['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
|
['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
|
||||||
@ -1816,7 +1816,7 @@ export default {
|
|||||||
{ id: 'storage_specific', description: 'storage_specific' }
|
{ id: 'storage_specific', description: 'storage_specific' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
fetchInstaceGroups () {
|
fetchInstanceGroups () {
|
||||||
this.options.instanceGroups = []
|
this.options.instanceGroups = []
|
||||||
getAPI('listInstanceGroups', {
|
getAPI('listInstanceGroups', {
|
||||||
account: this.$store.getters.userInfo.account,
|
account: this.$store.getters.userInfo.account,
|
||||||
@ -2767,12 +2767,12 @@ export default {
|
|||||||
configuration.cpunumber = 0
|
configuration.cpunumber = 0
|
||||||
configuration.cpuspeed = 0
|
configuration.cpuspeed = 0
|
||||||
configuration.memory = 0
|
configuration.memory = 0
|
||||||
for (var harwareItem of configuration.hardwareItems) {
|
for (var hardwareItem of configuration.hardwareItems) {
|
||||||
if (harwareItem.resourceType === 'Processor') {
|
if (hardwareItem.resourceType === 'Processor') {
|
||||||
configuration.cpunumber = harwareItem.virtualQuantity
|
configuration.cpunumber = hardwareItem.virtualQuantity
|
||||||
configuration.cpuspeed = harwareItem.reservation
|
configuration.cpuspeed = hardwareItem.reservation
|
||||||
} else if (harwareItem.resourceType === 'Memory') {
|
} else if (hardwareItem.resourceType === 'Memory') {
|
||||||
configuration.memory = harwareItem.virtualQuantity
|
configuration.memory = hardwareItem.virtualQuantity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
configurations.push(configuration)
|
configurations.push(configuration)
|
||||||
|
|||||||
@ -255,7 +255,7 @@ export default {
|
|||||||
this.fetchZoneDetails()
|
this.fetchZoneDetails()
|
||||||
this.fetchSecurityGroups()
|
this.fetchSecurityGroups()
|
||||||
this.fetchOsTypes()
|
this.fetchOsTypes()
|
||||||
this.fetchInstaceGroups()
|
this.fetchInstanceGroups()
|
||||||
this.fetchServiceOfferingData()
|
this.fetchServiceOfferingData()
|
||||||
this.fetchTemplateData()
|
this.fetchTemplateData()
|
||||||
this.fetchUserData()
|
this.fetchUserData()
|
||||||
@ -335,7 +335,7 @@ export default {
|
|||||||
this.$notifyError(error)
|
this.$notifyError(error)
|
||||||
}).finally(() => { this.osTypes.loading = false })
|
}).finally(() => { this.osTypes.loading = false })
|
||||||
},
|
},
|
||||||
fetchInstaceGroups () {
|
fetchInstanceGroups () {
|
||||||
this.groups.loading = true
|
this.groups.loading = true
|
||||||
this.groups.opts = []
|
this.groups.opts = []
|
||||||
const params = {
|
const params = {
|
||||||
|
|||||||
@ -47,7 +47,7 @@
|
|||||||
@change="handleGuestOsCategoryChange">
|
@change="handleGuestOsCategoryChange">
|
||||||
<template #radio-option="{ item }">
|
<template #radio-option="{ item }">
|
||||||
<div class="radio-option">
|
<div class="radio-option">
|
||||||
<div class="radio-opion__icon">
|
<div class="radio-option__icon">
|
||||||
<resource-icon v-if="item.icon && item.icon.base64image" :image="item.icon.base64image" size="os" style="margin-bottom: 2px; margin-left: 1px" />
|
<resource-icon v-if="item.icon && item.icon.base64image" :image="item.icon.base64image" size="os" style="margin-bottom: 2px; margin-left: 1px" />
|
||||||
<font-awesome-icon v-else-if="['-1', '0'].includes(item.id)" :icon="['fas', item.id === '0' ? 'user' : 'images']" size="2x" :style="categoryFontAwesomeIconStyle" />
|
<font-awesome-icon v-else-if="['-1', '0'].includes(item.id)" :icon="['fas', item.id === '0' ? 'user' : 'images']" size="2x" :style="categoryFontAwesomeIconStyle" />
|
||||||
<os-logo v-else size="2x" :os-name="item.name" />
|
<os-logo v-else size="2x" :os-name="item.name" />
|
||||||
@ -367,7 +367,7 @@ export default {
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
.radio-opion__icon {
|
.radio-option__icon {
|
||||||
width: 30px;
|
width: 30px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
object-fit: contain;
|
object-fit: contain;
|
||||||
|
|||||||
@ -47,8 +47,8 @@
|
|||||||
<tooltip-label :title="$t('label.path')" :tooltip="apiParams.path.description"/>
|
<tooltip-label :title="$t('label.path')" :tooltip="apiParams.path.description"/>
|
||||||
</template>
|
</template>
|
||||||
<div class="path-input-container">
|
<div class="path-input-container">
|
||||||
<span v-if="!!safeName" :title="extenstionBasePath" class="path-input-base">
|
<span v-if="!!safeName" :title="extensionBasePath" class="path-input-base">
|
||||||
{{ extenstionBasePath }}
|
{{ extensionBasePath }}
|
||||||
</span>
|
</span>
|
||||||
<a-input
|
<a-input
|
||||||
v-model:value="form.path"
|
v-model:value="form.path"
|
||||||
@ -137,7 +137,7 @@ export default {
|
|||||||
}
|
}
|
||||||
return value.replace(/[^a-zA-Z0-9._-]/g, '_').toLowerCase()
|
return value.replace(/[^a-zA-Z0-9._-]/g, '_').toLowerCase()
|
||||||
},
|
},
|
||||||
extenstionBasePath () {
|
extensionBasePath () {
|
||||||
return (this.$store.getters.features.extensionspath || '[EXTENSIONS_PATH]') + '/' + this.safeName + '/'
|
return (this.$store.getters.features.extensionspath || '[EXTENSIONS_PATH]') + '/' + this.safeName + '/'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -138,7 +138,7 @@ export default {
|
|||||||
this.roleTypes = this.$fetchCustomActionRoleTypes()
|
this.roleTypes = this.$fetchCustomActionRoleTypes()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
fixParamatersOptions (params) {
|
fixParametersOptions (params) {
|
||||||
if (!params) {
|
if (!params) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -153,7 +153,7 @@ export default {
|
|||||||
initForm () {
|
initForm () {
|
||||||
this.formRef = ref()
|
this.formRef = ref()
|
||||||
const formData = {
|
const formData = {
|
||||||
parameters: this.fixParamatersOptions(this.resource.parameters)
|
parameters: this.fixParametersOptions(this.resource.parameters)
|
||||||
}
|
}
|
||||||
const keys = ['description', 'allowedroletypes', 'successmessage', 'errormessage', 'details', 'timeout']
|
const keys = ['description', 'allowedroletypes', 'successmessage', 'errormessage', 'details', 'timeout']
|
||||||
for (const key of keys) {
|
for (const key of keys) {
|
||||||
|
|||||||
@ -202,7 +202,7 @@ export default {
|
|||||||
this.$emit('refresh-data')
|
this.$emit('refresh-data')
|
||||||
this.$notification.success({
|
this.$notification.success({
|
||||||
message: 'Create Role',
|
message: 'Create Role',
|
||||||
description: 'Sucessfully created role ' + params.name
|
description: 'Successfully created role ' + params.name
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
this.closeAction()
|
this.closeAction()
|
||||||
|
|||||||
@ -213,7 +213,7 @@ export default {
|
|||||||
this.$emit('refresh-data')
|
this.$emit('refresh-data')
|
||||||
this.$notification.success({
|
this.$notification.success({
|
||||||
message: 'Import Role',
|
message: 'Import Role',
|
||||||
description: 'Sucessfully imported role ' + params.name
|
description: 'Successfully imported role ' + params.name
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
this.closeAction()
|
this.closeAction()
|
||||||
|
|||||||
@ -35,7 +35,7 @@
|
|||||||
v-if="item.tagged"
|
v-if="item.tagged"
|
||||||
class="list-item__collapse"
|
class="list-item__collapse"
|
||||||
@change="handleCollapseChange(item.type)">
|
@change="handleCollapseChange(item.type)">
|
||||||
<a-collapse-panel key="1" :header="$t('label.tagged') + ' ' + returnCapacityTitle(item.type) + (collpaseActive[item.type] ? '' : ' - ' + item.tagsasstring)">
|
<a-collapse-panel key="1" :header="$t('label.tagged') + ' ' + returnCapacityTitle(item.type) + (collapseActive[item.type] ? '' : ' - ' + item.tagsasstring)">
|
||||||
<a-list
|
<a-list
|
||||||
size="small"
|
size="small"
|
||||||
:dataSource="item.tagged" >
|
:dataSource="item.tagged" >
|
||||||
@ -90,7 +90,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
fetchLoading: false,
|
fetchLoading: false,
|
||||||
resourcesList: [],
|
resourcesList: [],
|
||||||
collpaseActive: {}
|
collapseActive: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
@ -181,11 +181,11 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCollapseChange (type) {
|
handleCollapseChange (type) {
|
||||||
if (this.collpaseActive[type]) {
|
if (this.collapseActive[type]) {
|
||||||
this.collpaseActive[type] = null
|
this.collapseActive[type] = null
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.collpaseActive[type] = true
|
this.collapseActive[type] = true
|
||||||
var typeItems = this.resourcesList.filter(x => x.type === type)
|
var typeItems = this.resourcesList.filter(x => x.type === type)
|
||||||
typeItems.forEach(resource => {
|
typeItems.forEach(resource => {
|
||||||
this.animatePercentVals(resource.tagged)
|
this.animatePercentVals(resource.tagged)
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
banner
|
banner
|
||||||
:message="$t('message.action.router.health.checks.disabled.warning')" />
|
:message="$t('message.action.router.health.checks.disabled.warning')" />
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<a-button :disabled="!('getRouterHealthCheckResults' in $store.getters.apis)" type="primary" style="width: 100%; margin-bottom: 15px" @click="showGetHelathCheck">
|
<a-button :disabled="!('getRouterHealthCheckResults' in $store.getters.apis)" type="primary" style="width: 100%; margin-bottom: 15px" @click="showGetHealthCheck">
|
||||||
<template #icon><play-circle-outlined /></template>
|
<template #icon><play-circle-outlined /></template>
|
||||||
{{ $t('label.action.router.health.checks') }}
|
{{ $t('label.action.router.health.checks') }}
|
||||||
</a-button>
|
</a-button>
|
||||||
@ -158,7 +158,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.checkConfigurationAndGetHealthChecks()
|
this.checkConfigurationAndGetHealthChecks()
|
||||||
},
|
},
|
||||||
showGetHelathCheck () {
|
showGetHealthCheck () {
|
||||||
this.showGetHealthChecksForm = true
|
this.showGetHealthChecksForm = true
|
||||||
},
|
},
|
||||||
onCloseGetHealthChecksForm () {
|
onCloseGetHealthChecksForm () {
|
||||||
|
|||||||
@ -1609,7 +1609,7 @@ export default {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (!this.stepData.stepMove.includes('createStoragePool')) {
|
if (!this.stepData.stepMove.includes('createStoragePool')) {
|
||||||
this.stepData.primaryStorageRetunred = await this.createStoragePool(params)
|
this.stepData.primaryStorageReturned = await this.createStoragePool(params)
|
||||||
this.stepData.stepMove.push('createStoragePool')
|
this.stepData.stepMove.push('createStoragePool')
|
||||||
}
|
}
|
||||||
await this.stepAddSecondaryStorage()
|
await this.stepAddSecondaryStorage()
|
||||||
|
|||||||
@ -201,7 +201,7 @@ export default {
|
|||||||
if (successful.length > 0) {
|
if (successful.length > 0) {
|
||||||
this.$notification.success({
|
this.$notification.success({
|
||||||
message: this.$t('label.register.template'),
|
message: this.$t('label.register.template'),
|
||||||
description: 'Succesfully registered templates: ' + successful.map(r => r.name).join(', ')
|
description: 'Successfully registered templates: ' + successful.map(r => r.name).join(', ')
|
||||||
})
|
})
|
||||||
|
|
||||||
successful.forEach(r => {
|
successful.forEach(r => {
|
||||||
|
|||||||
@ -714,7 +714,7 @@ export default {
|
|||||||
domainLoading: false,
|
domainLoading: false,
|
||||||
zones: [],
|
zones: [],
|
||||||
zoneLoading: false,
|
zoneLoading: false,
|
||||||
selectedDeployementPlanner: null,
|
selectedDeploymentPlanner: null,
|
||||||
storagePolicies: null,
|
storagePolicies: null,
|
||||||
storageTags: [],
|
storageTags: [],
|
||||||
storageTagLoading: false,
|
storageTagLoading: false,
|
||||||
@ -1021,9 +1021,9 @@ export default {
|
|||||||
this.qosType = val
|
this.qosType = val
|
||||||
},
|
},
|
||||||
handleDeploymentPlannerChange (planner) {
|
handleDeploymentPlannerChange (planner) {
|
||||||
this.selectedDeployementPlanner = planner
|
this.selectedDeploymentPlanner = planner
|
||||||
this.plannerModeVisible = false
|
this.plannerModeVisible = false
|
||||||
if (this.selectedDeployementPlanner === 'ImplicitDedicationPlanner') {
|
if (this.selectedDeploymentPlanner === 'ImplicitDedicationPlanner') {
|
||||||
this.plannerModeVisible = isAdmin()
|
this.plannerModeVisible = isAdmin()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -144,7 +144,7 @@ export default {
|
|||||||
createModalVisible: false,
|
createModalVisible: false,
|
||||||
editModalVisible: false,
|
editModalVisible: false,
|
||||||
selectedRole: null,
|
selectedRole: null,
|
||||||
projectPermisssions: [],
|
projectPermissions: [],
|
||||||
customStyle: 'margin-bottom: 0; border: none'
|
customStyle: 'margin-bottom: 0; border: none'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -95,7 +95,7 @@ export default {
|
|||||||
loading: false,
|
loading: false,
|
||||||
configLoading: false,
|
configLoading: false,
|
||||||
serviceofferings: [],
|
serviceofferings: [],
|
||||||
serviceofferingLoding: false
|
serviceofferingLoading: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeCreate () {
|
beforeCreate () {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user