Commit graph

12242 commits

Author SHA1 Message Date
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
Brian Gough
1da76f0a8d Merge pull request #12848 from overleaf/bg-fix-path-exception
add exception handling for  path.join in ProjectEntityHandler

GitOrigin-RevId: dad305057fd6b2821525ca5b6d1933824989e241
2023-05-02 19:43:50 +00:00
Jakob Ackermann
6ef9be0d0c Merge pull request #12858 from overleaf/jpa-server-ce-script-change-compile-timeout
[web] server-ce-script: add script for changing compile timeout for user

GitOrigin-RevId: 3718b970661e1ede04402889c240ecdabdcc7eff
2023-05-01 08:05:20 +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
7f7443356c Merge pull request #12738 from overleaf/mj-disable-ace-beta-users
[web] Hide Ace editor for beta users

GitOrigin-RevId: 7e359823429656862c4701e55686ebfd3f1f7a36
2023-05-01 08:04:53 +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
Alf Eaton
f3205c1d06 Merge pull request #12768 from overleaf/ae-upgrade-codemirror-3
[cm6] Upgrade CodeMirror dependencies

GitOrigin-RevId: aa2d3473deee940fc86ac18261c0e0c35af53711
2023-05-01 08:04:07 +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
0de648eecd Merge pull request #12774 from overleaf/ds-em-mongo-secondary-db-fix
Bug fix - Mongo DB secondary preference

GitOrigin-RevId: d9adc0a7e1ee5085b34c5c1ddfdc715967607fc3
2023-04-28 08:04:51 +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
Jessica Lawshe
8be17cdb37 Merge pull request #12819 from overleaf/jpa-institutions-lookup
[web] migrate /institutions/ proxies to explicit V1 requests

GitOrigin-RevId: 535da280a6350dacbe2c957d2f2cedaeee02a48a
2023-04-28 08:04:34 +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
Miguel Serrano
d2172e5179 [web] Issue Oauth2 access tokens (#12788)
* [web] Issue Oauth2 access tokens

* [web] Add partial index for `oauthAccessTokens.user_id` for Personal Access Tokens

* [web] script to create personal access tokens

GitOrigin-RevId: 796e8d23a6799a87ac6096c686139c6290668b83
2023-04-28 08:04:10 +00:00
Brian Gough
426128554d Merge pull request #12813 from overleaf/bg-add-inr-currency
add Indian Rupee (INR) prices to plan and group settings

GitOrigin-RevId: 6c058ed034d1566cfda17e73a8ba23d8bd7b7ab0
2023-04-27 08:07:45 +00:00
Miguel Serrano
fe1dad8c0b [web/scripts] Clean legacy history data (#12812)
* [web/scripts] Clean legacy history data

GitOrigin-RevId: ce91ca69a9f4e8b340e659d0b468852abe01e6fd
2023-04-27 08:07:07 +00:00
Brian Gough
80fdef796c Merge pull request #12817 from overleaf/bg-plan-scripts
refactor plan-prices scripts and add new currency (INR)

GitOrigin-RevId: 12b515143e0426f19b2d224569bf9c5490b7d72a
2023-04-27 08:06:06 +00:00
Brian Gough
c3ad6645fe Merge pull request #12816 from overleaf/bg-recurly-scripts-cleanup
sort recurly script JSON outputs for consistency

GitOrigin-RevId: e5dc789fd834e9864912e3ef14ac3e6bf8eb7d99
2023-04-27 08:05:52 +00:00
Jakob Ackermann
46fb6f7c83 Merge pull request #12814 from overleaf/jpa-modules-rs-init
[web] initialize mongo replicaset for individual modules

GitOrigin-RevId: 9f8934ae58b21a99f466093617449f5e792d39cd
2023-04-27 08:05:40 +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
CloudBuild
28f90c8a87 auto update translation
GitOrigin-RevId: e0d9d3c22c4ce093c3ad7393ef2b91f9a3cada16
2023-04-26 08:05:16 +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
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
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
Davinder Singh
10f879eab8 Merge pull request #12365 from overleaf/ds-deleted-project-page
Admin panel- Deleted project info page migration to react

GitOrigin-RevId: a964d80b3a2ef25340452fccdab6bdc51c01c59e
2023-04-26 08:04:03 +00:00
Miguel Serrano
a8885b1720 OAuth server: generate GitHub-style tokens (#12617)
* Add `base-x` and `crc-32` dependencies

* OAuth server: generate GitHub-style tokens

GitOrigin-RevId: c128742a37d53f1902ccfaf75fa1c5ca5adfdbf2
2023-04-25 08:07:18 +00:00
Jimmy Domagala-Tang
45797f8bb6 Merge pull request #12764 from overleaf/jpa-remove-unused-http-proxy
[web] remove unused http-proxy dependency

GitOrigin-RevId: bc1e30d1ce175e1f5c88614ab6f2fbbeb5d863a5
2023-04-25 08:07:09 +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
Brian Gough
72abda9f29 Merge pull request #12757 from overleaf/bg-clean-up-recurly-prices-script
clean up recurly prices script

GitOrigin-RevId: b9afa05a0931bb11fd9be2d9a92a6d4beaab2f7d
2023-04-25 08:06:05 +00:00
Brian Gough
253f44894a Merge pull request #12748 from overleaf/bg-recurly-add-currency
add script for generating recurly prices

GitOrigin-RevId: c7a624af35eba9882798fbaf750e4328604f47fa
2023-04-25 08:05:57 +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
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
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