fix: gate scrollbar resize guard on size, preserve parse causes
Address CodeRabbit review on #6510: - gridstack: only suppress recalculation when the width delta is insignificant AND (non-dynamic OR height unchanged), so dynamic sections still rebuild on height changes - beszel: propagate the response parse failure via { cause } in both error wrappers - auth tests: cover invalid (non-string) OIDC groups claims
This commit is contained in:
1 parent
e0ebdd9047
commit
71b986f249
3 files changed
+44
-11
No files matched your search
@@ -319,23 +319,29 @@ const useCssVariableConfiguration = ({
|
|||||||
columnCount,
|
columnCount,
|
||||||
isDynamic,
|
isDynamic,
|
||||||
}: UseCssVariableConfiguration) => {
|
}: UseCssVariableConfiguration) => {
|
||||||
const prevWidthRef = useRef<number | null>(null);
|
const prevSizeRef = useRef<{ width: number; height: number } | null>(null);
|
||||||
|
|
||||||
const onResize = useCallback(() => {
|
const onResize = useCallback(() => {
|
||||||
if (!wrapperRef.current) return;
|
if (!wrapperRef.current) return;
|
||||||
if (!gridRef.current) return;
|
if (!gridRef.current) return;
|
||||||
|
|
||||||
const currentWidth = wrapperRef.current.clientWidth;
|
const currentWidth = wrapperRef.current.clientWidth;
|
||||||
const prevWidth = prevWidthRef.current;
|
const currentHeight = wrapperRef.current.clientHeight;
|
||||||
|
const prevSize = prevSizeRef.current;
|
||||||
|
|
||||||
// Only recalculate if the width change is significant enough (> 20px)
|
// Only skip recalculation when the width change is insignificant (< 20px)
|
||||||
// This prevents infinite feedback loops when the vertical scrollbar
|
// and, for dynamic sections, the height is unchanged. This prevents infinite
|
||||||
// appears/disappears, causing clientWidth to oscillate by ~15px
|
// feedback loops when the vertical scrollbar appears/disappears, causing
|
||||||
if (prevWidth !== null && Math.abs(currentWidth - prevWidth) < 20) {
|
// clientWidth to oscillate by ~15px, while still reacting to height changes.
|
||||||
|
if (
|
||||||
|
prevSize !== null &&
|
||||||
|
Math.abs(currentWidth - prevSize.width) < 20 &&
|
||||||
|
(!isDynamic || currentHeight === prevSize.height)
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
prevWidthRef.current = currentWidth;
|
prevSizeRef.current = { width: currentWidth, height: currentHeight };
|
||||||
|
|
||||||
handleResizeChange(
|
handleResizeChange(
|
||||||
wrapperRef.current,
|
wrapperRef.current,
|
||||||
|
|||||||
@@ -172,6 +172,27 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
|
|||||||
});
|
});
|
||||||
expect(dbGroupMembers?.groupId).toBe("1");
|
expect(dbGroupMembers?.groupId).toBe("1");
|
||||||
});
|
});
|
||||||
|
test("should not change memberships for an invalid groups claim", async () => {
|
||||||
|
// Arrange
|
||||||
|
const db = createDb();
|
||||||
|
await createUserAsync(db, "oidc");
|
||||||
|
await createGroupAsync(db);
|
||||||
|
await db.insert(groupMembers).values({ userId: "1", groupId: "1" });
|
||||||
|
const eventHandler = createSignInEventHandler(db);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await eventHandler?.({
|
||||||
|
user: { id: "1", name: "test" },
|
||||||
|
profile: { preferred_username: "test", someRandomGroupsKey: 42 },
|
||||||
|
account: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
const dbGroupMembers = await db.query.groupMembers.findFirst({
|
||||||
|
where: eq(groupMembers.userId, "1"),
|
||||||
|
});
|
||||||
|
expect(dbGroupMembers?.groupId).toBe("1");
|
||||||
|
});
|
||||||
test("should remove group membership", async () => {
|
test("should remove group membership", async () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const db = createDb();
|
const db = createDb();
|
||||||
|
|||||||
@@ -171,9 +171,11 @@ export class BeszelIntegration extends Integration {
|
|||||||
integrationId: this.integration.id,
|
integrationId: this.integration.id,
|
||||||
error: error instanceof Error ? error.message : String(error),
|
error: error instanceof Error ? error.message : String(error),
|
||||||
});
|
});
|
||||||
throw new ErrorWithMetadata("Beszel authentication response was not valid JSON", {
|
throw new ErrorWithMetadata(
|
||||||
integrationId: this.integration.id,
|
"Beszel authentication response was not valid JSON",
|
||||||
});
|
{ integrationId: this.integration.id },
|
||||||
|
{ cause: error instanceof Error ? error : new Error(String(error)) },
|
||||||
|
);
|
||||||
}
|
}
|
||||||
const expiresAt = parseTokenExpiration(data.token) ?? undefined;
|
const expiresAt = parseTokenExpiration(data.token) ?? undefined;
|
||||||
|
|
||||||
@@ -626,7 +628,11 @@ export class BeszelIntegration extends Integration {
|
|||||||
logger.warn("Failed to parse Beszel testing response JSON", {
|
logger.warn("Failed to parse Beszel testing response JSON", {
|
||||||
error: error instanceof Error ? error.message : String(error),
|
error: error instanceof Error ? error.message : String(error),
|
||||||
});
|
});
|
||||||
return TestConnectionError.ParseResult(new ParseError("Beszel testing response was not valid JSON"));
|
return TestConnectionError.ParseResult(
|
||||||
|
new ParseError("Beszel testing response was not valid JSON", {
|
||||||
|
cause: error instanceof Error ? error : new Error(String(error)),
|
||||||
|
}),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (!data.token) {
|
if (!data.token) {
|
||||||
return TestConnectionError.UnauthorizedResult(401);
|
return TestConnectionError.UnauthorizedResult(401);
|
||||||
|
|||||||
Reference in new issue
Block a user