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

fix(ingress): ingress ui feedback [EE-5852] (#9982)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-08-03 23:03:09 +12:00 • committed by GitHub
parent 9845518aa9
commit acf9203580
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 157 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,17 +119,6 @@ export function IngressForm({
}
}, [namespacesOptions, namespace, handleNamespaceChange]);
// when the ingress class options update update the value to an available one
useEffect(() => {
const ingressClasses = ingressClassOptions.map((option) => option.value);
if (
!ingressClasses.includes(rule.IngressClassName) &&
ingressClasses.length > 0
) {
handleIngressChange('IngressClassName', ingressClasses[0]);
}
}, [ingressClassOptions, rule.IngressClassName, handleIngressChange]);
return (
<Widget>
<WidgetTitle icon={Route} title="Ingress" />
@ -157,12 +146,22 @@ export function IngressForm({
) : (
<Select
name="namespaces"
options={namespacesOptions || []}
value={{ value: namespace, label: namespace }}
options={namespacesOptions}
value={
namespace
? { value: namespace, label: namespace }
: null
}
isDisabled={isEdit}
onChange={(val) =>
handleNamespaceChange(val?.value || '')
}
placeholder={
namespacesOptions.length
? 'Select a namespace'
: 'No namespaces available'
}
noOptionsMessage={() => 'No namespaces available'}
/>
)}
</div>
@ -222,18 +221,27 @@ export function IngressForm({
<>
<Select
name="ingress_class"
placeholder="Ingress name"
placeholder={
ingressClassOptions.length
? 'Select an ingress class'
: 'No ingress classes available'
}
options={ingressClassOptions}
value={{
label: rule.IngressClassName,
value: rule.IngressClassName,
}}
value={
rule.IngressClassName
? {
label: rule.IngressClassName,
value: rule.IngressClassName,
}
: null
}
onChange={(ingressClassOption) =>
handleIngressChange(
'IngressClassName',
ingressClassOption?.value || ''
)
}
noOptionsMessage={() => 'No ingress classes available'}
/>
{errors.className && (
<FormError className="error-inline mt-1">
@ -242,11 +250,6 @@ export function IngressForm({
)}
</>
)}
{errors.className && (
<FormError className="error-inline mt-1">
{errors.className}
</FormError>
)}
</div>
</div>
</div>
@ -401,13 +404,23 @@ export function IngressForm({
<Select
key={tlsOptions.toString() + host.Secret}
name={`ingress_tls_${hostIndex}`}
value={{
value: rule.Hosts[hostIndex].Secret,
label: rule.Hosts[hostIndex].Secret || 'No TLS',
}}
value={
host.Secret !== undefined
? {
value: host.Secret,
label: host.Secret || 'No TLS',
}
: null
}
onChange={(TLSOption) =>
handleTLSChange(hostIndex, TLSOption?.value || '')
}
placeholder={
tlsOptions.length
? 'Select a TLS secret'
: 'No TLS secrets available'
}
noOptionsMessage={() => 'No TLS secrets available'}
size="sm"
/>
{!host.NoHost && (
@ -472,10 +485,14 @@ export function IngressForm({
key={serviceOptions.toString() + path.ServiceName}
name={`ingress_service_${hostIndex}_${pathIndex}`}
options={serviceOptions}
value={{
value: path.ServiceName,
label: path.ServiceName || 'Select a service',
}}
value={
path.ServiceName
? {
value: path.ServiceName,
label: path.ServiceName,
}
: null
}
onChange={(serviceOption) =>
handlePathChange(
hostIndex,
@ -484,6 +501,12 @@ export function IngressForm({
serviceOption?.value || ''
)
}
placeholder={
serviceOptions.length
? 'Select a service'
: 'No services available'
}
noOptionsMessage={() => 'No services available'}
size="sm"
/>
</InputGroup>
@ -526,15 +549,20 @@ export function IngressForm({
option?.value || ''
)
}
value={{
label: (
path.ServicePort || 'Select a port'
).toString(),
value:
rule.Hosts[hostIndex].Paths[
pathIndex
].ServicePort.toString(),
}}
value={
path.ServicePort
? {
label: path.ServicePort.toString(),
value: path.ServicePort.toString(),
}
: null
}
placeholder={
servicePorts[path.ServiceName]?.length
? 'Select a port'
: 'No ports available'
}
noOptionsMessage={() => 'No ports available'}
size="sm"
/>
</InputGroup>
@ -573,10 +601,20 @@ export function IngressForm({
option?.value || ''
)
}
value={{
label: path.PathType || 'Select a path type',
value: path.PathType || '',
}}
value={
path.PathType
? {
label: path.PathType,
value: path.PathType,
}
: null
}
placeholder={
pathTypes?.length
? 'Select a path type'
: 'No path types available'
}
noOptionsMessage={() => 'No path types available'}
size="sm"
/>
</InputGroup>