Commit graph

458 commits

Author SHA1 Message Date
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
Rebeka
e3a0d236ae fix: color should be persisted on the disabled menu item when hovering over it
GitOrigin-RevId: e594388b36de986c02114aa652f6fe9c9d705c5d
2023-05-05 08:05:10 +00:00
Rebeka
0c54e6605b Remove deprecated uses of badge style
GitOrigin-RevId: 47234e95acd42d7e5d23de8e3b67edca2bdd98d1
2023-05-04 08:05:40 +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
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
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
f5740e6b17 Merge pull request #12593 from overleaf/jk-remove-plans-split-test
[web] Remove 'plans-page-layout-v3' split test

GitOrigin-RevId: 91e0d3d8bc40632df630131b2e872fa824015da5
2023-04-26 08:04:21 +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
Rebeka
b063495200 fix: fit text inside the circle shape
GitOrigin-RevId: 81167ee6ebc281a7a403ff2fdc3b19f4cc91d6be
2023-04-24 08:02:42 +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
Alf Eaton
98961d9465 Merge pull request #12719 from overleaf/ae-navbar
Restore z-index of .navbar-main

GitOrigin-RevId: f25b462227beaee483199043a97206ccdedfe1c0
2023-04-21 08:03:19 +00:00
Rebeka
5ff575e3e5 fix: when collapsing the navbar, do not overlap it with other elements, for example with the tooltip
GitOrigin-RevId: 2db133ce8399c46b620a3a594fc415244c7d9788
2023-04-21 08:02:49 +00:00
Rebeka
4adf965180 fix: make the navbar dropdown list to take the full viewport
GitOrigin-RevId: c6c6c447c14fa25ad27d73cf3c39d6650fa5e744
2023-04-21 08:02:46 +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
Jessica Lawshe
6fc5385ca6 Merge pull request #12249 from overleaf/tm-gallery-top-picks
Implement top picks in template gallery for CVs

GitOrigin-RevId: 22f720582e27fac2b9e454ce4e28bd124de094b7
2023-04-19 08:03:19 +00:00
Jimmy Domagala-Tang
77c2db38fc Merge pull request #12566 from overleaf/jdt-ghost-danger-buttons
feat: adding danger ghost buttons
GitOrigin-RevId: 2ee6ea1c395ba4a73fbe09b36acde3145c590a6b
2023-04-18 08:04:51 +00:00
Tim Down
38998afa8e Implement history diff viewer buttons (#12439)
GitOrigin-RevId: 0ed8eb8568783b4938188a86c4ee75c767e6d713
2023-04-17 08:05:41 +00:00
Jakob Ackermann
3841177931 Merge pull request #12504 from overleaf/jel-cms-card-padding
[web] Option to set padding on CMS rows

GitOrigin-RevId: 297344c9bf6c04eae630f1ddbed59f9519d4e4c7
2023-04-14 08:03:19 +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
Alexandre Bourdin
04c204f989 [web] Colour picker for tags (#12255)
* Base for color picker

* React color picker and updated modals

* Add tag color picker to mobile dashboard

* Update existing tests and fix disable save button condition

* CSS adaptations for desktop modal streched into mobile display

* Update TagsController tests

* Add aria-hidden label on color pickers

* Fix linting

* Fix project list test

* Select random color when creating tag

* Cleanup leftovers in project list context

* Test cleanup

* Pre-select custom color and store local color while picking

* Add type to preset colors

* Add css fix to override disabled button opacity

* Skip redundant check

* Fix linting

* Add back btn-secondary on manage tag modal after rebase

GitOrigin-RevId: a4cf24e85cc0ca01466f4bf9c77482be8360e68e
2023-04-13 08:04:03 +00:00
June Kelly
17109393c5 Merge pull request #12387 from overleaf/jk-split-button-tweaks
[web] Split-menu style tweaks

GitOrigin-RevId: a04121981c4fe240c247cf03da5be7052c26f541
2023-04-12 08:04:28 +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
Jessica Lawshe
caf8a57f47 Merge pull request #12383 from overleaf/jel-card-color
[web] Update default card color for new CMS page style

GitOrigin-RevId: bb74164f8e29d32e3d01418e77e6c370b281a3d7
2023-04-05 08:02:47 +00:00
Jessica Lawshe
91ec3ca47e Merge pull request #12425 from overleaf/jel-mobile-padding
[web] Option to add padding for mobile layout on CMS pages

GitOrigin-RevId: 33775905725710d7fc16d84c00af643c4adcc590
2023-04-04 08:04:46 +00:00
Jessica Lawshe
df8000fa83 Merge pull request #12414 from overleaf/jel-grid-in-card
[web] Option to render grid in a card on the CMS

GitOrigin-RevId: b65ee396915b4e8622384ab37a453d59b1d18c88
2023-04-04 08:04:38 +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
Alf Eaton
4ccf67203b Fix editor switcher colour transition (#12328)
GitOrigin-RevId: fc8caa34b12b9ef35422766023cdebf4bd36ff75
2023-03-30 08:03:20 +00:00
Jessica Lawshe
be6b89e9cf Merge pull request #12356 from overleaf/revert-12354-revert-12330-jel-grid-3-and-4-col
Revert "Revert "[web] Add 3 and 4 column options to Layout | Grid on the CMS""

GitOrigin-RevId: b24230c5f4f34bf2baa01ea82d73af1346ad95c8
2023-03-30 08:03:00 +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
Jessica Lawshe
e934e9af3d Merge pull request #12354 from overleaf/revert-12330-jel-grid-3-and-4-col
Revert "[web] Add 3 and 4 column options to `Layout | Grid` on the CMS"

GitOrigin-RevId: fea5f87e74fe9915f4ee7653ed60ff4261b4d144
2023-03-23 09:05:48 +00:00
Jessica Lawshe
8a572673c3 Merge pull request #12330 from overleaf/jel-grid-3-and-4-col
[web] Add 3 and 4 column options to `Layout | Grid` on the CMS

GitOrigin-RevId: 6003907344bb84c16678ff4e4424b9348a4cb0df
2023-03-23 09:05:40 +00:00
Jessica Lawshe
90a97e6d12 Merge pull request #12082 from overleaf/mf-jel-card-style-cms
Add new card style for CMS pages

GitOrigin-RevId: e664d185452e64702c23e2a09f3db6e950035cbe
2023-03-23 09:05:31 +00:00
Jakob Ackermann
c9513b79d3 Merge pull request #12155 from overleaf/ii-safari-project-title
[web] Adjust project checkboxes in project dash

GitOrigin-RevId: 42d40394eb1d933ba3c771ec7f5f873ead8cd770
2023-03-17 09:04:16 +00:00
Jessica Lawshe
b10b7b1f91 Merge pull request #12042 from overleaf/jel-change-plan
[web] Change plan UI now in a modal and update the style

GitOrigin-RevId: 1b501b4a972ca676cff32f531862c15c0c8f9e61
2023-03-09 09:05:05 +00:00
Tim Down
1f2c06b1d0 Position Grammarly button on top of CM6 editor
GitOrigin-RevId: f96d1897c38e8e14e9247690ee49972a2170f80e
2023-03-07 09:06:33 +00:00
M Fahru
20f8fc2dc0 Revert "Refactor project list notification by using onDismiss on Alert instead of custom Close component (#12043)" (#12133)
This reverts commit 9a3f95c322a063b84094452c21cb734a379da978

GitOrigin-RevId: 31fb4b1d429e2e9c611178afc3dc3c662340be44
2023-03-07 09:06:25 +00:00
M Fahru
06b75ebee2 Refactor project list notification by using onDismiss on Alert instead of custom Close component (#12043)
* Refactor project list notification by using `onDismiss` on `Alert` and not using the custom `Close` component

* Add dismissible alerts to storybook

GitOrigin-RevId: 9a3f95c322a063b84094452c21cb734a379da978
2023-03-07 09:05:48 +00:00
Davinder Singh
cc2d1a26e2 Merge pull request #11958 from overleaf/ds-td-documentation-btn-refactor
Styling and HTML structure of the documentation button

GitOrigin-RevId: e643edbe05579c037ca1ec27fab765974e74d2c5
2023-02-27 09:03:47 +00:00
Jessica Lawshe
b2a10260be Merge pull request #11773 from overleaf/jel-subscription-dash-change-to-group
[web] Begin change to group plan via React subscription dash

GitOrigin-RevId: 3f0f2820ab18ecc8337746282295302d7951c56f
2023-02-22 09:04:56 +00:00