github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(wizard): fix tunnel add validation [EE-5124] (#8595)

pull/8598/head
cmeng 2023-03-06 10:43:08 +13:00 committed by GitHub
parent 77e1f5aa34
commit 4c6f5f961e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentForm/EdgeAgentForm.tsx
View File

@ -32,7 +32,7 @@ export function EdgeAgentForm({ onCreate, readonly, asyncMode }: Props) {
const settingsQuery = useSettings(); const settingsQuery = useSettings();
const createMutation = useCreateEdgeAgentEnvironmentMutation(); const createMutation = useCreateEdgeAgentEnvironmentMutation();
const validation = useValidationSchema(asyncMode); const validation = useValidationSchema();
if (!settingsQuery.data) { if (!settingsQuery.data) {
return null; return null;

5
app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentForm/EdgeAgentForm.validation.ts
View File

@ -5,7 +5,6 @@ import {
EdgeAsyncIntervalsValues, EdgeAsyncIntervalsValues,
} from '@/react/edge/components/EdgeAsyncIntervalsForm'; } from '@/react/edge/components/EdgeAsyncIntervalsForm';
import { validation as urlValidation } from '@/react/portainer/common/PortainerTunnelAddrField'; import { validation as urlValidation } from '@/react/portainer/common/PortainerTunnelAddrField';
import { validation as addressValidation } from '@/react/portainer/common/PortainerUrlField';
import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
import { metadataValidation } from '../../MetadataFieldset/validation'; import { metadataValidation } from '../../MetadataFieldset/validation';
@ -13,13 +12,13 @@ import { useNameValidation } from '../../NameField';
import { FormValues } from './types'; import { FormValues } from './types';
export function useValidationSchema(asyncMode: boolean): SchemaOf<FormValues> { export function useValidationSchema(): SchemaOf<FormValues> {
const nameValidation = useNameValidation(); const nameValidation = useNameValidation();
return object().shape({ return object().shape({
name: nameValidation, name: nameValidation,
portainerUrl: urlValidation(), portainerUrl: urlValidation(),
tunnelServerAddr: asyncMode ? string() : addressValidation(), tunnelServerAddr: string(),
pollFrequency: number().required(), pollFrequency: number().required(),
meta: metadataValidation(), meta: metadataValidation(),
edge: isBE edge: isBE