Commit Graph

487 Commits

Author SHA1 Message Date
Matt Tracy
be7e37e924 Retain block references on file reload
Commit fixes a bug where block references (i.e. `:block/refs`
association in the db) are lost when the page containing the referenced
block is re-loaded due to an update of its underlying file.

Description of Bug:

The bug occurs because when a file is re-loaded to the DB from disk, all existing blocks
belonging to the file are deleted via `retractEntity`, and then blocks
from the parsed file are added. If the file had only had small changes,
the new block set will be very similar to the previous one, although
with different db/ids.

However, while new blocks with "id:: " properties will assume the UUID value
of the previous version of the block, any references to that block via
UUID will *not* be restored in the DB; they are deleted with the
retractEntity command. This results in an inconsistent DB state, where references that should
exist do not.

Description of Fix:

The 'delete-blocks-fn' passed to the graph_parser has been modified as
such:

- It now accepts a list of block uuids to *retain*; graph parser will
  pass the blocks parsed from the new file content.
- For any blocks which match a UUID in the retain list, instead of
  deleting via retractEntity, the individual attributes are deleted via
  retractAttribute (the `retract-attributes` from schema.cljs is used
  for this purpose).
2022-11-16 14:05:19 -08:00
Tienson Qin
98703f4d6c fix: typo 2022-11-07 11:39:28 +08:00
Tienson Qin
5bf0b49d1e Log error 2022-11-07 09:22:27 +08:00
Tienson Qin
dd0169b068 fix: notify users to switch to the new filename format
Notify users to switch to the new filename format if there're reserved
chars when syncing.

Also, this commit replace all `js/decodeURIComponent` with
`safe-decode-uri-component` to avoid UI crashes.
2022-11-07 09:22:27 +08:00
Peng Xiao
afd7c1b0f0 fix(whiteboard): persisting whiteboard block collapsed state 2022-10-27 21:23:58 +08:00
Gabriel Horner
93dd107b8f Fix file links creating garbage pages
Fixes #6034, #6618, #6930
2022-10-27 20:56:31 +08:00
Gabriel Horner
5962e0621d Bump to latest kondo and enable new aliased-namespace-symbol linter 2022-10-19 21:24:54 +08:00
Gabriel Horner
daf654172c Disallow tags as property names - fix #6753 2022-10-19 21:19:26 +08:00
Gabriel Horner
c6a3eb2de0 Fix title and other built-in properties incorrectly parsing refs
Fixes issues in #6970. Introduced built-in property types as there are
fewer to list as parsed than unparsed.  Also removed test case that was
incorrectly introduced in #5580
2022-10-16 12:17:11 +08:00
Junyi Du
99dc9c371c test: double queare bracket in title 2022-10-16 12:17:11 +08:00
Gabriel Horner
e05f28672a Fix: Remove hidden task properties that weren't used (#6938)
* Remove task properties that weren't used - fix #6902

* Address feedback - remove unused marker
2022-10-11 11:16:01 -04:00
Charlie
d53ac94bfc Enhance/pdf improvements (#6475)
Full-text search, highlights and assets alias support 
It also exposes a plugin API for highlight context menu   
    ```ts
    /**
       * Current it's only available for pdf viewer
       * @param label - displayed name of command
       * @param action - callback for the clickable item
       * @param opts - clearSelection: clear highlight selection when callback invoked
       */
      registerHighlightContextMenuItem: (
        label: string,
        action: SimpleCommandCallback,
        opts?: {
          clearSelection: boolean
        }
      ) => unknown
    ```
2022-10-09 20:44:18 +08:00
Peng Xiao
cca1d35510 Merge remote-tracking branch 'upstream/master' into whiteboards 2022-10-08 17:26:45 +08:00
Junyi Du
0e4037ab61 Feat: new file name escaping rules (#6134)
* feat: new file name escaping for namespace

feat: new file name decoding back to page name

* test: file name sanitization

feat: use _0x to encode %

feat: don't create title property

test: extra URL encoding for escaped file names

fix: fit pdf prefix into new file name rules

fix: encoding rules on some characters

fix: handle the buggy file names imported by users

fix: pdf block ref failed to jump

fix: #6167

* fix: enhance backward compatibility

chore: title validation

test: fix namespace queries test

chore: use index version stored in config.edn instead of search.versions

* feat: convert old version graph mechanism

ui: file conversion UI

feat: rename files for conversion

feat: don't trigger conversion when title property is manually edited

fix: file conflict notification while renaming files on some OS

feat: re-index on update version

feat: clicking NO in the re-index dialog would update the index-ver flag to suppress the dialog

feat: use html entities for reserved char escaping

dev: remove unresolved vars & minor refactor

chore: move file name sanity from gp-util to fs-util, as it's for encoding only but not parsing

test: update file name tests to html entities rule

test: convert files from dir ver 3 for repo_tests

feat: convert Windows reserved file names

fix: save index version into idb instead of file

fix: decode uri of path while parsing files on mobile

fix: couple dir version and index version to ensure only re-index on converted dirs

feat: go back to url-encode for special chars

* chore: fix lint

chore: improve codebase to address Gabriel's comments

fix: remove file remnants on add conflict

fix: remove file remnants on rename conflict

chore: add test ns to nbb runner

Also fix typoed fn and remove unused code

* fix: issues of rebase PR6134 to master after file-sync merged

* feat: switchable filename format

* fix: use  go block to replace promesa for rename all with blocking

* feat: re-index after apply rename all

* ui: file conversion enhancement

* fix: merging filename format PR with master

* fix: filename format lint & CI

* ui: filename format flow

* fix: error handling on the rare internal file path confliction case

* chore: shorten component code for files-breaking-changed

* chore: fix CI

* Minor fixes per latest code review

- Remove unused page-name-order
- Update catch usage to be consistent with what's on master
- Place state fn in right place
- Wording fixes:
  - select and apply -> manual. There are no checkboxes for the user
  - Update -> Edit. We use edit for all other settings button
  - Alternatives to starting sentences with May. Not a common way to
    start a sentence
  - update outdated template comment

* ux: rename instruction update

* ux: rename instruction update (2)

* Tweak wording of conversion modal

Simplifed first paragraph and explained the page to the user in first
sentence, may isn't a common way to start sentences and updated outdated
wording

* Fix large-var warning by splitting out a piece of component

* fix: right slash on Windows; legacy format file sanitization

* fix: triple lowbar renaming fns

Co-authored-by: Gabriel Horner <gabriel@logseq.com>
2022-10-08 15:47:45 +08:00
Tienson Qin
91dddd7541 Fix: stuck re-index when there're multiple whiteboards have the same UUID (#6890)
* fix: keep parsing even if some whiteboards can't be transacted

* enhance: notice parse errors

* enhance: instrument parse-and-load-error

* chore: add tests for whiteboards parsing and loading
2022-10-07 12:04:43 +08:00
Peng Xiao
bb2df1b3b7 Merge remote-tracking branch 'upstream/master' into whiteboards 2022-09-30 08:51:05 +08:00
Gabriel Horner
88dbb73b6b Add tldraw properties to hidden so they don't show up in unwanted places like autocompletion 2022-09-29 11:21:09 -04:00
charlie
627bfcec9e fix(sync): synced pictures not reload on mobile 2022-09-29 22:39:18 +08:00
Peng Xiao
48d4b657dc fix: ci 2022-09-29 15:11:06 +08:00
Peng Xiao
7bae8313d3 refactor: move tldraw shape related props into logseq.tldraw.shape/page 2022-09-29 14:41:55 +08:00
Peng Xiao
d1a7846a3b fix: tests 2022-09-29 00:21:49 +08:00
Peng Xiao
52b81c809c feat: create new portal shape when left-clicking block/page refs inside of portal shape 2022-09-28 22:37:37 +08:00
Peng Xiao
ce4b2a4ad1 fix: use :block/type instead of :block/whiteboard? 2022-09-28 18:27:03 +08:00
Peng Xiao
4520399ddf Merge remote-tracking branch 'upstream/master' into whiteboards 2022-09-28 10:29:20 +08:00
Tienson Qin
086bae5156 fix: use parsed level as heading level instead of default 2 2022-09-27 16:12:23 +08:00
Tienson Qin
a27a270b04 fix: CI 2022-09-27 16:12:23 +08:00
Tienson Qin
8b144269f7 refactor: unify heading UX for both markdown and org mode 2022-09-27 16:12:23 +08:00
Gabriel Horner
639001971d Add shortcut for seeing whiteboards and minor fixes
See #6812 for the catch and we should be using our util fns
for ref chars
2022-09-24 02:58:10 -04:00
Peng Xiao
4044a458ac fix: whiteboard idle check issue 2022-09-24 12:26:35 +08:00
Peng Xiao
3c85585431 fix: parsing whiteboard edn file 2022-09-24 10:36:06 +08:00
Peng Xiao
526a8d99c8 fix: merge issues 2022-09-24 10:16:19 +08:00
Peng Xiao
fd94862312 Merge remote-tracking branch 'upstream/master' into whiteboards 2022-09-24 09:42:00 +08:00
rcmerci
40e7c29bd6 enhance: use transducer in extract-refs-from-mldoc-ast 2022-09-22 15:06:34 +08:00
Tienson Qin
1830b0c082 fix: treat special chars as invalid properties instead 2022-09-22 14:20:15 +08:00
Gabriel Horner
9d9e976b8c Merge branch 'master' into refactor/refs-from-property-values 2022-09-21 15:34:47 -04:00
rcmerci
628cecc2fd enhance: use transducers 2022-09-21 18:32:14 +08:00
Tienson Qin
eae49ec1f5 chore: misc clean 2022-09-21 17:10:40 +08:00
Tienson Qin
baba078323 fix: support comma in Chinese 2022-09-21 17:03:17 +08:00
Tienson Qin
50db6e42a0 fix: extract property refs support mixed values 2022-09-21 16:46:56 +08:00
Tienson Qin
0ede2d1263 fix: lint 2022-09-21 16:07:05 +08:00
Tienson Qin
310bff0fad fix: CI 2022-09-21 16:02:21 +08:00
Tienson Qin
1fbb364512 Add :block/properties-text-values 2022-09-21 15:06:48 +08:00
Tienson Qin
da72d4d620 Some cleanup suggested by Gabe 2022-09-21 12:59:14 +08:00
Gabriel Horner
a368cab5e4 Add ns linter to deps libs and then add+update ns docstrings 2022-09-21 10:17:15 +08:00
Gabriel Horner
edd79954c1 Another test and address review feedback that shouldn't be controversial
- Added test for 71514ab36c
- Also removed dependency that is no longer used
2022-09-15 18:01:29 -04:00
Gabriel Horner
ecce39d13b Misc cleanup and test improvements
- Remove incorrect carve entry
- Move test-only code for extract-properties to test
- Remove unused if branches in extract-properties
- Move json parsing of get-references into mldoc to be consistent about
  json encapsulation like other mldoc fns
- reorganize relevant unit tests
- add tests for alias, tags and comma separated config properties
- Update incorrect docstring
2022-09-14 23:26:00 -04:00
Tienson Qin
b0aecd10b4 fix: keep invalid-properties for page too 2022-09-14 22:24:01 +08:00
Tienson Qin
00e13c1fc5 fix: datoms count 2022-09-14 20:45:04 +08:00
Tienson Qin
71514ab36c fix: extracting page's title property from mldoc ast 2022-09-14 20:29:44 +08:00
Peng Xiao
3d8fa09d0d fix: merge issues 2022-09-10 01:02:16 +08:00