From 718c934a8bb93d4d68ff0ea89866ac00d9f43f27 Mon Sep 17 00:00:00 2001
From: Jake Smith <jake.smith@lexisnexisrisk.com>
Date: Mon, 11 Nov 2024 17:32:24 +0000
Subject: [PATCH 1/2] Split off 9.2.138

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
---
 helm/hpcc/Chart.yaml             | 4 ++--
 helm/hpcc/templates/_helpers.tpl | 2 +-
 version.cmake                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index f5d9ab635ec..0b9ed739784 100644
--- a/helm/hpcc/Chart.yaml
+++ b/helm/hpcc/Chart.yaml
@@ -6,9 +6,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 9.2.137-closedown0
+version: 9.2.139-closedown0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 
-appVersion: 9.2.137-closedown0
+appVersion: 9.2.139-closedown0
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index 39bd5754557..4bc7e7a8cd3 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1361,7 +1361,7 @@ Pass in dict with .root, .visibility defined
 {{- end -}}
 
 {{- define "hpcc.generateHelmVersion" -}}
-helmVersion: 9.2.137-closedown0
+helmVersion: 9.2.139-closedown0
 {{- end -}}
 
 {{/*
diff --git a/version.cmake b/version.cmake
index 66b41896bef..146f1289fea 100644
--- a/version.cmake
+++ b/version.cmake
@@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" )
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 9 )
 set ( HPCC_MINOR 2 )
-set ( HPCC_POINT 137 )
+set ( HPCC_POINT 139 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-11-01T16:33:55Z" )
+set ( HPCC_TAG_TIMESTAMP "2024-11-11T17:32:23Z" )
 ###

From de6252b47d7fbb772dfb69dde89865f8f526cfda Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:41:12 -0500
Subject: [PATCH 2/2] HPCC-30254 ECL Watch v9 ZAP Report Container Name

changes the ZAP Dialog "Container Name" logs filter to allow multiple
selections rather than single values

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
 esp/src/src-react/components/forms/Fields.tsx   |  2 +-
 .../src-react/components/forms/ZAPDialog.tsx    | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/esp/src/src-react/components/forms/Fields.tsx b/esp/src/src-react/components/forms/Fields.tsx
index f7c435b1129..5e2213ba7fd 100644
--- a/esp/src/src-react/components/forms/Fields.tsx
+++ b/esp/src/src-react/components/forms/Fields.tsx
@@ -831,7 +831,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} />;
 };
 
 const states = Object.keys(States).map(s => States[s]);
diff --git a/esp/src/src-react/components/forms/ZAPDialog.tsx b/esp/src/src-react/components/forms/ZAPDialog.tsx
index 679c0b8a3a7..8d728ae5f8a 100644
--- 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`}