The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix: updated project level settings with incorrect fetching (#43706)
Ali Waseem96a38d356abb
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesConfirmationModal.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesConfirmationModal.tsxindex 06aa878386a..4362ea1e8b3 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesConfirmationModal.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesConfirmationModal.tsx@@ -1,7 +1,4 @@import { useQueryClient } from '@tanstack/react-query'-import { useMemo, useState } from 'react'-import { toast } from 'sonner'-import { useParams } from 'common'import { organizationKeys } from 'data/organization-members/keys'import { useOrganizationMemberAssignRoleMutation } from 'data/organization-members/organization-member-role-assign-mutation'@@ -13,14 +10,16 @@ import {} from 'data/organization-members/organization-roles-query'import { organizationKeys as organizationKeysV1 } from 'data/organizations/keys'import { OrganizationMember } from 'data/organizations/organization-members-query'-import { useOrgProjectsInfiniteQuery } from 'data/projects/org-projects-infinite-query'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'+import { useState } from 'react'+import { toast } from 'sonner'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'+import {- ProjectRoleConfiguration,deriveChanges,deriveRoleChangeActions,formatMemberRoleToProjectRoleConfiguration,+ ProjectRoleConfiguration,} from './UpdateRolesPanel.utils'interface UpdateRolesConfirmationModal {@@ -42,10 +41,6 @@ export const UpdateRolesConfirmationModal = ({const { data: allRoles } = useOrganizationRolesV2Query({ slug: organization?.slug })- const { data: projectsData } = useOrgProjectsInfiniteQuery({ slug })- const orgProjects =- useMemo(() => projectsData?.pages.flatMap((page) => page.projects), [projectsData?.pages]) || []-// [Joshen] Separate saving state instead of using RQ due to several successive stepsconst [saving, setSaving] = useState(false)const { mutateAsync: assignRole } = useOrganizationMemberAssignRoleMutation()@@ -72,21 +67,6 @@ export const UpdateRolesConfirmationModal = ({.map((id) => {return [...org_scoped_roles, ...project_scoped_roles].find((r) => r.id === id)})- .map((x) => {- // [Joshen] This is merely a patch to handle a issue on the BE whereby for a project-scoped member,- // if one of the projects that the member is deleted, the roles isn't cleaned up on the BE- // Hence adding an FE patch here for dashboard to self-remediate by omitting any project IDs from the role- // which no longer exists in the organization projects list.- // Note that because orgProjects is paginated, this is not always guaranteed- if ((x?.projects ?? []).length > 0) {- return {- ...x,- projects: x?.projects.filter(({ ref }) => orgProjects.some((p) => p.ref === ref)) ?? [],- }- } else {- return x- }- }).filter(Boolean) as OrganizationRole[]const isChangeWithinOrgScope =diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsxindex 6f6f3d2a77c..6a84e033f8c 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx@@ -1,7 +1,3 @@-import { isEqual } from 'lodash'-import { ChevronDown, X } from 'lucide-react'-import { useEffect, useMemo, useState } from 'react'-import { useParams } from 'common'import { ButtonTooltip } from 'components/ui/ButtonTooltip'import { DocsButton } from 'components/ui/DocsButton'@@ -13,19 +9,23 @@ import { OrgProject, useOrgProjectsInfiniteQuery } from 'data/projects/org-projeimport { useHasAccessToProjectLevelPermissions } from 'data/subscriptions/org-subscription-query'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { DOCS_URL } from 'lib/constants'+import { isEqual } from 'lodash'+import { ChevronDown, X } from 'lucide-react'+import { useEffect, useMemo, useState } from 'react'import {+ Alert_Shadcn_,AlertDescription_Shadcn_,AlertTitle_Shadcn_,- Alert_Shadcn_,Button,+ cn,+ Collapsible_Shadcn_,CollapsibleContent_Shadcn_,CollapsibleTrigger_Shadcn_,- Collapsible_Shadcn_,+ Select_Shadcn_,SelectContent_Shadcn_,SelectGroup_Shadcn_,SelectItem_Shadcn_,SelectTrigger_Shadcn_,- Select_Shadcn_,Sheet,SheetContent,SheetFooter,@@ -36,13 +36,13 @@ import {TooltipContent,TooltipTrigger,WarningIcon,- cn,} from 'ui'+import { useGetRolesManagementPermissions } from '../TeamSettings.utils'import { UpdateRolesConfirmationModal } from './UpdateRolesConfirmationModal'import {- ProjectRoleConfiguration,formatMemberRoleToProjectRoleConfiguration,+ ProjectRoleConfiguration,} from './UpdateRolesPanel.utils'interface UpdateRolesPanelProps {@@ -97,7 +97,9 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelPconst noAccessProjects = orgProjects.filter((project) => {return !projectsRoleConfiguration.some((p) => p.ref === project.ref)})- const numberOfProjectsWithAccess = orgProjects.length - noAccessProjects.length+ const numberOfProjectsWithAccess = projectsRoleConfiguration.filter(+ (p) => p.ref !== undefined+ ).lengthconst hasNoChanges = isEqual(projectsRoleConfiguration, originalConfiguration)const onSelectProject = (project: OrgProject) => {