binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: projects page flickering, mutation of workspace members

Browse source
This commit is contained in:
Dakshesh Jain 2022-12-07 10:15:57 +05:30
parent 02f0d14dc0
commit e4de5e62c9
10 changed files with 101 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/app/pages/projects/[projectId]/members.tsx
View file

@ -235,7 +235,7 @@ const ProjectMembers: NextPage = () => {
)}
</td>
<td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 sm:pl-6">
{member.status ? (
{member.member ? (
<span className="p-0.5 px-2 text-sm bg-green-700 text-white rounded-full">
Active
</span>
@ -261,7 +261,7 @@ const ProjectMembers: NextPage = () => {
className="w-full text-left py-2 pl-2"
type="button"
onClick={() => {
if (!member.status) {
if (!member.member) {
setToastAlert({
type: "error",
message: "You can't edit a pending invitation.",
@ -282,7 +282,7 @@ const ProjectMembers: NextPage = () => {
className="w-full text-left py-2 pl-2"
type="button"
onClick={() => {
if (member.status) {
if (member.member) {
setSelectedRemoveMember(member.id);
} else {
setSelectedInviteRemoveMember(member.id);

2
apps/app/pages/projects/[projectId]/settings.tsx
View file

@ -78,7 +78,7 @@ const ProjectSettings: NextPage = () => {
);
const { data: people } = useSWR<WorkspaceMember[]>(
activeWorkspace ? WORKSPACE_MEMBERS : null,
activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
);