feat: change ready condition equality check logic

Author: Sobyt483

docs/readme-generic-ui.md

@@ -26,10 +26,10 @@ In order to use the generic list view, you need to adjust the node’s   `conten
 
     - in the `"resourceDefinition"` the given fields need to be specified: `group, plural, singular, kind, scope, namespace` describing properties of the resource.
     - Also `"resourceDefinition"` have optional field `readyCondition` that describing when resource treated as ready
-    It's an object that contain two fields. `jsonPathExpression` that contain JSONPath expression for complex data access and `property` JSON path to the resource property that contain info about resource ready state
+    It's an object that contain two fields. `jsonPathExpression` that contain JSONPath expression for complex data access and ready status matching and `property` JSON path to the resource property that contain info about resource ready state
     ```json
     "readyCondition": {
-      "jsonPathExpression": "status.conditions[?(@.type=='Ready')].status",
+      "jsonPathExpression": "status.conditions[?(@.type=='Ready' && @.status=='True')]",
       "property": ["status.conditions.status", "status.conditions.type"],
     },
     ```
@@ -103,7 +103,7 @@ Below is an example content-configuration for an accounts node using the generic
               "scope": "Cluster",
               "namespace": null,
               "readyCondition": {
-                "jsonPathExpression": "status.conditions[?(@.type=='Ready')].status",
+                "jsonPathExpression": "status.conditions[?(@.type=='Ready' && @.status=='True')]",
                 "property": ["status.conditions.status", "status.conditions.type"],
               },
               "ui": {

projects/wc/src/app/components/generic-ui/list-view/list-view.component.spec.ts

@@ -349,6 +349,11 @@ describe('ListViewComponent', () => {
           plural: 'clusters',
           kind: 'Cluster',
           group: 'core.k8s.io',
+          readyCondition: {
+            jsonPathExpression:
+              'status.conditions[?(@.type=="Ready" && @.status=="True")]',
+            property: ['status.conditions.status', 'status.conditions.type'],
+          },
           ui: {
             listView: {
               fields: [],
@@ -393,7 +398,8 @@ describe('ListViewComponent', () => {
           kind: 'Cluster',
           group: 'core.k8s.io',
           readyCondition: {
-            jsonPathExpression: 'status.conditions[?(@.type=="Ready")].status',
+            jsonPathExpression:
+              'status.conditions[?(@.type=="Ready" && @.status=="True")]',
             property: ['status.conditions.status', 'status.conditions.type'],
           },
           ui: {
@@ -484,7 +490,8 @@ describe('ListViewComponent', () => {
           kind: 'Cluster',
           group: 'core.k8s.io',
           readyCondition: {
-            jsonPathExpression: 'status.conditions[?(@.type=="Ready")].status',
+            jsonPathExpression:
+              'status.conditions[?(@.type=="Ready" && @.status=="True")]',
             property: ['status.conditions.status', 'status.conditions.type'],
           },
           ui: {
@@ -533,7 +540,8 @@ describe('ListViewComponent', () => {
           kind: 'Cluster',
           group: 'core.k8s.io',
           readyCondition: {
-            jsonPathExpression: 'status.conditions[?(@.type=="Ready")].status',
+            jsonPathExpression:
+              'status.conditions[?(@.type=="Ready" && @.status=="True")]',
             property: ['status.conditions.status', 'status.conditions.type'],
           },
           ui: {
@@ -595,7 +603,8 @@ describe('ListViewComponent', () => {
           kind: 'Cluster',
           group: 'core.k8s.io',
           readyCondition: {
-            jsonPathExpression: 'status.conditions[?(@.type=="Ready")].status',
+            jsonPathExpression:
+              'status.conditions[?(@.type=="Ready" && @.status=="True")]',
             property: ['status.conditions.status', 'status.conditions.type'],
           },
           ui: {
@@ -801,5 +810,5 @@ describe('ListViewComponent', () => {
         type: 'error',
       });
     });
-  })
+  });
 });

projects/wc/src/app/components/generic-ui/list-view/list-view.component.ts

@@ -244,7 +244,8 @@ export class ListViewComponent implements OnInit {
     }
 
     const readyStatus = getResourceValueByJsonPath(resource, readyCondition);
-    return readyStatus === 'True';
+    console.log('readyStatus', readyStatus);
+    return !!readyStatus;
   }
 
   private getResourceDefinition() {