gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-02-20 04:34:38 +01:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

feat(badges/content): disable toggle when not necessary

Browse Source
This commit is contained in:
Elian Doran 2026-02-14 12:22:27 +02:00
parent 866d3110da
commit 740b02952f
No known key found for this signature in database
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/entities/fnote.ts
View File

@ -700,6 +700,10 @@ export default class FNote {
return this.hasAttribute(LABEL, name);
}
hasLabelOrDisabled(name: string) {
return this.hasLabel(name) || this.hasLabel(`disabled:${name}`);
}
/**
* @param name - label name
* @returns true if label exists (including inherited) and does not have "false" value.

37
apps/client/src/widgets/layout/ActiveContentBadges.tsx
View File

@ -51,8 +51,8 @@ export function ActiveContentBadges() {
return (note && info &&
<>
{info.canToggleEnabled && <ActiveContentToggle info={info} note={note} />}
<ActiveContentBadge info={info} note={note} />
<ActiveContentToggle info={info} note={note} />
</>
);
}
@ -151,15 +151,23 @@ function ScriptRunOptions({ info, note }: { note: FNote, info: ActiveContentInfo
function WidgetSwitcher({ note }: { note: FNote }) {
const [ widget, setWidget ] = useNoteLabelBoolean(note, "widget");
const [ disabledWidget, setDisabledWidget ] = useNoteLabelBoolean(note, "disabled:widget");
return (
<FormListItem
return (widget || disabledWidget)
? <FormListItem
icon="bx bx-window"
onClick={() => {
setWidget(false);
setDisabledWidget(false);
}}
>{t("active_content_badges.menu_change_to_frontend_script")}</FormListItem>
: <FormListItem
icon={widget ? "bx bx-window" : "bx bxs-widget"}
onClick={() => setWidget(!widget)}
>
{widget ? t("active_content_badges.menu_change_to_frontend_script") : t("active_content_badges.menu_change_to_widget")}
</FormListItem>
);
onClick={() => {
setWidget(true);
}}
>{t("active_content_badges.menu_change_to_widget")}</FormListItem>;
}
function getTranslationForType(type: ActiveContentInfo["type"]) {
@ -213,6 +221,7 @@ function getNameWithoutPrefix(name: string) {
interface ActiveContentInfo {
type: "iconPack" | "backendScript" | "frontendScript" | "widget" | "appCss";
isEnabled: boolean;
canToggleEnabled: boolean;
}
function useActiveContentInfo(note: FNote | null | undefined) {
@ -221,6 +230,7 @@ function useActiveContentInfo(note: FNote | null | undefined) {
function refresh() {
let type: ActiveContentInfo["type"] | null = null;
let isEnabled = true;
let canToggleEnabled = false;
if (!note) {
setInfo(null);
@ -229,8 +239,17 @@ function useActiveContentInfo(note: FNote | null | undefined) {
if (note.type === "code" && note.mime === "application/javascript;env=backend") {
type = "backendScript";
for (const backendLabel of [ "run", "customRequestHandler", "customResourceProvider" ]) {
isEnabled ||= note.hasLabel(backendLabel);
if (!canToggleEnabled && note.hasLabelOrDisabled(backendLabel)) {
canToggleEnabled = true;
}
}
} else if (note.type === "code" && note.mime === "application/javascript;env=frontend") {
type = "frontendScript";
isEnabled = note.hasLabel("widget") || note.hasLabel("run");
canToggleEnabled = note.hasLabelOrDisabled("widget") || note.hasLabelOrDisabled("run");
}
for (const labelToCheck of activeContentLabels ) {
@ -245,7 +264,7 @@ function useActiveContentInfo(note: FNote | null | undefined) {
}
if (type) {
setInfo({ type, isEnabled });
setInfo({ type, isEnabled, canToggleEnabled });
} else {
setInfo(null);
}