github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14831 from overleaf/jdt-hist-free-label

Browse source 
allow labels on history for free user versions over 24 hrs

GitOrigin-RevId: 8a71f999ad0bb22a5dc8155f14a39a4b625624ba
This commit is contained in:
Jimmy Domagala-Tang 2023-09-14 11:42:08 -04:00 committed by Copybot
parent 08d8b40934
commit 6929984e04
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/frontend/js/features/history/components/change-list/all-history-list.tsx
View file

@ -140,7 +140,8 @@ function AllHistoryList() {
const showDivider = Boolean(update.meta.first_in_day && index > 0) const showDivider = Boolean(update.meta.first_in_day && index > 0)
const faded = const faded =
updatesInfo.freeHistoryLimitHit && updatesInfo.freeHistoryLimitHit &&
index === visibleUpdates.length - 1 index === visibleUpdates.length - 1 &&
visibleUpdates.length > 1
const selectable = const selectable =
!faded && !faded &&
(selection.comparing || (selection.comparing ||

10
services/web/frontend/js/features/history/context/history-context.tsx
View file

@ -132,15 +132,17 @@ function useHistory() {
previousUpdate = update previousUpdate = update
// the free tier cutoff is 24 hours, so show one extra update
// after which will become the fade teaser above the paywall
if ( if (
!userHasFullFeature && !userHasFullFeature &&
visibleUpdateCount === null && visibleUpdateCount === null &&
update.meta.end_ts < timestamp24hoursAgo update.meta.end_ts < timestamp24hoursAgo
) { ) {
// Make sure that we show at least one entry (to allow labelling), and // Make sure that we show at least one entry fully (to allow labelling), and one extra for fading
// load one extra update that is displayed but faded out above the // Since the index for the first free tier cutoff will be at 0 if all versions were updated the day before (all version in the past),
// paywall // we need to +2 instead of +1. this gives us one which is selected and one which is faded
visibleUpdateCount = index + 1 visibleUpdateCount = index > 0 ? index + 1 : 2
freeHistoryLimitHit = true freeHistoryLimitHit = true
} }
} }