GUI Issue (#3794): Cloud nodes tab - apply ALL flag to filter

epam · Dec 20, 2024 · 5990c7e · 5990c7e
1 parent 9e0b40c
commit 5990c7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/client/src/components/cluster/Cluster.js b/client/src/components/cluster/Cluster.js
@@ -672,9 +672,7 @@ export default class Cluster extends localization.LocalizedReactComponent {
         onCellClick: this.onNodeInstanceSelect,
         render: (item, record) => {
           return (
-            <span className={classNames({
-              // 'cp-primary': highlightCloudNodes && record.isCloudNode
-            })}>
+            <span>
               {item}
               {highlightCloudNodes && record.isCloudNode ? (
                 <Icon style={{marginLeft: 5, fontSize: 14}} type="cloud-o" />
@@ -733,7 +731,7 @@ export default class Cluster extends localization.LocalizedReactComponent {
         addresses: node.addresses,
         created: node.creationTimestamp,
         labels: node.labels,
-        uid: node.uid || `${node.region}_${node.name}`,
+        uid: node.uid || `${node.region}_${node.name}_${node.createdDate}`,
         pipelineRun: node.pipelineRun,
         runId: node.runId,
         mask: node.mask,

diff --git a/client/src/models/cluster/FilterClusterNodes.js b/client/src/models/cluster/FilterClusterNodes.js
@@ -17,10 +17,9 @@
 import RemotePost from '../basic/RemotePost';
 
 class FilterClusterNodes extends RemotePost {
-
   constructor () {
     super();
-    this.url = '/cluster/node/filter';
+    this.url = '/cluster/node/filter?machineType=ALL';
   };
 
   postprocess (value) {