Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-09 15:55:23 +02:00
Code Issues Releases Activity

fix(env): strip protocol from url

Browse source
This commit is contained in:
Chaim Lev-Ari 2024-06-12 15:12:10 +03:00
parent 26a6d67073
commit e4c6ca02e4
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/react/portainer/environments/ItemView/UpdateForm/AgentForm/AgentForm.tsx
View file

@ -3,6 +3,7 @@ import { Form, Formik } from 'formik';
import { Environment } from '@/react/portainer/environments/types'; import { Environment } from '@/react/portainer/environments/types';
import { MetadataFieldset } from '@/react/portainer/environments/common/MetadataFieldset'; import { MetadataFieldset } from '@/react/portainer/environments/common/MetadataFieldset';
import { NameField } from '@/react/portainer/environments/common/NameField'; import { NameField } from '@/react/portainer/environments/common/NameField';
import { stripProtocol } from '@/portainer/filters/filters';
import { FormSection } from '@@/form-components/FormSection'; import { FormSection } from '@@/form-components/FormSection';
@ -27,7 +28,7 @@ export function AgentForm({
const initialValues: FormValues = { const initialValues: FormValues = {
name: environment.Name, name: environment.Name,
url: environment.URL, url: stripProtocol(environment.URL),
publicUrl: environment.PublicURL || '', publicUrl: environment.PublicURL || '',
meta: { meta: {

5
app/react/portainer/environments/ItemView/UpdateForm/AzureForm/AzureForm.tsx
View file

@ -3,6 +3,7 @@ import { Form, Formik } from 'formik';
import { NameField } from '@/react/portainer/environments/common/NameField'; import { NameField } from '@/react/portainer/environments/common/NameField';
import { MetadataFieldset } from '@/react/portainer/environments/common/MetadataFieldset'; import { MetadataFieldset } from '@/react/portainer/environments/common/MetadataFieldset';
import { Environment } from '@/react/portainer/environments/types'; import { Environment } from '@/react/portainer/environments/types';
import { stripProtocol } from '@/portainer/filters/filters';
import { FormSection } from '@@/form-components/FormSection'; import { FormSection } from '@@/form-components/FormSection';
@ -37,13 +38,15 @@ export function AzureForm({
authKey: environment.AzureCredentials?.AuthenticationKey || '', authKey: environment.AzureCredentials?.AuthenticationKey || '',
}; };
const url = stripProtocol(environment.URL);
return ( return (
<Formik initialValues={initialValues} onSubmit={handleSubmit}> <Formik initialValues={initialValues} onSubmit={handleSubmit}>
{({ isValid }) => ( {({ isValid }) => (
<Form className="form-horizontal"> <Form className="form-horizontal">
<FormSection title="Configuration"> <FormSection title="Configuration">
<NameField /> <NameField />
<URLField disabled value={environment.URL} /> <URLField disabled value={url} />
</FormSection> </FormSection>
<AzureEnvironmentConfiguration /> <AzureEnvironmentConfiguration />
<MetadataFieldset /> <MetadataFieldset />

3
app/react/portainer/environments/ItemView/UpdateForm/OtherTypesForm/OtherTypesForm.tsx
View file

@ -7,6 +7,7 @@ import {
isLocalEnvironment, isLocalEnvironment,
} from '@/react/portainer/environments/utils'; } from '@/react/portainer/environments/utils';
import { MetadataFieldset } from '@/react/portainer/environments/common/MetadataFieldset'; import { MetadataFieldset } from '@/react/portainer/environments/common/MetadataFieldset';
import { stripProtocol } from '@/portainer/filters/filters';
import { TLSFieldset } from '@@/TLSFieldset'; import { TLSFieldset } from '@@/TLSFieldset';
import { FormSection } from '@@/form-components/FormSection'; import { FormSection } from '@@/form-components/FormSection';
@ -39,7 +40,7 @@ export function OtherTypesForm({
const initialValues: FormValues = { const initialValues: FormValues = {
name: environment.Name, name: environment.Name,
url: environment.URL, url: stripProtocol(environment.URL),
publicUrl: environment.PublicURL || '', publicUrl: environment.PublicURL || '',
tlsConfig: { tlsConfig: {