From a0b8bd5c0b919fc07b13d5f9c7a5fc15235876db Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Mon, 24 Jun 2024 16:25:53 -0700
Subject: [PATCH] add config option to show block header ids

---
 frontend/app/block/block.tsx  | 21 ++++++++++++---------
 frontend/types/gotypes.d.ts   |  6 ++++++
 pkg/wconfig/settingsconfig.go | 13 +++++++++----
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/frontend/app/block/block.tsx b/frontend/app/block/block.tsx
index 7999fd45..a4a5cbfc 100644
--- a/frontend/app/block/block.tsx
+++ b/frontend/app/block/block.tsx
@@ -92,10 +92,14 @@ function processTitleString(titleString: string): React.ReactNode[] {
     return partsStack[0];
 }
 
-function getBlockHeaderText(blockIcon: string, blockData: Block): React.ReactNode {
+function getBlockHeaderText(blockIcon: string, blockData: Block, settings: SettingsConfigType): React.ReactNode {
     if (!blockData) {
         return "no block data";
     }
+    let blockIdStr = "";
+    if (settings?.blockheader?.showblockids) {
+        blockIdStr = ` [${blockData.oid.substring(0, 8)}]`;
+    }
     let blockIconElem: React.ReactNode = null;
     if (!util.isBlank(blockIcon)) {
         let iconColor = blockData?.meta?.["icon:color"];
@@ -114,20 +118,17 @@ function getBlockHeaderText(blockIcon: string, blockData: Block): React.ReactNod
     if (!util.isBlank(blockData?.meta?.title)) {
         try {
             const rtn = processTitleString(blockData.meta.title) ?? [];
-            if (blockIconElem) {
-                rtn.unshift(blockIconElem);
-            }
-            return rtn;
+            return [blockIconElem, ...rtn, blockIdStr == "" ? null : blockIdStr];
         } catch (e) {
             console.error("error processing title", blockData.meta.title, e);
-            return [blockIconElem, blockData.meta.title];
+            return [blockIconElem, blockData.meta.title + blockIdStr];
         }
     }
     let viewString = blockData?.view;
     if (blockData.controller == "cmd") {
         viewString = "cmd";
     }
-    return [blockIconElem, `${viewString} [${blockData.oid.substring(0, 8)}]`];
+    return [blockIconElem, viewString + blockIdStr];
 }
 
 interface FramelessBlockHeaderProps {
@@ -138,10 +139,11 @@ interface FramelessBlockHeaderProps {
 
 const FramelessBlockHeader = ({ blockId, onClose, dragHandleRef }: FramelessBlockHeaderProps) => {
     const [blockData] = WOS.useWaveObjectValue<Block>(WOS.makeORef("block", blockId));
+    const settingsConfig = jotai.useAtomValue(atoms.settingsConfigAtom);
 
     return (
         <div key="header" className="block-header" ref={dragHandleRef}>
-            <div className="block-header-text text-fixed">{getBlockHeaderText(null, blockData)}</div>
+            <div className="block-header-text text-fixed">{getBlockHeaderText(null, blockData, settingsConfig)}</div>
             {onClose && (
                 <div className="close-button" onClick={onClose}>
                     <i className="fa fa-solid fa-xmark-large" />
@@ -175,6 +177,7 @@ const BlockFrame_Tech = ({
     children,
 }: BlockFrameProps) => {
     const [blockData] = WOS.useWaveObjectValue<Block>(WOS.makeORef("block", blockId));
+    const settingsConfig = jotai.useAtomValue(atoms.settingsConfigAtom);
     const isFocusedAtom = useBlockAtom<boolean>(blockId, "isFocused", () => {
         return jotai.atom((get) => {
             const winData = get(atoms.waveWindow);
@@ -215,7 +218,7 @@ const BlockFrame_Tech = ({
             style={style}
         >
             <div className="block-frame-tech-header" ref={dragHandleRef} onContextMenu={handleContextMenu}>
-                {getBlockHeaderText(blockIcon, blockData)}
+                {getBlockHeaderText(blockIcon, blockData, settingsConfig)}
             </div>
             <div className={clsx("block-frame-tech-close")} onClick={onClose}>
                 <i className="fa fa-solid fa-xmark fa-fw" />
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
index 56209dd5..a55d2630 100644
--- a/frontend/types/gotypes.d.ts
+++ b/frontend/types/gotypes.d.ts
@@ -54,6 +54,11 @@ declare global {
         oref: string;
     };
 
+    // wconfig.BlockHeaderOpts
+    type BlockHeaderOpts = {
+        showblockids: boolean;
+    };
+
     // wshutil.BlockInputCommand
     type BlockInputCommand = {
         blockid: string;
@@ -214,6 +219,7 @@ declare global {
         datetime: DateTimeConfigType;
         term: TerminalConfigType;
         widgets: WidgetsConfigType[];
+        blockheader: BlockHeaderOpts;
     };
 
     // wstore.StickerClickOptsType
diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go
index 51468240..bf3fa3c3 100644
--- a/pkg/wconfig/settingsconfig.go
+++ b/pkg/wconfig/settingsconfig.go
@@ -42,11 +42,16 @@ type MimeTypeConfigType struct {
 	Icon string `json:"icon"`
 }
 
+type BlockHeaderOpts struct {
+	ShowBlockIds bool `json:"showblockids"`
+}
+
 type SettingsConfigType struct {
-	MimeTypes map[string]MimeTypeConfigType `json:"mimetypes"`
-	DateTime  DateTimeConfigType            `json:"datetime"`
-	Term      TerminalConfigType            `json:"term"`
-	Widgets   []WidgetsConfigType           `json:"widgets"`
+	MimeTypes   map[string]MimeTypeConfigType `json:"mimetypes"`
+	DateTime    DateTimeConfigType            `json:"datetime"`
+	Term        TerminalConfigType            `json:"term"`
+	Widgets     []WidgetsConfigType           `json:"widgets"`
+	BlockHeader BlockHeaderOpts               `json:"blockheader"`
 }
 
 func getSettingsConfigDefaults() SettingsConfigType {