Commit graph

34 commits

Author SHA1 Message Date
Eric Mc Sween
94b9d1fa48 Merge pull request #16073 from overleaf/em-postpone-tutorials
Support postponing tutorials

GitOrigin-RevId: fe662086c87cc1909d6d9eeac07f85e306d64418
2023-12-06 09:04:58 +00:00
Mathias Jakobsen
edb4d7b84e Merge pull request #15455 from overleaf/mj-enable-all-the-things
[web] Enable skipped cypress tests

GitOrigin-RevId: 36cffbb2cc72ffb4cae9e5b8eaa57f7ba7929fa7
2023-10-30 09:04:29 +00:00
Jimmy Domagala-Tang
0d932a226b Merge pull request #14492 from overleaf/ds-remake-compare
HIstory UI - Adding a new compare component for drop down

GitOrigin-RevId: 3e01e8fedd5966c1bc6253df0e8868e4a41b8504
2023-09-06 08:06:28 +00:00
Jimmy Domagala-Tang
faffc35860 Merge pull request #14507 from overleaf/ds-upper-highlight-version
added conditional styling for upper selected version

GitOrigin-RevId: 3474058c5fdb204d9c8dd6538c79d2074d49222b
2023-09-01 08:04:13 +00:00
ilkin-overleaf
1c66d2728c Merge pull request #14405 from overleaf/ii-enable-tests
[web] Enable disabled tests

GitOrigin-RevId: 1b7199446849ccaf3febe51409f73d9305a93e9c
2023-09-01 08:04:05 +00:00
Jimmy Domagala-Tang
462b7a2256 Merge pull request #14379 from overleaf/jdt-history-onboarding
history onboarding popover

GitOrigin-RevId: 4afe2ae54317341df64e83bed0b3c94875eb10a0
2023-08-30 08:05:21 +00:00
Davinder Singh
d8c4399c01 History ui - Adding the compare dropdown on the withinSelected versions
GitOrigin-RevId: 728979b11918c9bc1e535024040d90053536251d
2023-08-24 08:03:26 +00:00
Davinder Singh
7e5a476a95 History UI changes- Adding enums for history versions
GitOrigin-RevId: 63f3a324889ad10e4a96994fa61f04bea4333630
2023-08-23 08:05:18 +00:00
Davinder Singh
3490f6a58e History UI changes- Extracting compare outside dropdown menu
GitOrigin-RevId: 67f51428debefdafe2c9bb746de5da8fc0ac5385
2023-08-18 08:05:23 +00:00
Brian Gough
137eda06f0 Merge pull request #13571 from overleaf/bg-disable-flaky-cypress-tests
disable flaky cypress tests

GitOrigin-RevId: 3ff8a8a50aff352251eb23daa86e55650ca1f369
2023-07-17 10:43:11 +00:00
ilkin-overleaf
bb815268f2 Merge pull request #13146 from overleaf/ii-history-react-save-last-selected-file-in-local-storage
[web] Save lastly selected file in the file tree

GitOrigin-RevId: 4b4dcdcb1340e253d4cd2003280f67385975d664
2023-05-31 08:04:59 +00:00
Tim Down
9ca81a72af Merge pull request #13218 from overleaf/td-history-update-change-list-tests
History migration: Update change list fixtures to ensure file diff request happens

GitOrigin-RevId: 5ec7b4389bc4d7f1343f9e3d26c0bcb7e4585ab5
2023-05-26 08:04:38 +00:00
Tim Down
66dc566752 Merge pull request #13039 from overleaf/td-history-auto-select-file-ignore-binary
History migration: Ignore binary files when auto-selecting file to display in history view

GitOrigin-RevId: 7d2a314cdb3d54e4e2292a95e7633e3829ea931f
2023-05-26 08:04:29 +00:00
Alf Eaton
5827c6f05c Merge pull request #13208 from overleaf/td-history-fix-change-list-test
History migration: Skip change list tests temporarily

GitOrigin-RevId: 38cdc3c42c8eafbada75c83503afb523b5d93199
2023-05-25 08:05:43 +00:00
Tim Down
ccacd4cab7 History migration: Abort previous GET requests (#12893)
GitOrigin-RevId: ad72d526bf7cdfa91b00025b58205d9a5b4cc62f
2023-05-25 08:04:15 +00:00
ilkin-overleaf
454f8f80c2 Merge pull request #13117 from overleaf/ii-history-react-changes-list-tests
[web] Add changes list tests

GitOrigin-RevId: 5a4e1ea647d737dc761e4258002e6507c76e95a9
2023-05-23 08:05:27 +00:00
Tim Down
fd8557ef39 Merge pull request #13159 from overleaf/td-history-comparison-text-icon-tweaks
History migration: Icon and text changes to version comparison, switch order of from and to

GitOrigin-RevId: e31db255c55caf15481ed0237875e637c0ac0861
2023-05-23 08:04:15 +00:00
June Kelly
6c2bc2fe8b Merge pull request #13068 from overleaf/td-history-renamed-file-auto-select
History migration: Fix bug that prevents renamed files being automatically selected

GitOrigin-RevId: ce127b218d1eb472fe7b35467a17549f3db4bfb7
2023-05-17 08:03:58 +00:00
Tim Down
f8a2d85126 Merge pull request #12917 from overleaf/td-history-highlight-tooltip-improvements
History migration: Rework change marker tooltips to match Angular version behaviour

GitOrigin-RevId: c34e42db6c310521d04690de41f3bb81c219bfbc
2023-05-10 08:04:18 +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
da916c9c13 Merge pull request #12906 from overleaf/td-history-fix-labels-test
Expect correct number of labels in history version list test

GitOrigin-RevId: 2a56b21c7359aad5111a2a7879f31fb5e7c6b73d
2023-05-02 19:45:40 +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
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
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
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
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
Tim Down
5f5e07a334 Merge pull request #12668 from overleaf/td-history-scroll-to-first-change
Scroll to first change in history document diff viewer

GitOrigin-RevId: e135877ca440c5eb2732890e8723d9098444727f
2023-04-19 08:03:28 +00:00
Tim Down
99e1ff0804 Merge pull request #12644 from overleaf/td-history-compare
Initial implementation of comparing history versions

GitOrigin-RevId: 890e270d6e41856a79689ab41ccfbde25c4703ba
2023-04-19 08:03:25 +00:00
Alf Eaton
f205d1f31d Merge pull request #12621 from overleaf/ii-history-react-delete-labels
[web] Delete history tags

GitOrigin-RevId: 0a2846bbb3e99ef632b9192a9f8c04f702645506
2023-04-19 08:02:47 +00:00
Tim Down
23b9c078b8 Merge pull request #12636 from overleaf/td-history-autoselect-file
Simplify file autoselect in React history view

GitOrigin-RevId: 43f070b26ab0a75af13063712b5cf05778da4064
2023-04-17 08:05:49 +00:00
Tim Down
38998afa8e Implement history diff viewer buttons (#12439)
GitOrigin-RevId: 0ed8eb8568783b4938188a86c4ee75c767e6d713
2023-04-17 08:05:41 +00:00
M Fahru
fb6746a887 Add default pathname logic on history react file tree (#12505)
On history react, when the initial screen has been loaded, no default pathname is selected. This PR adds logic for selecting default pathname and getting the diff for that pathname.

Also, add some other small changes, the notable ones are:

- Refactor some type naming and file structure related to the history file tree
- Refactor file tree selectable hooks (merge selectable context provider into the main provider)
- prevent clicking on the same file tree item by checking the current pathname before invoking the handler function

GitOrigin-RevId: 73c36e9ed918ae3d92dd47108fbe8542a7571bdd
2023-04-12 08:04:58 +00:00
ilkin-overleaf
867b37b76f Merge pull request #12417 from overleaf/ii-history-react-toggle-switch
[web] Toggle switch history migration

GitOrigin-RevId: c0812d03d576bc66dd8878fa80d4ac18dd8576d0
2023-03-30 08:04:22 +00:00