Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

10 files changed, 25 insertions, 32 deletions

diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index e057012a246..4f26bab8bd3 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -1,8 +1,6 @@
 <script>
 /* global Flash */
 
-import $ from 'jquery';
-import 'vendor/jquery.scrollTo';
 import { GlLoadingIcon, GlModal } from '@gitlab/ui';
 import { __, s__, sprintf } from '~/locale';
 import { HIDDEN_CLASS } from '~/lib/utils/constants';
@@ -108,7 +106,7 @@ export default {
     fetchGroups({ parentId, page, filterGroupsBy, sortBy, archived, updatePagination }) {
       return this.service
         .getGroups(parentId, page, filterGroupsBy, sortBy, archived)
-        .then(res => {
+        .then((res) => {
           if (updatePagination) {
             this.updatePagination(res.headers);
           }
@@ -116,7 +114,7 @@ export default {
         })
         .catch(() => {
           this.isLoading = false;
-          $.scrollTo(0);
+          window.scrollTo({ top: 0, behavior: 'smooth' });
 
           Flash(COMMON_STR.FAILURE);
         });
@@ -135,7 +133,7 @@ export default {
         sortBy,
         archived,
         updatePagination: true,
-      }).then(res => {
+      }).then((res) => {
         this.isLoading = false;
         this.updateGroups(res, Boolean(filterGroupsBy));
       });
@@ -149,9 +147,9 @@ export default {
         sortBy,
         archived,
         updatePagination: true,
-      }).then(res => {
+      }).then((res) => {
         this.isLoading = false;
-        $.scrollTo(0);
+        window.scrollTo({ top: 0, behavior: 'smooth' });
 
         const currentPath = mergeUrlParams({ page }, window.location.href);
         window.history.replaceState(
@@ -173,7 +171,7 @@ export default {
           this.fetchGroups({
             parentId: parentGroup.id,
           })
-            .then(res => {
+            .then((res) => {
               this.store.setGroupChildren(parentGroup, res);
             })
             .catch(() => {
@@ -194,12 +192,12 @@ export default {
       this.targetGroup.isBeingRemoved = true;
       this.service
         .leaveGroup(this.targetGroup.leavePath)
-        .then(res => {
-          $.scrollTo(0);
+        .then((res) => {
+          window.scrollTo({ top: 0, behavior: 'smooth' });
           this.store.removeGroup(this.targetGroup, this.targetParentGroup);
           this.$toast.show(res.data.notice);
         })
-        .catch(err => {
+        .catch((err) => {
           let message = COMMON_STR.FAILURE;
           if (err.status === 403) {
             message = COMMON_STR.LEAVE_FORBIDDEN;
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index ef58b93c049..d65ad974c73 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -126,7 +126,7 @@ export default {
       />
       <div
         :class="{ 'd-sm-flex': !group.isChildrenLoading }"
-        class="avatar-container rect-avatar s32 d-none flex-grow-0 flex-shrink-0 "
+        class="avatar-container rect-avatar s32 d-none flex-grow-0 flex-shrink-0"
       >
         <a :href="group.relativePath" class="no-expand">
           <img
diff --git a/app/assets/javascripts/groups/components/visibility_level_dropdown.vue b/app/assets/javascripts/groups/components/visibility_level_dropdown.vue
index ff0f8c3ff46..0933045fc38 100644
--- a/app/assets/javascripts/groups/components/visibility_level_dropdown.vue
+++ b/app/assets/javascripts/groups/components/visibility_level_dropdown.vue
@@ -23,7 +23,7 @@ export default {
   },
   methods: {
     getDefaultOption() {
-      return this.visibilityLevelOptions.find(option => option.level === this.defaultLevel);
+      return this.visibilityLevelOptions.find((option) => option.level === this.defaultLevel);
     },
     onClick(option) {
       this.selectedOption = option;
diff --git a/app/assets/javascripts/groups/groups_filterable_list.js b/app/assets/javascripts/groups/groups_filterable_list.js
index 693519729ac..c33ad8b6ecb 100644
--- a/app/assets/javascripts/groups/groups_filterable_list.js
+++ b/app/assets/javascripts/groups/groups_filterable_list.js
@@ -65,10 +65,7 @@ export default class GroupFilterableList extends FilterableList {
 
   setDefaultFilterOption() {
     const defaultOption = $.trim(
-      this.$dropdown
-        .find('.dropdown-menu li.js-filter-sort-order a')
-        .first()
-        .text(),
+      this.$dropdown.find('.dropdown-menu li.js-filter-sort-order a').first().text(),
     );
     this.$dropdown.find('.dropdown-label').text(defaultOption);
   }
diff --git a/app/assets/javascripts/groups/init_invite_members_banner.js b/app/assets/javascripts/groups/init_invite_members_banner.js
index c7967827917..2052dd6ac8c 100644
--- a/app/assets/javascripts/groups/init_invite_members_banner.js
+++ b/app/assets/javascripts/groups/init_invite_members_banner.js
@@ -18,6 +18,6 @@ export default function initInviteMembersBanner() {
       isDismissedKey,
       trackLabel,
     },
-    render: createElement => createElement(InviteMembersBanner),
+    render: (createElement) => createElement(InviteMembersBanner),
   });
 }
diff --git a/app/assets/javascripts/groups/members/components/app.vue b/app/assets/javascripts/groups/members/components/app.vue
index f6f3a955813..34a2c67fa9f 100644
--- a/app/assets/javascripts/groups/members/components/app.vue
+++ b/app/assets/javascripts/groups/members/components/app.vue
@@ -5,12 +5,10 @@ import MembersTable from '~/members/components/table/members_table.vue';
 import FilterSortContainer from '~/members/components/filter_sort/filter_sort_container.vue';
 import { scrollToElement } from '~/lib/utils/common_utils';
 import { HIDE_ERROR } from '~/members/store/mutation_types';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   name: 'GroupMembersApp',
   components: { MembersTable, FilterSortContainer, GlAlert },
-  mixins: [glFeatureFlagsMixin()],
   computed: {
     ...mapState(['showError', 'errorMessage']),
   },
@@ -36,7 +34,7 @@ export default {
     <gl-alert v-if="showError" ref="errorAlert" variant="danger" @dismiss="hideError">{{
       errorMessage
     }}</gl-alert>
-    <filter-sort-container v-if="glFeatures.groupMembersFilteredSearch" />
+    <filter-sort-container />
     <members-table />
   </div>
 </template>
diff --git a/app/assets/javascripts/groups/members/index.js b/app/assets/javascripts/groups/members/index.js
index 9ce0e3c1179..3ec874b8d36 100644
--- a/app/assets/javascripts/groups/members/index.js
+++ b/app/assets/javascripts/groups/members/index.js
@@ -38,6 +38,6 @@ export const initGroupMembersApp = (
     el,
     components: { App },
     store,
-    render: createElement => createElement('app'),
+    render: (createElement) => createElement('app'),
   });
 };
diff --git a/app/assets/javascripts/groups/members/utils.js b/app/assets/javascripts/groups/members/utils.js
index 2d584556bbc..4fcf348b69f 100644
--- a/app/assets/javascripts/groups/members/utils.js
+++ b/app/assets/javascripts/groups/members/utils.js
@@ -7,7 +7,7 @@ import {
   GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
 } from './constants';
 
-export const parseDataAttributes = el => {
+export const parseDataAttributes = (el) => {
   const { members, groupId, memberPath, canManageMembers } = el.dataset;
 
   return {
diff --git a/app/assets/javascripts/groups/store/groups_store.js b/app/assets/javascripts/groups/store/groups_store.js
index b6cea38e87f..6cf70f4052e 100644
--- a/app/assets/javascripts/groups/store/groups_store.js
+++ b/app/assets/javascripts/groups/store/groups_store.js
@@ -12,15 +12,15 @@ export default class GroupsStore {
 
   setGroups(rawGroups) {
     if (rawGroups && rawGroups.length) {
-      this.state.groups = rawGroups.map(rawGroup => this.formatGroupItem(rawGroup));
+      this.state.groups = rawGroups.map((rawGroup) => this.formatGroupItem(rawGroup));
     } else {
       this.state.groups = [];
     }
   }
 
   setSearchedGroups(rawGroups) {
-    const formatGroups = groups =>
-      groups.map(group => {
+    const formatGroups = (groups) =>
+      groups.map((group) => {
         const formattedGroup = this.formatGroupItem(group);
         if (formattedGroup.children && formattedGroup.children.length) {
           formattedGroup.children = formatGroups(formattedGroup.children);
@@ -37,7 +37,7 @@ export default class GroupsStore {
 
   setGroupChildren(parentGroup, children) {
     const updatedParentGroup = parentGroup;
-    updatedParentGroup.children = children.map(rawChild => this.formatGroupItem(rawChild));
+    updatedParentGroup.children = children.map((rawChild) => this.formatGroupItem(rawChild));
     updatedParentGroup.isOpen = true;
     updatedParentGroup.isChildrenLoading = false;
   }
@@ -103,9 +103,9 @@ export default class GroupsStore {
   removeGroup(group, parentGroup) {
     const updatedParentGroup = parentGroup;
     if (updatedParentGroup.children && updatedParentGroup.children.length) {
-      updatedParentGroup.children = parentGroup.children.filter(child => group.id !== child.id);
+      updatedParentGroup.children = parentGroup.children.filter((child) => group.id !== child.id);
     } else {
-      this.state.groups = this.state.groups.filter(child => group.id !== child.id);
+      this.state.groups = this.state.groups.filter((child) => group.id !== child.id);
     }
   }
 }
diff --git a/app/assets/javascripts/groups/transfer_dropdown.js b/app/assets/javascripts/groups/transfer_dropdown.js
index cefd803c631..59cc779d2ae 100644
--- a/app/assets/javascripts/groups/transfer_dropdown.js
+++ b/app/assets/javascripts/groups/transfer_dropdown.js
@@ -20,11 +20,11 @@ export default class TransferDropdown {
     initDeprecatedJQueryDropdown(this.groupDropdown, {
       selectable: true,
       filterable: true,
-      toggleLabel: item => item.text,
+      toggleLabel: (item) => item.text,
       search: { fields: ['text'] },
       data: extraOptions.concat(this.data),
-      text: item => item.text,
-      clicked: options => {
+      text: (item) => item.text,
+      clicked: (options) => {
         const { e } = options;
         e.preventDefault();
         this.assignSelected(options.selectedObj);