[147] hierarchical labels by DrEverr · Pull Request #176 · FluffyLabs/graypaper-reader

DrEverr · 2025-02-18T08:50:25Z

add hierarchical labels
toggle groups of labels

netlify · 2025-02-18T08:50:50Z

✅ Deploy Preview for graypaper-reader ready!

Name	Link
🔨 Latest commit	`fffa90b`
🔍 Latest deploy log	https://app.netlify.com/sites/graypaper-reader/deploys/67c4c9e0351743000844db1d
😎 Deploy Preview	https://deploy-preview-176--graypaper-reader.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

* Add version name to location hash url * refactor version name with default empty

* Update readme * Update main readme. * Update tools/links-check/README.md Co-authored-by: Mewa <ms1997sokol@gmail.com> --------- Co-authored-by: Mewa <ms1997sokol@gmail.com>

tomusdrw

As discussed off-band, the PR needs a bit more work to align with the requirements from #147

src/components/Label/Label.tsx

src/components/NotesProvider/hooks/useLabels.ts

* clean commit history * button confirmation instead of alert * saving deleted notes to file * refactor * Add countdown timer for delete confirmation button * refactor * refactor redundant method

…r-reader into 147-hierarchical-labels

DrEverr · 2025-02-25T12:29:43Z

Still as draft, because it doesn't re-trigger filteredNotes on label change.

…r-reader into 147-hierarchical-labels

… formatting

tomusdrw · 2025-02-27T05:52:49Z

src/components/NotesProvider/utils/labelsLocalStorage.ts

+  if (!("parent" in x && (x.parent === null || isLabel(x.parent)))) {
+    return false;
+  }
+  if (!("children" in x && Array.isArray(x.children))) {
+    return false;
+  }
+  if (!("notes" in x && Array.isArray(x.notes))) {
+    return false;
+  }


This should not be here. In local storage the notes should be stored in a flat format as currently and not as a tree.

tomusdrw · 2025-02-27T05:53:20Z

tools/links-check/README.md

+## Options
+
+```
+Usage: gp-links-check [options] <paths...>
+
+Arguments:
+  paths                           Paths of files to be scanned. Supports glob patterns.


These changes are already on main, there is something funky happening in the PR. Can you please try to re-open it as a new one or clean up the history?

tomusdrw · 2025-02-27T06:04:54Z

src/components/Label/Label.tsx

+      if (parts.length === 1) {
+        if (parts[0] === LABEL_LOCAL || parts[0] === LABEL_REMOTE) {
+          root.notes.push(note);
+          continue;
+        }
+      }
+      addToTree(parts, note, root);


Suggested change

if (parts.length === 1) {

if (parts[0] === LABEL_LOCAL || parts[0] === LABEL_REMOTE) {

root.notes.push(note);

continue;

}

}

addToTree(parts, note, root);

// if the label starts with `local` or `remote` just trim the first part.

if (parts[0] === LABEL_LOCAL || parts[0] === LABEL_REMOTE) {

parts.shift();

}

addToTree(parts, note, root);

I think this is more correct way to handle that case. I wonder however where does this special casing come from? Do we currently have notes with explicit local or remote label within them? I think it's totally fine if they were displayed as local/local - the user may remove that label if it was added there unnecessarily.

Our other mechanism continuously adds the ‘local’ label, resulting in ‘local/local’ on each page refresh.

tomusdrw · 2025-02-28T22:13:42Z

src/components/Label/Label.tsx

+
 export function Label({ label, prefix = "" }: { label: string; prefix?: string }) {
-  const backgroundColor = useMemo(() => labelToColor(label), [label]);
+  const backgroundColor = useMemo(() => labelToColor(label.split("/").pop() || ""), [label]);


Suggested change

const backgroundColor = useMemo(() => labelToColor(label.split("/").pop() || ""), [label]);

const backgroundColor = useMemo(() => labelToColor(label), [label]);

Background color should depend on the whole "path" (i.e. remote label v0.4.5 should have different color than a local one with the same name)

it makes labels in notes and labels on the tree displays differently (w/ different color)

Hmm, we should have full path in notes then.

full path displayed on tree?
eg.
local
local/a
local/a/b
local/a/c

What I mean is that we should always use full path for color and display the text-label depending on the context:

In the tree we just display shorter label (since it's nested)

In the note we display full label (perhaps without the source part)

src/components/Label/Label.tsx

tomusdrw · 2025-02-28T22:22:46Z

src/components/LabelsFilter/LabelsFilter.tsx

+      <div
+        className="label-node-header"
+        onClick={() => onToggleLabel(label)}
+        onKeyUp={(e) => e.key === "Enter" && setExpanded(!expanded)}


Suggested change

onKeyUp={(e) => e.key === "Enter" && setExpanded(!expanded)}

that shouldn't be needed. The group should be expanded when it's active and folded when inactive.

tomusdrw · 2025-02-28T22:23:04Z

src/components/LabelsFilter/LabelsFilter.tsx

-  );
-
+function LabelNode({ label, onToggleLabel }: LabelLinkProps) {
+  const [expanded, setExpanded] = useState(true);


Suggested change

const [expanded, setExpanded] = useState(true);

const expanded = label.isActive;

Co-authored-by: Tomek Drwięga <tomusdrw@users.noreply.github.com>

DrEverr · 2025-03-11T17:54:53Z

Continued in #196

add hierarchical labels

edc4ddd

DrEverr mentioned this pull request Feb 18, 2025

[147] hierarchical labels #174

Closed

DrEverr and others added 8 commits February 19, 2025 10:14

refactor label color logic

d65233b

display flat label structure

9035ca8

sort labels in LabelsFilter component

cd6353c

updating local labels at the end, for proper toggle groups

fec5017

[85] Add version name to location hash url (FluffyLabs#178)

c48c3c0

* Add version name to location hash url * refactor version name with default empty

Update readme (FluffyLabs#172)

7241f59

* Update readme * Update main readme. * Update tools/links-check/README.md Co-authored-by: Mewa <ms1997sokol@gmail.com> --------- Co-authored-by: Mewa <ms1997sokol@gmail.com>

Avoid removing commonPath if there is only one file. (FluffyLabs#171)

57265b5

refactor toggleLabel to search newLabel by hooks

69d78af

DrEverr requested a review from tomusdrw February 20, 2025 13:42

tomusdrw requested changes Feb 20, 2025

View reviewed changes

src/components/Label/Label.tsx Outdated Show resolved Hide resolved

src/components/Label/Label.tsx Outdated Show resolved Hide resolved

src/components/NotesProvider/hooks/useLabels.ts Outdated Show resolved Hide resolved

DrEverr added 10 commits February 21, 2025 18:06

[159] mass remove notes (FluffyLabs#175)

f8c527f

* clean commit history * button confirmation instead of alert * saving deleted notes to file * refactor * Add countdown timer for delete confirmation button * refactor * refactor redundant method

add hierarchical labels

9e8787e

refactor label color logic

b4eb7ca

display flat label structure

6624ff9

sort labels in LabelsFilter component

bc3dd75

updating local labels at the end, for proper toggle groups

ef4954d

refactor toggleLabel to search newLabel by hooks

15995eb

Merge branch '147-hierarchical-labels' of github.com:DrEverr/graypape…

491682d

…r-reader into 147-hierarchical-labels

Implement hierarchical label structure in LabelsFilter component

e5bd5ed

refactor

118ae21

DrEverr added 6 commits February 25, 2025 13:57

fix label filtering

438d324

refactor

646acdf

fix delete all

cfff3e1

deleted comment

e7ffc31

refactor

efad22d

refactor

5258c05

DrEverr added 2 commits February 26, 2025 10:31

refactor

d58b7e7

Merge branch '147-hierarchical-labels' of github.com:DrEverr/graypape…

7a240e0

…r-reader into 147-hierarchical-labels

DrEverr requested a review from tomusdrw February 26, 2025 10:06

DrEverr added 6 commits February 26, 2025 13:50

upped contrast to match with the downloaded pdf

a6ee5bd

revert last commit

36d49ea

refactor

184fc94

file name change

c51989f

refactor notes import/export functions to enhance label filtering and…

8c10280

… formatting

fix: standardize string delimiter

7241239

tomusdrw requested changes Feb 28, 2025

View reviewed changes

DrEverr and others added 2 commits March 2, 2025 21:57

shorter and cleaner traverseAndCollectNotes

d2313f8

Co-authored-by: Tomek Drwięga <tomusdrw@users.noreply.github.com>

fix

fffa90b

DrEverr mentioned this pull request Mar 10, 2025

[147] label tree #196

Merged

DrEverr closed this Mar 11, 2025

	const backgroundColor = useMemo(() => labelToColor(label.split("/").pop() \|\| ""), [label]);
	const backgroundColor = useMemo(() => labelToColor(label), [label]);

	const [expanded, setExpanded] = useState(true);
	const expanded = label.isActive;

Conversation

DrEverr commented Feb 18, 2025

Uh oh!

netlify bot commented Feb 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for graypaper-reader ready!

Uh oh!

tomusdrw left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DrEverr commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DrEverr commented Mar 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

netlify bot commented Feb 18, 2025 •

edited

Loading

DrEverr commented Feb 25, 2025 •

edited

Loading