Skip to content

Commit f8d2033

Browse files
Compare resolved types of status
1 parent 45f85b7 commit f8d2033

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

src/components/KymaModules/components/ModuleStatus.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@ import { useModuleStatus } from '../support';
33

44
export const resolveType = (status: string) => {
55
switch (status) {
6+
case 'Initial':
7+
case 'Pending':
8+
case 'Available':
9+
case 'Released':
10+
return 'Information';
611
case 'Ready':
12+
case 'Bound':
13+
case 'Running':
14+
case 'Success':
15+
case 'Succeeded':
16+
case 'Ok':
717
return 'Positive';
818
case 'Processing':
919
case 'Deleting':
@@ -12,7 +22,10 @@ export const resolveType = (status: string) => {
1222
return 'None';
1323
case 'Warning':
1424
return 'Critical';
25+
case 'Failed':
1526
case 'Error':
27+
case 'Failure':
28+
case 'Invalid':
1629
return 'Negative';
1730
default:
1831
return 'None';

src/components/KymaModules/support.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
33

44
import { useFetch } from 'shared/hooks/BackendAPI/useFetch';
55
import { ColumnLayoutState } from 'state/columnLayoutAtom';
6+
import { resolveType } from './components/ModuleStatus';
67

78
export const enum ModuleTemplateStatus {
89
Ready = 'Ready',
@@ -12,6 +13,7 @@ export const enum ModuleTemplateStatus {
1213
Unmanaged = 'Unmanaged',
1314
Warning = 'Warning',
1415
Error = 'Error',
16+
NotInstalled = 'Not installed',
1517
}
1618

1719
type ConditionType = {
@@ -326,11 +328,11 @@ export const resolveInstallationStateName = (
326328
managerResourceState?: string,
327329
) => {
328330
if (state === ModuleTemplateStatus.Unmanaged && !managerExists) {
329-
return 'Not installed';
331+
return ModuleTemplateStatus.NotInstalled;
330332
}
331333

332334
if (state === ModuleTemplateStatus.Unmanaged && managerExists) {
333-
if (state !== managerResourceState) {
335+
if (resolveType(state) !== resolveType(managerResourceState ?? '')) {
334336
return ModuleTemplateStatus.Processing;
335337
}
336338
return managerResourceState || ModuleTemplateStatus.Unknown;

0 commit comments

Comments
 (0)