fix(edge/stacks): fix ui issues [EE-5578] (#9070)

pull/9115/head
Chaim Lev-Ari 1 year ago committed by GitHub
parent 3d22cde096
commit 2cd5d55b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -183,23 +183,31 @@ function InnerForm({
/>
{values.deploymentType === DeploymentType.Compose && (
<>
<div className="form-group">
<div className="col-sm-12">
<SwitchField
checked={values.prePullImage}
name="prePullImage"
label="Pre-pull images"
tooltip="When enabled, redeployment will be executed when image(s) is pulled successfully"
label-Class="col-sm-3 col-lg-2"
labelClass="col-sm-3 col-lg-2"
onChange={(value) => setFieldValue('prePullImage', value)}
/>
</div>
</div>
<div className="form-group">
<div className="col-sm-12">
<SwitchField
checked={values.retryDeploy}
name="retryDeploy"
label="Retry deployment"
tooltip="When enabled, this will allow edge agent keep retrying deployment if failure occur"
label-Class="col-sm-3 col-lg-2"
labelClass="col-sm-3 col-lg-2"
onChange={(value) => setFieldValue('retryDeploy', value)}
/>
</div>
</div>
</>
)}
</>

@ -1,4 +1,5 @@
import { useState, useEffect } from 'react';
import { RefreshCw } from 'lucide-react';
import { Registry } from '@/react/portainer/registries/types';
@ -75,17 +76,15 @@ export function PrivateRegistryFieldset({
{checked && (
<>
{method !== 'repository' && (
<>
<TextTip color="blue">
If you make any changes to the image urls in your yaml, please
reload or select registry manually
</TextTip>
<Button onClick={reload}>Reload</Button>
</>
)}
{!errorMessage ? (
<FormControl label="Registry" inputId="users-selector">
<div className="flex">
<Select
value={registries.filter(
(registry) => registry.Id === selected
@ -94,7 +93,17 @@ export function PrivateRegistryFieldset({
getOptionLabel={(registry) => registry.Name}
getOptionValue={(registry) => registry.Id.toString()}
onChange={(value) => onSelect(value?.Id)}
className="w-full"
/>
{method !== 'repository' && (
<Button
onClick={reload}
title="Reload"
icon={RefreshCw}
color="light"
/>
)}
</div>
</FormControl>
) : (
<FormError>{errorMessage}</FormError>

@ -31,9 +31,13 @@ export async function createStackFromFileContent({
...payload
}: FileContentPayload) {
try {
const { data } = await axios.post<EdgeStack>(buildUrl(), payload, {
params: { method: 'string', dryrun: dryRun ? 'true' : 'false' },
});
const { data } = await axios.post<EdgeStack>(
buildUrl(undefined, 'create/string'),
payload,
{
params: { dryrun: dryRun ? 'true' : 'false' },
}
);
return data;
} catch (e) {
throw parseAxiosError(e as Error);

Loading…
Cancel
Save