From f551a4158def93224d83d4ffe8fb1bce733641df Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Tue, 26 Mar 2024 22:52:38 +0530 Subject: [PATCH] feat: resolved upstream rebase conflict --- ...ts => 20240326172010_project-user-additional-privilege.ts} | 2 -- ...> 20240326172011_machine-identity-additional-privilege.ts} | 2 -- .../AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx | 4 ++-- .../AdditionalPrivilegeSection/AdditionalPrivilegeSection.tsx | 4 ++-- .../AdditionalPrivilegeTemporaryAccess.tsx | 4 ++-- .../MembersPage/components/IdentityTab/IdentityTab.tsx | 4 ++-- 6 files changed, 8 insertions(+), 12 deletions(-) rename backend/src/db/migrations/{20240313185040_project-user-additional-privilege.ts => 20240326172010_project-user-additional-privilege.ts} (94%) rename backend/src/db/migrations/{20240315102813_machine-identity-additional-privilege.ts => 20240326172011_machine-identity-additional-privilege.ts} (95%) diff --git a/backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts b/backend/src/db/migrations/20240326172010_project-user-additional-privilege.ts similarity index 94% rename from backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts rename to backend/src/db/migrations/20240326172010_project-user-additional-privilege.ts index 0d9d81507..0366ba507 100644 --- a/backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts +++ b/backend/src/db/migrations/20240326172010_project-user-additional-privilege.ts @@ -7,9 +7,7 @@ export async function up(knex: Knex): Promise { 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); diff --git a/backend/src/db/migrations/20240315102813_machine-identity-additional-privilege.ts b/backend/src/db/migrations/20240326172011_machine-identity-additional-privilege.ts similarity index 95% rename from backend/src/db/migrations/20240315102813_machine-identity-additional-privilege.ts rename to backend/src/db/migrations/20240326172011_machine-identity-additional-privilege.ts index 143fa6bdd..c59fc685a 100644 --- a/backend/src/db/migrations/20240315102813_machine-identity-additional-privilege.ts +++ b/backend/src/db/migrations/20240326172011_machine-identity-additional-privilege.ts @@ -7,9 +7,7 @@ export async function up(knex: Knex): Promise { 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") diff --git a/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx b/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx index a6f1d2a48..767b9a6f9 100644 --- a/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx +++ b/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 } = diff --git a/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeSection.tsx b/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeSection.tsx index 9940691e1..581925ffd 100644 --- a/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeSection.tsx +++ b/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(); diff --git a/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeTemporaryAccess.tsx b/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeTemporaryAccess.tsx index faa670f05..d45e9139e 100644 --- a/frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeTemporaryAccess.tsx +++ b/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({ resolver: zodResolver(temporaryRoleFormSchema), values: { diff --git a/frontend/src/views/Project/MembersPage/components/IdentityTab/IdentityTab.tsx b/frontend/src/views/Project/MembersPage/components/IdentityTab/IdentityTab.tsx index 3aa301583..58577f1ec 100644 --- a/frontend/src/views/Project/MembersPage/components/IdentityTab/IdentityTab.tsx +++ b/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 ?? "";