Skip to content

Commit

Permalink
fix(UI): rc-0.4 fixes (#1342)
Browse files Browse the repository at this point in the history
Signed-off-by: Shakira M <shakira_m@intuit.com>
(cherry picked from commit f6edd5a)
  • Loading branch information
mshakira authored and whynowy committed Nov 3, 2023
1 parent a8d44d1 commit ceed5de
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
CRITICAL,
HEALTHY,
INACTIVE,
INACTIVE_STATUS,
NO_PIPELINES,
WARNING,
WITH_PIPELINES,
Expand Down Expand Up @@ -72,6 +73,8 @@ export function ClusterNamespaceListing({
return ns.pipelinesWarningCount > 0;
} else if (healthFilter === CRITICAL) {
return ns.pipelinesCriticalCount > 0;
} else if (healthFilter === INACTIVE_STATUS) {
return ns.pipelinesInactiveCount > 0;
} else {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
DESC,
FAILED,
HEALTHY,
INACTIVE_STATTUS,
INACTIVE_STATUS,
LAST_CREATED_SORT,
LAST_UPDATED_SORT,
PAUSED,
Expand All @@ -54,7 +54,7 @@ export const HEALTH = [
HEALTHY,
WARNING,
CRITICAL,
INACTIVE_STATTUS,
INACTIVE_STATUS,
UNKNOWN,
];
export const STATUS = [
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ui/src/utils/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const ALL = "All";
export const RUNNING = "Running";
export const ACTIVE = "Running";
export const INACTIVE = "Not-Running";
export const INACTIVE_STATTUS = "inactive";
export const INACTIVE_STATUS = "inactive";
export const HEALTHY = "healthy";
export const WARNING = "warning";
export const CRITICAL0 = "critical0";
Expand Down Expand Up @@ -241,7 +241,7 @@ export const IconsStatusMap = {
[PAUSED]: circleDash,
[ACTIVE]: circleCheck,
[INACTIVE]: circleDash,
[INACTIVE_STATTUS]: circleDash,
[INACTIVE_STATUS]: circleDash,
[HEALTHY]: heartFill,
[WARNING]: warning,
[CRITICAL]: critical,
Expand All @@ -268,7 +268,7 @@ export const StatusString: StatusStringType = {
[STOPPED]: "Stopped",
[ACTIVE]: "Running",
[INACTIVE]: "Inactive",
[INACTIVE_STATTUS]: "Inactive",
[INACTIVE_STATUS]: "Inactive",
[HEALTHY]: "Healthy",
[WARNING]: "Warning",
[CRITICAL]: "Critical",
Expand Down

0 comments on commit ceed5de

Please sign in to comment.