feat(rbac): resolved merge conflict

frontend/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx

@@ -12,11 +12,10 @@ type Props = {
 const ProjectPermissionContext = createContext<null | TProjectPermission>(null);
 
 export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentWorkspace, isLoading: isWsLoading } = useWorkspace();
   const workspaceId = currentWorkspace?._id || "";
   const { data: permission, isLoading } = useGetUserProjectPermissions({ workspaceId });
 
-  console.log(workspaceId);
   if (!permission && currentWorkspace) {
     return (
       <div className="flex items-center justify-center w-screen h-screen bg-bunker-800">
@@ -25,7 +24,7 @@ export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
     );
   }
 
-  if (isLoading && workspaceId) {
+  if ((isLoading && currentWorkspace) || isWsLoading) {
     return (
       <div className="flex items-center justify-center w-screen h-screen bg-bunker-800">
         <img

frontend/src/views/DashboardPage/DashboardPage.tsx

@@ -56,7 +56,13 @@ import {
   UpgradePlanModal
 } from "@app/components/v2";
 import { leaveConfirmDefaultMessage } from "@app/const";
-import { ProjectPermissionActions, ProjectPermissionSub,useOrganization, useSubscription, useWorkspace  } from "@app/context";
+import {
+  ProjectPermissionActions,
+  ProjectPermissionSub,
+  useOrganization,
+  useSubscription,
+  useWorkspace
+} from "@app/context";
 import { withProjectPermission } from "@app/hoc";
 import { useLeaveConfirm, usePopUp, useToggle } from "@app/hooks";
 import {
@@ -522,11 +528,12 @@ export const DashboardPage = withProjectPermission(
     );
 
     const onCreateWsTag = useCallback(
-      async (tagName: string) => {
+      async (tagName: string, tagColor: string) => {
         try {
           await createWsTag({
             workspaceID: workspaceId,
             tagName,
+            tagColor,
             tagSlug: tagName.replace(" ", "_")
           });
           handlePopUpClose("addTag");
@@ -862,7 +869,7 @@ export const DashboardPage = withProjectPermission(
                       }}
                       leftIcon={<FontAwesomeIcon icon={faCodeCommit} />}
                       isLoading={isLoadingSnapshotCount}
-                      isDisabled={!canDoRollback || !isAllowed}
+                      isDisabled={!canDoRollback && !isAllowed}
                       className="h-10"
                     >
                       {snapshotCount} Commits

frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx

@@ -7,7 +7,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
-import { OrgPermissionCan, ProjectPermissionCan } from "@app/components/permissions";
+import { ProjectPermissionCan } from "@app/components/permissions";
 import {
   decryptAssymmetric,
   encryptAssymmetric
@@ -34,8 +34,6 @@ import {
   UpgradePlanModal
 } from "@app/components/v2";
 import {
-  GeneralPermissionActions,
-  OrgPermissionSubjects,
   ProjectPermissionActions,
   ProjectPermissionSub,
   useOrganization,