Commit 97c1c0ba authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '254223-follow-up-access-dropdown' into 'master'

RUN AS-IF-FOSS Removed deprecated Flash from AccessDropdown

Closes #254223

See merge request gitlab-org/gitlab!44285
parents 5ebad765 c67f6309
/* eslint-disable no-underscore-dangle, class-methods-use-this */ /* eslint-disable no-underscore-dangle, class-methods-use-this */
import { escape, find, countBy } from 'lodash'; import { escape, find, countBy } from 'lodash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { deprecatedCreateFlash as Flash } from '~/flash'; import createFlash from '~/flash';
import { n__, s__, __, sprintf } from '~/locale'; import { n__, s__, __, sprintf } from '~/locale';
import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants'; import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants';
import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
...@@ -328,15 +328,15 @@ export default class AccessDropdown { ...@@ -328,15 +328,15 @@ export default class AccessDropdown {
}) })
.catch(() => { .catch(() => {
if (this.deployKeysOnProtectedBranchesEnabled) { if (this.deployKeysOnProtectedBranchesEnabled) {
Flash(__('Failed to load groups, users and deploy keys.')); createFlash({ message: __('Failed to load groups, users and deploy keys.') });
} else { } else {
Flash(__('Failed to load groups & users.')); createFlash({ message: __('Failed to load groups & users.') });
} }
}); });
} else { } else {
this.getDeployKeys(query) this.getDeployKeys(query)
.then(deployKeysResponse => callback(this.consolidateData(deployKeysResponse.data))) .then(deployKeysResponse => callback(this.consolidateData(deployKeysResponse.data)))
.catch(() => Flash(__('Failed to load deploy keys.'))); .catch(() => createFlash({ message: __('Failed to load deploy keys.') }));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment