awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39: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-26 22:52:38 +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

2
backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts → backend/src/db/migrations/20240326172010_project-user-additional-privilege.ts
View File

@@ -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);

2
backend/src/db/migrations/20240315102813_machine-identity-additional-privilege.ts → backend/src/db/migrations/20240326172011_machine-identity-additional-privilege.ts
View File

@@ -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")

4
frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeForm.tsx
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 } =

4
frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeSection.tsx
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();

4
frontend/src/views/Project/MembersPage/components/AdditionalPrivilegeSection/AdditionalPrivilegeTemporaryAccess.tsx
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: {

4
frontend/src/views/Project/MembersPage/components/IdentityTab/IdentityTab.tsx
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 ?? "";