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

feat(ui): ui change for edge compute settings EE-3800 (#7365) 

* added style to edge compute under settings
pull/7357/head^2
Richard Wei 2022-08-03 11:15:00 +12:00 committed by GitHub
parent 21fbd37bfb
commit 65c050dc87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/portainer/settings/edge-compute/AutomaticEdgeEnvCreation/AutomaticEdgeEnvCreation.tsx
View File

@ -42,7 +42,7 @@ export function AutomaticEdgeEnvCreation() {
return ( return (
<Widget> <Widget>
<WidgetTitle <WidgetTitle
icon="fa-laptop" icon="svg-laptop"
title="Automatic Edge Environment Creation" title="Automatic Edge Environment Creation"
/> />
<WidgetBody> <WidgetBody>

6
app/portainer/settings/edge-compute/EdgeComputeSettings/EdgeComputeSettings.tsx
View File

@ -32,7 +32,7 @@ export function EdgeComputeSettings({ settings, onSubmit }: Props) {
return ( return (
<div className="row"> <div className="row">
<Widget> <Widget>
<WidgetTitle icon="fa-laptop" title="Edge Compute settings" /> <WidgetTitle icon="svg-laptop" title="Edge Compute settings" />
<WidgetBody> <WidgetBody>
<Formik <Formik
initialValues={settings} initialValues={settings}
@ -58,7 +58,7 @@ export function EdgeComputeSettings({ settings, onSubmit }: Props) {
<FormControl <FormControl
inputId="edge_enable" inputId="edge_enable"
label="Enable Edge Compute features" label="Enable Edge Compute features"
size="medium" size="small"
errors={errors.EnableEdgeComputeFeatures} errors={errors.EnableEdgeComputeFeatures}
> >
<Switch <Switch
@ -80,7 +80,7 @@ export function EdgeComputeSettings({ settings, onSubmit }: Props) {
<FormControl <FormControl
inputId="edge_enforce_id" inputId="edge_enforce_id"
label="Enforce use of Portainer generated Edge ID" label="Enforce use of Portainer generated Edge ID"
size="medium" size="small"
tooltip="This setting only applies to manually created environments." tooltip="This setting only applies to manually created environments."
errors={errors.EnforceEdgeID} errors={errors.EnforceEdgeID}
> >

4
app/portainer/settings/edge-compute/SettingsFDO/SettingsFDO.tsx
View File

@ -48,7 +48,7 @@ export function SettingsFDO({ settings, onSubmit }: Props) {
return ( return (
<div className="row"> <div className="row">
<Widget> <Widget>
<WidgetTitle icon="fa-laptop" title="FDO" /> <WidgetTitle icon="svg-laptop" title="FDO" />
<WidgetBody> <WidgetBody>
<Formik <Formik
initialValues={initialValues} initialValues={initialValues}
@ -71,7 +71,7 @@ export function SettingsFDO({ settings, onSubmit }: Props) {
<FormControl <FormControl
inputId="edge_enableFDO" inputId="edge_enableFDO"
label="Enable FDO Management Service" label="Enable FDO Management Service"
size="medium" size="small"
errors={errors.enabled} errors={errors.enabled}
> >
<Switch <Switch

3
app/portainer/settings/edge-compute/SettingsOpenAMT/SettingsOpenAMT.tsx
View File

@ -93,7 +93,7 @@ export function SettingsOpenAMT({ settings, onSubmit }: Props) {
return ( return (
<div className="row"> <div className="row">
<Widget> <Widget>
<WidgetTitle icon="fa-laptop" title="Intel OpenAMT" /> <WidgetTitle icon="svg-laptop" title="Intel OpenAMT" />
<WidgetBody> <WidgetBody>
<Formik <Formik
initialValues={initialValues} initialValues={initialValues}
@ -117,6 +117,7 @@ export function SettingsOpenAMT({ settings, onSubmit }: Props) {
inputId="edge_enableOpenAMT" inputId="edge_enableOpenAMT"
label="Enable OpenAMT" label="Enable OpenAMT"
errors={errors.enabled} errors={errors.enabled}
size="small"
> >
<Switch <Switch
id="edge_enableOpenAMT" id="edge_enableOpenAMT"

11
app/react/components/form-components/FormError.tsx
View File

@ -1,11 +1,14 @@
import { PropsWithChildren } from 'react'; import { PropsWithChildren } from 'react';
import { Icon } from '@@/Icon';
export function FormError({ children }: PropsWithChildren<unknown>) { export function FormError({ children }: PropsWithChildren<unknown>) {
return ( return (
<div className="small text-warning"> <div className="small text-warning vertical-center">
<i <Icon
className="fa fa-exclamation-triangle space-right" icon="alert-triangle"
aria-hidden="true" feather
className="icon icon-sm icon-warning"
/> />
{children} {children}
</div> </div>

4
app/react/components/form-components/SwitchField/Switch.css
View File

@ -66,3 +66,7 @@
background-color: var(--BE-only); background-color: var(--BE-only);
box-shadow: inset 0 0 1px rgb(0 0 0 / 50%), inset 0 0 40px var(--BE-only); box-shadow: inset 0 0 1px rgb(0 0 0 / 50%), inset 0 0 40px var(--BE-only);
} }
.switch input[type='checkbox']:disabled + .slider {
cursor: not-allowed;
}