ts pmo

Author: izadoesdev

apps/dashboard/app/(main)/websites/[id]/_components/tabs/settings-tab.tsx

@@ -5,13 +5,15 @@ import {
 	ClipboardIcon,
 	DownloadIcon,
 	InfoIcon,
+	UserIcon,
 	WarningCircleIcon,
 } from '@phosphor-icons/react';
 import dayjs from 'dayjs';
 import { useRouter } from 'next/navigation';
 import { useCallback, useState } from 'react';
 import type { DateRange as DayPickerRange } from 'react-day-picker';
 import { toast } from 'sonner';
+import { FaviconImage } from '@/components/analytics/favicon-image';
 import { DateRangePicker } from '@/components/date-range-picker';
 import {
 	AlertDialog,
@@ -31,7 +33,6 @@ import { WebsiteDialog } from '@/components/website-dialog';
 import { useDataExport } from '@/hooks/use-data-export';
 import { useDeleteWebsite, useTogglePublicWebsite } from '@/hooks/use-websites';
 import { SETTINGS_TABS, TOAST_MESSAGES } from '../shared/tracking-constants';
-
 import type {
 	DeleteWebsiteDialogProps,
 	ExportFormat,

apps/dashboard/app/(main)/websites/[id]/_components/utils/types.ts

@@ -4,39 +4,27 @@ import type {
 	Website,
 } from '@databuddy/shared';
 
-// Extended date range with granularity
 export interface DateRange extends BaseDateRange {
 	granularity?: 'daily' | 'hourly';
 }
 
-// Settings tab specific types
-export type SettingsTab =
-	| 'tracking'
-	| 'basic'
-	| 'advanced'
-	| 'optimization'
-	| 'privacy'
-	| 'export';
+export type SettingsTab = 'privacy' | 'export';
 
-// Base tab props shared across all tabs
 export interface BaseTabProps {
 	websiteId: string;
 	dateRange: DateRange;
 }
 
-// Tab props with refresh functionality
 export interface RefreshableTabProps extends BaseTabProps {
 	isRefreshing: boolean;
 	setIsRefreshing: (value: boolean) => void;
 }
 
-// Tab props with website data
 export interface WebsiteDataTabProps extends BaseTabProps {
 	websiteData: Website | undefined;
 	onWebsiteUpdated?: () => void;
 }
 
-// Combined tab props that include all features
 export interface FullTabProps extends BaseTabProps {
 	websiteData: Website | undefined;
 	isRefreshing: boolean;
@@ -45,7 +33,6 @@ export interface FullTabProps extends BaseTabProps {
 	addFilter: (filter: DynamicQueryFilter) => void;
 }
 
-// Common analytics data types
 export interface MetricPoint {
 	date: string;
 	pageviews?: number;
@@ -67,48 +54,40 @@ export interface TableColumn {
 	className?: string;
 }
 
-// Settings-related types
 export interface WebsiteFormData {
 	name?: string;
 	domain?: string;
 }
 
 export interface TrackingOptions {
-	// Core tracking
 	disabled: boolean;
 	trackScreenViews: boolean;
 	trackHashChanges: boolean;
 	trackSessions: boolean;
 
-	// Interaction tracking
 	trackAttributes: boolean;
 	trackOutgoingLinks: boolean;
 	trackInteractions: boolean;
 
-	// Advanced tracking
 	trackEngagement: boolean;
 	trackScrollDepth: boolean;
 	trackExitIntent: boolean;
 	trackBounceRate: boolean;
 
-	// Performance tracking
 	trackPerformance: boolean;
 	trackWebVitals: boolean;
 	trackErrors: boolean;
 
-	// Optimization
 	samplingRate: number;
 	enableRetries: boolean;
 	maxRetries: number;
 	initialRetryDelay: number;
 
-	// Batching
 	enableBatching: boolean;
 	batchSize: number;
 	batchTimeout: number;
 }
 
-// Component-specific prop interfaces
 export interface WebsiteHeaderProps {
 	websiteData: Website;
 	websiteId: string;

apps/dashboard/hooks/use-website-transfer.ts

@@ -2,14 +2,14 @@
 
 import { trpc } from '@/lib/trpc';
 
-export function useWebsiteTransfer(organizationId: string) {
+export function useWebsiteTransfer(organizationId?: string) {
 	// Fetch personal websites (no organizationId)
 	const { data: personalWebsites, isLoading: isLoadingPersonal } =
 		trpc.websites.list.useQuery({
 			organizationId: undefined,
 		});
 
-	// Fetch organization websites
+	// Fetch organization websites (only if organizationId is provided)
 	const { data: organizationWebsites, isLoading: isLoadingOrg } =
 		trpc.websites.list.useQuery(
 			{
@@ -23,10 +23,10 @@ export function useWebsiteTransfer(organizationId: string) {
 	const utils = trpc.useUtils();
 
 	const transferMutation = trpc.websites.transfer.useMutation({
-		onSuccess: () => {
-			// Invalidate both queries to refresh the data
-			utils.websites.list.invalidate({ organizationId: undefined });
-			utils.websites.list.invalidate({ organizationId });
+		onSuccess: (_, variables) => {
+			utils.websites.list.invalidate();
+			utils.websites.listWithCharts.invalidate();
+			utils.websites.getById.invalidate({ id: variables.websiteId });
 		},
 	});
 

packages/rpc/src/routers/websites.ts

@@ -365,7 +365,10 @@ export const websitesRouter = createTRPCRouter({
 			if (input.organizationId) {
 				const { success } = await websitesApi.hasPermission({
 					headers: ctx.headers,
-					body: { permissions: { website: ['create'] } },
+					body: {
+						organizationId: input.organizationId,
+						permissions: { website: ['create'] },
+					},
 				});
 				if (!success) {
 					throw new TRPCError({