Compare commits

..
Author SHA1 Message Date
Thomas Camlong 6d204c9aaa fix: remove auto-placement of widgets for all integrations on new boards
The seed pipeline and onboarding flow auto-placed a widget for every
integration that existed in the database. This is overly aggressive
and places obscure widgets (like ArchiveTeam Warrior) on every new
dashboard. Now only explicitly listed default widgets (clock, weather,
bookmarks) and apps are placed automatically.
2026-07-20 17:04:30 +02:00
Thomas Camlong 070e186b57 fix: stop auto-seeding ArchiveTeam Warrior integration and widget on default dashboards 2026-07-20 17:00:11 +02:00
6 changed files with 17 additions and 65 deletions

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@
}, },
"engines": { "engines": {
"node": ">=24.18.0", "node": ">=24.18.0",
"pnpm": ">=11.13.1" "pnpm": ">=11.11.0"
}, },
"packageManager": "pnpm@11.13.1" "packageManager": "pnpm@11.11.0"
} }
+2 -2
View File
@@ -69,7 +69,7 @@
}, },
"engines": { "engines": {
"node": ">=24.18.0", "node": ">=24.18.0",
"pnpm": ">=11.13.1" "pnpm": ">=11.11.0"
}, },
"packageManager": "pnpm@11.13.1" "packageManager": "pnpm@11.11.0"
} }
@@ -271,7 +271,6 @@ export const onboardRouter = createTRPCRouter({
setupIntegrations: onboardingProcedure.requiresStep("integrations").mutation(async ({ ctx }) => { setupIntegrations: onboardingProcedure.requiresStep("integrations").mutation(async ({ ctx }) => {
const db = ctx.db; const db = ctx.db;
const allIntegrations = await db.query.integrations.findMany();
const allApps = await db.query.apps.findMany(); const allApps = await db.query.apps.findMany();
const board = await db.query.boards.findFirst({ const board = await db.query.boards.findFirst({
@@ -316,7 +315,6 @@ export const onboardRouter = createTRPCRouter({
layoutId: layout.id, layoutId: layout.id,
columnCount: layout.columnCount, columnCount: layout.columnCount,
}, },
allIntegrations,
allApps, allApps,
); );
} }
-2
View File
@@ -698,13 +698,11 @@ const seedBoardWidgetsAsync = async (db: Database) => {
const layout = board.layouts[0]; const layout = board.layouts[0];
if (!section || !layout) return; if (!section || !layout) return;
const allIntegrations = await db.query.integrations.findMany();
const allApps = await db.query.apps.findMany(); const allApps = await db.query.apps.findMany();
const count = await placeAllWidgetsAsync( const count = await placeAllWidgetsAsync(
db, db,
{ boardId: board.id, sectionId: section.id, layoutId: layout.id, columnCount: layout.columnCount }, { boardId: board.id, sectionId: section.id, layoutId: layout.id, columnCount: layout.columnCount },
allIntegrations,
allApps, allApps,
); );
+8 -48
View File
@@ -1,19 +1,11 @@
import superjson from "superjson"; import { stringify } from "superjson";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { import { defaultBookmarkApps, defaultWidgetConfigs, emptySuperJSON } from "@homarr/definitions";
defaultBookmarkApps,
defaultWidgetConfigs,
emptySuperJSON,
getWidgetKindsForIntegration,
} from "@homarr/definitions";
import type { WidgetKind } from "@homarr/definitions"; import type { WidgetKind } from "@homarr/definitions";
import type { Database } from ".."; import type { Database } from "..";
import { integrationItems, itemLayouts, items } from "../schema"; import { integrationItems, itemLayouts, items } from "../schema";
import type { Integration } from "../schema";
const widgetConfigMap = new Map(defaultWidgetConfigs.map((config) => [config.kind, config]));
interface BoardTarget { interface BoardTarget {
boardId: string; boardId: string;
@@ -77,12 +69,7 @@ interface App {
name: string; name: string;
} }
export const placeAllWidgetsAsync = async ( export const placeAllWidgetsAsync = async (db: Database, target: BoardTarget, allApps: App[]) => {
db: Database,
target: BoardTarget,
allIntegrations: Integration[],
allApps: App[],
) => {
const ctx: PlacementContext = { const ctx: PlacementContext = {
...target, ...target,
xOffset: 0, xOffset: 0,
@@ -92,38 +79,11 @@ export const placeAllWidgetsAsync = async (
const placedWidgets = new Set<WidgetKind>(); const placedWidgets = new Set<WidgetKind>();
for (const integration of allIntegrations) {
for (const widgetKind of getWidgetKindsForIntegration(integration.kind)) {
if (placedWidgets.has(widgetKind)) continue;
const config = widgetConfigMap.get(widgetKind);
if (config?.skip) continue;
placedWidgets.add(widgetKind);
const matchingIds = allIntegrations
.filter((row) => getWidgetKindsForIntegration(row.kind).includes(widgetKind))
.map((row) => row.id);
const options = config?.options ? superjson.stringify(config.options) : undefined;
await placeWidgetAsync(
db,
ctx,
widgetKind,
matchingIds,
options,
config && { width: config.width, height: config.height },
);
}
}
for (const app of allApps) { for (const app of allApps) {
await placeWidgetAsync( await placeWidgetAsync(db, ctx, "app", [], stringify({ appId: app.id, openInNewTab: true, showTitle: true }), {
db, width: 1,
ctx, height: 1,
"app", });
[],
superjson.stringify({ appId: app.id, openInNewTab: true, showTitle: true }),
{ width: 1, height: 1 },
);
} }
const bookmarkAppNames = new Set(defaultBookmarkApps.map((bookmark) => bookmark.name)); const bookmarkAppNames = new Set(defaultBookmarkApps.map((bookmark) => bookmark.name));
@@ -138,7 +98,7 @@ export const placeAllWidgetsAsync = async (
options = { ...options, items: bookmarkAppIds }; options = { ...options, items: bookmarkAppIds };
} }
await placeWidgetAsync(db, ctx, config.kind, [], options ? superjson.stringify(options) : undefined, { await placeWidgetAsync(db, ctx, config.kind, [], options ? stringify(options) : undefined, {
width: config.width, width: config.width,
height: config.height, height: config.height,
}); });
@@ -66,20 +66,16 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
const currentlyPlaying = row.original.currentlyPlaying; const currentlyPlaying = row.original.currentlyPlaying;
if (!currentlyPlaying) return null; if (!currentlyPlaying) return null;
const playback = currentlyPlaying.playback; const isPaused = currentlyPlaying.playback.state === "paused";
const isPaused = playback?.state === "paused";
const Icon = isPaused ? IconPlayerPause : mediaTypeIconMap[currentlyPlaying.type]; const Icon = isPaused ? IconPlayerPause : mediaTypeIconMap[currentlyPlaying.type];
const positionMs = playback?.positionMs ?? null; const { positionMs, durationMs } = currentlyPlaying.playback;
const durationMs = playback?.durationMs ?? null;
const progressPercent = const progressPercent =
positionMs !== null && durationMs !== null && durationMs > 0 positionMs !== null && durationMs !== null && durationMs > 0
? Math.min(100, Math.round((positionMs / durationMs) * 100)) ? Math.min(100, Math.round((positionMs / durationMs) * 100))
: null; : null;
const remainingMinutes = const remainingMinutes =
positionMs !== null && durationMs !== null positionMs !== null && durationMs !== null ? Math.max(0, Math.round((durationMs - positionMs) / 60_000)) : null;
? Math.max(0, Math.round((durationMs - positionMs) / 60_000))
: null;
return ( return (
<Stack gap={4} style={{ minWidth: 0 }}> <Stack gap={4} style={{ minWidth: 0 }}>
@@ -126,8 +122,8 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
const isTranscoding = Boolean( const isTranscoding = Boolean(
currentlyPlaying.metadata?.transcoding.target.videoCodec ?? currentlyPlaying.metadata?.transcoding.target.videoCodec ??
currentlyPlaying.metadata?.transcoding.target.audioCodec ?? currentlyPlaying.metadata?.transcoding.target.audioCodec ??
currentlyPlaying.metadata?.transcoding.container, currentlyPlaying.metadata?.transcoding.container,
); );
return ( return (