feat: resolved upstream rebase conflict

backend/src/db/migrations/20240326172010_project-user-additional-privilege.ts

@@ -7,9 +7,7 @@ export async function up(knex: Knex): Promise<void> {
   if (!(await knex.schema.hasTable(TableName.ProjectUserAdditionalPrivilege))) {
     await knex.schema.createTable(TableName.ProjectUserAdditionalPrivilege, (t) => {
       t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
-      t.string("name").notNullable();
       t.string("slug", 60).notNullable();
-      t.string("description");
       t.uuid("projectMembershipId").notNullable();
       t.foreign("projectMembershipId").references("id").inTable(TableName.ProjectMembership).onDelete("CASCADE");
       t.boolean("isTemporary").notNullable().defaultTo(false);

backend/src/db/migrations/20240326172011_machine-identity-additional-privilege.ts

@@ -7,9 +7,7 @@ export async function up(knex: Knex): Promise<void> {
   if (!(await knex.schema.hasTable(TableName.IdentityProjectAdditionalPrivilege))) {
     await knex.schema.createTable(TableName.IdentityProjectAdditionalPrivilege, (t) => {
       t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
-      t.string("name").notNullable();
       t.string("slug", 60).notNullable();
-      t.string("description");
       t.uuid("projectMembershipId").notNullable();
       t.foreign("projectMembershipId")
         .references("id")

frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx

@@ -18,7 +18,7 @@ import {
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
 
-import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import { createNotification } from "@app/components/notifications";
 import guidGenerator from "@app/components/utilities/randomId";
 import { Button, FormControl, Input, Spinner } from "@app/components/v2";
 import { ProjectPermissionSub } from "@app/context";
@@ -134,7 +134,7 @@ export const AdditionalPrivilegeForm = ({
   workspaceId,
   isIdentity
 }: Props) => {
-  const { createNotification } = useNotificationContext();
+  
   const isEdit = Boolean(privilegeId);
 
   const { data: projectUserPrivilegeDetails, isLoading: isProjectUserPrivilegeLoading } =

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

@@ -8,7 +8,7 @@ import {
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { motion } from "framer-motion";
 
-import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import { createNotification } from "@app/components/notifications";
 import {
   Button,
   DeleteActionModal,
@@ -48,7 +48,7 @@ export const AdditionalPrivilegeSection = ({
     "modifyPrivilege",
     "deletePrivilege"
   ] as const);
-  const { createNotification } = useNotificationContext();
+  
   const { currentWorkspace } = useWorkspace();
   const workspaceId = currentWorkspace?.id || "";
   const deleteProjectUserAdditionalPrivilege = useDeleteProjectUserAdditionalPrivilege();

frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeTemporaryAccess.tsx

@@ -5,7 +5,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { twMerge } from "tailwind-merge";
 import { z } from "zod";
 
-import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import { createNotification } from "@app/components/notifications";
 import {
   Button,
   FormControl,
@@ -50,7 +50,7 @@ export const AdditionalPrivilegeTemporaryAccess = ({
   isIdentity
 }: TTemporaryRoleFormProps) => {
   const { popUp, handlePopUpToggle } = usePopUp(["setTempRole"] as const);
-  const { createNotification } = useNotificationContext();
+  
   const { control, handleSubmit } = useForm<TTemporaryRoleFormSchema>({
     resolver: zodResolver(temporaryRoleFormSchema),
     values: {

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

@@ -11,7 +11,7 @@ import { format } from "date-fns";
 import { motion } from "framer-motion";
 import { twMerge } from "tailwind-merge";
 
-import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import {
     Button,
@@ -38,7 +38,7 @@ import { IdentityRoles } from "./components/IdentityRoles";
 
 export const IdentityTab = withProjectPermission(
     () => {
-        const { createNotification } = useNotificationContext();
+        
         const { currentWorkspace } = useWorkspace();
 
         const workspaceId = currentWorkspace?.id ?? "";