Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
hpcc-systems · Nov 14, 2024 · aa60df1 · aa60df1
2 parents 9e9ce0d + 2cb65fe
commit aa60df1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/esp/src/src-react/components/forms/Fields.tsx b/esp/src/src-react/components/forms/Fields.tsx
@@ -836,7 +836,7 @@ export const CloudContainerNameField: React.FunctionComponent<CloudContainerName
         setOptions([{ key: "", text: "" }, ...options]);
     }, [cloudContainerNames]);
 
-    return <ComboBox {...props} allowFreeform={true} autoComplete={"on"} options={options} />;
+    return <ComboBox {...props} allowFreeform={true} multiSelect autoComplete={"on"} options={options} />;
 };
 
 export interface CloudPodNameFieldProps extends Omit<IComboBoxProps, "options"> {

diff --git a/esp/src/src-react/components/forms/ZAPDialog.tsx b/esp/src/src-react/components/forms/ZAPDialog.tsx
@@ -620,15 +620,22 @@ export const ZAPDialog: React.FunctionComponent<ZAPDialogProps> = ({
             <Controller
                 control={control} name="LogFilter.ComponentsFilter"
                 render={({
-                    field: { onChange, name: fieldName }
+                    field: { onChange, name: fieldName, value }
                 }) => <CloudContainerNameField
                         name={fieldName}
-                        onChange={(_evt, option, _idx, value) => {
-                            if (option?.key) {
-                                onChange(option.key);
+                        selectedKey={value}
+                        onChange={(_evt, option, _idx, _value) => {
+                            const selectedKeys = value ? [...value] : [];
+                            const selected = option?.key ?? _value;
+                            const index = selectedKeys.indexOf(selected.toString());
+
+                            if (index === -1) {
+                                selectedKeys.push(selected.toString());
                             } else {
-                                onChange(value);
+                                selectedKeys.splice(index, 1);
                             }
+
+                            onChange(selectedKeys);
                         }}
                         onRenderLabel={(props: CustomLabelProps) => <CustomLabel
                             id={`${fieldName}_Label`}