diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 45f8676a1d2..a8ca17ab4dd 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -524,7 +524,7 @@ export default { if ( window.gon?.features?.diffsVirtualScrolling || - window.gon?.features?.diffSearchingUsageData + window.gon?.features?.usageDataDiffSearches ) { let keydownTime; Mousetrap.bind(['mod+f', 'mod+g'], () => { @@ -540,7 +540,7 @@ export default { if (delta >= 0 && delta < 1000) { this.disableVirtualScroller(); - if (window.gon?.features?.diffSearchingUsageData) { + if (window.gon?.features?.usageDataDiffSearches) { api.trackRedisHllUserEvent('i_code_review_user_searches_diff'); api.trackRedisCounterEvent('diff_searches'); } diff --git a/app/assets/javascripts/groups/components/transfer_group_form.vue b/app/assets/javascripts/groups/components/transfer_group_form.vue index ba8de2b0203..2d0d6b41c99 100644 --- a/app/assets/javascripts/groups/components/transfer_group_form.vue +++ b/app/assets/javascripts/groups/components/transfer_group_form.vue @@ -43,9 +43,6 @@ export default { }; }, computed: { - selectedNamespaceId() { - return this.selectedId; - }, disableSubmitButton() { return this.isPaidGroup || !this.selectedId; }, diff --git a/app/assets/javascripts/groups/init_transfer_group_form.js b/app/assets/javascripts/groups/init_transfer_group_form.js index c60255e6ec3..c9a1e46de72 100644 --- a/app/assets/javascripts/groups/init_transfer_group_form.js +++ b/app/assets/javascripts/groups/init_transfer_group_form.js @@ -4,6 +4,10 @@ import { parseBoolean } from '~/lib/utils/common_utils'; import TransferGroupForm, { i18n } from './components/transfer_group_form.vue'; const prepareGroups = (rawGroups) => { + if (!rawGroups) { + return { group: [] }; + } + const group = JSON.parse(rawGroups).map(({ id, text: humanName }) => ({ id, humanName, @@ -22,7 +26,7 @@ export default () => { targetFormId = null, buttonText: confirmButtonText = '', groupName = '', - parentGroups = [], + parentGroups, isPaidGroup, } = el.dataset; diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 6f61afe6e68..11de58aa344 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -578,7 +578,7 @@ export default { :endpoint="mr.accessibilityReportPath" /> -