diff options
Diffstat (limited to 'app/assets/javascripts/pages')
32 files changed, 174 insertions, 204 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue index ccb449f96e1..b68148e5461 100644 --- a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue +++ b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue @@ -44,6 +44,7 @@ export default { 'signupEnabled', 'requireAdminApprovalAfterUserSignup', 'sendUserConfirmationEmail', + 'emailConfirmationSetting', 'minimumPasswordLength', 'minimumPasswordLengthMin', 'minimumPasswordLengthMax', @@ -58,6 +59,8 @@ export default { 'emailRestrictions', 'afterSignUpText', 'pendingUserCount', + 'projectSharingHelpLink', + 'groupSharingHelpLink', ], data() { return { @@ -66,6 +69,7 @@ export default { signupEnabled: this.signupEnabled, requireAdminApproval: this.requireAdminApprovalAfterUserSignup, sendConfirmationEmail: this.sendUserConfirmationEmail, + emailConfirmationSetting: this.emailConfirmationSetting, minimumPasswordLength: this.minimumPasswordLength, minimumPasswordLengthMin: this.minimumPasswordLengthMin, minimumPasswordLengthMax: this.minimumPasswordLengthMax, @@ -81,6 +85,8 @@ export default { supportedSyntaxLinkUrl: this.supportedSyntaxLinkUrl, emailRestrictions: this.emailRestrictions, afterSignUpText: this.afterSignUpText, + projectSharingHelpLink: this.projectSharingHelpLink, + groupSharingHelpLink: this.groupSharingHelpLink, }, }; }, @@ -199,6 +205,15 @@ export default { signupEnabledLabel: s__('ApplicationSettings|Sign-up enabled'), requireAdminApprovalLabel: s__('ApplicationSettings|Require admin approval for new sign-ups'), sendConfirmationEmailLabel: s__('ApplicationSettings|Send confirmation email on sign-up'), + emailConfirmationSettingsLabel: s__('ApplicationSettings|Email confirmation settings'), + emailConfirmationSettingsOffLabel: s__('ApplicationSettings|Off'), + emailConfirmationSettingsOffHelpText: s__( + 'ApplicationSettings|New users can sign up without confirming their email address.', + ), + emailConfirmationSettingsHardLabel: s__('ApplicationSettings|Hard'), + emailConfirmationSettingsHardHelpText: s__( + 'ApplicationSettings|Send a confirmation email during sign up. New users must confirm their email address before they can log in.', + ), minimumPasswordLengthLabel: s__( 'ApplicationSettings|Minimum password length (number of characters)', ), @@ -208,7 +223,7 @@ export default { ), userCapLabel: s__('ApplicationSettings|User cap'), userCapDescription: s__( - 'ApplicationSettings|After the instance reaches the user cap, any user who is added or requests access must be approved by an administrator. Leave blank for unlimited.', + 'ApplicationSettings|After the instance reaches the user cap, any user who is added or requests access must be approved by an administrator. Leave blank for an unlimited user cap. If you change the user cap to unlimited, you must re-enable %{projectSharingLinkStart}project sharing%{projectSharingLinkEnd} and %{groupSharingLinkStart}group sharing%{groupSharingLinkEnd}.', ), domainDenyListGroupLabel: s__('ApplicationSettings|Domain denylist'), domainDenyListLabel: s__('ApplicationSettings|Enable domain denylist for sign-ups'), @@ -276,9 +291,28 @@ export default { :label="$options.i18n.sendConfirmationEmailLabel" /> + <gl-form-group :label="$options.i18n.emailConfirmationSettingsLabel"> + <gl-form-radio-group + v-model="form.emailConfirmationSetting" + name="application_setting[email_confirmation_setting]" + > + <gl-form-radio value="hard"> + {{ $options.i18n.emailConfirmationSettingsHardLabel }} + + <template #help> {{ $options.i18n.emailConfirmationSettingsHardHelpText }} </template> + </gl-form-radio> + <gl-form-radio value="off"> + {{ $options.i18n.emailConfirmationSettingsOffLabel }} + + <template #help> {{ $options.i18n.emailConfirmationSettingsOffHelpText }} </template> + </gl-form-radio> + </gl-form-radio-group> + </gl-form-group> + <gl-form-group :label="$options.i18n.userCapLabel" :description="$options.i18n.userCapDescription" + data-testid="user-cap-form-group" > <gl-form-input v-model="form.userCap" @@ -286,6 +320,17 @@ export default { name="application_setting[new_user_signups_cap]" data-testid="user-cap-input" /> + + <template #description> + <gl-sprintf :message="$options.i18n.userCapDescription"> + <template #projectSharingLink="{ content }"> + <gl-link :href="projectSharingHelpLink" target="_blank">{{ content }}</gl-link> + </template> + <template #groupSharingLink="{ content }"> + <gl-link :href="groupSharingHelpLink" target="_blank">{{ content }}</gl-link> + </template> + </gl-sprintf> + </template> </gl-form-group> <gl-form-group :label="$options.i18n.minimumPasswordLengthLabel"> diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/constants.js b/app/assets/javascripts/pages/admin/jobs/index/components/constants.js new file mode 100644 index 00000000000..9e2d464bc4d --- /dev/null +++ b/app/assets/javascripts/pages/admin/jobs/index/components/constants.js @@ -0,0 +1,11 @@ +import { s__, __ } from '~/locale'; + +export const STOP_JOBS_MODAL_ID = 'stop-jobs-modal'; +export const STOP_JOBS_MODAL_TITLE = s__('AdminArea|Stop all jobs?'); +export const STOP_JOBS_BUTTON_TEXT = s__('AdminArea|Stop all jobs'); +export const CANCEL_TEXT = __('Cancel'); +export const STOP_JOBS_FAILED_TEXT = s__('AdminArea|Stopping jobs failed'); +export const PRIMARY_ACTION_TEXT = s__('AdminArea|Stop jobs'); +export const STOP_JOBS_WARNING = s__( + 'AdminArea|You’re about to stop all jobs. This will halt all current jobs that are running.', +); diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue index 4f42ef2892d..b608b3b9492 100644 --- a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue +++ b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue @@ -3,7 +3,14 @@ import { GlModal } from '@gitlab/ui'; import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { redirectTo } from '~/lib/utils/url_utility'; -import { __, s__ } from '~/locale'; +import { + CANCEL_TEXT, + STOP_JOBS_MODAL_ID, + STOP_JOBS_FAILED_TEXT, + STOP_JOBS_MODAL_TITLE, + STOP_JOBS_WARNING, + PRIMARY_ACTION_TEXT, +} from './constants'; export default { components: { @@ -15,13 +22,6 @@ export default { required: true, }, }, - computed: { - text() { - return s__( - 'AdminArea|You’re about to stop all jobs. This will halt all current jobs that are running.', - ); - }, - }, methods: { onSubmit() { return axios @@ -32,30 +32,33 @@ export default { }) .catch((error) => { createAlert({ - message: s__('AdminArea|Stopping jobs failed'), + message: STOP_JOBS_FAILED_TEXT, }); throw error; }); }, }, primaryAction: { - text: s__('AdminArea|Stop jobs'), + text: PRIMARY_ACTION_TEXT, attributes: [{ variant: 'danger' }], }, cancelAction: { - text: __('Cancel'), + text: CANCEL_TEXT, }, + STOP_JOBS_WARNING, + STOP_JOBS_MODAL_ID, + STOP_JOBS_MODAL_TITLE, }; </script> <template> <gl-modal - modal-id="stop-jobs-modal" + :modal-id="$options.STOP_JOBS_MODAL_ID" :action-primary="$options.primaryAction" :action-cancel="$options.cancelAction" @primary="onSubmit" > - <template #modal-title>{{ s__('AdminArea|Stop all jobs?') }}</template> - {{ text }} + <template #modal-title>{{ $options.STOP_JOBS_MODAL_TITLE }}</template> + {{ $options.STOP_JOBS_WARNING }} </gl-modal> </template> diff --git a/app/assets/javascripts/pages/admin/jobs/index/index.js b/app/assets/javascripts/pages/admin/jobs/index/index.js index 4cd312b403c..c82b186f671 100644 --- a/app/assets/javascripts/pages/admin/jobs/index/index.js +++ b/app/assets/javascripts/pages/admin/jobs/index/index.js @@ -1,29 +1,29 @@ import Vue from 'vue'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import Translate from '~/vue_shared/translate'; +import { STOP_JOBS_MODAL_ID } from './components/constants'; import StopJobsModal from './components/stop_jobs_modal.vue'; Vue.use(Translate); function initJobs() { const buttonId = 'js-stop-jobs-button'; - const modalId = 'stop-jobs-modal'; const stopJobsButton = document.getElementById(buttonId); if (stopJobsButton) { // eslint-disable-next-line no-new new Vue({ - el: `#js-${modalId}`, + el: `#js-${STOP_JOBS_MODAL_ID}`, components: { StopJobsModal, }, mounted() { stopJobsButton.classList.remove('disabled'); stopJobsButton.addEventListener('click', () => { - this.$root.$emit(BV_SHOW_MODAL, modalId, `#${buttonId}`); + this.$root.$emit(BV_SHOW_MODAL, STOP_JOBS_MODAL_ID, `#${buttonId}`); }); }, render(createElement) { - return createElement(modalId, { + return createElement(STOP_JOBS_MODAL_ID, { props: { url: stopJobsButton.dataset.url, }, diff --git a/app/assets/javascripts/pages/admin/runners/edit/index.js b/app/assets/javascripts/pages/admin/runners/edit/index.js index 03d31f49a99..dcce2a8dafd 100644 --- a/app/assets/javascripts/pages/admin/runners/edit/index.js +++ b/app/assets/javascripts/pages/admin/runners/edit/index.js @@ -1,3 +1,3 @@ -import { initRunnerEdit } from '~/runner/runner_edit'; +import { initRunnerEdit } from '~/ci/runner/runner_edit'; initRunnerEdit('#js-admin-runner-edit'); diff --git a/app/assets/javascripts/pages/admin/runners/index/index.js b/app/assets/javascripts/pages/admin/runners/index/index.js index f83111b6385..bc7b1421b31 100644 --- a/app/assets/javascripts/pages/admin/runners/index/index.js +++ b/app/assets/javascripts/pages/admin/runners/index/index.js @@ -1,3 +1,3 @@ -import { initAdminRunners } from '~/runner/admin_runners'; +import { initAdminRunners } from '~/ci/runner/admin_runners'; initAdminRunners(); diff --git a/app/assets/javascripts/pages/admin/runners/show/index.js b/app/assets/javascripts/pages/admin/runners/show/index.js index f76f3a2430d..fd38abf221a 100644 --- a/app/assets/javascripts/pages/admin/runners/show/index.js +++ b/app/assets/javascripts/pages/admin/runners/show/index.js @@ -1,3 +1,3 @@ -import { initAdminRunnerShow } from '~/runner/admin_runner_show'; +import { initAdminRunnerShow } from '~/ci/runner/admin_runner_show'; initAdminRunnerShow(); diff --git a/app/assets/javascripts/pages/dashboard/issues/index.js b/app/assets/javascripts/pages/dashboard/issues/index.js index d0903ad53bc..08c247a498b 100644 --- a/app/assets/javascripts/pages/dashboard/issues/index.js +++ b/app/assets/javascripts/pages/dashboard/issues/index.js @@ -1,4 +1,5 @@ import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; +import { mountIssuesDashboardApp } from '~/issues/dashboard'; import initManualOrdering from '~/issues/manual_ordering'; import { FILTERED_SEARCH } from '~/filtered_search/constants'; import initFilteredSearch from '~/pages/search/init_filtered_search'; @@ -12,3 +13,5 @@ initFilteredSearch({ projectSelect(); initManualOrdering(); + +mountIssuesDashboardApp(); diff --git a/app/assets/javascripts/pages/groups/observability/dashboards/index.js b/app/assets/javascripts/pages/groups/observability/dashboards/index.js new file mode 100644 index 00000000000..c3b6ce6f99f --- /dev/null +++ b/app/assets/javascripts/pages/groups/observability/dashboards/index.js @@ -0,0 +1,3 @@ +import ObservabilityApp from '~/observability'; + +ObservabilityApp(); diff --git a/app/assets/javascripts/pages/groups/observability/explore/index.js b/app/assets/javascripts/pages/groups/observability/explore/index.js new file mode 100644 index 00000000000..c3b6ce6f99f --- /dev/null +++ b/app/assets/javascripts/pages/groups/observability/explore/index.js @@ -0,0 +1,3 @@ +import ObservabilityApp from '~/observability'; + +ObservabilityApp(); diff --git a/app/assets/javascripts/pages/groups/observability/manage/index.js b/app/assets/javascripts/pages/groups/observability/manage/index.js new file mode 100644 index 00000000000..c3b6ce6f99f --- /dev/null +++ b/app/assets/javascripts/pages/groups/observability/manage/index.js @@ -0,0 +1,3 @@ +import ObservabilityApp from '~/observability'; + +ObservabilityApp(); diff --git a/app/assets/javascripts/pages/groups/runners/edit/index.js b/app/assets/javascripts/pages/groups/runners/edit/index.js index febb0026b67..08ae57866e2 100644 --- a/app/assets/javascripts/pages/groups/runners/edit/index.js +++ b/app/assets/javascripts/pages/groups/runners/edit/index.js @@ -1,3 +1,3 @@ -import { initRunnerEdit } from '~/runner/runner_edit'; +import { initRunnerEdit } from '~/ci/runner/runner_edit'; initRunnerEdit('#js-group-runner-edit'); diff --git a/app/assets/javascripts/pages/groups/runners/index/index.js b/app/assets/javascripts/pages/groups/runners/index/index.js index ca1a6bdab75..1cc07d1069a 100644 --- a/app/assets/javascripts/pages/groups/runners/index/index.js +++ b/app/assets/javascripts/pages/groups/runners/index/index.js @@ -1,3 +1,3 @@ -import { initGroupRunners } from '~/runner/group_runners'; +import { initGroupRunners } from '~/ci/runner/group_runners'; initGroupRunners(); diff --git a/app/assets/javascripts/pages/groups/runners/show/index.js b/app/assets/javascripts/pages/groups/runners/show/index.js index c59e3b80dc1..755e38004ad 100644 --- a/app/assets/javascripts/pages/groups/runners/show/index.js +++ b/app/assets/javascripts/pages/groups/runners/show/index.js @@ -1,3 +1,3 @@ -import { initGroupRunnerShow } from '~/runner/group_runner_show'; +import { initGroupRunnerShow } from '~/ci/runner/group_runner_show'; initGroupRunnerShow(); diff --git a/app/assets/javascripts/pages/groups/shared/group_details.js b/app/assets/javascripts/pages/groups/shared/group_details.js index 2aec0617b5a..52124865bcc 100644 --- a/app/assets/javascripts/pages/groups/shared/group_details.js +++ b/app/assets/javascripts/pages/groups/shared/group_details.js @@ -1,23 +1,12 @@ /* eslint-disable no-new */ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; -import { ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED } from '~/groups/constants'; import initInviteMembersBanner from '~/groups/init_invite_members_banner'; import initInviteMembersModal from '~/invite_members/init_invite_members_modal'; -import { getPagePath, getDashPath } from '~/lib/utils/common_utils'; import initNotificationsDropdown from '~/notifications'; import ProjectsList from '~/projects_list'; -import GroupTabs from './group_tabs'; -export default function initGroupDetails(actionName = 'show') { - const loadableActions = [ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED]; - const dashPath = getDashPath(); - let action = loadableActions.includes(dashPath) ? dashPath : getPagePath(1); - if (actionName && action === actionName) { - action = 'show'; // 'show' resets GroupTabs to default action through base class - } - - new GroupTabs({ parentEl: '.groups-listing', action }); +export default function initGroupDetails() { new ShortcutsNavigation(); initNotificationsDropdown(); diff --git a/app/assets/javascripts/pages/groups/shared/group_tabs.js b/app/assets/javascripts/pages/groups/shared/group_tabs.js deleted file mode 100644 index 73d810007dc..00000000000 --- a/app/assets/javascripts/pages/groups/shared/group_tabs.js +++ /dev/null @@ -1,136 +0,0 @@ -import $ from 'jquery'; -import createGroupTree from '~/groups'; -import { - ACTIVE_TAB_SUBGROUPS_AND_PROJECTS, - ACTIVE_TAB_SHARED, - ACTIVE_TAB_ARCHIVED, - CONTENT_LIST_CLASS, - GROUPS_LIST_HOLDER_CLASS, - GROUPS_FILTER_FORM_CLASS, -} from '~/groups/constants'; -import GroupFilterableList from '~/groups/groups_filterable_list'; -import { removeParams } from '~/lib/utils/url_utility'; -import UserTabs from '~/pages/users/user_tabs'; - -export default class GroupTabs extends UserTabs { - constructor({ defaultAction = 'subgroups_and_projects', action, parentEl }) { - super({ defaultAction, action, parentEl }); - } - - bindEvents() { - this.$parentEl - .off('shown.bs.tab', '.nav-links a[data-toggle="tab"]') - .on('shown.bs.tab', '.nav-links a[data-toggle="tab"]', (event) => this.tabShown(event)); - } - - tabShown(event) { - const $target = $(event.target); - const action = $target.data('action') || $target.data('targetSection'); - const source = $target.attr('href') || $target.data('targetPath'); - - document.querySelector(GROUPS_FILTER_FORM_CLASS).action = source; - - this.setTab(action); - return this.setCurrentAction(source); - } - - setTab(action) { - const loadableActions = [ - ACTIVE_TAB_SUBGROUPS_AND_PROJECTS, - ACTIVE_TAB_SHARED, - ACTIVE_TAB_ARCHIVED, - ]; - this.enableSearchBar(action); - this.action = action; - - if (this.loaded[action]) { - return; - } - - if (loadableActions.includes(action)) { - this.cleanFilterState(); - this.loadTab(action); - } - } - - loadTab(action) { - const elId = `js-groups-${action}-tree`; - const endpoint = this.getEndpoint(action); - - this.toggleLoading(true); - - createGroupTree(elId, endpoint, action); - this.loaded[action] = true; - - this.toggleLoading(false); - } - - getEndpoint(action) { - const { endpointsDefault, endpointsShared } = this.$parentEl.data(); - let endpoint; - - switch (action) { - case ACTIVE_TAB_ARCHIVED: - endpoint = `${endpointsDefault}?archived=only`; - break; - case ACTIVE_TAB_SHARED: - endpoint = endpointsShared; - break; - default: - // ACTIVE_TAB_SUBGROUPS_AND_PROJECTS - endpoint = endpointsDefault; - break; - } - - return endpoint; - } - - enableSearchBar(action) { - const containerEl = document.getElementById(action); - const form = document.querySelector(GROUPS_FILTER_FORM_CLASS); - const filter = form.querySelector('.js-groups-list-filter'); - const holder = containerEl.querySelector(GROUPS_LIST_HOLDER_CLASS); - const dataEl = containerEl.querySelector(CONTENT_LIST_CLASS); - const endpoint = this.getEndpoint(action); - - if (!dataEl) { - return; - } - - const { dataset } = dataEl; - const opts = { - form, - filter, - holder, - filterEndpoint: endpoint || dataset.endpoint, - pagePath: null, - dropdownSel: '.js-group-filter-dropdown-wrap', - filterInputField: 'filter', - action, - }; - - if (!this.loaded[action]) { - const filterableList = new GroupFilterableList(opts); - filterableList.initSearch(); - } - } - - cleanFilterState() { - const values = Object.values(this.loaded); - const loadedTabs = values.filter((e) => e === true); - - if (!loadedTabs.length) { - return; - } - - const newState = removeParams(['page'], window.location.search); - - window.history.replaceState( - { - url: newState, - }, - document.title, - newState, - ); - } -} diff --git a/app/assets/javascripts/pages/profiles/init_timezone_dropdown.js b/app/assets/javascripts/pages/profiles/init_timezone_dropdown.js index 80b911493a8..91d5013c67d 100644 --- a/app/assets/javascripts/pages/profiles/init_timezone_dropdown.js +++ b/app/assets/javascripts/pages/profiles/init_timezone_dropdown.js @@ -8,7 +8,7 @@ export const initTimezoneDropdown = () => { return null; } - const { timezoneData, initialValue } = el.dataset; + const { timezoneData, initialValue, name } = el.dataset; const timezones = JSON.parse(timezoneData); const timezoneDropdown = new Vue({ @@ -23,7 +23,7 @@ export const initTimezoneDropdown = () => { props: { value: this.value, timezoneData: timezones, - name: 'user[timezone]', + name, }, class: 'gl-md-form-input-lg', }); diff --git a/app/assets/javascripts/pages/projects/artifacts/index.js b/app/assets/javascripts/pages/projects/artifacts/index.js new file mode 100644 index 00000000000..4aa9b225790 --- /dev/null +++ b/app/assets/javascripts/pages/projects/artifacts/index.js @@ -0,0 +1,3 @@ +import { initArtifactsTable } from '~/artifacts/index'; + +initArtifactsTable(); diff --git a/app/assets/javascripts/pages/projects/branches/index/index.js b/app/assets/javascripts/pages/projects/branches/index/index.js index f3530b46845..ac5e0b28dd1 100644 --- a/app/assets/javascripts/pages/projects/branches/index/index.js +++ b/app/assets/javascripts/pages/projects/branches/index/index.js @@ -3,6 +3,7 @@ import BranchSortDropdown from '~/branches/branch_sort_dropdown'; import initDiverganceGraph from '~/branches/divergence_graph'; import initDeleteBranchButton from '~/branches/init_delete_branch_button'; import initDeleteBranchModal from '~/branches/init_delete_branch_modal'; +import initDeleteMergedBranches from '~/branches/init_delete_merged_branches'; const { divergingCountsEndpoint, defaultBranch } = document.querySelector( '.js-branch-list', @@ -11,6 +12,7 @@ const { divergingCountsEndpoint, defaultBranch } = document.querySelector( initDiverganceGraph(divergingCountsEndpoint, defaultBranch); BranchSortDropdown(); initDeprecatedRemoveRowBehavior(); +initDeleteMergedBranches(); document .querySelectorAll('.js-delete-branch-button') diff --git a/app/assets/javascripts/pages/projects/hooks/index.js b/app/assets/javascripts/pages/projects/hooks/index.js index ed476d25f8b..9e559354205 100644 --- a/app/assets/javascripts/pages/projects/hooks/index.js +++ b/app/assets/javascripts/pages/projects/hooks/index.js @@ -1,5 +1,7 @@ import initSearchSettings from '~/search_settings'; import initWebhookForm from '~/webhooks'; +import { initPushEventsEditForm } from '~/webhooks/webhook'; initSearchSettings(); initWebhookForm(); +initPushEventsEditForm(); diff --git a/app/assets/javascripts/pages/projects/init_blob.js b/app/assets/javascripts/pages/projects/init_blob.js index f37a2987685..097b2f33aa9 100644 --- a/app/assets/javascripts/pages/projects/init_blob.js +++ b/app/assets/javascripts/pages/projects/init_blob.js @@ -3,7 +3,6 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import BlobForkSuggestion from '~/blob/blob_fork_suggestion'; import BlobLinePermalinkUpdater from '~/blob/blob_line_permalink_updater'; import LineHighlighter from '~/blob/line_highlighter'; -import initBlobBundle from '~/blob_edit/blob_bundle'; export default () => { new LineHighlighter(); // eslint-disable-line no-new @@ -35,6 +34,4 @@ export default () => { suggestionSections: document.querySelectorAll('.js-file-fork-suggestion-section'), actionTextPieces: document.querySelectorAll('.js-file-fork-suggestion-section-action'), }).init(); - - initBlobBundle(); }; diff --git a/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue b/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue index 4eab0cccb06..3717d8027c4 100644 --- a/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue +++ b/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue @@ -86,6 +86,7 @@ export default { :target="openInNewTab ? '_blank' : '_self'" :href="value.url" data-testid="uncompleted-learn-gitlab-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-track-action="click_link" :data-track-label="actionLabelValue('trackLabel')" >{{ actionLabelValue('title') }}</gl-link diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js index ebf7c266482..42fa306d226 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js @@ -6,8 +6,8 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import Diff from '~/diff'; import GLForm from '~/gl_form'; import LabelsSelect from '~/labels/labels_select'; -import MilestoneSelect from '~/milestones/milestone_select'; import IssuableTemplateSelectors from '~/issuable/issuable_template_selectors'; +import { mountMilestoneDropdown } from '~/sidebar/mount_sidebar'; export default () => { new Diff(); @@ -15,8 +15,8 @@ export default () => { new GLForm($('.merge-request-form')); new IssuableForm($('.merge-request-form')); new LabelsSelect(); - new MilestoneSelect(); new IssuableTemplateSelectors({ warnTemplateOverride: true, }); + mountMilestoneDropdown('[name="merge_request[milestone_id]"]'); }; diff --git a/app/assets/javascripts/pages/projects/ml/experiments/show/index.js b/app/assets/javascripts/pages/projects/ml/experiments/show/index.js new file mode 100644 index 00000000000..0a9d9f4c987 --- /dev/null +++ b/app/assets/javascripts/pages/projects/ml/experiments/show/index.js @@ -0,0 +1,31 @@ +import Vue from 'vue'; +import ShowExperiment from '~/ml/experiment_tracking/components/experiment.vue'; + +const initShowExperiment = () => { + const element = document.querySelector('#js-show-ml-experiment'); + if (!element) { + return; + } + + const container = document.createElement('div'); + element.appendChild(container); + + const candidates = JSON.parse(element.dataset.candidates); + const metricNames = JSON.parse(element.dataset.metrics); + const paramNames = JSON.parse(element.dataset.params); + + // eslint-disable-next-line no-new + new Vue({ + el: container, + provide: { + candidates, + metricNames, + paramNames, + }, + render(h) { + return h(ShowExperiment); + }, + }); +}; + +initShowExperiment(); diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/edit/index.js b/app/assets/javascripts/pages/projects/pipeline_schedules/edit/index.js index 0edce2db0a3..e2a782bc5d8 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/edit/index.js +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/edit/index.js @@ -1,4 +1,4 @@ -import initPipelineSchedulesFormApp from '~/pipeline_schedules/mount_pipeline_schedules_form_app'; +import initPipelineSchedulesFormApp from '~/ci/pipeline_schedules/mount_pipeline_schedules_form_app'; import initForm from '../shared/init_form'; if (gon.features?.pipelineSchedulesVue) { diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js b/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js index 7d0930f6424..27610df482d 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; -import initPipelineSchedulesApp from '~/pipeline_schedules/mount_pipeline_schedules_app'; -import PipelineSchedulesTakeOwnershipModal from '~/pipeline_schedules/components/take_ownership_modal.vue'; +import initPipelineSchedulesApp from '~/ci/pipeline_schedules/mount_pipeline_schedules_app'; +import PipelineSchedulesTakeOwnershipModalLegacy from '~/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue'; import PipelineSchedulesCallout from '../shared/components/pipeline_schedules_callout.vue'; function initPipelineSchedulesCallout() { @@ -58,7 +58,7 @@ function initTakeownershipModal() { }); }, render(createElement) { - return createElement(PipelineSchedulesTakeOwnershipModal, { + return createElement(PipelineSchedulesTakeOwnershipModalLegacy, { props: { ownershipUrl: this.url, }, diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/new/index.js b/app/assets/javascripts/pages/projects/pipeline_schedules/new/index.js index 06084fa729b..d8ba7bbd752 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/new/index.js +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/new/index.js @@ -1,4 +1,4 @@ -import initPipelineSchedulesFormApp from '~/pipeline_schedules/mount_pipeline_schedules_form_app'; +import initPipelineSchedulesFormApp from '~/ci/pipeline_schedules/mount_pipeline_schedules_form_app'; import initForm from '../shared/init_form'; if (gon.features?.pipelineSchedulesVue) { diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js index eae721771de..abd17efc498 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js @@ -6,8 +6,8 @@ import { REF_TYPE_BRANCHES, REF_TYPE_TAGS } from '~/ref/constants'; import setupNativeFormVariableList from '~/ci_variable_list/native_form_variable_list'; import GlFieldErrors from '~/gl_field_errors'; import Translate from '~/vue_shared/translate'; +import { initTimezoneDropdown } from '../../../profiles/init_timezone_dropdown'; import IntervalPatternInput from './components/interval_pattern_input.vue'; -import TimezoneDropdown from './components/timezone_dropdown'; Vue.use(Translate); @@ -81,13 +81,6 @@ export default () => { const formElement = document.getElementById('new-pipeline-schedule-form'); - gl.timezoneDropdown = new TimezoneDropdown({ - $dropdownEl: $('.js-timezone-dropdown'), - $inputEl: $('#schedule_cron_timezone'), - onSelectTimezone: () => { - gl.pipelineScheduleFieldErrors.updateFormValidityState(); - }, - }); gl.pipelineScheduleFieldErrors = new GlFieldErrors(formElement); initTargetRefDropdown(); @@ -97,3 +90,5 @@ export default () => { formField: 'schedule', }); }; + +initTimezoneDropdown(); diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index 3e5c02bbf19..c37b4cc643a 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -41,6 +41,8 @@ export default { featureFlagsHelpText: s__( 'ProjectSettings|Roll out new features without redeploying with feature flags.', ), + infrastructureLabel: s__('ProjectSettings|Infrastructure'), + infrastructureHelpText: s__('ProjectSettings|Configure your infrastructure.'), monitorLabel: s__('ProjectSettings|Monitor'), packagesHelpText: s__( 'ProjectSettings|Every project can have its own space to store its packages. Note: The Package Registry is always visible when a project is public.', @@ -157,6 +159,11 @@ export default { required: false, default: '', }, + infrastructureHelpPath: { + type: String, + required: false, + default: '', + }, releasesHelpPath: { type: String, required: false, @@ -245,6 +252,7 @@ export default { operationsAccessLevel: featureAccessLevel.EVERYONE, environmentsAccessLevel: featureAccessLevel.EVERYONE, featureFlagsAccessLevel: featureAccessLevel.PROJECT_MEMBERS, + infrastructureAccessLevel: featureAccessLevel.PROJECT_MEMBERS, releasesAccessLevel: featureAccessLevel.EVERYONE, monitorAccessLevel: featureAccessLevel.EVERYONE, containerRegistryAccessLevel: featureAccessLevel.EVERYONE, @@ -433,6 +441,10 @@ export default { featureAccessLevel.PROJECT_MEMBERS, this.featureFlagsAccessLevel, ); + this.infrastructureAccessLevel = Math.min( + featureAccessLevel.PROJECT_MEMBERS, + this.infrastructureAccessLevel, + ); this.releasesAccessLevel = Math.min( featureAccessLevel.PROJECT_MEMBERS, this.releasesAccessLevel, @@ -981,6 +993,19 @@ export default { name="project[project_feature_attributes][feature_flags_access_level]" /> </project-setting-row> + <project-setting-row + ref="infrastructure-settings" + :label="$options.i18n.infrastructureLabel" + :help-text="$options.i18n.infrastructureHelpText" + :help-path="infrastructureHelpPath" + > + <project-feature-setting + v-model="infrastructureAccessLevel" + :label="$options.i18n.infrastructureLabel" + :options="featureAccessLevelOptions" + name="project[project_feature_attributes][infrastructure_access_level]" + /> + </project-setting-row> </template> <project-setting-row ref="releases-settings" diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js index eff39a744ad..1de36f4a0fb 100644 --- a/app/assets/javascripts/pages/projects/show/index.js +++ b/app/assets/javascripts/pages/projects/show/index.js @@ -10,14 +10,6 @@ import { initUploadFileTrigger } from '~/projects/upload_file'; import initReadMore from '~/read_more'; // Project show page loads different overview content based on user preferences -if (document.querySelector('.js-upload-blob-form')) { - import(/* webpackChunkName: 'blobBundle' */ '~/blob_edit/blob_bundle') - .then(({ initUploadForm }) => { - initUploadForm(); - }) - .catch(() => {}); -} - if (document.getElementById('js-tree-list')) { import(/* webpackChunkName: 'treeList' */ 'ee_else_ce/repository') .then(({ default: initTree }) => { diff --git a/app/assets/javascripts/pages/projects/tree/show/index.js b/app/assets/javascripts/pages/projects/tree/show/index.js index cf7162f477d..17c17014ece 100644 --- a/app/assets/javascripts/pages/projects/tree/show/index.js +++ b/app/assets/javascripts/pages/projects/tree/show/index.js @@ -1,10 +1,8 @@ import $ from 'jquery'; import initTree from 'ee_else_ce/repository'; -import initBlob from '~/blob_edit/blob_bundle'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import NewCommitForm from '~/new_commit_form'; new NewCommitForm($('.js-create-dir-form')); // eslint-disable-line no-new -initBlob(); initTree(); new ShortcutsNavigation(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue index 7b9656de362..8e2f542aec0 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue @@ -343,7 +343,7 @@ export default { :uploads-path="pageInfo.uploadsPath" :enable-content-editor="isMarkdownFormat" :enable-preview="isMarkdownFormat" - :init-on-autofocus="pageInfo.persisted" + :autofocus="pageInfo.persisted" :form-field-placeholder="$options.i18n.content.placeholder" :form-field-aria-label="$options.i18n.content.label" form-field-id="wiki_content" |