Commit graph

906 commits

Author SHA1 Message Date
Jessica Lawshe
44c2b6d2b2 Merge pull request #12958 from overleaf/jel-payment-change-currency
[web] Add currency as a dependency of effect and query price with current currency

GitOrigin-RevId: 1bbb2c5cd71a0dc23642e9af1eddc4a8a129b7ae
2023-05-05 08:05:27 +00:00
Tim Down
a0e3379c86 Merge pull request #12939 from overleaf/td-history-more-update-scroll-amount
History migration: More update button scrolls next change to the centre

GitOrigin-RevId: 29d41a046f7110c246a0b9c784dedf6b148ea298
2023-05-05 08:04:53 +00:00
Tim Down
27457133e4 Merge pull request #12873 from overleaf/td-history-loading-improvements
History migration: Improve loading logic and display for loading file diffs

GitOrigin-RevId: 9d20c4632e6a804cb21e6fffd52faa88bc03f01a
2023-05-05 08:04:45 +00:00
Tim Down
95646a1bd5 Merge pull request #12936 from overleaf/td-history-diff-viewer-fixed-font
History migration: Use fixed font, text size, line height and theme in document diff viewer

GitOrigin-RevId: 9f86be609e0fe72ca41429bae9db03e047952c08
2023-05-05 08:04:37 +00:00
June Kelly
7d1d34726e Merge pull request #12914 from overleaf/mf-sort-file-tree-history-react
Sort react history file tree items with the same rule as the angular history file tree

GitOrigin-RevId: da3d3195fff1f5b05b232b329fc3cf38a65743f6
2023-05-05 08:04:04 +00:00
Jakob Ackermann
b0633b3a47 Merge pull request #12842 from overleaf/jpa-logout
[web] remove GET /logout endpoints

GitOrigin-RevId: 93f9498fdb66ece5028d90941aac50cda2737604
2023-05-04 08:05:57 +00:00
Rebeka
0c54e6605b Remove deprecated uses of badge style
GitOrigin-RevId: 47234e95acd42d7e5d23de8e3b67edca2bdd98d1
2023-05-04 08:05:40 +00:00
Alf Eaton
680a02892c Duplicate the cloneSelectionVertically key mapping to re-allow Ctrl on macOS (#12918)
GitOrigin-RevId: 747e8889b5e3b34dd9ffef888f4a1d42fea1af74
2023-05-04 08:05:31 +00:00
Alf Eaton
2093d85a5f Exclude CtrlSym commands from completion (#12905)
GitOrigin-RevId: f6d1813eba6c17444d2371b024f538137c244963
2023-05-04 08:05:23 +00:00
Alf Eaton
b010d6a5d3 Handle unset editor theme (#12892)
GitOrigin-RevId: 0e3413c08c6fd0752cd90ee868fec9b0f9f77437
2023-05-04 08:05:14 +00:00
Alf Eaton
2796f750ee Rename TrackChangesToggleButton prop to match onMouseDown attribute (#12862)
GitOrigin-RevId: bf2a83c58298ee809f181d95beddec695d223922
2023-05-04 08:05:05 +00:00
Alf Eaton
09c5bf72d2 [cm6] Use Cmd on macOS for cloneSelectionVertically (#12855)
GitOrigin-RevId: ea72da47f2ebb377cf22af061ab616a021950502
2023-05-04 08:04:57 +00:00
Alf Eaton
8a12c34fce [cm6] Emacs: close search form when Enter is pressed in "Find" input (#12841)
GitOrigin-RevId: a4c974f45e0dbb13d96b9b424f056768449791fb
2023-05-04 08:04:49 +00:00
Alf Eaton
6c21f0821c [cm6] Handle multiple selection ranges when applying snippets (#12830)
* Use fork of @codemirror/autocomplete
* Handle multiple selection ranges when applying snippets

GitOrigin-RevId: 04afc087ac127206463ea3d4950284a50308364a
2023-05-04 08:04:39 +00:00
Alf Eaton
05582567b4 Improve performance of search match counting (#12808)
GitOrigin-RevId: 70cd1aaf5b079cbd540c4a9f92a04fcb2786b308
2023-05-04 08:04:30 +00:00
Tim Down
7f17992cbc Merge pull request #12870 from overleaf/td-history-prevent-diff-render-on-label-change
History migration: prevent unnecessary render when adding or deleting a label

GitOrigin-RevId: acabd581403f17f863e3bd0c06d1fbd77fe22228
2023-05-02 19:45:31 +00:00
Tim Down
76103eb77f Merge pull request #12874 from overleaf/td-history-binary-file
History migration: Show alert for binary file preview

GitOrigin-RevId: f30e4946ce9f873661055b8a096c6aba7ab08e2d
2023-05-02 19:45:22 +00:00
Tim Down
a19dffeac2 Merge pull request #12877 from overleaf/td-history-file-tree-keyboard
History migration: Only activate document in file tree for space and enter keys

GitOrigin-RevId: 166a9ba36b1f19cd4e50d0e6f63ce04b164512cf
2023-05-02 19:45:14 +00:00
Tim Down
91db36bc01 Merge pull request #12883 from overleaf/td-history-deletion-marker-fix
History migration: Fix deletion marker class in theme

GitOrigin-RevId: d84c97632f467b116024ffc0992970b9aa586294
2023-05-02 19:45:05 +00:00
M Fahru
9e5aabea33 Implement auto retry mechanism for deleted file restore in history react (#12866)
GitOrigin-RevId: b30895061ee6fdfb6488d27ce2f91d4e410735aa
2023-05-02 19:44:57 +00:00
Tim Down
1fb921de99 History migration: Add error handling for all history requests (#12872)
* Add error handling for all history requests

* Remove comment

GitOrigin-RevId: 528dc98a0fc4ab523f8536274996c4166be45064
2023-05-02 19:44:48 +00:00
Tim Down
70bae34bd8 Add paywall to React history view (#12849)
* Implement history view paywall

* Add tests and some CSS fallbacks

* Make additional faded version above paywall non-clickable

* Change isFaded to faded for consistency

* Remove unused import

* Add missing attribute

* SHow all labels in free tier

* Address review comments

* Change Boolean conversion

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>

* Make adding or deleting a label show up in version list again

* Refactor to use visibleUpdateCount rather than maintaining two separate update arrays

* Removed unused import

* Use data-testid instead on class

* Round gradient values

* Correct test selector

---------

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
GitOrigin-RevId: a2b021f3f4d3b9eb1358edb2ee4aa7db1bc7240e
2023-05-02 19:44:39 +00:00
June Kelly
e89b4b4214 Merge pull request #12811 from overleaf/jk-plans-event-currency-segmentation
[web] Add currency/id segmentation to Recurly analytics events

GitOrigin-RevId: 56998f403358d5f6b3cece6835e16e65e06635b1
2023-05-02 19:44:24 +00:00
ilkin-overleaf
5480e1b371 Merge pull request #12850 from overleaf/ii-history-react-fix-disappeared-pseudo-labels
[web] Fix disappeared pseudo labels

GitOrigin-RevId: 4d33eb8888cadbccba29ac001e205db8fa717c49
2023-05-02 19:44:15 +00:00
Alf Eaton
e0d9069131 [cm6] Add "within selection" option to the search form (#12798)
* Use forked @codemirror/search
* Use getPanel to get the search panel
* Remove layer-based highlightSelectionMatches
* Add "within selection" option to the search form
* Add test for "replace all within selection"
* Fix tests

GitOrigin-RevId: 95ce76fd017f96278b04c16a1fd34f785f7504a3
2023-05-01 08:05:02 +00:00
Alf Eaton
2606c76aec Merge pull request #12805 from overleaf/ae-markdown-types
[cm6] Fix type for Markdown language loader

GitOrigin-RevId: 725e1b28dd73e9090638f5d682e48e658c957a04
2023-05-01 08:04:45 +00:00
Alf Eaton
1da94f029c [cm6] Avoid selecting a search match when re-opening the search panel (#12797)
GitOrigin-RevId: 32bb03b71ce56cc0dbe6f7c92cc6d85151ef1971
2023-05-01 08:04:36 +00:00
Alf Eaton
40cbfc451a [cm6] Improve search match scrolling into view (#12787)
GitOrigin-RevId: 6ce9b86253a9c3a2c6ff44c10f78204ff16bd6e2
2023-05-01 08:04:27 +00:00
Alf Eaton
c53411ff1d Merge pull request #12776 from overleaf/ae-search-close-tooltip
[cm6] Add tooltip to search panel close button

GitOrigin-RevId: ba7f4ca5d672580054cb6214be94497fd5141730
2023-05-01 08:04:17 +00:00
M Fahru
0648b8aa6c Implement deleted file restore for history react (#12753)
* Add strikethrough to deleted file tree item in history file tree

* Add "restore file" button on toolbar if the selected file have a `removed` operation.

* Implement "restore file" functionality on removed file:

- Refactor the `Selection` object in history context value since we need the `deletedAtV` data which currently is not passed through the state.
- Refactor and clean up file tree type system to support passing through the whole `FileDiff` object for getting the `deletedAtV` data which only appear on `removed` operation
- Implement `postJSON` with file restoration API and pass it on restore file onClick handler at toolbar

* Implement loading behaviour while restoring file is inflight:

- Add `loadingRestoreFile` to `LoadingState`
- Change restore file button to `Restoring...` when in loading state.

* Refactor:

- Rename `DiffOperation` to `FileOperation`
- Extract `isFileRemoved` and `isFileRenamed` to its own file
- Extract `Toolbar` components into small files

GitOrigin-RevId: 2e32ebd2165f73fc6533ff282a9c084162efd682
2023-04-28 08:04:59 +00:00
Jessica Lawshe
afb810c2a1 Merge pull request #12772 from overleaf/td-history-infinite-scroll-fix
Fix bug in infinite scrolling in history view

GitOrigin-RevId: ae71e96a17197451ae583e5614adbbd9dda93ee0
2023-04-28 08:04:42 +00:00
Domagoj Kriskovic
3d5e8c9877 add 'Ace removal' notification (#12800)
* add 'Ace removal' notification

* prettier

* add memo, window.clearTimeout

* remove warning for server pro

* added tracking events

* useCallback for onClick

* fix: event rename

GitOrigin-RevId: 70bce8b93bae233e7183a941abaf2ec7a70ddfb6
2023-04-28 08:04:19 +00:00
Domagoj Kriskovic
cd689e4e1f [cm6] Show Regex errors in find & replace (#12720)
* [cm6] Show Regex errors in find & replace

* cleanup, isInvalidRegExp function

* no state variable, less color var

* use @brand-dager

* using var(--ol-cm-search-form-focus-shadow)

* using state-danger-border

GitOrigin-RevId: 844c9dfee5a56d2a7494cd86c266acbe9eacd033
2023-04-27 08:05:14 +00:00
Domagoj Kriskovic
e311a22686 Merge pull request #12765 from overleaf/dk-fix-create-folder-name
fix: Clear new folder input after closing modal
GitOrigin-RevId: cde804212ef966f211804afc6bec1b207befeedc
2023-04-27 08:05:00 +00:00
ilkin-overleaf
0895e33235 Merge pull request #12773 from overleaf/ii-history-react-changes-list-dropdown
[web] Actions dropdown history migration

GitOrigin-RevId: 6b7055501c5eb1529b1794db92bb9f5f3faa6648
2023-04-26 08:05:24 +00:00
June Kelly
724a8d6113 Merge pull request #12698 from overleaf/jk-full-stops
[web] Add full-stops after 'Please use a different password'

GitOrigin-RevId: 9cac7c70358db11a74858252001a2dee211c0325
2023-04-26 08:04:30 +00:00
Brian Gough
70072481f4 Merge pull request #12783 from overleaf/ae-dev-tools-localstorage
[cm6] Use customLocalStorage in CM6 dev tools

GitOrigin-RevId: df4c40868b5a7b24b30483d55d1fbe75b5703776
2023-04-26 08:04:12 +00:00
Tim Down
afd1195902 Add infinite scrolling to history versions list (#12752)
* Add infinite scrolling to change list, add spinner while doing initial updates load, refactor updates state

* Update type in tests

* Update types

* Using LoadingSpinner component

* Remove redundant imports

GitOrigin-RevId: 98c7eae8edbc4d10d7107d825045edfc4159494f
2023-04-25 08:06:22 +00:00
Tim Down
bf076a8c97 Merge pull request #12721 from overleaf/td-history-improve-diff-highlight
Add markers for addition and deletion on empty lines in history diff

GitOrigin-RevId: 62e329da8bc055ee922854b837fe9465d724402e
2023-04-25 08:06:14 +00:00
Mathias Jakobsen
17ca11fae0 [cm6] Add save command to emacs (recompiles doc) (#12742)
GitOrigin-RevId: 10cda3f14411147d0d900f688d9b5017f49d2db2
2023-04-25 08:05:35 +00:00
Alf Eaton
f409b96f00 Fix padding in emptyLineFiller and lineWrappingIndentation extensions (#12736)
GitOrigin-RevId: 8b6a2ad0beb802d917f3e998c378792c6156836a
2023-04-25 08:05:27 +00:00
Alf Eaton
8537a7a5d0 Handle mode: 'none' in keybindings (#12717)
GitOrigin-RevId: 77d040352b1de2311f663a8b33bd0d20d79a30ae
2023-04-25 08:05:18 +00:00
Alf Eaton
4bb582bdd8 [cm6] Improve Tab behaviour in read-only mode (#12715)
* Improve Tab behaviour in read-only mode
* Remove Tab shortcuts from Markdown configuration

GitOrigin-RevId: 9eb804fcf820b37b371b1c351cfbdf7bff1ced89
2023-04-25 08:05:10 +00:00
Alf Eaton
08ccdb79d3 [cm6] Improve alignment of review panel elements (#12710)
* Use a block widget for top padding
* Update review panel positions when the editor geometry changes
* Remove editorPaddingTop from position calculations
* Recalculate review panel on start adding comment
* Assert on line content rather than index
* Use broadcastChange
* Keep focus in the editor when opening the review panel
* debounce broadcastChange
* Set CULL_AFTER to Infinity

GitOrigin-RevId: a8d7b8967736a9164b5264eeaadf334c15ec95ce
2023-04-25 08:05:02 +00:00
Alf Eaton
acf6abb0fb [cm6] Use a block widget for padding at the top of the editor (#12705)
GitOrigin-RevId: 000ce9c90ea6b2ca72ab969704354a19fcea7a87
2023-04-25 08:04:53 +00:00
M Fahru
4dec157e08 Implement history react toolbar UI (#12530)
There are two different UI in this PR: `comparing` and `viewing` mode.

- For `comparing`, the user would be shown two separate date. It uses the `UpdateRange` object and this PR adds a timestamp to both `fromV` and `toV` of the object type.
- For `viewing`, the user would only be shown one date since `viewing` mode means viewing a specific update version.

Some other notable changes:

- Move `diff` state to `diff-view.tsx`, which contains `main.tsx` (main editor history view) and `toolbar.tsx` as its children
- refactor `autoSelectFile` by passing `updateRange.toV` directly
- refactor `updateIsSelected` by passing an object that contains `fromV` and `toV` instead of passing `update

There's also a cypress test for both the `viewing` mode and `comparing` mode in this PR.

GitOrigin-RevId: ba54f073f3479c55a39eb6b2932ea7faff78dddc
2023-04-21 08:03:39 +00:00
M Fahru
08d2eea47a Decouple history-file-tree styling out of editor file tree:
- Extract/duplicate the style from editor file tree (only extract styling that's being used in history file tree)
- Change some of the class name to avoid duplicated class name from the editor file tree
- Revert change to editor file tree since it has been moved to history file tree

GitOrigin-RevId: 6c3b20080c9b428363024db622f60e3540d919e6
2023-04-21 08:03:36 +00:00
Ilkin Ismailov
dd5509b16f add sm size to badge
GitOrigin-RevId: 4e69d582ce770abcff10f3a6b34662f4873fc224
2023-04-21 08:03:33 +00:00
M Fahru
8212b686c6 Implement new style for history file tree badge
GitOrigin-RevId: 6221bc00e5aecf49fd3f2657128d1e9a2d4e648b
2023-04-21 08:03:30 +00:00
Mathias Jakobsen
81a8fa2ce3 Merge pull request #12672 from overleaf/ae-emacs-compile-keydown
[cm6] Stop propagation of Ctrl-s when Emacs keybindings are enabled

GitOrigin-RevId: 32bebefb583ad813931af221cce7498d40fdbaf1
2023-04-21 08:03:11 +00:00