Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 194 additions & 3 deletions electron/src/renderer/pages/DeepSeshPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Main Deep Sesh screen shown after onboarding.
// This page composes the Deep Sesh UI and keeps timer display text together.

import { useEffect, useState } from 'react'
import { useEffect, useMemo, useState } from 'react'
import DeepSeshModeSelector from '../components/deepSesh/DeepSeshModeSelector'
import DeepSeshSetupPanel from '../components/deepSesh/DeepSeshSetupPanel'
import DeepSeshTimerCard from '../components/deepSesh/DeepSeshTimerCard'
Expand All @@ -13,6 +13,10 @@ import {
import { useDeepSeshTimer } from '../hooks/useDeepSeshTimer'
import type { BrowserActivityPayload } from '../../shared/browserActivity'
import type { DesktopActivityPayload } from '../../shared/focusMonitoring'
import type {
AppRuleStatus,
BrowserActivityRuleStatus,
} from '../hooks/useFocusEnvironmentSettings'
import '../styles/deepSesh.css'

export default function DeepSeshPage() {
Expand All @@ -29,6 +33,10 @@ export default function DeepSeshPage() {
browserActivity,
desktopActivity,
})
const shouldShowReviewScreen =
!timer.isSessionActive &&
focusMonitor.hasCompletedSessionSummary &&
focusMonitor.unknownActivities.length > 0
const layoutClass = timer.isSessionActive
? 'deep-sesh-screen--active'
: 'deep-sesh-screen--setup'
Expand Down Expand Up @@ -167,8 +175,12 @@ export default function DeepSeshPage() {
</svg>
</button>

<div className="deep-sesh-shell">
<main className="deep-sesh-main">
<div
className={`deep-sesh-shell ${
shouldShowReviewScreen ? 'deep-sesh-shell--reviewing' : ''
}`}
>
<main className="deep-sesh-main deep-sesh-main--timer">
<section className="deep-sesh-panel surface-card">
<div className="deep-sesh-session-column">
{/* Mode, timer, setup, and summary are split for reviewable UI changes. */}
Expand Down Expand Up @@ -216,7 +228,175 @@ export default function DeepSeshPage() {
<FocusMonitorPanel focusMonitor={focusMonitor} />
)}
</section>

</main>

{shouldShowReviewScreen && (
<SessionReviewPanel focusMonitor={focusMonitor} />
)}
</div>
</section>
)
}

function SessionReviewPanel({
focusMonitor,
}: {
focusMonitor: ReturnType<typeof useFocusMonitoringSession>
}) {
const [selectedStatuses, setSelectedStatuses] = useState<
Record<string, AppRuleStatus | BrowserActivityRuleStatus>
>({})
const selectedCount = Object.keys(selectedStatuses).length
const unresolvedCount = Math.max(
0,
focusMonitor.unknownActivities.length - selectedCount,
)
const canContinue = selectedCount > 0

const sortedUnknownActivities = useMemo(() => {
return [...focusMonitor.unknownActivities].sort((leftItem, rightItem) => {
return leftItem.kind.localeCompare(rightItem.kind) ||
leftItem.label.localeCompare(rightItem.label)
})
}, [focusMonitor.unknownActivities])

/* Stores the review choice locally so the user can change their mind before saving. */
function selectUnknownStatus(
itemId: string,
status: AppRuleStatus | BrowserActivityRuleStatus,
) {
setSelectedStatuses((currentStatuses) => ({
...currentStatuses,
[itemId]: status,
}))
}

function doLater() {
focusMonitor.dismissSessionSummary({ keepUnknownActivities: true })
}

function continueReview() {
if (!canContinue) {
return
}

if (
unresolvedCount > 0 &&
!window.confirm(
`${unresolvedCount} unknown item${unresolvedCount === 1 ? '' : 's'} ` +
'still need a choice. Taskmaster will ask you again after a later session.',
)
) {
return
}

focusMonitor.unknownActivities.forEach((item) => {
const selectedStatus = selectedStatuses[item.id]

if (selectedStatus) {
focusMonitor.reviewUnknownActivity(item, selectedStatus)
}
})
focusMonitor.dismissSessionSummary({ keepUnknownActivities: true })
}

return (
<section className="deep-sesh-review-screen" aria-label="Review unknown activity">
<button
className="deep-sesh-review-later-button secondary-button"
type="button"
onClick={doLater}
>
Do later
</button>

<div className="deep-sesh-review-panel surface-card">
<div className="deep-sesh-review-header">
<span className="status-pill">Session summary</span>
<h2>Review new activity</h2>
</div>

<p className="muted-text">
Choose what Taskmaster should do with anything new it saw. Unchosen
items stay unknown and will come back after a future session.
</p>

<div className="deep-sesh-review-stats">
<div>
<span>Distractions</span>
<strong>{focusMonitor.stats.distractionEvents}</strong>
</div>
<div>
<span>Distracted time</span>
<strong>{formatSecondsLabel(focusMonitor.stats.distractedSeconds)}</strong>
</div>
<div>
<span>Unknown</span>
<strong>{focusMonitor.stats.unknownCount}</strong>
</div>
</div>

<div className="deep-sesh-review-list">
{sortedUnknownActivities.map((item) => {
const selectedStatus = selectedStatuses[item.id]

return (
<div className="deep-sesh-review-item" key={item.id}>
<div>
<span>{item.kind === 'desktop-app' ? 'Unknown app' : 'Unknown page'}</span>
<strong>{item.label}</strong>
<p className="muted-text">{item.detail}</p>
</div>
<div className="deep-sesh-review-actions">
<button
className={`secondary-button ${
selectedStatus === 'allowed' ? 'deep-sesh-review-choice--active' : ''
}`}
type="button"
onClick={() => selectUnknownStatus(item.id, 'allowed')}
>
Allow
</button>
<button
className={`secondary-button ${
selectedStatus === 'blocked' ? 'deep-sesh-review-choice--active' : ''
}`}
type="button"
onClick={() => selectUnknownStatus(item.id, 'blocked')}
>
Block
</button>
<button
className={`secondary-button ${
selectedStatus === 'ignored' ? 'deep-sesh-review-choice--active' : ''
}`}
type="button"
onClick={() => selectUnknownStatus(item.id, 'ignored')}
>
Ignore
</button>
</div>
</div>
)
})}
</div>

<div className="deep-sesh-review-footer">
<span className="muted-text">
{selectedCount === 0
? 'Choose at least one item to continue.'
: `${selectedCount} selected, ${unresolvedCount} left for later.`}
</span>
<button
className="primary-button"
type="button"
disabled={!canContinue}
onClick={continueReview}
>
Continue
</button>
</div>
</div>
</section>
)
Expand Down Expand Up @@ -296,3 +476,14 @@ function formatDurationLabel(totalMinutes: number) {

return `${hourText} ${minuteText}`
}

function formatSecondsLabel(totalSeconds: number) {
const minutes = Math.floor(totalSeconds / 60)
const seconds = totalSeconds % 60

if (minutes === 0) {
return `${seconds}s`
}

return `${minutes}m ${seconds}s`
}
Loading
Loading