init rbac db schema #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
packages/auth/src/rbac/index.ts
Outdated
| workspace, | ||
| } from "@ctrlplane/db/schema"; | ||
|
|
||
| const scopeHierarchy: Array<ScopeType> = ["deployment", "system", "workspace"]; |
There was a problem hiding this comment.
How exactly is the Hierarchy defined?
is it left to right?
.orderBy(sql`ARRAY_POSITION(${scopeHierarchy}, ${entityRole.scopeType})`)
Comment on lines
+55
to
+61
| try { | ||
| const system = await create.mutateAsync({ workspaceId, ...values }); | ||
| await utils.system.list.invalidate(); | ||
| router.push(`/${workspaceSlug}/systems/${system.slug}`); | ||
| } catch (e) { | ||
| console.error(e); | ||
| } |
There was a problem hiding this comment.
I will handle this with the slug validation once my other PR looks good.
Comment on lines
+95
to
+98
| <SelectTrigger className="w-[200px]"> | ||
| <SelectValue placeholder="Select a role" /> | ||
| </SelectTrigger> | ||
| <SelectContent className="w-[200px]"> |
There was a problem hiding this comment.
w-48 | width: 12rem; /* 192px */
w-52 | width: 13rem; /* 208px */
|
|
||
| return ( | ||
| <Select defaultValue={currentRoleId}> | ||
| <SelectTrigger className="w-[230px]"> |
There was a problem hiding this comment.
w-56 | width: 14rem; /* 224px */
w-60 | width: 15rem; /* 240px */
packages/api/src/router/user.ts
Outdated
Comment on lines
35
to
47
| // viewerAllPermissions: protectedProcedure.query(({ ctx }) => | ||
| // ctx.db | ||
| // .selectDistinct({ permission: rolePermission.permission }) | ||
| // .from(rolePermission) | ||
| // .innerJoin(role, eq(role.id, rolePermission.roleId)) | ||
| // .innerJoin(entityRole, eq(entityRole.roleId, role.id)) | ||
| // .innerJoin( | ||
| // user, | ||
| // and(eq(user.id, entityRole.id), eq(entityRole.entityType, "user")), | ||
| // ) | ||
| // .where(eq(user.id, ctx.session.user.id)), | ||
| // ), | ||
|
|
zacharyblasczyk
approved these changes
Sep 6, 2024
|
Just fix the build and lint. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.