Fix sidecar undefined error (#19487)

* Fix sidecar undefined error * changelog file * use ifs instead of switch
Graylog2 · May 31, 2024 · d019301 · d019301
1 parent d6ea2d3
commit d019301
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/changelog/unreleased/pr-19487.toml b/changelog/unreleased/pr-19487.toml
@@ -0,0 +1,4 @@
+type = "f"
+message = "Fix sidecar undefined error"
+
+pulls = ["19487"]
diff --git a/graylog2-web-interface/src/components/sidecars/administration/CollectorsAdministration.tsx b/graylog2-web-interface/src/components/sidecars/administration/CollectorsAdministration.tsx
@@ -358,7 +358,9 @@ const CollectorsAdministration = ({
     onPageChange(page, pageSize);
   };
 
-  const selectedSidecarCollectorPairs = selected.map((selectedSidecarCollectorId) => sidecarCollectorPairs.find(({ sidecar, collector }) => sidecarCollectorId(sidecar, collector) === selectedSidecarCollectorId));
+  const selectedSidecarCollectorPairs = selected.map((selectedSidecarCollectorId) => sidecarCollectorPairs.find(
+    ({ sidecar, collector }) => sidecarCollectorId(sidecar, collector) === selectedSidecarCollectorId),
+  ).filter((sidecarCollectorPair) => !!sidecarCollectorPair?.collector && !!sidecarCollectorPair?.sidecar);
 
   let formattedCollectors;
 

diff --git a/...-web-interface/src/components/sidecars/administration/CollectorsAdministrationActions.tsx b/...-web-interface/src/components/sidecars/administration/CollectorsAdministrationActions.tsx
@@ -50,14 +50,26 @@ const CollectorsAdministrationActions = ({
   const onCancelConfigurationModal = useCallback(() => setShowConfigurationModal(false), []);
 
   const selectedLogCollectorsNames = uniq(selectedSidecarCollectorPairs.map(({ collector }) => collector.name));
-  const configButtonTooltip = `Cannot change configurations of ${selectedLogCollectorsNames.join(', ')} collectors simultaneously`;
+  const disableConfigButton = !selectedSidecarCollectorPairs.length || selectedLogCollectorsNames.length !== 1;
+
+  const getConfigButtonTooltip = () => {
+    if (!selectedSidecarCollectorPairs.length) {
+      return 'Incompatible collectors, please check your sidecar configuration.';
+    }
+
+    if (selectedLogCollectorsNames.length !== 1) {
+      return `Cannot change configurations of ${selectedLogCollectorsNames.join(', ')} collectors simultaneously.`;
+    }
+
+    return 'Assign Configurations';
+  };
 
   return (
     <ButtonToolbar>
-      <ConfigurationButton title={(selectedLogCollectorsNames.length > 1) ? configButtonTooltip : undefined}
+      <ConfigurationButton title={getConfigButtonTooltip()}
                            bsStyle="primary"
                            bsSize="small"
-                           disabled={selectedLogCollectorsNames.length !== 1}
+                           disabled={disableConfigButton}
                            onClick={() => setShowConfigurationModal(true)}>
         <Icon name="edit_square" /> Assign Configurations
       </ConfigurationButton>