fix: right-click apps, board keyboard shortcuts, scrollbar oscillation, Beszel JSON errors
- #6416: Skip widget context menu for app widgets (pass through native right-click) - #6392: Add board keyboard shortcuts (mod+shift+arrows to cycle, mod+shift+1-9 for direct) - #6080: Prevent GridStack scrollbar oscillation by thresholding resize events - #6024: Add try-catch for Beszel response.json() calls in auth and testing paths
This commit is contained in:
8 files changed
+144
-4
No files matched your search
@@ -3,4 +3,15 @@ export const hotkeys = {
|
||||
toggleColorScheme: "mod+j",
|
||||
saveNotebook: "mod+s",
|
||||
openSpotlight: "mod+k",
|
||||
nextBoard: "mod+shift+ArrowRight",
|
||||
previousBoard: "mod+shift+ArrowLeft",
|
||||
switchBoard1: "mod+shift+1",
|
||||
switchBoard2: "mod+shift+2",
|
||||
switchBoard3: "mod+shift+3",
|
||||
switchBoard4: "mod+shift+4",
|
||||
switchBoard5: "mod+shift+5",
|
||||
switchBoard6: "mod+shift+6",
|
||||
switchBoard7: "mod+shift+7",
|
||||
switchBoard8: "mod+shift+8",
|
||||
switchBoard9: "mod+shift+9",
|
||||
};
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ResponseError } from "@homarr/common/server";
|
||||
import { ParseError, ResponseError } from "@homarr/common/server";
|
||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||
import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
|
||||
import { createCertificateAgentAsync, fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||
@@ -163,7 +163,18 @@ export class BeszelIntegration extends Integration {
|
||||
throw new ResponseError(response);
|
||||
}
|
||||
|
||||
const data = (await response.json()) as BeszelAuthResponse;
|
||||
let data: BeszelAuthResponse;
|
||||
try {
|
||||
data = (await response.json()) as BeszelAuthResponse;
|
||||
} catch (error) {
|
||||
logger.warn("Failed to parse Beszel auth response JSON", {
|
||||
integrationId: this.integration.id,
|
||||
error: error instanceof Error ? error.message : String(error),
|
||||
});
|
||||
throw new ErrorWithMetadata("Beszel authentication response was not valid JSON", {
|
||||
integrationId: this.integration.id,
|
||||
});
|
||||
}
|
||||
const expiresAt = parseTokenExpiration(data.token) ?? undefined;
|
||||
|
||||
// A token that has already lapsed by the time it reaches us means our clock and Beszel's
|
||||
@@ -608,7 +619,15 @@ export class BeszelIntegration extends Integration {
|
||||
return TestConnectionError.StatusResult({ status: response.status, url: response.url });
|
||||
}
|
||||
|
||||
const data = (await response.json()) as BeszelAuthResponse;
|
||||
let data: BeszelAuthResponse;
|
||||
try {
|
||||
data = (await response.json()) as BeszelAuthResponse;
|
||||
} catch (error) {
|
||||
logger.warn("Failed to parse Beszel testing response JSON", {
|
||||
error: error instanceof Error ? error.message : String(error),
|
||||
});
|
||||
return TestConnectionError.ParseResult(new ParseError("Beszel testing response was not valid JSON"));
|
||||
}
|
||||
if (!data.token) {
|
||||
return TestConnectionError.UnauthorizedResult(401);
|
||||
}
|
||||
|
||||
@@ -5272,7 +5272,18 @@
|
||||
"toggleBoardEdit": "Toggle board edit mode",
|
||||
"toggleColorScheme": "Toggle light/dark mode",
|
||||
"saveNotebook": "Save notebook (only inside notebook widget)",
|
||||
"openSpotlight": "Open search"
|
||||
"openSpotlight": "Open search",
|
||||
"nextBoard": "Switch to next board",
|
||||
"previousBoard": "Switch to previous board",
|
||||
"switchBoard1": "Switch to first board",
|
||||
"switchBoard2": "Switch to second board",
|
||||
"switchBoard3": "Switch to third board",
|
||||
"switchBoard4": "Switch to fourth board",
|
||||
"switchBoard5": "Switch to fifth board",
|
||||
"switchBoard6": "Switch to sixth board",
|
||||
"switchBoard7": "Switch to seventh board",
|
||||
"switchBoard8": "Switch to eighth board",
|
||||
"switchBoard9": "Switch to ninth board"
|
||||
},
|
||||
"note": "Tip: Mod refers to both Ctrl key and ⌘ key on macOS"
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user