From fcbb703ef21fe35f3fb37e3fd5c8a62c3d6021c2 Mon Sep 17 00:00:00 2001 From: DK101010 Date: Thu, 1 Apr 2021 09:19:01 +0100 Subject: [PATCH 1/7] add checkbox to display all vm's in a account --- ui/src/components/view/SearchView.vue | 14 ++++++++++++-- ui/src/config/section/compute.js | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index d7084e5989bc..f1c5ef252462 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -60,8 +60,11 @@ :key="idx" :value="opt.id">{{ $t(opt.name) }} +
@@ -200,6 +203,9 @@ export default { } else if (item === 'tags') { type = 'tag' } + if (item === 'accountwide') { + type = 'checkbox' + } this.fields.push({ type: type, @@ -419,7 +425,11 @@ export default { if (input === '' || input === null || input === undefined) { continue } - this.paramsFilter[key] = input + if (key === 'accountwide' && input) { + this.paramsFilter.projectid = -1 + } else { + this.paramsFilter[key] = input + } } if (this.searchFilters.includes('tags')) { if (this.inputKey) { diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 39271c44d8a5..39aadcbd9151 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -67,7 +67,7 @@ export default { } return fields }, - searchFilters: ['name', 'zoneid', 'domainid', 'account', 'tags'], + searchFilters: ['name', 'zoneid', 'domainid', 'account', 'tags', 'accountwide'], details: ['displayname', 'name', 'id', 'state', 'ipaddress', 'templatename', 'ostypename', 'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account', 'domain', 'zonename'], tabs: [{ component: () => import('@/views/compute/InstanceTab.vue') From 73255963f864b1843e0740d1a85d2fcb95ef0ce6 Mon Sep 17 00:00:00 2001 From: DK101010 Date: Tue, 27 Apr 2021 13:17:54 +0100 Subject: [PATCH 2/7] change label name to projectwide and add local entry for label --- ui/public/locales/en.json | 1 + ui/src/components/view/SearchView.vue | 4 ++-- ui/src/config/section/compute.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index a00357755a14..676a4300d723 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -1635,6 +1635,7 @@ "label.project.view": "Project View", "label.projectaccountname": "Project Account Name", "label.projectid": "Project ID", +"label.projectwide": "Search Across Projects", "label.projectlimit": "Project Limits", "label.projectname": "Project", "label.projects": "Projects", diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index f1c5ef252462..d1f472bfcd3f 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -203,7 +203,7 @@ export default { } else if (item === 'tags') { type = 'tag' } - if (item === 'accountwide') { + if (item === 'projectwide') { type = 'checkbox' } @@ -425,7 +425,7 @@ export default { if (input === '' || input === null || input === undefined) { continue } - if (key === 'accountwide' && input) { + if (key === 'projectwide' && input) { this.paramsFilter.projectid = -1 } else { this.paramsFilter[key] = input diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 39aadcbd9151..1a970cb14d61 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -67,7 +67,7 @@ export default { } return fields }, - searchFilters: ['name', 'zoneid', 'domainid', 'account', 'tags', 'accountwide'], + searchFilters: ['name', 'zoneid', 'domainid', 'account', 'tags', 'projectwide'], details: ['displayname', 'name', 'id', 'state', 'ipaddress', 'templatename', 'ostypename', 'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account', 'domain', 'zonename'], tabs: [{ component: () => import('@/views/compute/InstanceTab.vue') From b1db6619038588c226bb500cb02dd27adf05e9ef Mon Sep 17 00:00:00 2001 From: DK101010 <57522802+DK101010@users.noreply.github.com> Date: Thu, 1 Jul 2021 09:08:11 +0200 Subject: [PATCH 3/7] Update SearchView.vue --- ui/src/components/view/SearchView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index cef05847f12a..31e6eb75117a 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -214,7 +214,7 @@ export default { } else if (item === 'tags') { type = 'tag' } - if (item === 'projectwide') { + if (item === 'projectwide') { type = 'checkbox' } From a7c6aac26904bf737b7981f6346b567c0876b6fc Mon Sep 17 00:00:00 2001 From: DK101010 Date: Thu, 1 Jul 2021 09:59:06 +0100 Subject: [PATCH 4/7] style errors fixed --- ui/src/components/view/SearchView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index 31e6eb75117a..222fa0f3e4ed 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -214,7 +214,7 @@ export default { } else if (item === 'tags') { type = 'tag' } - if (item === 'projectwide') { + if (item === 'projectwide') { type = 'checkbox' } From 9898db6071c08261973648c9caa4e408c613fc84 Mon Sep 17 00:00:00 2001 From: DK101010 Date: Fri, 2 Jul 2021 09:55:41 +0100 Subject: [PATCH 5/7] replace checkbox with switch --- ui/src/components/view/SearchView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index 222fa0f3e4ed..03c215f97649 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -62,8 +62,8 @@ :key="idx" :value="opt.id">{{ $t(opt.name) }} - Date: Fri, 1 Oct 2021 10:37:35 +0100 Subject: [PATCH 6/7] add property checked as default value property --- ui/src/components/view/SearchView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue index 03c215f97649..48c9666ebf7f 100644 --- a/ui/src/components/view/SearchView.vue +++ b/ui/src/components/view/SearchView.vue @@ -64,7 +64,7 @@ + v-decorator="[field.name,{ valuePropName: 'checked' }]" />