diff options
Diffstat (limited to 'app/assets/javascripts/profile')
4 files changed, 13 insertions, 24 deletions
diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue index c99133fd251..b038b78088f 100644 --- a/app/assets/javascripts/profile/account/components/update_username.vue +++ b/app/assets/javascripts/profile/account/components/update_username.vue @@ -1,7 +1,7 @@ <script> import { GlSafeHtmlDirective as SafeHtml, GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; import { escape } from 'lodash'; -import createFlash from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __, s__, sprintf } from '~/locale'; @@ -85,12 +85,12 @@ Please update your Git repository remotes as soon as possible.`), return axios .put(this.actionUrl, putData) .then((result) => { - createFlash({ message: result.data.message, type: 'notice' }); + createAlert({ message: result.data.message, variant: VARIANT_INFO }); this.username = username; this.isRequestPending = false; }) .catch((error) => { - createFlash({ + createAlert({ message: error?.response?.data?.message || s__('Profiles|An error occurred while updating your username, please try again.'), diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js index 722f7d467a2..050b004f657 100644 --- a/app/assets/javascripts/profile/gl_crop.js +++ b/app/assets/javascripts/profile/gl_crop.js @@ -165,6 +165,7 @@ import { loadCSSFile } from '../lib/utils/css_utils'; setPreview() { const filename = this.fileInput.val().replace(FILENAMEREGEX, ''); this.previewImage.attr('src', this.dataURL); + this.previewImage.attr('srcset', this.dataURL); return this.filename.text(filename); } diff --git a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue index 7542f81a361..a33a20b49f6 100644 --- a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue +++ b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue @@ -1,6 +1,6 @@ <script> import { GlButton } from '@gitlab/ui'; -import createFlash, { FLASH_TYPES } from '~/flash'; +import { createAlert, VARIANT_DANGER, VARIANT_INFO } from '~/flash'; import { INTEGRATION_VIEW_CONFIGS, i18n } from '../constants'; import IntegrationView from './integration_view.vue'; @@ -94,15 +94,15 @@ export default { return; } updateClasses(this.bodyClasses, this.getSelectedTheme().css_class, this.selectedLayout); - const { message = this.$options.i18n.defaultSuccess, type = FLASH_TYPES.NOTICE } = + const { message = this.$options.i18n.defaultSuccess, variant = VARIANT_INFO } = customEvent?.detail?.[0] || {}; - createFlash({ message, type }); + createAlert({ message, variant }); this.isSubmitEnabled = true; }, handleError(customEvent) { - const { message = this.$options.i18n.defaultError, type = FLASH_TYPES.ALERT } = + const { message = this.$options.i18n.defaultError, variant = VARIANT_DANGER } = customEvent?.detail?.[0] || {}; - createFlash({ message, type }); + createAlert({ message, variant }); this.isSubmitEnabled = true; }, }, @@ -110,7 +110,7 @@ export default { </script> <template> - <div class="row gl-mt-3 js-preferences-form"> + <div class="row gl-mt-3 js-preferences-form js-search-settings-section"> <div v-if="integrationViews.length" class="col-sm-12"> <hr data-testid="profile-preferences-integrations-rule" /> </div> @@ -131,9 +131,9 @@ export default { :message-url="view.message_url" :config="$options.integrationViewConfigs[view.name]" /> - </div> - <div class="col-sm-12"> <hr /> + </div> + <div class="col-sm-12 js-hide-when-nothing-matches-search"> <gl-button category="primary" variant="confirm" diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js index af5beeb686c..93bc203d391 100644 --- a/app/assets/javascripts/profile/profile.js +++ b/app/assets/javascripts/profile/profile.js @@ -5,9 +5,6 @@ import axios from '~/lib/utils/axios_utils'; import { parseBoolean } from '~/lib/utils/common_utils'; import { parseRailsFormFields } from '~/lib/utils/forms'; import { Rails } from '~/lib/utils/rails_ujs'; -import TimezoneDropdown, { - formatTimezone, -} from '~/pages/projects/pipeline_schedules/shared/components/timezone_dropdown'; import UserProfileSetStatusWrapper from '~/set_status_modal/user_profile_set_status_wrapper.vue'; export default class Profile { @@ -17,21 +14,12 @@ export default class Profile { this.setRepoRadio(); this.bindEvents(); this.initAvatarGlCrop(); - - this.$inputEl = $('#user_timezone'); - - this.timezoneDropdown = new TimezoneDropdown({ - $inputEl: this.$inputEl, - $dropdownEl: $('.js-timezone-dropdown'), - displayFormat: (selectedItem) => formatTimezone(selectedItem), - allowEmpty: true, - }); } initAvatarGlCrop() { const cropOpts = { filename: '.js-avatar-filename', - previewImage: '.avatar-image .avatar', + previewImage: '.avatar-image .gl-avatar', modalCrop: '.modal-profile-crop', pickImageEl: '.js-choose-user-avatar-button', uploadImageBtn: '.js-upload-user-avatar', |