@@ -21,11 +21,13 @@ export class RunPresenter {
21
21
projectSlug,
22
22
organizationSlug,
23
23
runFriendlyId,
24
+ showDeletedLogs,
24
25
} : {
25
26
userId : string ;
26
27
projectSlug : string ;
27
28
organizationSlug : string ;
28
29
runFriendlyId : string ;
30
+ showDeletedLogs : boolean ;
29
31
} ) {
30
32
const run = await this . #prismaClient. taskRun . findFirstOrThrow ( {
31
33
select : {
@@ -72,31 +74,41 @@ export class RunPresenter {
72
74
} ,
73
75
} ) ;
74
76
77
+ const showLogs = showDeletedLogs ? true : run . logsDeletedAt ? false : true ;
78
+
79
+ const runData = {
80
+ id : run . id ,
81
+ number : run . number ,
82
+ friendlyId : run . friendlyId ,
83
+ traceId : run . traceId ,
84
+ spanId : run . spanId ,
85
+ status : run . status ,
86
+ isFinished : isFinalRunStatus ( run . status ) ,
87
+ completedAt : run . completedAt ,
88
+ logsDeletedAt : showDeletedLogs ? null : run . logsDeletedAt ,
89
+ rootTaskRun : run . rootTaskRun ,
90
+ environment : {
91
+ id : run . runtimeEnvironment . id ,
92
+ organizationId : run . runtimeEnvironment . organizationId ,
93
+ type : run . runtimeEnvironment . type ,
94
+ slug : run . runtimeEnvironment . slug ,
95
+ userId : run . runtimeEnvironment . orgMember ?. user . id ,
96
+ userName : getUsername ( run . runtimeEnvironment . orgMember ?. user ) ,
97
+ } ,
98
+ } ;
99
+
100
+ if ( ! showLogs ) {
101
+ return {
102
+ run : runData ,
103
+ trace : undefined ,
104
+ } ;
105
+ }
106
+
75
107
// get the events
76
108
const traceSummary = await eventRepository . getTraceSummary ( run . traceId ) ;
77
-
78
109
if ( ! traceSummary ) {
79
110
return {
80
- run : {
81
- id : run . id ,
82
- number : run . number ,
83
- friendlyId : run . friendlyId ,
84
- traceId : run . traceId ,
85
- spanId : run . spanId ,
86
- status : run . status ,
87
- isFinished : isFinalRunStatus ( run . status ) ,
88
- completedAt : run . completedAt ,
89
- logsDeletedAt : run . logsDeletedAt ,
90
- rootTaskRun : run . rootTaskRun ,
91
- environment : {
92
- id : run . runtimeEnvironment . id ,
93
- organizationId : run . runtimeEnvironment . organizationId ,
94
- type : run . runtimeEnvironment . type ,
95
- slug : run . runtimeEnvironment . slug ,
96
- userId : run . runtimeEnvironment . orgMember ?. user . id ,
97
- userName : getUsername ( run . runtimeEnvironment . orgMember ?. user ) ,
98
- } ,
99
- } ,
111
+ run : runData ,
100
112
trace : undefined ,
101
113
} ;
102
114
}
@@ -139,26 +151,7 @@ export class RunPresenter {
139
151
}
140
152
141
153
return {
142
- run : {
143
- id : run . id ,
144
- number : run . number ,
145
- friendlyId : run . friendlyId ,
146
- traceId : run . traceId ,
147
- spanId : run . spanId ,
148
- status : run . status ,
149
- isFinished : isFinalRunStatus ( run . status ) ,
150
- completedAt : run . completedAt ,
151
- logsDeletedAt : run . logsDeletedAt ,
152
- rootTaskRun : run . rootTaskRun ,
153
- environment : {
154
- id : run . runtimeEnvironment . id ,
155
- organizationId : run . runtimeEnvironment . organizationId ,
156
- type : run . runtimeEnvironment . type ,
157
- slug : run . runtimeEnvironment . slug ,
158
- userId : run . runtimeEnvironment . orgMember ?. user . id ,
159
- userName : getUsername ( run . runtimeEnvironment . orgMember ?. user ) ,
160
- } ,
161
- } ,
154
+ run : runData ,
162
155
trace : {
163
156
rootSpanStatus,
164
157
events : events ,
0 commit comments