gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-22 08:08:51 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

feat(react/settings): port protected session timeout

Browse Source
This commit is contained in:
Elian Doran 2025-08-18 19:00:42 +03:00
parent ccf52be431
commit 227cf5de85
No known key found for this signature in database
3 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/widgets/type_widgets/options/components/TimeSelector.tsx
View File

@ -61,13 +61,13 @@ export default function TimeSelector({ name, label, includedTimeScales, optionVa
let time = parseInt(value, 10); let time = parseInt(value, 10);
const minimumSecondsOrDefault = (minimumSeconds ?? 0); const minimumSecondsOrDefault = (minimumSeconds ?? 0);
const newTime = convertTime(time, scale).toOption();
if (Number.isNaN(time) || time < (minimumSecondsOrDefault)) { if (Number.isNaN(time) || newTime < (minimumSecondsOrDefault)) {
toast.showError(t("time_selector.minimum_input", { minimumSeconds: minimumSecondsOrDefault })); toast.showError(t("time_selector.minimum_input", { minimumSeconds: minimumSecondsOrDefault }));
time = minimumSecondsOrDefault; time = minimumSecondsOrDefault;
} }
const newTime = convertTime(time, scale).toOption();
setValue(newTime); setValue(newTime);
}} }}
/> />

11
apps/client/src/widgets/type_widgets/options/password.tsx
View File

@ -11,6 +11,8 @@ import OptionsSection from "./components/OptionsSection"
import protected_session_holder from "../../../services/protected_session_holder" import protected_session_holder from "../../../services/protected_session_holder"
import { ChangePasswordResponse } from "@triliumnext/commons" import { ChangePasswordResponse } from "@triliumnext/commons"
import dialog from "../../../services/dialog" import dialog from "../../../services/dialog"
import TimeSelector from "./components/TimeSelector"
import FormText from "../../react/FormText"
export default function PasswordSettings() { export default function PasswordSettings() {
return ( return (
@ -106,9 +108,18 @@ function ChangePassword() {
function ProtectedSessionTimeout() { function ProtectedSessionTimeout() {
return ( return (
<OptionsSection title={t("password.protected_session_timeout")}> <OptionsSection title={t("password.protected_session_timeout")}>
<FormText>
{t("password.protected_session_timeout_description")} {t("password.protected_session_timeout_description")}
&nbsp; &nbsp;
<a class="tn-link" href="https://triliumnext.github.io/Docs/Wiki/protected-notes.html" className="external">{t("password.wiki")}</a> {t("password.for_more_info")} <a class="tn-link" href="https://triliumnext.github.io/Docs/Wiki/protected-notes.html" className="external">{t("password.wiki")}</a> {t("password.for_more_info")}
</FormText>
<TimeSelector
name="protected-session-timeout"
label={t("password.protected_session_timeout_label")}
optionValueId="protectedSessionTimeout" optionTimeScaleId="protectedSessionTimeoutTimeScale"
minimumSeconds={60}
/>
</OptionsSection> </OptionsSection>
) )
} }

29
apps/client/src/widgets/type_widgets/options/password/protected_session_timeout.ts
View File

@ -1,29 +0,0 @@
import TimeSelector from "../time_selector.js";
const TPL = /*html*/`
<div class="options-section">
<p class="form-text">
</p>
<div id="time-selector-placeholder"></div>
</div>`;
export default class ProtectedSessionTimeoutOptions extends TimeSelector {
constructor() {
super({
widgetId: "protected-session-timeout",
widgetLabelId: "password.protected_session_timeout_label",
optionValueId: "protectedSessionTimeout",
optionTimeScaleId: "protectedSessionTimeoutTimeScale",
minimumSeconds: 60
});
super.doRender();
}
doRender() {
const $timeSelector = this.$widget;
// inject TimeSelector widget template
this.$widget = $(TPL);
this.$widget.find("#time-selector-placeholder").replaceWith($timeSelector);
}
}