Skip to content

Commit 574d5ff

Browse files
committed
refactor: Update LogStageAccordion and LogsRenderer to support full screen view
1 parent 6d0e525 commit 574d5ff

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

src/Shared/Components/CICDHistory/LogStageAccordion.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const LogStageAccordion = ({
1919
handleStageOpen,
2020
stageIndex,
2121
isLoading,
22+
fullScreenView,
2223
}: LogStageAccordionProps) => {
2324
const handleAccordionToggle = () => {
2425
if (isOpen) {
@@ -41,7 +42,7 @@ const LogStageAccordion = ({
4142
<button
4243
className={`flexbox dc__transparent dc__content-space py-6 px-8 br-4 dc__align-items-center dc__select-text logs-renderer__stage-accordion ${
4344
isOpen ? 'logs-renderer__stage-accordion--open-stage' : ''
44-
} dc__position-sticky dc__zi-1 dc__top-82`}
45+
} dc__position-sticky dc__zi-1 ${fullScreenView ? 'dc__top-44' : 'dc__top-82'}`}
4546
type="button"
4647
role="tab"
4748
onClick={handleAccordionToggle}

src/Shared/Components/CICDHistory/LogsRenderer.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ export const LogsRenderer = ({
171171
triggerDetails,
172172
isBlobStorageConfigured,
173173
parentType,
174+
fullScreenView,
174175
}: LogsRendererType): JSX.Element => {
175176
const { pipelineId, envId, appId } = useParams<DeploymentHistoryBaseParamsType>()
176177
const logsURL =
@@ -407,7 +408,7 @@ export const LogsRenderer = ({
407408
}}
408409
>
409410
<div
410-
className="flexbox-col pb-7 dc__position-sticky dc__top-38 dc__zi-2"
411+
className={`flexbox-col pb-7 dc__position-sticky dc__zi-2 ${fullScreenView ? 'dc__top-0' : 'dc__top-38'}`}
411412
style={{
412413
backgroundColor: '#0C1021',
413414
}}
@@ -444,6 +445,7 @@ export const LogsRenderer = ({
444445
handleStageOpen={handleStageOpen}
445446
stageIndex={index}
446447
isLoading={index === stageList.length - 1 && areEventsProgressing}
448+
fullScreenView={fullScreenView}
447449
/>
448450
))}
449451
</div>

src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
483483
renderVirtualHistoryArtifacts,
484484
scrollToTop,
485485
scrollToBottom,
486+
fullScreenView,
486487
}) => {
487488
const { path } = useRouteMatch()
488489
const { appId, pipelineId, triggerId, envId } = useParams<{
@@ -514,6 +515,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
514515
triggerDetails={triggerDetails}
515516
isBlobStorageConfigured={isBlobStorageConfigured}
516517
parentType={HistoryComponentType.CD}
518+
fullScreenView={fullScreenView}
517519
/>
518520

519521
{(scrollToTop || scrollToBottom) && (
@@ -898,6 +900,7 @@ const TriggerOutput = ({
898900
renderVirtualHistoryArtifacts={renderVirtualHistoryArtifacts}
899901
scrollToTop={scrollToTop}
900902
scrollToBottom={scrollToBottom}
903+
fullScreenView={fullScreenView}
901904
/>
902905
</>
903906
)

src/Shared/Components/CICDHistory/types.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,6 @@ export interface TriggerDetailsStatusIconType {
245245
status: string
246246
}
247247

248-
export interface LogsRendererType {
249-
triggerDetails: History
250-
isBlobStorageConfigured: boolean
251-
parentType: HistoryComponentType
252-
}
253248
export interface SyncStageResourceDetail {
254249
id: number
255250
cdWorkflowRunnerId: number
@@ -406,6 +401,7 @@ export interface HistoryLogsProps
406401
| 'renderDeploymentApprovalInfo'
407402
| 'renderCIListHeader'
408403
| 'renderVirtualHistoryArtifacts'
404+
| 'fullScreenView'
409405
> {
410406
triggerDetails: History
411407
loading: boolean
@@ -417,6 +413,11 @@ export interface HistoryLogsProps
417413
renderRunSource: (runSource: RunSourceType, isDeployedInThisResource: boolean) => JSX.Element
418414
}
419415

416+
export interface LogsRendererType
417+
extends Pick<HistoryLogsProps, 'fullScreenView' | 'triggerDetails' | 'isBlobStorageConfigured'> {
418+
parentType: HistoryComponentType
419+
}
420+
420421
export interface DeploymentStatusDetailBreakdownType {
421422
deploymentStatusDetailsBreakdownData: DeploymentStatusDetailsBreakdownDataType
422423
isVirtualEnvironment?: boolean
@@ -717,7 +718,7 @@ export interface StageDetailType extends Pick<StageInfoDTO, 'stage' | 'startTime
717718
isOpen: boolean
718719
}
719720

720-
export interface LogStageAccordionProps extends StageDetailType {
721+
export interface LogStageAccordionProps extends StageDetailType, Pick<LogsRendererType, 'fullScreenView'> {
721722
handleStageClose: (index: number) => void
722723
handleStageOpen: (index: number) => void
723724
stageIndex: number

src/Shared/constants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ export const statusIcon = {
380380
}
381381

382382
export const statusColor = {
383-
suspended: '#ffaa00',
383+
suspended: 'var(--Y500)',
384384
unknown: 'var(--N700)',
385385
queued: 'var(--N700)',
386386
degraded: 'var(--R500)',

0 commit comments

Comments
 (0)