awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 02:29:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved upstream rebase conflict

Browse Source
This commit is contained in:
Akhil Mohan
2024-03-28 19:55:12 +05:30
parent e850b82fb3
commit f551a4158d
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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 ?? "";