From b67d13c644eb9cf7dff9e1408e06ebc7fc342dfe Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Thu, 6 Nov 2025 23:05:39 +0100
Subject: [PATCH] chore(studio): param routing on oauth apps

---
 .../Auth/OAuthApps/OAuthAppsList.tsx          | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx
index 219aacc66ec..242ff9d146c 100644
--- a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx
+++ b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthAppsList.tsx
@@ -1,7 +1,9 @@
 import type { OAuthClient } from '@supabase/supabase-js'
 import { MoreVertical, Plus, RotateCw, Search, Trash } from 'lucide-react'
 import Link from 'next/link'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
+import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
+import { toast } from 'sonner'
 
 import { useParams } from 'common'
 import AlertError from 'components/ui/AlertError'
@@ -52,9 +54,14 @@ export const OAuthAppsList = () => {
   const isOAuthServerEnabled = !!authConfig?.OAUTH_SERVER_ENABLED
   const [newOAuthApp, setNewOAuthApp] = useState<OAuthClient | undefined>(undefined)
 
-  // State for OAuth apps
-  const [showCreateSheet, setShowCreateSheet] = useState(false)
-  const [showDeleteModal, setShowDeleteModal] = useState(false)
+  const [showCreateSheet, setShowCreateSheet] = useQueryState(
+    'new',
+    parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true })
+  )
+  const [selectedOAuthAppToDelete, setSelectedOAuthAppToDelete] = useQueryState(
+    'delete',
+    parseAsString.withDefault('').withOptions({ history: 'push', clearOnDefault: true })
+  )
   const [showRegenerateDialog, setShowRegenerateDialog] = useState(false)
   const [selectedApp, setSelectedApp] = useState<OAuthClient>()
   const [filteredAppTypes, setFilteredAppTypes] = useState<string[]>([])
@@ -82,10 +89,23 @@ export const OAuthAppsList = () => {
   const oAuthApps = data?.clients || []
 
   const handleDeleteClick = (app: OAuthClient) => {
-    setSelectedApp(app)
-    setShowDeleteModal(true)
+    setSelectedOAuthAppToDelete(app.client_id)
   }
 
+  const oAuthAppToDelete = oAuthApps?.find(
+    (app) => app.client_id.toString() === selectedOAuthAppToDelete
+  )
+  const showoAuthAppToDelete = selectedOAuthAppToDelete !== '' && !!oAuthAppToDelete
+  const oAuthAppToDeleteNotFound = selectedOAuthAppToDelete !== '' && !oAuthAppToDelete
+
+  // Error handling if delete dialog is open and oAuth app is not found
+  useEffect(() => {
+    if (!isLoading && oAuthAppToDeleteNotFound) {
+      toast.error('OAuth App not found')
+      setSelectedOAuthAppToDelete('')
+    }
+  }, [selectedOAuthAppToDelete, oAuthAppToDelete, isLoading])
+
   const [filterString, setFilterString] = useState<string>('')
 
   if (isAuthConfigLoading || (isOAuthServerEnabled && isLoading)) {
@@ -270,9 +290,9 @@ export const OAuthAppsList = () => {
       />
 
       <DeleteOAuthAppModal
-        visible={showDeleteModal}
-        onClose={() => setShowDeleteModal(false)}
-        selectedApp={selectedApp}
+        visible={showoAuthAppToDelete}
+        onClose={() => setSelectedOAuthAppToDelete('')}
+        selectedApp={oAuthAppToDelete}
       />
 
       <ConfirmationModal