fix(portals-admin): Stop redirecting when only one result (#17020)

causes loop when going back now that we have query in url Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Nov 26, 2024 · 050a2eb · 050a2eb
1 parent 41721f3
commit 050a2eb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 36 deletions.
diff --git a/libs/portals/admin/service-desk/src/screens/Companies/Companies.action.ts b/libs/portals/admin/service-desk/src/screens/Companies/Companies.action.ts
@@ -68,20 +68,6 @@ export const CompaniesAction: WrappedActionFn =
         throw res.error
       }
 
-      const companies = res.data?.companyRegistryCompanies?.data
-
-      // Redirect to Procurers screen if only one company is found
-      if (companies?.length === 1) {
-        return redirect(
-          replaceParams({
-            href: ServiceDeskPaths.Company,
-            params: {
-              nationalId: companies[0].nationalId,
-            },
-          }),
-        )
-      }
-
       return {
         errors: null,
         data: res.data.companyRegistryCompanies,

diff --git a/libs/portals/admin/service-desk/src/screens/Companies/Companies.tsx b/libs/portals/admin/service-desk/src/screens/Companies/Companies.tsx
@@ -79,14 +79,12 @@ const Companies = () => {
             buttonProps={{
               type: 'submit',
               disabled: !searchInput,
-              onClick: (e) => {
-                e.preventDefault()
+              onClick: () => {
                 if (searchInput) {
                   setSearchParams((params) => {
                     params.set('q', searchInput)
                     return params
                   })
-                  submit(formRef.current)
                 }
               },
             }}

diff --git a/libs/portals/admin/service-desk/src/screens/Users/Users.action.ts b/libs/portals/admin/service-desk/src/screens/Users/Users.action.ts
@@ -78,22 +78,6 @@ export const UsersAction: WrappedActionFn =
         throw res.error
       }
 
-      const { data: respData, totalCount } = res.data.UserProfileAdminProfiles
-
-      if (totalCount === 1) {
-        return redirect(
-          replaceParams({
-            href: ServiceDeskPaths.User,
-            params: {
-              nationalId: (await maskString(
-                respData[0].nationalId,
-                userInfo.profile.nationalId,
-              )) as string,
-            },
-          }),
-        )
-      }
-
       return {
         data: res.data.UserProfileAdminProfiles,
         errors: null,

diff --git a/libs/portals/admin/service-desk/src/screens/Users/Users.tsx b/libs/portals/admin/service-desk/src/screens/Users/Users.tsx
@@ -87,14 +87,12 @@ const Users = () => {
             buttonProps={{
               type: 'submit',
               disabled: searchInput.length === 0,
-              onClick: (e) => {
-                e.preventDefault()
+              onClick: () => {
                 if (searchInput) {
                   setSearchParams((params) => {
                     params.set('q', searchInput)
                     return params
                   })
-                  submit(formRef.current)
                 }
               },
             }}