fix: allow assigning cards to any member in a user's workspace
This commit is contained in:
@@ -126,7 +126,6 @@ const getActivityIcon = (
|
||||
fromIndex?: number | null,
|
||||
toIndex?: number | null,
|
||||
): React.ReactNode | null => {
|
||||
console.log({ fromIndex, toIndex });
|
||||
if (type === "card.updated.list" && fromIndex != null && toIndex != null) {
|
||||
return fromIndex > toIndex ? (
|
||||
<HiOutlineArrowLeft />
|
||||
|
||||
@@ -4,6 +4,7 @@ import { HiMiniPlus } from "react-icons/hi2";
|
||||
import Badge from "~/components/Badge";
|
||||
import CheckboxDropdown from "~/components/CheckboxDropdown";
|
||||
import { useModal } from "~/providers/modal";
|
||||
import { usePopup } from "~/providers/popup";
|
||||
import { api } from "~/utils/api";
|
||||
|
||||
interface LabelSelectorProps {
|
||||
@@ -14,6 +15,7 @@ interface LabelSelectorProps {
|
||||
selected: boolean;
|
||||
leftIcon: React.ReactNode;
|
||||
}[];
|
||||
refetchCard: () => Promise<void>;
|
||||
handleSelectLabel: (labelPublicId: string) => void;
|
||||
isLoading: boolean;
|
||||
}
|
||||
@@ -21,18 +23,25 @@ interface LabelSelectorProps {
|
||||
export default function LabelSelector({
|
||||
cardPublicId,
|
||||
labels,
|
||||
refetchCard,
|
||||
handleSelectLabel,
|
||||
isLoading,
|
||||
}: LabelSelectorProps) {
|
||||
const { openModal } = useModal();
|
||||
const utils = api.useUtils();
|
||||
|
||||
const refetchCard = () => utils.card.byId.refetch({ cardPublicId });
|
||||
const { showPopup } = usePopup();
|
||||
|
||||
const addOrRemoveLabel = api.card.addOrRemoveLabel.useMutation({
|
||||
onSuccess: async () => {
|
||||
await refetchCard();
|
||||
},
|
||||
onError: async () => {
|
||||
await refetchCard();
|
||||
showPopup({
|
||||
header: "Unable to update labels",
|
||||
message: "Please try again later, or contact customer support.",
|
||||
icon: "error",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
const selectedLabels = labels.filter((label) => label.selected);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { Menu } from "@headlessui/react";
|
||||
|
||||
import CheckboxDropdown from "~/components/CheckboxDropdown";
|
||||
import { usePopup } from "~/providers/popup";
|
||||
import { api } from "~/utils/api";
|
||||
|
||||
interface ListSelectorProps {
|
||||
@@ -10,6 +11,7 @@ interface ListSelectorProps {
|
||||
value: string;
|
||||
selected: boolean;
|
||||
}[];
|
||||
refetchCard: () => Promise<void>;
|
||||
handleChangeList: (newListPublicId: string, newListName: string) => void;
|
||||
isLoading: boolean;
|
||||
}
|
||||
@@ -18,16 +20,23 @@ export default function ListSelector({
|
||||
cardPublicId,
|
||||
lists,
|
||||
handleChangeList,
|
||||
refetchCard,
|
||||
isLoading,
|
||||
}: ListSelectorProps) {
|
||||
const utils = api.useUtils();
|
||||
|
||||
const refetchCard = () => utils.card.byId.refetch({ cardPublicId });
|
||||
const { showPopup } = usePopup();
|
||||
|
||||
const updateCardList = api.card.reorder.useMutation({
|
||||
onSuccess: async () => {
|
||||
await refetchCard();
|
||||
},
|
||||
onError: async () => {
|
||||
await refetchCard();
|
||||
showPopup({
|
||||
header: "Unable to update list",
|
||||
message: "Please try again later, or contact customer support.",
|
||||
icon: "error",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
const selectedList = lists.find((list) => list.selected);
|
||||
|
||||
@@ -18,6 +18,7 @@ interface MemberSelectorProps {
|
||||
imageUrl: string | undefined;
|
||||
}[];
|
||||
handleSelectMember: (memberPublicId: string) => void;
|
||||
refetchCard: () => Promise<void>;
|
||||
isLoading: boolean;
|
||||
}
|
||||
|
||||
@@ -25,14 +26,12 @@ export default function MemberSelector({
|
||||
cardPublicId,
|
||||
members,
|
||||
handleSelectMember,
|
||||
refetchCard,
|
||||
isLoading,
|
||||
}: MemberSelectorProps) {
|
||||
const router = useRouter();
|
||||
const { openModal } = useModal();
|
||||
const { showPopup } = usePopup();
|
||||
const utils = api.useUtils();
|
||||
|
||||
const refetchCard = () => utils.card.byId.refetch({ cardPublicId });
|
||||
|
||||
const addOrRemoveMember = api.card.addOrRemoveMember.useMutation({
|
||||
onSuccess: async () => {
|
||||
|
||||
@@ -44,10 +44,20 @@ export default function CardPage() {
|
||||
? router.query.cardId[0]
|
||||
: router.query.cardId;
|
||||
|
||||
const { data, isLoading } = api.card.byId.useQuery({
|
||||
const { data, isLoading, refetch } = api.card.byId.useQuery({
|
||||
cardPublicId: cardId ?? "",
|
||||
});
|
||||
|
||||
const refetchCard = async () => {
|
||||
try {
|
||||
const { data: updatedCard } = await refetch();
|
||||
|
||||
if (updatedCard) setCard(updatedCard);
|
||||
} catch (error) {
|
||||
console.error({ error });
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
setCard(data);
|
||||
}, [data]);
|
||||
@@ -180,9 +190,11 @@ export default function CardPage() {
|
||||
|
||||
const updateCard = api.card.update.useMutation({
|
||||
onSuccess: async () => {
|
||||
await utils.card.byId.refetch();
|
||||
await refetchCard();
|
||||
},
|
||||
onError: () => {
|
||||
onError: async () => {
|
||||
await refetchCard();
|
||||
|
||||
showPopup({
|
||||
header: "Unable to update card",
|
||||
message: "Please try again later, or contact customer support.",
|
||||
@@ -295,6 +307,7 @@ export default function CardPage() {
|
||||
<ListSelector
|
||||
cardPublicId={cardId}
|
||||
lists={formattedLists}
|
||||
refetchCard={refetchCard}
|
||||
handleChangeList={handleChangeList}
|
||||
isLoading={isLoading}
|
||||
/>
|
||||
@@ -304,6 +317,7 @@ export default function CardPage() {
|
||||
<LabelSelector
|
||||
cardPublicId={cardId}
|
||||
labels={formattedLabels}
|
||||
refetchCard={refetchCard}
|
||||
handleSelectLabel={handleSelectLabel}
|
||||
isLoading={isLoading}
|
||||
/>
|
||||
@@ -313,6 +327,7 @@ export default function CardPage() {
|
||||
<MemberSelector
|
||||
cardPublicId={cardId}
|
||||
members={formattedMembers}
|
||||
refetchCard={refetchCard}
|
||||
handleSelectMember={handleSelectMember}
|
||||
isLoading={isLoading}
|
||||
/>
|
||||
|
||||
@@ -582,9 +582,11 @@ USING (
|
||||
"workspaceMemberId" IN (
|
||||
SELECT wm.id
|
||||
FROM workspace_members wm
|
||||
JOIN workspace w ON wm."workspaceId" = w.id
|
||||
JOIN board b ON w.id = b."workspaceId"
|
||||
WHERE wm."userId" = auth.uid()
|
||||
WHERE wm."workspaceId" IN (
|
||||
SELECT "workspaceId"
|
||||
FROM workspace_members
|
||||
WHERE "userId" = auth.uid()
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user