From c91b4beac51e2d5e6342faae1cf51beb536821ed Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Sun, 21 Dec 2025 19:41:53 -0500
Subject: [PATCH] fix resource queries

---
 .../proxy/[niceId]/authentication/page.tsx    | 29 +++++++++--------
 src/components/EditInternalResourceDialog.tsx | 12 +++----
 src/lib/queries.ts                            | 31 ++++++++++++++++---
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/authentication/page.tsx b/src/app/[orgId]/settings/resources/proxy/[niceId]/authentication/page.tsx
index fa0784c4..4c520733 100644
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/authentication/page.tsx
+++ b/src/app/[orgId]/settings/resources/proxy/[niceId]/authentication/page.tsx
@@ -307,17 +307,18 @@ export default function ResourceAuthenticationPage() {
                 title: t("resourceAuthSettingsSave"),
                 description: t("resourceAuthSettingsSaveDescription")
             });
-            await queryClient.invalidateQueries({
-                predicate(query) {
-                    const resourceKey = resourceQueries.resourceClients({
-                        resourceId: resource.resourceId
-                    }).queryKey;
-                    return (
-                        query.queryKey[0] === resourceKey[0] &&
-                        query.queryKey[1] === resourceKey[1]
-                    );
-                }
-            });
+            // invalidate resource queries
+            await queryClient.invalidateQueries(
+                resourceQueries.resourceUsers({
+                    resourceId: resource.resourceId
+                })
+            );
+            await queryClient.invalidateQueries(
+                resourceQueries.resourceRoles({
+                    resourceId: resource.resourceId
+                })
+            );
+
             router.refresh();
         } catch (e) {
             console.error(e);
@@ -398,7 +399,7 @@ export default function ResourceAuthenticationPage() {
         api.post(`/resource/${resource.resourceId}/header-auth`, {
             user: null,
             password: null,
-            extendedCompatibility: null,
+            extendedCompatibility: null
         })
             .then(() => {
                 toast({
@@ -655,7 +656,9 @@ export default function ResourceAuthenticationPage() {
                                             {autoLoginEnabled && (
                                                 <div className="space-y-2">
                                                     <label className="text-sm font-medium">
-                                                        {t("defaultIdentityProvider")}
+                                                        {t(
+                                                            "defaultIdentityProvider"
+                                                        )}
                                                     </label>
                                                     <Select
                                                         onValueChange={(
diff --git a/src/components/EditInternalResourceDialog.tsx b/src/components/EditInternalResourceDialog.tsx
index 88d98aa5..169f6554 100644
--- a/src/components/EditInternalResourceDialog.tsx
+++ b/src/components/EditInternalResourceDialog.tsx
@@ -281,9 +281,9 @@ export default function EditInternalResourceDialog({
                     filter: "machine"
                 }
             }),
-            resourceQueries.resourceUsers({ resourceId: resource.id }),
-            resourceQueries.resourceRoles({ resourceId: resource.id }),
-            resourceQueries.resourceClients({ resourceId: resource.id })
+            resourceQueries.siteResourceUsers({ siteResourceId: resource.id }),
+            resourceQueries.siteResourceRoles({ siteResourceId: resource.id }),
+            resourceQueries.siteResourceClients({ siteResourceId: resource.id })
         ],
         combine: (results) => {
             const [
@@ -501,13 +501,13 @@ export default function EditInternalResourceDialog({
             // ]);
 
             await queryClient.invalidateQueries(
-                resourceQueries.resourceRoles({ resourceId: resource.id })
+                resourceQueries.siteResourceRoles({ siteResourceId: resource.id })
             );
             await queryClient.invalidateQueries(
-                resourceQueries.resourceUsers({ resourceId: resource.id })
+                resourceQueries.siteResourceUsers({ siteResourceId: resource.id })
             );
             await queryClient.invalidateQueries(
-                resourceQueries.resourceClients({ resourceId: resource.id })
+                resourceQueries.siteResourceClients({ siteResourceId: resource.id })
             );
 
             toast({
diff --git a/src/lib/queries.ts b/src/lib/queries.ts
index e90f6eea..585ce4e5 100644
--- a/src/lib/queries.ts
+++ b/src/lib/queries.ts
@@ -228,7 +228,7 @@ export const resourceQueries = {
             queryFn: async ({ signal, meta }) => {
                 const res = await meta!.api.get<
                     AxiosResponse<ListSiteResourceUsersResponse>
-                >(`/site-resource/${resourceId}/users`, { signal });
+                >(`/resource/${resourceId}/users`, { signal });
                 return res.data.data.users;
             }
         }),
@@ -238,18 +238,39 @@ export const resourceQueries = {
             queryFn: async ({ signal, meta }) => {
                 const res = await meta!.api.get<
                     AxiosResponse<ListSiteResourceRolesResponse>
-                >(`/site-resource/${resourceId}/roles`, { signal });
+                >(`/resource/${resourceId}/roles`, { signal });
 
                 return res.data.data.roles;
             }
         }),
-    resourceClients: ({ resourceId }: { resourceId: number }) =>
+    siteResourceUsers: ({ siteResourceId }: { siteResourceId: number }) =>
         queryOptions({
-            queryKey: ["RESOURCES", resourceId, "CLIENTS"] as const,
+            queryKey: ["SITE_RESOURCES", siteResourceId, "USERS"] as const,
+            queryFn: async ({ signal, meta }) => {
+                const res = await meta!.api.get<
+                    AxiosResponse<ListSiteResourceUsersResponse>
+                >(`/site-resource/${siteResourceId}/users`, { signal });
+                return res.data.data.users;
+            }
+        }),
+    siteResourceRoles: ({ siteResourceId }: { siteResourceId: number }) =>
+        queryOptions({
+            queryKey: ["SITE_RESOURCES", siteResourceId, "ROLES"] as const,
+            queryFn: async ({ signal, meta }) => {
+                const res = await meta!.api.get<
+                    AxiosResponse<ListSiteResourceRolesResponse>
+                >(`/site-resource/${siteResourceId}/roles`, { signal });
+
+                return res.data.data.roles;
+            }
+        }),
+    siteResourceClients: ({ siteResourceId }: { siteResourceId: number }) =>
+        queryOptions({
+            queryKey: ["SITE_RESOURCES", siteResourceId, "CLIENTS"] as const,
             queryFn: async ({ signal, meta }) => {
                 const res = await meta!.api.get<
                     AxiosResponse<ListSiteResourceClientsResponse>
-                >(`/site-resource/${resourceId}/clients`, { signal });
+                >(`/site-resource/${siteResourceId}/clients`, { signal });
 
                 return res.data.data.clients;
             }