Skip to content

Commit 54227bf

Browse files
lemurra_microsoftlemurra_microsoft
lemurra_microsoft
authored and
lemurra_microsoft
committed
Refactor session metadata display logic for improved clarity and consistency
1 parent cdb27d1 commit 54227bf

3 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎webviews/dashboardView/app.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,13 @@ function Dashboard() {
294294
</span>
295295
<span className="item-title-text">{item.data.name}</span>
296296
</div>
297-
<div className="item-metadata">
298-
<div className="metadata-item">
299-
<span className="project-path-text">{item.data.path}</span>
297+
{item.data.path && (
298+
<div className="item-metadata">
299+
<div className="metadata-item">
300+
<span className="project-path-text">{item.data.path}</span>
301+
</div>
300302
</div>
301-
</div>
303+
)}
302304
</div>
303305
)
304306
)

‎webviews/dashboardView/components/GlobalSessionItem.tsx‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,26 @@ export const GlobalSessionItem: React.FC<GlobalSessionItemProps> = ({
7070
<span className="repository-name">{session.repository}</span>
7171
</div>
7272
)}
73-
<div className="metadata-item">
74-
{session.isTemporary ? (
75-
<span className="status-badge status-creating">
76-
<span className="codicon codicon-loading codicon-modifier-spin"></span>
77-
{session.status}
78-
</span>
79-
) : session.isLocal ? (
80-
// No status badge for local tasks
81-
null
82-
) : (
83-
<span className={index === 0 && (session.status === '1' || session.status?.toLowerCase() === 'completed') ? 'status-badge status-needs-clarification' : getStatusBadgeClass(session.status)}>
84-
{(session.status === '2' || session.status?.toLowerCase() === 'in progress') && (
73+
{(session.isTemporary || !session.isLocal) && (
74+
<div className="metadata-item">
75+
{session.isTemporary ? (
76+
<span className="status-badge status-creating">
8577
<span className="codicon codicon-loading codicon-modifier-spin"></span>
86-
)}
87-
{(session.status === '1' || session.status?.toLowerCase() === 'completed') && (
88-
<span className="codicon codicon-circle-filled"></span>
89-
)}
90-
{formatStatus(session.status, index)}
91-
</span>
92-
)}
93-
</div>
78+
{session.status}
79+
</span>
80+
) : (
81+
<span className={index === 0 && (session.status === '1' || session.status?.toLowerCase() === 'completed') ? 'status-badge status-needs-clarification' : getStatusBadgeClass(session.status)}>
82+
{(session.status === '2' || session.status?.toLowerCase() === 'in progress') && (
83+
<span className="codicon codicon-loading codicon-modifier-spin"></span>
84+
)}
85+
{(session.status === '1' || session.status?.toLowerCase() === 'completed') && (
86+
<span className="codicon codicon-circle-filled"></span>
87+
)}
88+
{formatStatus(session.status, index)}
89+
</span>
90+
)}
91+
</div>
92+
)}
9493
<div className="metadata-item">
9594
<span title={formatFullDateTime(session.dateCreated)}>{formatDate(session.dateCreated)}</span>
9695
</div>

‎webviews/dashboardView/components/SessionItem.tsx‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,26 @@ export const SessionItem: React.FC<SessionItemProps> = ({
6464
<span className="item-title-text">{session.title}</span>
6565
</div>
6666
<div className="item-metadata">
67-
<div className="metadata-item">
68-
{session.isTemporary ? (
69-
<span className="status-badge status-creating">
70-
<span className="codicon codicon-loading codicon-modifier-spin"></span>
71-
{session.status}
72-
</span>
73-
) : session.isLocal ? (
74-
// No status badge for local tasks
75-
null
76-
) : (
77-
<span className={index === 0 && (session.status === '1' || session.status?.toLowerCase() === 'completed') ? 'status-badge status-needs-clarification' : getStatusBadgeClass(session.status)}>
78-
{(session.status === '2' || session.status?.toLowerCase() === 'in progress') && (
67+
{(session.isTemporary || !session.isLocal) && (
68+
<div className="metadata-item">
69+
{session.isTemporary ? (
70+
<span className="status-badge status-creating">
7971
<span className="codicon codicon-loading codicon-modifier-spin"></span>
80-
)}
81-
{(session.status === '1' || session.status?.toLowerCase() === 'completed') && (
82-
<span className="codicon codicon-circle-filled"></span>
83-
)}
84-
{formatStatus(session.status, index)}
85-
</span>
86-
)}
87-
</div>
72+
{session.status}
73+
</span>
74+
) : (
75+
<span className={index === 0 && (session.status === '1' || session.status?.toLowerCase() === 'completed') ? 'status-badge status-needs-clarification' : getStatusBadgeClass(session.status)}>
76+
{(session.status === '2' || session.status?.toLowerCase() === 'in progress') && (
77+
<span className="codicon codicon-loading codicon-modifier-spin"></span>
78+
)}
79+
{(session.status === '1' || session.status?.toLowerCase() === 'completed') && (
80+
<span className="codicon codicon-circle-filled"></span>
81+
)}
82+
{formatStatus(session.status, index)}
83+
</span>
84+
)}
85+
</div>
86+
)}
8887
<div className="metadata-item">
8988
<span title={formatFullDateTime(session.dateCreated)}>{formatDate(session.dateCreated)}</span>
9089
</div>

0 commit comments

Comments
 (0)