jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged vault (from main) and resolved conflicts

Browse source
This commit is contained in:
Shekar Siri 2022-05-18 12:26:21 +02:00
parent 9ea1992b34
commit ab2a800b7c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/app/components/BugFinder/SessionList/SessionListHeader.js
View file

@ -33,10 +33,12 @@ function SessionListHeader({
<span>{ activeTab.name }</span>
<span className="ml-2 font-normal color-gray-medium">{ count ? numberWithCommas(count) : 0 }</span>
</h3>
<div className="ml-3 flex items-center">
<span className="mr-2 color-gray-medium">Sessions Captured in</span>
<DateRange />
</div>
{ activeTab.type !== 'bookmark' && (
<div className="ml-3 flex items-center">
<span className="mr-2 color-gray-medium">Sessions Captured in</span>
<DateRange />
</div>
)}
</div>
<div className="flex items-center">
{/* <div className="flex items-center">

3
frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js
View file

@ -79,7 +79,8 @@ function SessionsMenu(props) {
title={ isEnterprise ? "Vault" : "Bookmarks" }
iconName={ isEnterprise ? "safe" : "star" }
active={activeTab.type === 'bookmark'}
onClick={() => onMenuItemClick({ name: 'Bookmarks', type: 'bookmark' })}
onClick={() => onMenuItemClick({ name: isEnterprise ? 'Vault' : 'Bookmarks', type: 'bookmark', description: isEnterprise ? 'Sessions saved to vault never get\'s deleted from records.' : '' })}
// TODO show the description in header
/>
</div>