mirror/formbricks-formbricks
1
0
Fork 0
mirror of https://github.com/formbricks/formbricks.git synced 2026-02-21 14:29:20 -06:00
Code Issues Packages Projects Releases 100 Wiki Activity

Feat: Add a column to add user roles

Browse Source
This commit is contained in:
Ashutosh-Bhadauriya
2023-06-14 20:52:47 +05:30
parent bbec1c9066
commit 7554ab4d97
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web/app/environments/[environmentId]/attributes/AttributeClassesList.tsx
View File

@@ -8,6 +8,7 @@ import { useState } from "react";
import AttributeDetailModal from "./AttributeDetailModal";
import UploadAttributesModal from "./UploadAttributesModal";
import { timeSinceConditionally } from "@formbricks/lib/time";
import { useMemo } from "react";
export default function AttributeClassesList({ environmentId }: { environmentId: string }) {
const { attributeClasses, isLoadingAttributeClasses, isErrorAttributeClasses } =
@@ -18,6 +19,14 @@ export default function AttributeClassesList({ environmentId }: { environmentId:
const [activeAttributeClass, setActiveAttributeClass] = useState("" as any);
const [showArchived, setShowArchived] = useState(false);
const displayedAttributeClasses = useMemo(() => {
return attributeClasses ? (showArchived ? attributeClasses : attributeClasses.filter(ac => !ac.archived)) : [];
}, [showArchived, attributeClasses]);
const hasArchived = useMemo(() => {
return attributeClasses ? attributeClasses.some(ac => ac.archived) : false;
}, [attributeClasses]);
if (isLoadingAttributeClasses) {
return <LoadingSpinner />;
}
@@ -35,9 +44,6 @@ export default function AttributeClassesList({ environmentId }: { environmentId:
setShowArchived(!showArchived);
};
const displayedAttributeClasses = showArchived ? attributeClasses : attributeClasses.filter(ac => !ac.archived);
const hasArchived = attributeClasses.some(ac => ac.archived);
return (
<>
<div className="mb-6 text-right flex items-center justify-end">

11
apps/web/app/environments/[environmentId]/settings/members/EditMemberships.tsx
View File

@@ -17,6 +17,7 @@ import { useState } from "react";
import toast from "react-hot-toast";
import AddMemberModal from "./AddMemberModal";
import CreateTeamModal from "@/components/team/CreateTeamModal";
import { capitalizeFirstLetter } from "@/lib/utils";
type EditMembershipsProps = {
environmentId: string;
@@ -86,16 +87,17 @@ export function EditMemberships({ environmentId }: EditMembershipsProps) {
</Button>
</div>
<div className="rounded-lg border border-slate-200">
<div className="grid h-12 grid-cols-7 content-center rounded-t-lg bg-slate-100 text-left text-sm font-semibold text-slate-900">
<div className="grid h-12 grid-cols-8 content-center rounded-t-lg bg-slate-100 text-left text-sm font-semibold text-slate-900">
<div className="px-6"></div>
<div className="col-span-2">Fullname</div>
<div className="col-span-2">Email</div>
<div className="">Role</div>
<div className=""></div>
</div>
<div className="grid-cols-7">
<div className="grid-cols-8">
{[...team.members, ...team.invitees].map((member) => (
<div
className="grid h-auto w-full grid-cols-7 content-center rounded-lg p-0.5 py-2 text-left text-sm text-slate-900"
className="grid h-auto w-full grid-cols-8 content-center rounded-lg p-0.5 py-2 text-left text-sm text-slate-900"
key={member.email}>
<div className="h-58 px-6 ">
<ProfileAvatar userId={member.userId || member.email} />
@@ -106,6 +108,9 @@ export function EditMemberships({ environmentId }: EditMembershipsProps) {
<div className="ph-no-capture col-span-2 flex flex-col justify-center break-all">
{member.email}
</div>
<div className="ph-no-capture col-span-1 flex flex-col justify-center items-start break-all">
<Badge text={capitalizeFirstLetter(member.role)} type="gray" size="tiny" />
</div>
<div className="col-span-2 flex items-center justify-end gap-x-6 pr-6">
{!member.accepted && <Badge type="warning" text="Pending" size="tiny" />}
{member.role !== "owner" && (