fix use-org

Author: izadoesdev

apps/dashboard/components/date-range-picker.tsx

@@ -19,10 +19,10 @@ import { useIsMobile } from "@/hooks/use-mobile";
 import { formatMonthDay } from "@/lib/formatters";
 import { cn } from "@/lib/utils";
 
-type PresetRange = {
+interface PresetRange {
 	label: string;
 	getValue: () => DateRange;
-};
+}
 
 const PRESET_RANGES: PresetRange[] = [
 	{
@@ -83,14 +83,14 @@ const PRESET_RANGES: PresetRange[] = [
 	},
 ];
 
-type DateRangePickerProps = {
+interface DateRangePickerProps {
 	className?: string;
 	value?: DateRange;
 	onChange?: (dateRange: DateRange | undefined) => void;
 	disabled?: boolean;
 	maxDate?: Date;
 	minDate?: Date;
-};
+}
 
 export function DateRangePicker({
 	className,
@@ -111,12 +111,16 @@ export function DateRangePicker({
 	}, [value, isOpen]);
 
 	const daysDiff = useMemo(() => {
-		if (!(tempRange?.from && tempRange?.to)) return 0;
+		if (!(tempRange?.from && tempRange?.to)) {
+			return 0;
+		}
 		return dayjs(tempRange.to).diff(dayjs(tempRange.from), "day") + 1;
 	}, [tempRange]);
 
 	const activePreset = useMemo(() => {
-		if (!(tempRange?.from && tempRange?.to)) return null;
+		if (!(tempRange?.from && tempRange?.to)) {
+			return null;
+		}
 		return PRESET_RANGES.find((preset) => {
 			const presetRange = preset.getValue();
 			return (
@@ -158,7 +162,9 @@ export function DateRangePicker({
 	);
 
 	const formatDisplayRange = useCallback((range: DateRange | undefined) => {
-		if (!(range?.from && range?.to)) return "Select dates";
+		if (!(range?.from && range?.to)) {
+			return "Select dates";
+		}
 
 		const from = dayjs(range.from);
 		const to = dayjs(range.to);
@@ -317,8 +323,12 @@ export function DateRangePicker({
 								<Calendar
 									defaultMonth={tempRange?.from || value?.from || new Date()}
 									disabled={(date) => {
-										if (minDate && date < minDate) return true;
-										if (maxDate && date > maxDate) return true;
+										if (minDate && date < minDate) {
+											return true;
+										}
+										if (maxDate && date > maxDate) {
+											return true;
+										}
 										return false;
 									}}
 									mode="range"

apps/dashboard/components/empty-state.tsx

@@ -6,14 +6,14 @@ import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { cn } from "@/lib/utils";
 
-export type EmptyStateAction = {
+export interface EmptyStateAction {
 	label: string;
 	onClick: () => void;
 	variant?: "default" | "outline" | "secondary";
 	size?: "default" | "sm" | "lg" | "icon";
-};
+}
 
-export type EmptyStateProps = {
+export interface EmptyStateProps {
 	/** Main icon to display */
 	icon: ReactElement<IconProps>;
 	/** Main heading */
@@ -38,7 +38,7 @@ export type EmptyStateProps = {
 	"aria-label"?: string;
 	/** Whether this is the main content area */
 	isMainContent?: boolean;
-};
+}
 
 export const EmptyState = memo(function EmptyState({
 	icon,
@@ -117,7 +117,7 @@ export const EmptyState = memo(function EmptyState({
 				{showPlusBadge && (
 					<button
 						aria-label="Create new item"
-						className="absolute -top-2 -right-2 cursor-pointer select-none rounded-full border-2 border-primary/10 bg-background p-2"
+						className="-top-2 -right-2 absolute cursor-pointer select-none rounded-full border-2 border-primary/10 bg-background p-2"
 						onClick={(e) => {
 							e.stopPropagation();
 							action?.onClick();
@@ -220,7 +220,7 @@ export const EmptyState = memo(function EmptyState({
 										variant={action.variant || "default"}
 									>
 										{variant === "default" && (
-											<div className="absolute inset-0 translate-x-[-100%] bg-linear-to-r from-white/0 via-white/20 to-white/0 transition-transform duration-700 group-hover:translate-x-[100%] motion-reduce:transform-none" />
+											<div className="absolute inset-0 translate-x-full bg-linear-to-r from-white/0 via-white/20 to-white/0 transition-transform duration-700 group-hover:translate-x-full motion-reduce:transform-none" />
 										)}
 										{variant === "default" && (
 											<PlusIcon

apps/dashboard/hooks/use-organizations.ts

@@ -9,28 +9,28 @@ import { orpc } from "@/lib/orpc";
 
 export type OrganizationRole = "owner" | "admin" | "member";
 
-type CreateOrganizationData = {
+interface CreateOrganizationData {
 	name: string;
 	slug?: string;
 	logo?: string;
 	metadata?: Record<string, unknown>;
 };
 
-type UpdateOrganizationData = {
+interface UpdateOrganizationData {
 	name?: string;
 	slug?: string;
 	logo?: string;
 	metadata?: Record<string, unknown>;
 };
 
-type InviteMemberData = {
+interface InviteMemberData {
 	email: string;
 	role: OrganizationRole;
 	organizationId?: string;
 	resend?: boolean;
 };
 
-export type UpdateMemberData = {
+export interface UpdateMemberData {
 	memberId: string;
 	role: OrganizationRole;
 	organizationId?: string;
@@ -75,6 +75,9 @@ export function useOrganizations() {
 		queryClient.invalidateQueries({
 			queryKey: AUTH_QUERY_KEYS.activeOrganization,
 		});
+		queryClient.invalidateQueries({ queryKey: orpc.websites.listWithCharts.key() });
+		queryClient.invalidateQueries({ queryKey: orpc.websites.list.key() });
+		queryClient.invalidateQueries({ queryKey: orpc.websites.getById.key() });
 	};
 
 	const createOrganizationMutation = useMutation(

packages/rpc/src/routers/apikeys.ts

@@ -141,9 +141,9 @@ export const apikeysRouter = {
 					input.organizationId
 						? eq(apikey.organizationId, input.organizationId)
 						: and(
-								eq(apikey.userId, context.user.id),
-								isNull(apikey.organizationId)
-							)
+							eq(apikey.userId, context.user.id),
+							isNull(apikey.organizationId)
+						)
 				)
 				.orderBy(desc(apikey.createdAt));
 			return rows.map((r) => mapKey(r));