Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +02:00
Code Issues Releases Activity

apply changes from EE (#9232)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-07-20 13:48:48 +12:00 • committed by GitHub
parent ff1f549590
commit bb61723ba1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx
View file

@ -87,8 +87,16 @@ export function AppIngressPathForm({
Host: newIngressHostValue,
IngressName: newIngressNameValue,
};
// the selected option should match the new ingress path
const newIngressOption = newIngressPath.Host
? {
ingressName: newIngressPath.IngressName,
value: newIngressPath.Host ?? '',
label: `${newIngressPath.Host} (${newIngressPath.IngressName})`,
}
: null;
onChangeIngressPath(newIngressPath);
setSelectedIngress(ingressHostOptionsWithCurrentValue[0] ?? null);
setSelectedIngress(newIngressOption);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ingressHostOptionsWithCurrentValue]);
@ -129,7 +137,7 @@ export function AppIngressPathForm({
{ingressHostOptions.length === 0 && !ingressPath?.Host && (
<FormError>
No ingress hostnames are available for the namespace &apos;
{namespace}&apos;. Please update the namespace or{' '}
{namespace}&apos;. Please select another namespace or{' '}
<Link
to="kubernetes.ingresses.create"
target="_blank"

6
app/react/kubernetes/applications/CreateView/application-services/kubeServicesValidation.ts
View file

@ -229,7 +229,11 @@ export function kubeServicesValidation(
'path-is-unique',
'Ingress path is already in use for this hostname.',
(path, context) => {
if (path === undefined || validationData === undefined) {
if (
path === undefined ||
validationData === undefined ||
!context.parent.Host
) {
return true;
}
const ingressHostAndPath = `${