Merge branch...

Merge branch '518625-direct-transfer-placeholder-users-not-displaying-when-navigating-via-members-added-tile' into 'master' 

Fix invalid sort in placeholder users app

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183210



Merged-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Approved-by: Oiza Baiye <obaiye@gitlab.com>
Approved-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Co-authored-by: Justin Ho Tuan Duong <hduong@gitlab.com>

app/assets/javascripts/import_entities/import_groups/constants.js

@@ -128,3 +128,9 @@ export const PLACEHOLDER_SORT_STATUS_DESC = 'STATUS_DESC';
 export const PLACEHOLDER_SORT_STATUS_ASC = 'STATUS_ASC';
 export const PLACEHOLDER_SORT_SOURCE_NAME_ASC = 'SOURCE_NAME_ASC';
 export const PLACEHOLDER_SORT_SOURCE_NAME_DESC = 'SOURCE_NAME_DESC';
+export const PLACEHOLDER_SORT_VALUES = [
+  PLACEHOLDER_SORT_STATUS_DESC,
+  PLACEHOLDER_SORT_STATUS_ASC,
+  PLACEHOLDER_SORT_SOURCE_NAME_ASC,
+  PLACEHOLDER_SORT_SOURCE_NAME_DESC,
+];

app/assets/javascripts/members/placeholders/components/app.vue

@@ -32,6 +32,7 @@ import {
   PLACEHOLDER_SORT_STATUS_ASC,
   PLACEHOLDER_SORT_SOURCE_NAME_ASC,
   PLACEHOLDER_SORT_SOURCE_NAME_DESC,
+  PLACEHOLDER_SORT_VALUES,
   PLACEHOLDER_TAB_AWAITING,
   PLACEHOLDER_TAB_REASSIGNED,
 } from '~/import_entities/import_groups/constants';
@@ -198,7 +199,7 @@ export default {
 
       this.filterParams = { ...queryParams };
 
-      if (sort) {
+      if (sort && PLACEHOLDER_SORT_VALUES.includes(sort)) {
         this.sort = sort || PLACEHOLDER_SORT_SOURCE_NAME_ASC;
       }
 

spec/frontend/members/placeholders/components/app_spec.js

@@ -141,6 +141,17 @@ describe('PlaceholdersTabApp', () => {
       });
     });
 
+    describe('with invalid sort query', () => {
+      beforeEach(() => {
+        setWindowLocation('?sort=last_joined');
+        createComponent();
+      });
+
+      it('falls back to default sort for FilteredSearchBar', () => {
+        expect(findFilteredSearchBar().props('initialSortBy')).toBe('SOURCE_NAME_ASC');
+      });
+    });
+
     describe('with status, search and sort queries present on load', () => {
       beforeEach(() => {
         setWindowLocation('?status=failed&search=foo&sort=STATUS_ASC');