Commit graph

42 commits

Author SHA1 Message Date
Mathias Jakobsen
7d80d22e96 Merge pull request #20233 from overleaf/mj-restore-promo
[web] Add promotion for file/project reverting

GitOrigin-RevId: 9f8e66ab2ad945274576800253d288bca5986562
2024-09-09 08:05:01 +00:00
Domagoj Kriskovic
4aa746a759 [web] show file restored change in history (#18792)
* add RestoreFileOrigin in overleaf-editor-core

* support source to be an object

* use sourceOrOrigin as param

* rename to originOrSource so the priority is more clear

* get timestamp from version

* fix test

* include version and min_count in getUpdatesFromHistory

* extractOriginOrSource util function

* fix RestoreManagerTests

* [web] show restore file change in history

* make sure two restore operations are not merged

* dont summarize updates for different paths

GitOrigin-RevId: d890484760a7379716e8bd65dd28e353d293492f
2024-06-18 08:04:43 +00:00
Alf Eaton
95ab3921d7 Ensure that multiple spaces in file names are visible in the file tree (#18330)
GitOrigin-RevId: 512e89d8afbfccf1c981d4f10df1e5729248f381
2024-05-17 08:04:33 +00:00
Alf Eaton
ed57b5a479 Use EditorView.theme for the history diff viewer styles (#17156)
GitOrigin-RevId: e52519b392395ed740de5932a59fe35321200d5a
2024-02-22 09:04:38 +00:00
Alf Eaton
2818c4a519 Move history diff viewer color style out of CodeMirror theme (#17154)
GitOrigin-RevId: 1fa527542c3b901c731cb79e1a6063e394e4af34
2024-02-16 09:05:37 +00:00
Alf Eaton
12326b420d Use sliced MaterialSymbolsRounded font (#16994)
GitOrigin-RevId: 51158acccc9967794b2192791961561d43274979
2024-02-16 09:04:36 +00:00
Davinder Singh
9618d2bf20 fixing stickyness of the date (#15964)
GitOrigin-RevId: 9bc9bc1323f944a7c57e0bb92724063d8da44e89
2023-11-29 09:04:48 +00:00
Tim Down
ea9a639734 Merge pull request #15721 from overleaf/ii-file-tree-nested-files-and-folders
[web] Fix deeply nested files and folders selection

GitOrigin-RevId: 3c9cc62f3294a735627d27019e53917b6fa8e6f2
2023-11-14 09:04:31 +00:00
Davinder Singh
57d2ce046e History version - Padding-left for the selected version (#14729)
GitOrigin-RevId: 9780922ea8055d58f7133c013fb25b94f4f334d3
2023-09-22 08:03:44 +00:00
Davinder Singh
74d64af950 History UI - Moving pop over out from the version (#14770)
Moving popover out of versions list

GitOrigin-RevId: d1739f4c17b66a0e39c8bb46a0fac5b2069d9171
2023-09-22 08:03:40 +00:00
Rebeka Dekany
bd7f6bf6d4 Merge pull request #14792 from overleaf/rd-report-remove-li-element
Accessibility - use CSS instead of empty list item for spacing in the filetree

GitOrigin-RevId: 2ee330dc867c223394afa9ccce1017a79c7112c1
2023-09-15 08:05:27 +00:00
ilkin-overleaf
a66e1329df Merge pull request #14695 from overleaf/jdt-hist-compare-hover
fix: adding hover state to compare buttons
GitOrigin-RevId: 85989aebdee6d8ee3ffef3300f975e0dbfa2adb1
2023-09-11 08:05:26 +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
ilkin-overleaf
738ff5e63c Revert filetree empty space click (#14283)
GitOrigin-RevId: e019f88631e91ffefd71cae145b5355372f12df7
2023-08-14 08:05:26 +00:00
Alf Eaton
3ae32f8332 Merge pull request #14197 from overleaf/ii-filetree-empty-space-click
[web] Select project root folder

GitOrigin-RevId: 78272a6af16879e9c71c9167ba066c258b0ff7b7
2023-08-14 08:04:41 +00:00
Tim Down
a74eecd110 Merge pull request #13259 from overleaf/td-history-survey-link
History migration: Add beta badge to history toolbar

GitOrigin-RevId: e5c818953a7d41c31018a2d39c3937d70c057f8c
2023-06-01 08:04:24 +00:00
M Fahru
c7a80f9228 History migration: Wrap history version item texts in version history list (#12961)
Texts that need individual wrapping so they won't overflow the history item:

- long file name
- long label name
- long tooltip text
- long user email

---------

Co-authored-by: Ilkin Ismailov <ilkin.ismailov@overleaf.com>
GitOrigin-RevId: 3f75c4173dd59524de1148b22bcbc1d856c021eb
2023-05-26 08:04:53 +00:00
Alf Eaton
142cfb51d9 Merge pull request #13173 from overleaf/td-history-menu-jump
History migration: Remove initial jump on displaying menu and line up menu items nicely

GitOrigin-RevId: f04c01565aa9ea128e87543fa7108d7fb0ae8657
2023-05-25 08:04:23 +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
Alf Eaton
0ffa75979f Merge pull request #13001 from overleaf/td-history-version-hover-style
History migration: Use green selected style when hovering over selected version

GitOrigin-RevId: 7771ce64d719c3d0e5264dfd2fbbf52f5b519213
2023-05-10 08:05:45 +00:00
Tim Down
478b463e5f Merge pull request #12871 from overleaf/td-history-update-button-shadow
History migration: add shadow to "more updates" buttons

GitOrigin-RevId: e74cd8f8b7cf27393483b7c675f3ed607a5d6b06
2023-05-10 08:04:10 +00:00
M Fahru
c19fa74aa4 In history react file tree, always show badge (stick to the right side) and truncate long filename with ellipsis (#12897)
GitOrigin-RevId: 2e982f03b7a60e506f061a2c5bf1ab3d93dfccf5
2023-05-09 08:05:08 +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
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
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
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
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
Tim Down
38998afa8e Implement history diff viewer buttons (#12439)
GitOrigin-RevId: 0ed8eb8568783b4938188a86c4ee75c767e6d713
2023-04-17 08:05:41 +00:00
Alexandre Bourdin
481cd14cb1 Merge pull request #12557 from overleaf/ii-history-react-labels-only
[web] History labels only list

GitOrigin-RevId: 58b8e5a5af0754e32841223f9c478c25900df526
2023-04-13 08:04:12 +00:00
ilkin-overleaf
8e0aa685ce Merge pull request #12549 from overleaf/ii-history-react-list-of-all-versions
[web] All versions of history entries

GitOrigin-RevId: 7365ac4913c115b3b2872a3713d893463719c15e
2023-04-12 08:03:47 +00:00
M Fahru
17a98d756e Add badges UI to history react file tree (#12479)
GitOrigin-RevId: 52c45b72110e01bb193139654fa9385cb9b9e489
2023-04-05 08:03:05 +00:00
Tim Down
11f8905be4 Connect up document diff viewer to history state
GitOrigin-RevId: 610a254ea77c194969033d0791ecf1129e02c4bf
2023-03-31 08:03:47 +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
Tim Down
397fbd47c2 Merge pull request #12363 from overleaf/td-history-main-area-shell
Add CSS for main history view shell

GitOrigin-RevId: 9c455007bf8b177d59ea97cd73b608d48aba3907
2023-03-30 08:02:54 +00:00
ilkin-overleaf
d1d47b2767 Merge pull request #12339 from overleaf/ii-react-history-editor-and-change-list-init
[web] History editor and change list initialisation

GitOrigin-RevId: bb7800301d28c296bd524212cd27ddcd8defd149
2023-03-23 09:06:24 +00:00