feat: update requestedRole filter

sanity-io · Oct 1, 2024 · 3117cb9 · 3117cb9
1 parent 8a8fbe2
commit 3117cb9
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/packages/sanity/src/structure/components/requestPermissionDialog/RequestPermissionDialog.tsx b/packages/sanity/src/structure/components/requestPermissionDialog/RequestPermissionDialog.tsx
@@ -64,14 +64,18 @@ export function RequestPermissionDialog({
   const requestedRole$: Observable<'administrator' | 'editor'> = useMemo(() => {
     const adminRole = 'administrator' as const
     if (!projectId || !client) return of(adminRole)
-    return client.observable.request<Role[]>({url: `/projects/${projectId}/roles`}).pipe(
-      map((roles) => {
-        const hasEditor = roles.find((role) => role.name === 'editor')
-        return hasEditor ? 'editor' : adminRole
-      }),
-      startWith(adminRole),
-      catchError(() => of(adminRole)),
-    )
+    return client.observable
+      .request<(Role & {appliesToUsers?: boolean})[]>({url: `/projects/${projectId}/roles`})
+      .pipe(
+        map((roles) => {
+          const hasEditor = roles
+            .filter((role) => role?.appliesToUsers)
+            .find((role) => role.name === 'editor')
+          return hasEditor ? 'editor' : adminRole
+        }),
+        startWith(adminRole),
+        catchError(() => of(adminRole)),
+      )
   }, [projectId, client])
 
   const requestedRole = useObservable(requestedRole$)