Skip to content

Commit 8e91e58

Browse files
fix for archived plr loader logic
1 parent ed537a7 commit 8e91e58

10 files changed

Lines changed: 24 additions & 17 deletions

File tree

src/components/logs/Logs.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ const Logs: FC<LogsProps> = ({
411411
}, [logData, activeStep, findTargetRowForActiveStep]);
412412

413413
return (
414-
<div className="pf-v5-u-h-100 pf-v5-u-w-100">
414+
<div className="pf-v6-u-h-100 pf-v6-u-w-100">
415415
{error && (
416416
<Alert
417417
variant="danger"
@@ -422,8 +422,8 @@ const Logs: FC<LogsProps> = ({
422422
<LogViewer
423423
useAnsiClasses={true}
424424
header={
425-
<Banner className="pf-v5-l-flex pf-v5-l-gap-md">
426-
<span data-test-id="logs-taskName" className="pf-v5-u-font-size-md">
425+
<Banner className="pf-v6-l-flex pf-v6-l-gap-md">
426+
<span data-test-id="logs-taskName" className="pf-v6-u-font-size-md">
427427
{taskName}
428428
</span>
429429
{stillFetching ? (

src/components/logs/TektonTaskRunLog.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.odc-tekton-taskrun-log {
44
overflow: hidden;
55

6-
.pf-v5-c-log-viewer__text {
6+
.pf-v6-c-log-viewer__text {
77
white-space: pre;
88
}
99

src/components/pipelineRuns-details/PipelineRunDetailsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const PipelineRunDetailsPage: FC<PipelineRunDetailsPageProps> = ({
4848
const { t } = useTranslation('plugin__pipelines-console-plugin');
4949
const [pipelineRun, k8sLoaded, trLoaded] = usePipelineRun(namespace, name);
5050
/* this needs decoupling */
51-
const pipelineRunLoaded = k8sLoaded && trLoaded;
51+
const pipelineRunLoaded = k8sLoaded || trLoaded;
5252

5353
const customActionMenu = useCallback((_kindObj, obj) => {
5454
const reference = getReferenceForModel(PipelineRunModel);

src/components/pipelineRuns-details/PipelineRunLogs.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
bottom: 0;
1010
overflow: hidden;
1111

12-
.pf-v5-c-log-viewer__text {
12+
.pf-v6-c-log-viewer__text {
1313
white-space: pre;
1414
}
1515

src/components/pipelineRuns-details/PipelineRunLogs.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ export const PipelineRunLogsWithActiveTask: FC<
292292
plrStatus !== ComputedStatus.Running &&
293293
plrStatus !== ComputedStatus.Pending &&
294294
plrStatus !== ComputedStatus.Cancelling;
295-
const [taskRuns, taskRunsLoaded, , , pendingAdmission, proxyUnavailable] =
295+
const [taskRuns, k8sLoaded, trLoaded, , pendingAdmission, proxyUnavailable] =
296296
useTaskRuns(
297297
obj?.metadata?.namespace,
298298
obj?.metadata?.name,
@@ -303,6 +303,8 @@ export const PipelineRunLogsWithActiveTask: FC<
303303
pipelineRunManagedBy: obj?.spec?.managedBy,
304304
},
305305
);
306+
/* this needs decoupling */
307+
const taskRunsLoaded = k8sLoaded || trLoaded;
306308
const { isResourceManagedByKueue } = useMultiClusterProxyService({
307309
managedBy: obj?.spec?.managedBy,
308310
});

src/components/pipelineRuns-details/PipelineRunVisualization.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const PipelineRunVisualization: FC<PipelineRunVisualizationProps> = ({
3535
},
3636
);
3737
/* this needs decoupling */
38-
const taskRunsLoaded = k8sLoaded && trLoaded;
38+
const taskRunsLoaded = k8sLoaded || trLoaded;
3939
const pipeline: PipelineKind = usePipelineFromPipelineRun(pipelineRun);
4040
if (!pipeline) {
4141
return (

src/components/pipelines-metrics/PipelinesAverageDurationK8s.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const PipelinesAverageDurationK8s: FC<PipelinesAverageDurationProps> = ({
8686
interval,
8787
parentName,
8888
namespace,
89-
width = 530
89+
width = 530,
9090
}) => {
9191
const { t } = useTranslation('plugin__pipelines-console-plugin');
9292
const startTimespan = timespan - parsePrometheusDuration('1d');
@@ -299,16 +299,18 @@ const PipelinesAverageDurationK8s: FC<PipelinesAverageDurationProps> = ({
299299
<>
300300
<Card
301301
className={classNames({
302-
'pf-v6-u-h-100 pipeline-overview__min-width-full pipeline-overview__overflow-hidden pf-v6-u-display-flex pf-v6-u-flex-direction-column': !averageDurationError,
302+
'pf-v6-u-h-100 pipeline-overview__min-width-full pipeline-overview__overflow-hidden pf-v6-u-display-flex pf-v6-u-flex-direction-column':
303+
!averageDurationError,
303304
'card-border': bordered,
304305
})}
305306
>
306307
<CardTitle className="pf-v6-u-pb-0">
307308
<span>{t('Average duration')}</span>
308309
</CardTitle>
309-
<CardBody
310+
<CardBody
310311
className={classNames({
311-
'pf-v6-u-flex-1 pipeline-overview__min-height-0 pf-v6-u-display-flex pf-v6-u-flex-direction-column pf-v6-u-justify-content-flex-end pf-v6-u-align-items-flex-start pf-v6-u-p-0': !averageDurationError,
312+
'pf-v6-u-flex-1 pipeline-overview__min-height-0 pf-v6-u-display-flex pf-v6-u-flex-direction-column pf-v6-u-justify-content-flex-end pf-v6-u-align-items-flex-start pf-v6-u-p-0':
313+
!averageDurationError,
312314
})}
313315
>
314316
{averageDurationError ? (
@@ -357,7 +359,7 @@ const PipelinesAverageDurationK8s: FC<PipelinesAverageDurationProps> = ({
357359
</ChartGroup>
358360
</Chart>
359361
) : (
360-
<div className="pipeline-overview__number-of-plr-card__loading pf-v5-u-h-100">
362+
<div className="pipeline-overview__number-of-plr-card__loading pf-v6-u-h-100">
361363
<LoadingInline />
362364
</div>
363365
)}

src/components/pipelines-overview/PipelinesOverviewPageK8s.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const PipelinesOverviewPageK8s: FC = () => {
6060
<PageSection hasBodyWrapper={false} className="pf-v6-u-pl-md">
6161
<Title headingLevel="h2">{t('Overview')}</Title>
6262
</PageSection>
63-
<div className="pf-v5-u-m-md">
63+
<div className="pf-v6-u-m-md">
6464
<K8sDataLimitationAlert />
6565
</div>
6666
<Flex className="pf-v6-u-pl-md pf-v6-u-pr-md pf-v6-u-mb-md">

src/components/pipelines-tasks/tasks-details-pages/TaskRunLog.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
flex: 1;
66
padding: var(--pf-t--global--spacer--xl);
77

8-
.pf-v5-c-log-viewer__text {
8+
.pf-v6-c-log-viewer__text {
99
white-space: pre;
1010
}
1111

src/components/quick-search/QuickSearchBar.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
margin-left: auto !important;
4949
}
5050
&__icon {
51-
background-color: var(--pf-t--global--background--color--secondary--default);
52-
border-bottom: solid var(--pf-v5-global--BorderWidth--sm) var(--pf-v5-global--BorderColor--200);
51+
background-color: var(
52+
--pf-t--global--background--color--secondary--default
53+
);
54+
border-bottom: solid var(--pf-v6-global--BorderWidth--sm)
55+
var(--pf-v6-global--BorderColor--200);
5356
}
5457
}

0 commit comments

Comments
 (0)