diff options
Diffstat (limited to 'app/assets/javascripts/users')
-rw-r--r-- | app/assets/javascripts/users/profile/components/report_abuse_button.vue | 21 | ||||
-rw-r--r-- | app/assets/javascripts/users/profile/index.js | 7 |
2 files changed, 18 insertions, 10 deletions
diff --git a/app/assets/javascripts/users/profile/components/report_abuse_button.vue b/app/assets/javascripts/users/profile/components/report_abuse_button.vue index aabb7fde396..0e41a214888 100644 --- a/app/assets/javascripts/users/profile/components/report_abuse_button.vue +++ b/app/assets/javascripts/users/profile/components/report_abuse_button.vue @@ -1,6 +1,6 @@ <script> import { GlButton, GlTooltipDirective } from '@gitlab/ui'; -import { __ } from '~/locale'; +import { s__ } from '~/locale'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue'; @@ -14,8 +14,9 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, + inject: ['reportedUserId', 'reportedFromUrl'], i18n: { - reportAbuse: __('Report abuse to administrator'), + reportAbuse: s__('ReportAbuse|Report abuse to administrator'), }, data() { return { @@ -28,11 +29,8 @@ export default { }, }, methods: { - openDrawer() { - this.open = true; - }, - closeDrawer() { - this.open = false; + toggleDrawer(open) { + this.open = open; }, hideTooltips() { this.$root.$emit(BV_HIDE_TOOLTIP); @@ -47,9 +45,14 @@ export default { category="primary" :aria-label="buttonTooltipText" icon="error" - @click="openDrawer" + @click="toggleDrawer(true)" @mouseout="hideTooltips" /> - <abuse-category-selector :show-drawer="open" @close-drawer="closeDrawer" /> + <abuse-category-selector + :reported-user-id="reportedUserId" + :reported-from-url="reportedFromUrl" + :show-drawer="open" + @close-drawer="toggleDrawer(false)" + /> </span> </template> diff --git a/app/assets/javascripts/users/profile/index.js b/app/assets/javascripts/users/profile/index.js index 37f8e3ac471..c6b85489785 100644 --- a/app/assets/javascripts/users/profile/index.js +++ b/app/assets/javascripts/users/profile/index.js @@ -10,7 +10,12 @@ export const initReportAbuse = () => { return new Vue({ el, - provide: { reportAbusePath, reportedUserId, reportedFromUrl }, + name: 'ReportAbuseButtonRoot', + provide: { + reportAbusePath, + reportedUserId: parseInt(reportedUserId, 10), + reportedFromUrl, + }, render(createElement) { return createElement(ReportAbuseButton); }, |