feat(KFLUXUI-175): give up SpaceBindingRequest and enjoy RoleBinding

konflux-ci · Jan 22, 2025 · 3ab4b52 · 3ab4b52
1 parent 94ef75c
commit 3ab4b52
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/src/components/UserAccess/index.ts b/src/components/UserAccess/index.ts
@@ -11,10 +11,7 @@ export const grantAccessPageLoader = createLoaderWithAccessCheck(() => null, {
   verb: 'create',
 });
 
-<<<<<<< HEAD
-=======
 // We delete and create roles which looks like 'patch'.
->>>>>>> 9edc1c1 (feat(KFLUXUI-175): give up SpaceBindingRequest and enjoy RoleBinding)
 export const editAccessPageLoader = createLoaderWithAccessCheck(() => null, {
   model: RoleBindingModel,
   verb: 'patch',

diff --git a/src/components/UserAccess/user-access-actions.ts b/src/components/UserAccess/user-access-actions.ts
@@ -36,11 +36,7 @@ export const useRBActions = (binding: RoleBinding): Action[] => {
     },
     {
       cta: () => showModal(revokeAccessModalLauncher(userSubject?.name, binding)),
-<<<<<<< HEAD
-      id: `revoke-access-${userSubject?.name}`, // Use subject name instead of masterUserRecord
-=======
       id: `revoke-access-${userSubject?.name}`,
->>>>>>> 9edc1c1 (feat(KFLUXUI-175): give up SpaceBindingRequest and enjoy RoleBinding)
       label: 'Revoke access',
       disabled: !canDelete,
       disabledTooltip: "You don't have permission to revoke access",