Merge pull request #18596 from jeclrsg/hpcc-31708-zap-dialog-include-…

…logs HPCC-31708 ECL Watch v9 ZAP Dialog containerized log options
hpcc-systems · May 2, 2024 · ca2de2c · ca2de2c
2 parents b226033 + 97fbfa5
commit ca2de2c
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/esp/src/src-react/components/forms/ZAPDialog.tsx b/esp/src/src-react/components/forms/ZAPDialog.tsx
@@ -376,30 +376,34 @@ export const ZAPDialog: React.FunctionComponent<ZAPDialogProps> = ({
                 />}
         />
         <div style={{ padding: "15px 0 7px 0" }}>
-            <div>
-                <Controller
-                    control={control} name="IncludeThorSlaveLog"
-                    render={({
-                        field: { onChange, name: fieldName, value }
-                    }) => <Checkbox name={fieldName} checked={value} onChange={onChange} label={nlsHPCC.IncludeSlaveLogs} />}
-                />
-            </div>
-            <div style={{ marginTop: 2, marginBottom: 2 }}>
-                <Controller
-                    control={control} name="IncludeRelatedLogs"
-                    render={({
-                        field: { onChange, name: fieldName, value }
-                    }) => <Checkbox name={fieldName} checked={value} onChange={onChange} label={nlsHPCC.IncludeRelatedLogs} />}
-                />
-            </div>
-            <div>
-                <Controller
-                    control={control} name="IncludePerComponentLogs"
-                    render={({
-                        field: { onChange, name: fieldName, value }
-                    }) => <Checkbox name={fieldName} checked={value} onChange={onChange} label={nlsHPCC.IncludePerComponentLogs} />}
-                />
-            </div>
+            {!isContainer
+                ? <div>
+                    <Controller
+                        control={control} name="IncludeThorSlaveLog"
+                        render={({
+                            field: { onChange, name: fieldName, value }
+                        }) => <Checkbox name={fieldName} checked={value} onChange={onChange} label={nlsHPCC.IncludeSlaveLogs} />}
+                    />
+                </div>
+                : <div>
+                    <div style={{ marginBottom: 4 }}>
+                        <Controller
+                            control={control} name="IncludeRelatedLogs"
+                            render={({
+                                field: { onChange, name: fieldName, value }
+                            }) => <Checkbox name={fieldName} checked={value} onChange={onChange} label={nlsHPCC.IncludeRelatedLogs} />}
+                        />
+                    </div>
+                    <div>
+                        <Controller
+                            control={control} name="IncludePerComponentLogs"
+                            render={({
+                                field: { onChange, name: fieldName, value }
+                            }) => <Checkbox name={fieldName} checked={value} onChange={onChange} label={nlsHPCC.IncludePerComponentLogs} />}
+                        />
+                    </div>
+                </div>
+            }
             <div style={{ paddingTop: "10px" }}>
                 <Controller
                     control={control} name="SendEmail"