diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue index 7f0345c7ec0feeaaa6f4276d178b087a1b470dee..478e44d104c808f6718c1d7592ce81639ed2ef1d 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue @@ -52,7 +52,7 @@ export default { this.$emit('projectClicked', project); }, isSelected(project) { - return Boolean(_.findWhere(this.selectedProjects, { id: project.id })); + return Boolean(_.find(this.selectedProjects, { id: project.id })); }, onInput: _.debounce(function debouncedOnInput() { this.$emit('searched', this.searchQuery); diff --git a/ee/app/assets/javascripts/projects/settings/access_dropdown.js b/ee/app/assets/javascripts/projects/settings/access_dropdown.js index 1cbde73c9682973806d1c467558bc92cb4d72561..6cb569dbbfb65367ba126042b6486181df6dcfd3 100644 --- a/ee/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/ee/app/assets/javascripts/projects/settings/access_dropdown.js @@ -445,7 +445,7 @@ export default class AccessDropdown { break; } - const isActive = _.findWhere(this.getSelectedItems(), criteria) ? 'is-active' : ''; + const isActive = _.find(this.getSelectedItems(), criteria) ? 'is-active' : ''; switch (item.type) { case LEVEL_TYPES.USER: diff --git a/ee/app/assets/javascripts/protected_branches/protected_branch_edit.js b/ee/app/assets/javascripts/protected_branches/protected_branch_edit.js index 8461c7fb5f107f989f9df122d4b04f3b60e44310..6eb7541501968565c21fb821059a8d0616ae4797 100644 --- a/ee/app/assets/javascripts/protected_branches/protected_branch_edit.js +++ b/ee/app/assets/javascripts/protected_branches/protected_branch_edit.js @@ -95,7 +95,7 @@ export default class ProtectedBranchEdit { // Do this only for users for now // get the current data for selected items const selectedItems = this[dropdownName].getSelectedItems(); - const currentSelectedItem = _.findWhere(selectedItems, { + const currentSelectedItem = _.find(selectedItems, { user_id: currentItem.user_id, }); diff --git a/ee/app/assets/javascripts/protected_environments/protected_environment_edit.js b/ee/app/assets/javascripts/protected_environments/protected_environment_edit.js index 404233898561e479cfb2ea4567aaf97364eba694..712dc517aa0f084ef0f950a0700055942692ccbe 100644 --- a/ee/app/assets/javascripts/protected_environments/protected_environment_edit.js +++ b/ee/app/assets/javascripts/protected_environments/protected_environment_edit.js @@ -80,7 +80,7 @@ export default class ProtectedEnvironmentEdit { // Do this only for users for now // get the current data for selected items const selectedItems = this[dropdownName].getSelectedItems(); - const currentSelectedItem = _.findWhere(selectedItems, { + const currentSelectedItem = _.find(selectedItems, { user_id: currentItem.user_id, }); diff --git a/ee/app/assets/javascripts/protected_tags/protected_tag_edit.js b/ee/app/assets/javascripts/protected_tags/protected_tag_edit.js index 0bb70e55d613363e5cd137c567a0acb7ff1d2877..42bb8776d10f705b4571cc34f9db2da84a5f2cae 100644 --- a/ee/app/assets/javascripts/protected_tags/protected_tag_edit.js +++ b/ee/app/assets/javascripts/protected_tags/protected_tag_edit.js @@ -78,7 +78,7 @@ export default class ProtectedTagEdit { // Do this only for users for now // get the current data for selected items const selectedItems = this[dropdownName].getSelectedItems(); - const currentSelectedItem = _.findWhere(selectedItems, { + const currentSelectedItem = _.find(selectedItems, { user_id: currentItem.user_id, }); diff --git a/ee/app/assets/javascripts/vue_shared/dashboards/store/actions.js b/ee/app/assets/javascripts/vue_shared/dashboards/store/actions.js index 59e39698b0be9db0fbfbfc986f5451b60eadddf1..05d83d312e6ce8528b8674f9af67eee0e921cbdf 100644 --- a/ee/app/assets/javascripts/vue_shared/dashboards/store/actions.js +++ b/ee/app/assets/javascripts/vue_shared/dashboards/store/actions.js @@ -33,7 +33,7 @@ export const addProjectsToDashboard = ({ state, dispatch }) => .catch(() => dispatch('receiveAddProjectsToDashboardError')); export const toggleSelectedProject = ({ commit, state }, project) => { - if (!_.findWhere(state.selectedProjects, { id: project.id })) { + if (!_.find(state.selectedProjects, { id: project.id })) { commit(types.ADD_SELECTED_PROJECT, project); } else { commit(types.REMOVE_SELECTED_PROJECT, project);