From 88ff77dae10e095afc10731bbef50668cb1df19c Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 8 May 2023 17:46:17 +0530 Subject: [PATCH 1/3] ui: fix action notifications (#7499) Some UI actions were missing title and description in pollJob method preventing notification for them to be published. Signed-off-by: Abhishek Kumar --- ui/public/locales/en.json | 1 + ui/src/views/compute/AutoScaleUpPolicyTab.vue | 4 +++- ui/src/views/compute/ScaleVM.vue | 2 ++ ui/src/views/storage/MigrateVolume.vue | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index c026e5bb7f0..287622c76e7 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -593,6 +593,7 @@ "label.delete.certificate": "Delete certificate", "label.delete.ciscoasa1000v": "Delete CiscoASA1000v", "label.delete.ciscovnmc.resource": "Delete CiscoVNMC resource", +"label.delete.condition": "Delete condition", "label.delete.dedicated.vlan.range": "Deleted dedicated VLAN/VNI range.", "label.delete.domain": "Delete domain", "label.delete.events": "Delete events", diff --git a/ui/src/views/compute/AutoScaleUpPolicyTab.vue b/ui/src/views/compute/AutoScaleUpPolicyTab.vue index a44c1fd0c51..450b95409f9 100644 --- a/ui/src/views/compute/AutoScaleUpPolicyTab.vue +++ b/ui/src/views/compute/AutoScaleUpPolicyTab.vue @@ -541,7 +541,7 @@ export default { api('deleteCondition', { id: conditionId }).then(response => { const jobId = response.deleteconditionresponse.jobid this.$pollJob({ - title: this.$t('label.action.delete.condition'), + title: this.$t('label.delete.condition'), description: conditionId, jobId: jobId, successMethod: () => { @@ -588,6 +588,8 @@ export default { threshold: this.updateConditionDetails.threshold }).then(response => { this.$pollJob({ + title: this.$t('label.update.condition'), + description: this.selectedCondition.id, jobId: response.updateconditionresponse.jobid, successMessage: this.$t('message.success.update.condition'), successMethod: () => { diff --git a/ui/src/views/compute/ScaleVM.vue b/ui/src/views/compute/ScaleVM.vue index bc3f5842b1f..1a1d1309720 100644 --- a/ui/src/views/compute/ScaleVM.vue +++ b/ui/src/views/compute/ScaleVM.vue @@ -255,6 +255,8 @@ export default { if (jobId) { this.$pollJob({ jobId, + title: this.$t('label.scale.vm'), + description: this.resource.name, successMethod: result => { this.$notification.success({ message: this.$t('message.success.change.offering') diff --git a/ui/src/views/storage/MigrateVolume.vue b/ui/src/views/storage/MigrateVolume.vue index b698cb49a39..62bed706608 100644 --- a/ui/src/views/storage/MigrateVolume.vue +++ b/ui/src/views/storage/MigrateVolume.vue @@ -193,6 +193,8 @@ export default { } api('migrateVolume', params).then(response => { this.$pollJob({ + title: this.$t('label.migrate.volume'), + description: this.resource.id, jobId: response.migratevolumeresponse.jobid, successMessage: this.$t('message.success.migrate.volume'), errorMessage: this.$t('message.migrate.volume.failed'), From 66cbe0a0512cae71ba42b9f2b02ab86f41f9c33d Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 9 May 2023 18:40:20 +0200 Subject: [PATCH 2/3] replace pull_request_target with pull_request --- .github/workflows/sonar-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml index 2bfdaf0a65f..2a08fba6dd0 100644 --- a/.github/workflows/sonar-check.yml +++ b/.github/workflows/sonar-check.yml @@ -17,7 +17,7 @@ name: Sonar Quality Check -on: [pull_request_target] +on: [pull_request] permissions: contents: read From 0e4a5a1fa41bf437793d990cbdc87358ea749961 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 10 May 2023 14:07:29 +0530 Subject: [PATCH 3/3] .github: restrict sonar and CI actions to only apache/cloudstack Signed-off-by: Rohit Yadav --- .github/workflows/ci.yml | 1 + .github/workflows/main-sonar-check.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fadf33f2043..da263142f09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ concurrency: jobs: build: + if: github.repository == 'apache/cloudstack' runs-on: ubuntu-22.04 strategy: diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml index 429b0607552..635526a1826 100644 --- a/.github/workflows/main-sonar-check.yml +++ b/.github/workflows/main-sonar-check.yml @@ -24,6 +24,7 @@ on: jobs: build: + if: github.repository == 'apache/cloudstack' name: Main Sonar JaCoCo Build runs-on: ubuntu-22.04 steps: