Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Code Issues Releases Activity

fix(ingress): empty initial selection + fixes [EE-5852] (#10066)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-08-16 18:07:46 +12:00 • committed by GitHub
parent 26074437ca
commit 2b4cb1b7b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/react/kubernetes/ingresses/CreateIngressView/IngressForm.tsx
View file

@ -47,6 +47,7 @@ interface Props {
tlsOptions: Option<string>[];
namespacesOptions: Option<string>[];
isNamespaceOptionsLoading: boolean;
isIngressNamesLoading: boolean;
removeIngressRoute: (hostIndex: number, pathIndex: number) => void;
removeIngressHost: (hostIndex: number) => void;
@ -102,6 +103,7 @@ export function IngressForm({
errors,
namespacesOptions,
isNamespaceOptionsLoading,
isIngressNamesLoading,
handleNamespaceChange,
namespace,
}: Props) {
@ -114,10 +116,21 @@ export function IngressForm({
// when the namespace options update the value to an available one
useEffect(() => {
const namespaces = namespacesOptions.map((option) => option.value);
if (!namespaces.includes(namespace) && namespaces.length > 0) {
if (
!namespaces.includes(namespace) &&
namespaces.length > 0 &&
(!isIngressNamesLoading || isEdit)
) {
handleNamespaceChange(namespaces[0]);
}
}, [namespacesOptions, namespace, handleNamespaceChange]);
}, [
namespacesOptions,
namespace,
handleNamespaceChange,
isNamespaceOptionsLoading,
isEdit,
isIngressNamesLoading,
]);
return (
<Widget>
@ -526,7 +539,7 @@ export function IngressForm({
)}
</div>
<div className="form-group col-sm-2 col-xl-2 !m-0 !pl-0">
<div className="form-group col-sm-2 col-xl-2 !m-0 min-w-[170px] !pl-0">
{servicePorts && (
<>
<InputGroup size="small">
@ -669,7 +682,7 @@ export function IngressForm({
<div className="form-group col-sm-1 !m-0 !pl-0">
<Button
className="btn-only-icon vertical-center !ml-0"
className="!ml-0 h-[30px]"
color="dangerlight"
type="button"
data-cy={`k8sAppCreate-rmPortButton_${hostIndex}-${pathIndex}`}