fix: prevent provider error for public boards
This commit is contained in:
@@ -12,7 +12,6 @@ import {
|
|||||||
import type { GetCardByIdOutput } from "@kan/api/types";
|
import type { GetCardByIdOutput } from "@kan/api/types";
|
||||||
|
|
||||||
import Avatar from "~/components/Avatar";
|
import Avatar from "~/components/Avatar";
|
||||||
import { useWorkspace } from "~/providers/workspace";
|
|
||||||
import Comment from "./Comment";
|
import Comment from "./Comment";
|
||||||
|
|
||||||
type ActivityType =
|
type ActivityType =
|
||||||
@@ -141,13 +140,13 @@ const ActivityList = ({
|
|||||||
activities,
|
activities,
|
||||||
cardPublicId,
|
cardPublicId,
|
||||||
isLoading,
|
isLoading,
|
||||||
|
isAdmin,
|
||||||
}: {
|
}: {
|
||||||
activities: NonNullable<GetCardByIdOutput>["activities"];
|
activities: NonNullable<GetCardByIdOutput>["activities"];
|
||||||
cardPublicId: string;
|
cardPublicId: string;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
|
isAdmin?: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
const { workspace } = useWorkspace();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col space-y-4 pt-4">
|
<div className="flex flex-col space-y-4 pt-4">
|
||||||
{activities.map((activity, index) => {
|
{activities.map((activity, index) => {
|
||||||
@@ -174,7 +173,7 @@ const ActivityList = ({
|
|||||||
comment={activity.comment?.comment}
|
comment={activity.comment?.comment}
|
||||||
isEdited={!!activity.comment?.updatedAt}
|
isEdited={!!activity.comment?.updatedAt}
|
||||||
isAuthor={activity.comment?.createdBy === activity.user?.id}
|
isAuthor={activity.comment?.createdBy === activity.user?.id}
|
||||||
isAdmin={workspace.role === "admin"}
|
isAdmin={isAdmin ?? false}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
|
|||||||
import { PageHead } from "~/components/PageHead";
|
import { PageHead } from "~/components/PageHead";
|
||||||
import { useModal } from "~/providers/modal";
|
import { useModal } from "~/providers/modal";
|
||||||
import { usePopup } from "~/providers/popup";
|
import { usePopup } from "~/providers/popup";
|
||||||
|
import { useWorkspace } from "~/providers/workspace";
|
||||||
import { api } from "~/utils/api";
|
import { api } from "~/utils/api";
|
||||||
import { formatMemberDisplayName } from "~/utils/helpers";
|
import { formatMemberDisplayName } from "~/utils/helpers";
|
||||||
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
|
import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
|
||||||
@@ -36,6 +37,7 @@ export default function CardPage() {
|
|||||||
const utils = api.useUtils();
|
const utils = api.useUtils();
|
||||||
const { modalContentType, entityId } = useModal();
|
const { modalContentType, entityId } = useModal();
|
||||||
const { showPopup } = usePopup();
|
const { showPopup } = usePopup();
|
||||||
|
const { workspace } = useWorkspace();
|
||||||
|
|
||||||
const cardId = Array.isArray(router.query.cardId)
|
const cardId = Array.isArray(router.query.cardId)
|
||||||
? router.query.cardId[0]
|
? router.query.cardId[0]
|
||||||
@@ -206,6 +208,7 @@ export default function CardPage() {
|
|||||||
cardPublicId={cardId}
|
cardPublicId={cardId}
|
||||||
activities={activities ?? []}
|
activities={activities ?? []}
|
||||||
isLoading={isLoading}
|
isLoading={isLoading}
|
||||||
|
isAdmin={workspace.role === "admin"}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-6">
|
<div className="mt-6">
|
||||||
|
|||||||
Reference in New Issue
Block a user