Commitcd86a9c

committed

Dedupe disable org permission query

1 parentf6dfce0 commitcd86a9cCopy full SHA for cd86a9c

File tree

+19

-27

lines changed

+19

-27

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,13 @@ export const organizations = () => {`
`110`	`110`
`111`	`111`	`/**`
`112`	`112`	`* Fetch permissions for a single organization.`
	`113`	`+ *`
	`114`	`+ * If the ID is undefined, return a disabled query.`
`113`	`115`	`*/`
`114`		`-exportconstorganizationPermissions=(organizationId:string)=>{`
	`116`	`+exportconstorganizationPermissions=(organizationId:string\|undefined)=>{`
	`117`	`+if(!organizationId){`
	`118`	`+return{enabled:false};`
	`119`	`+}`
`115`	`120`	`return{`
`116`	`121`	`queryKey:["organization",organizationId,"permissions"],`
`117`	`122`	`queryFn:()=>`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,7 @@ export const GroupsPage: FC = () => {`
`29`	`29`	`// TODO: If we could query permissions based on the name then we would not`
`30`	`30`	`// have to cascade off the organizations query.`
`31`	`31`	`constorganization=organizations?.find((o)=>o.name===organizationName);`
`32`		`-constpermissionsQuery=useQuery(`
`33`		`-organization`
`34`		`- ?organizationPermissions(organization.id)`
`35`		`- :{enabled:false},`
`36`		`-);`
	`32`	`+constpermissionsQuery=useQuery(organizationPermissions(organization?.id));`
`37`	`33`
`38`	`34`	`useEffect(()=>{`
`39`	`35`	`if(groupsQuery.error){`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,7 @@ const OrganizationMembersPage: FC = () => {`
`64`	`64`	`// have to cascade off the organizations query.`
`65`	`65`	`const{ organizations}=useOrganizationSettings();`
`66`	`66`	`constorganization=organizations?.find((o)=>o.name===organizationName);`
`67`		`-constpermissionsQuery=useQuery(`
`68`		`-organization`
`69`		`- ?organizationPermissions(organization.id)`
`70`		`- :{enabled:false},`
`71`		`-);`
	`67`	`+constpermissionsQuery=useQuery(organizationPermissions(organization?.id));`
`72`	`68`
`73`	`69`	`constpermissions=permissionsQuery.data;`
`74`	`70`	`if(!permissions){`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,10 @@ const OrganizationSettingsPage: FC = () => {`
`32`	`32`	`// TODO: If we could query permissions based on the name then we would not`
`33`	`33`	`// have to cascade off the organizations query.`
`34`	`34`	`constorganization=`
`35`		`-organizations&&`
`36`		`-organizationName&&`
`37`		`-getOrganizationByName(organizations,organizationName);`
`38`		`-constpermissionsQuery=useQuery(`
`39`		`-organization`
`40`		`- ?organizationPermissions(organization.id)`
`41`		`- :{enabled:false},`
`42`		`-);`
	`35`	`+organizations&&organizationName`
	`36`	`+ ?getOrganizationByName(organizations,organizationName)`
	`37`	`+ :undefined;`
	`38`	`+constpermissionsQuery=useQuery(organizationPermissions(organization?.id));`
`43`	`39`
`44`	`40`	`if(!organizations){`
`45`	`41`	`return<Loader/>;`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,14 +164,13 @@ interface OrganizationSettingsNavigationProps {`
`164`	`164`	`exportconstOrganizationSettingsNavigation:FC<`
`165`	`165`	`OrganizationSettingsNavigationProps`
`166`	`166`	`>=({ organization, active})=>{`
`167`		`-constpermissionsQuery=useQuery({`
`168`		`- ...organizationPermissions(organization.id),`
`169`		`-// The menu items only show while the menu is expanded, so we can wait until`
`170`		`-// expanded to run the query. Downside is that we have to show a loader`
`171`		`-// until the query finishes...maybe we should prefetch permissions for all`
`172`		`-// the orgs instead?`
`173`		`-enabled:active,`
`174`		`-});`
	`167`	`+// The menu items only show while the menu is expanded, so we can wait until`
	`168`	`+// expanded to run the query. Downside is that we have to show a loader`
	`169`	`+// until the query finishes...maybe we should prefetch permissions for all`
	`170`	`+// the orgs instead?`
	`171`	`+constpermissionsQuery=useQuery(`
	`172`	`+organizationPermissions(active ?organization.id :undefined),`
	`173`	`+);`
`175`	`174`
`176`	`175`	`return(`
`177`	`176`	`<>`

Comments

(0)