From 5d8d23704ebff7980a8595f76b03070b9b33e23d Mon Sep 17 00:00:00 2001 From: Bryan Lima Date: Mon, 29 Aug 2022 16:17:48 -0300 Subject: [PATCH] Remove unsupported params from API calls on the UI --- ui/src/components/header/SamlDomainSwitcher.vue | 2 +- ui/src/components/view/SearchView.vue | 6 +++--- ui/src/components/view/SettingsTab.vue | 5 +---- ui/src/config/section/offering.js | 2 -- ui/src/store/modules/user.js | 2 +- ui/src/views/AutogenView.vue | 9 +++++++++ ui/src/views/compute/DeployVM.vue | 4 ++-- ui/src/views/compute/EditVM.vue | 2 +- ui/src/views/iam/SSLCertificateTab.vue | 1 - ui/src/views/image/AddKubernetesSupportedVersion.vue | 1 - ui/src/views/image/IsoZones.vue | 2 +- ui/src/views/image/RegisterOrUploadIso.vue | 6 +----- ui/src/views/image/RegisterOrUploadTemplate.vue | 7 +------ ui/src/views/image/TemplateZones.vue | 2 +- ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue | 2 +- ui/src/views/network/CreateIsolatedNetworkForm.vue | 1 - ui/src/views/network/CreateL2NetworkForm.vue | 1 - ui/src/views/network/CreateNetwork.vue | 1 - ui/src/views/network/CreateSharedNetworkForm.vue | 1 - ui/src/views/network/CreateVpc.vue | 2 +- ui/src/views/network/GuestIpRanges.vue | 1 - ui/src/views/network/LoadBalancing.vue | 1 - ui/src/views/offering/AddComputeOffering.vue | 9 ++------- ui/src/views/offering/AddDiskOffering.vue | 2 -- ui/src/views/offering/AddNetworkOffering.vue | 5 +---- ui/src/views/offering/AddVpcOffering.vue | 1 - ui/src/views/offering/UpdateOfferingAccess.vue | 1 - ui/src/views/tools/ManageInstances.vue | 2 +- 28 files changed, 28 insertions(+), 53 deletions(-) diff --git a/ui/src/components/header/SamlDomainSwitcher.vue b/ui/src/components/header/SamlDomainSwitcher.vue index 9bad8fd52fe9..fbb7557a0e2e 100644 --- a/ui/src/components/header/SamlDomainSwitcher.vue +++ b/ui/src/components/header/SamlDomainSwitcher.vue @@ -73,7 +73,7 @@ export default { const samlAccounts = [] const getNextPage = () => { this.loading = true - api('listAndSwitchSamlAccount', { listAll: true, details: 'min', page: page, pageSize: 500 }).then(json => { + api('listAndSwitchSamlAccount', { details: 'min', page: page, pageSize: 500 }).then(json => { if (json && json.listandswitchsamlaccountresponse && json.listandswitchsamlaccountresponse.samluseraccount) { samlAccounts.push(...json.listandswitchsamlaccountresponse.samluseraccount) } diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index 2c350de816d9..680d5521d49e 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -449,7 +449,7 @@ export default { }, fetchZones () { return new Promise((resolve, reject) => { - api('listZones', { listAll: true, showicon: true }).then(json => { + api('listZones', { showicon: true }).then(json => { const zones = json.listzonesresponse.zone resolve({ type: 'zoneid', @@ -475,7 +475,7 @@ export default { }, fetchPods () { return new Promise((resolve, reject) => { - api('listPods', { listAll: true }).then(json => { + api('listPods').then(json => { const pods = json.listpodsresponse.pod resolve({ type: 'podid', @@ -488,7 +488,7 @@ export default { }, fetchClusters () { return new Promise((resolve, reject) => { - api('listClusters', { listAll: true }).then(json => { + api('listClusters').then(json => { const clusters = json.listclustersresponse.cluster resolve({ type: 'clusterid', diff --git a/ui/src/components/view/SettingsTab.vue b/ui/src/components/view/SettingsTab.vue index 6066bf897488..4c4e538c2f61 100644 --- a/ui/src/components/view/SettingsTab.vue +++ b/ui/src/components/view/SettingsTab.vue @@ -142,10 +142,7 @@ export default { methods: { fetchData (callback) { this.tabLoading = true - const params = { - [this.scopeKey]: this.resource.id, - listAll: true - } + const params = { [this.scopeKey]: this.resource.id } if (this.filter) { params.keyword = this.filter } diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js index 098b128529e4..918548ddae86 100644 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@ -247,7 +247,6 @@ export default { icon: 'wifi-outlined', docHelp: 'adminguide/networking.html#network-offerings', permission: ['listNetworkOfferings', 'listInfrastructure'], - params: { isrecursive: 'true' }, columns: ['name', 'state', 'guestiptype', 'traffictype', 'networkrate', 'domain', 'zone', 'order'], details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'internetprotocol', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'service', 'tags', 'domain', 'zone'], resourceType: 'NetworkOffering', @@ -339,7 +338,6 @@ export default { icon: 'deployment-unit-outlined', docHelp: 'plugins/nuage-plugin.html?#vpc-offerings', permission: ['listVPCOfferings', 'listInfrastructure'], - params: { isrecursive: 'true' }, resourceType: 'VpcOffering', columns: ['name', 'state', 'displaytext', 'domain', 'zone', 'order'], details: ['name', 'id', 'displaytext', 'internetprotocol', 'distributedvpcrouter', 'tags', 'service', 'domain', 'zone', 'created'], diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js index cf4e420df03f..4eddd447035e 100644 --- a/ui/src/store/modules/user.js +++ b/ui/src/store/modules/user.js @@ -214,7 +214,7 @@ const user = { }) } else { const hide = message.loading(i18n.global.t('message.discovering.feature'), 0) - api('listZones', { listall: true }).then(json => { + api('listZones').then(json => { const zones = json.listzonesresponse.zone || [] commit('SET_ZONES', zones) }).catch(error => { diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index b9caf632c099..85c90e6c3a6b 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -876,6 +876,15 @@ export default { if (this.$showIcon()) { params.showIcon = true } + + if (['listAnnotations', 'listRoles', 'listZonesMetrics', 'listPods', + 'listClustersMetrics', 'listHostsMetrics', 'listStoragePoolsMetrics', + 'listImageStores', 'listSystemVms', 'listManagementServers', + 'listConfigurations', 'listHypervisorCapabilities', + 'listAlerts', 'listNetworkOfferings', 'listVPCOfferings'].includes(this.apiName)) { + delete params.listall + } + api(this.apiName, params).then(json => { var responseName var objectName diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue index dadecd994196..27c58aa20524 100644 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@ -1919,7 +1919,7 @@ export default { return new Promise((resolve) => { this.loading.zones = true const param = this.params.zones - const args = { listall: true, showicon: true } + const args = { showicon: true } if (zoneId) args.id = zoneId api(param.list, args).then(json => { const zoneResponse = json.listzonesresponse.zone || [] @@ -1951,7 +1951,7 @@ export default { param.loading = true param.opts = [] const options = param.options || {} - if (!('listall' in options)) { + if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'dynamicScalingVmConfig', 'hypervisors'].includes(name)) { options.listall = true } api(param.list, options).then((response) => { diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue index 87545c7e11c3..070823d19fbb 100644 --- a/ui/src/views/compute/EditVM.vue +++ b/ui/src/views/compute/EditVM.vue @@ -254,7 +254,7 @@ export default { fetchOsTypes () { this.osTypes.loading = true this.osTypes.opts = [] - api('listOsTypes', { listAll: true }).then(json => { + api('listOsTypes').then(json => { this.osTypes.opts = json.listostypesresponse.ostype || [] }).catch(error => { this.$notifyError(error) diff --git a/ui/src/views/iam/SSLCertificateTab.vue b/ui/src/views/iam/SSLCertificateTab.vue index 4a84b19b3b23..6a3e161859fc 100644 --- a/ui/src/views/iam/SSLCertificateTab.vue +++ b/ui/src/views/iam/SSLCertificateTab.vue @@ -152,7 +152,6 @@ export default { methods: { fetchData () { const params = {} - params.listAll = true params.page = this.page params.pageSize = this.pageSize params.accountid = this.resource.id diff --git a/ui/src/views/image/AddKubernetesSupportedVersion.vue b/ui/src/views/image/AddKubernetesSupportedVersion.vue index 8aab83bf1295..f72bd64df9f4 100644 --- a/ui/src/views/image/AddKubernetesSupportedVersion.vue +++ b/ui/src/views/image/AddKubernetesSupportedVersion.vue @@ -189,7 +189,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { diff --git a/ui/src/views/image/IsoZones.vue b/ui/src/views/image/IsoZones.vue index 8c9df643542d..7718b1c68f16 100644 --- a/ui/src/views/image/IsoZones.vue +++ b/ui/src/views/image/IsoZones.vue @@ -426,7 +426,7 @@ export default { fetchZoneData () { this.zones = [] this.zoneLoading = true - api('listZones', { listall: true, showicon: true }).then(json => { + api('listZones', { showicon: true }).then(json => { const zones = json.listzonesresponse.zone || [] this.zones = [...zones.filter((zone) => this.currentRecord.zoneid !== zone.id)] }).finally(() => { diff --git a/ui/src/views/image/RegisterOrUploadIso.vue b/ui/src/views/image/RegisterOrUploadIso.vue index c4f728adfb56..b243a58f35bc 100644 --- a/ui/src/views/image/RegisterOrUploadIso.vue +++ b/ui/src/views/image/RegisterOrUploadIso.vue @@ -223,7 +223,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true @@ -241,12 +240,9 @@ export default { }) }, fetchOsType () { - const params = {} - params.listAll = true - this.osTypeLoading = true - api('listOsTypes', params).then(json => { + api('listOsTypes').then(json => { const listOsTypes = json.listostypesresponse.ostype this.osTypes = this.osTypes.concat(listOsTypes) }).finally(() => { diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue index b0a667555be9..eaeffe5bcdb0 100644 --- a/ui/src/views/image/RegisterOrUploadTemplate.vue +++ b/ui/src/views/image/RegisterOrUploadTemplate.vue @@ -464,7 +464,6 @@ export default { fetchZone () { const params = {} let listZones = [] - params.listAll = true params.showicon = true this.allowed = false @@ -509,13 +508,10 @@ export default { }) }, fetchOsTypes () { - const params = {} - params.listAll = true - this.osTypes.opts = [] this.osTypes.loading = true - api('listOsTypes', params).then(json => { + api('listOsTypes').then(json => { const listOsTypes = json.listostypesresponse.ostype this.osTypes.opts = listOsTypes this.defaultOsType = this.osTypes.opts[1].description @@ -732,7 +728,6 @@ export default { const params = {} if (value.includes(this.$t('label.all.zone'))) { - params.listAll = true this.fetchHyperVisor(params) return } diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue index e910fe7eea25..d4811c0c9443 100644 --- a/ui/src/views/image/TemplateZones.vue +++ b/ui/src/views/image/TemplateZones.vue @@ -498,7 +498,7 @@ export default { fetchZoneData () { this.zones = [] this.zoneLoading = true - api('listZones', { listall: true, showicon: true }).then(json => { + api('listZones', { showicon: true }).then(json => { const zones = json.listzonesresponse.zone || [] this.zones = [...zones.filter((zone) => this.currentRecord.zoneid !== zone.id)] }).finally(() => { diff --git a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue index c48aaae27ea7..21dc0058a037 100644 --- a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue +++ b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue @@ -422,7 +422,7 @@ export default { }) }, fetchData () { - api('listHypervisors', { listAll: true }).then(json => { + api('listHypervisors').then(json => { this.hypervisors = json.listhypervisorsresponse.hypervisor if ('listSimulatorHAStateTransitions' in this.$store.getters.apis) { this.hypervisors.push({ name: 'Simulator' }) diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue index 90df22be8a76..7e6e83e9f93f 100644 --- a/ui/src/views/network/CreateIsolatedNetworkForm.vue +++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue @@ -328,7 +328,6 @@ export default { if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') { params.id = this.resource.zoneid } - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue index c3edd588c98e..8da95d31209b 100644 --- a/ui/src/views/network/CreateL2NetworkForm.vue +++ b/ui/src/views/network/CreateL2NetworkForm.vue @@ -297,7 +297,6 @@ export default { if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') { params.id = this.resource.zoneid } - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue index 85c9ae8a8da2..168a10835057 100644 --- a/ui/src/views/network/CreateNetwork.vue +++ b/ui/src/views/network/CreateNetwork.vue @@ -98,7 +98,6 @@ export default { if (this.resource && this.resource.zoneid) { params.id = this.resource.zoneid } - params.listAll = true this.actionZonesLoading = true return api('listZones', params).then(json => { this.actionZones = json.listzonesresponse.zone diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue b/ui/src/views/network/CreateSharedNetworkForm.vue index fdcb890fd07b..1b62e473dc7c 100644 --- a/ui/src/views/network/CreateSharedNetworkForm.vue +++ b/ui/src/views/network/CreateSharedNetworkForm.vue @@ -522,7 +522,6 @@ export default { if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') { params.id = this.resource.zoneid } - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { diff --git a/ui/src/views/network/CreateVpc.vue b/ui/src/views/network/CreateVpc.vue index ff7e2b144647..381de40c1b5b 100644 --- a/ui/src/views/network/CreateVpc.vue +++ b/ui/src/views/network/CreateVpc.vue @@ -156,7 +156,7 @@ export default { }, fetchZones () { this.loadingZone = true - api('listZones', { listAll: true, showicon: true }).then((response) => { + api('listZones', { showicon: true }).then((response) => { const listZones = response.listzonesresponse.zone || [] this.zones = listZones.filter(zone => !zone.securitygroupsenabled) this.form.zoneid = '' diff --git a/ui/src/views/network/GuestIpRanges.vue b/ui/src/views/network/GuestIpRanges.vue index a14f98d51395..14cd8a116bc1 100644 --- a/ui/src/views/network/GuestIpRanges.vue +++ b/ui/src/views/network/GuestIpRanges.vue @@ -165,7 +165,6 @@ export default { const params = { zoneid: this.resource.zoneid, networkid: this.resource.id, - listall: true, page: this.page, pagesize: this.pageSize } diff --git a/ui/src/views/network/LoadBalancing.vue b/ui/src/views/network/LoadBalancing.vue index 63d7f35e92ce..9220f22bd2e3 100644 --- a/ui/src/views/network/LoadBalancing.vue +++ b/ui/src/views/network/LoadBalancing.vue @@ -735,7 +735,6 @@ export default { this.loading = true this.lbRules.forEach(rule => { api('listLBStickinessPolicies', { - listAll: true, lbruleid: rule.id }).then(response => { this.stickinessPolicies.push(...response.listlbstickinesspoliciesresponse.stickinesspolicies) diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue index 2022a53b1860..6600035db414 100644 --- a/ui/src/views/offering/AddComputeOffering.vue +++ b/ui/src/views/offering/AddComputeOffering.vue @@ -802,7 +802,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { @@ -815,11 +814,9 @@ export default { }) }, fetchStorageTagData () { - const params = {} - params.listAll = true this.storageTagLoading = true this.storageTags = [] - api('listStorageTags', params).then(json => { + api('listStorageTags').then(json => { const tags = json.liststoragetagsresponse.storagetag || [] for (const tag of tags) { if (!this.storageTags.includes(tag.name)) { @@ -831,10 +828,8 @@ export default { }) }, fetchDeploymentPlannerData () { - const params = {} - params.listAll = true this.deploymentPlannerLoading = true - api('listDeploymentPlanners', params).then(json => { + api('listDeploymentPlanners').then(json => { const planners = json.listdeploymentplannersresponse.deploymentPlanner this.deploymentPlanners = this.deploymentPlanners.concat(planners) this.deploymentPlanners.unshift({ name: '' }) diff --git a/ui/src/views/offering/AddDiskOffering.vue b/ui/src/views/offering/AddDiskOffering.vue index 1c9f5bc8c74f..690ee065535c 100644 --- a/ui/src/views/offering/AddDiskOffering.vue +++ b/ui/src/views/offering/AddDiskOffering.vue @@ -404,7 +404,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { @@ -418,7 +417,6 @@ export default { }, fetchStorageTagData () { const params = {} - params.listAll = true this.storageTagLoading = true api('listStorageTags', params).then(json => { const tags = json.liststoragetagsresponse.storagetag || [] diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue index 4a7aae1d7a43..0342fe72a0f6 100644 --- a/ui/src/views/offering/AddNetworkOffering.vue +++ b/ui/src/views/offering/AddNetworkOffering.vue @@ -614,7 +614,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { @@ -649,11 +648,9 @@ export default { } }, fetchSupportedServiceData () { - const params = {} - params.listAll = true this.supportedServiceLoading = true this.supportedServices = [] - api('listSupportedNetworkServices', params).then(json => { + api('listSupportedNetworkServices').then(json => { this.supportedServices = json.listsupportednetworkservicesresponse.networkservice for (var i in this.supportedServices) { var networkServiceObj = this.supportedServices[i] diff --git a/ui/src/views/offering/AddVpcOffering.vue b/ui/src/views/offering/AddVpcOffering.vue index fb646e13f737..03b7288232d4 100644 --- a/ui/src/views/offering/AddVpcOffering.vue +++ b/ui/src/views/offering/AddVpcOffering.vue @@ -264,7 +264,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { diff --git a/ui/src/views/offering/UpdateOfferingAccess.vue b/ui/src/views/offering/UpdateOfferingAccess.vue index 46805a460466..235a25f97040 100644 --- a/ui/src/views/offering/UpdateOfferingAccess.vue +++ b/ui/src/views/offering/UpdateOfferingAccess.vue @@ -205,7 +205,6 @@ export default { }, fetchZoneData () { const params = {} - params.listAll = true params.showicon = true this.zoneLoading = true api('listZones', params).then(json => { diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index 052d5f51b0bb..1e6cf3a66493 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -518,7 +518,7 @@ export default { param.loading = true param.opts = [] const options = param.options || {} - if (!('listall' in options)) { + if (!('listall' in options) && !['zones', 'pods', 'clusters'].includes(name)) { options.listall = true } api(param.list, options).then((response) => {