rename Saved to Updated

This commit is contained in:
Proddy
2023-01-23 18:52:10 +01:00
parent f64fbd1040
commit 1cd5e0781d
18 changed files with 51 additions and 60 deletions

View File

@@ -3,7 +3,7 @@ import { ValidateFieldsError } from 'async-validator';
import { range } from 'lodash'; import { range } from 'lodash';
import { Button, Checkbox, MenuItem } from '@mui/material'; import { Button, Checkbox, MenuItem } from '@mui/material';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import { createAPSettingsValidator, validate } from '../../validators'; import { createAPSettingsValidator, validate } from '../../validators';
@@ -178,10 +178,10 @@ const APSettingsForm: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -2,7 +2,7 @@ import { FC, useState } from 'react';
import { ValidateFieldsError } from 'async-validator'; import { ValidateFieldsError } from 'async-validator';
import { Button, Checkbox, MenuItem, Grid, Typography, InputAdornment } from '@mui/material'; import { Button, Checkbox, MenuItem, Grid, Typography, InputAdornment } from '@mui/material';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import { createMqttSettingsValidator, validate } from '../../validators'; import { createMqttSettingsValidator, validate } from '../../validators';
@@ -388,10 +388,10 @@ const MqttSettingsForm: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -17,7 +17,7 @@ import {
import LockOpenIcon from '@mui/icons-material/LockOpen'; import LockOpenIcon from '@mui/icons-material/LockOpen';
import DeleteIcon from '@mui/icons-material/Delete'; import DeleteIcon from '@mui/icons-material/Delete';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import LockIcon from '@mui/icons-material/Lock'; import LockIcon from '@mui/icons-material/Lock';
import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew'; import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
@@ -313,10 +313,10 @@ const WiFiSettingsForm: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -2,7 +2,7 @@ import { FC, useState } from 'react';
import { ValidateFieldsError } from 'async-validator'; import { ValidateFieldsError } from 'async-validator';
import { Button, Checkbox, MenuItem } from '@mui/material'; import { Button, Checkbox, MenuItem } from '@mui/material';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import { validate } from '../../validators'; import { validate } from '../../validators';
@@ -94,10 +94,10 @@ const NTPSettingsForm: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -2,7 +2,7 @@ import { FC, useContext, useState } from 'react';
import { ValidateFieldsError } from 'async-validator'; import { ValidateFieldsError } from 'async-validator';
import { Button } from '@mui/material'; import { Button } from '@mui/material';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import * as SecurityApi from '../../api/security'; import * as SecurityApi from '../../api/security';
@@ -70,10 +70,10 @@ const SecuritySettingsForm: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -1,7 +1,7 @@
import { FC, useState } from 'react'; import { FC, useState } from 'react';
import { Button, Checkbox } from '@mui/material'; import { Button, Checkbox } from '@mui/material';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import * as SystemApi from '../../api/system'; import * as SystemApi from '../../api/system';
@@ -91,10 +91,10 @@ const OTASettingsForm: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -14,7 +14,6 @@ const de: Translation = {
SU_PASSWORD: 'su Passwort', SU_PASSWORD: 'su Passwort',
DASHBOARD: 'Kontrollzentrum', DASHBOARD: 'Kontrollzentrum',
SETTINGS_OF: '{0} Einstellungen', SETTINGS_OF: '{0} Einstellungen',
SAVED: 'gespeichert',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate
UPDATE: 'Update', // TODO translate UPDATE: 'Update', // TODO translate
HELP_OF: '{0} Hilfe', HELP_OF: '{0} Hilfe',
@@ -49,7 +48,6 @@ const de: Translation = {
CANCEL: 'Abbrechen', CANCEL: 'Abbrechen',
RESET: 'Zurücksetzen', RESET: 'Zurücksetzen',
SEND: 'Senden', SEND: 'Senden',
SAVE: 'Speichern',
REMOVE: 'Entfernen', REMOVE: 'Entfernen',
PROBLEM_UPDATING: 'Problem beim Aktualisieren', PROBLEM_UPDATING: 'Problem beim Aktualisieren',
PROBLEM_LOADING: 'Problem beim Laden', PROBLEM_LOADING: 'Problem beim Laden',

View File

@@ -14,7 +14,6 @@ const en: Translation = {
SU_PASSWORD: 'su Password', SU_PASSWORD: 'su Password',
DASHBOARD: 'Dashboard', DASHBOARD: 'Dashboard',
SETTINGS_OF: '{0} Settings', SETTINGS_OF: '{0} Settings',
SAVED: 'saved',
HELP_OF: '{0} Help', HELP_OF: '{0} Help',
LOGGED_IN: 'Logged in as {name}', LOGGED_IN: 'Logged in as {name}',
PLEASE_SIGNIN: 'Please sign in to continue', PLEASE_SIGNIN: 'Please sign in to continue',
@@ -47,7 +46,6 @@ const en: Translation = {
CANCEL: 'Cancel', CANCEL: 'Cancel',
RESET: 'Reset', RESET: 'Reset',
SEND: 'Send', SEND: 'Send',
SAVE: 'Save',
APPLY_CHANGES: 'Apply Changes ({0})', APPLY_CHANGES: 'Apply Changes ({0})',
UPDATE: 'Update', UPDATE: 'Update',
REMOVE: 'Remove', REMOVE: 'Remove',

View File

@@ -14,7 +14,6 @@ const fr: Translation = {
SU_PASSWORD: 'Mot de passe su', SU_PASSWORD: 'Mot de passe su',
DASHBOARD: 'Tableau de bord', DASHBOARD: 'Tableau de bord',
SETTINGS_OF: 'Paramètres {0}', SETTINGS_OF: 'Paramètres {0}',
SAVED: 'sauvegardé',
HELP_OF: 'Aide {0}', HELP_OF: 'Aide {0}',
LOGGED_IN: 'Connecté en tant que {name}', LOGGED_IN: 'Connecté en tant que {name}',
PLEASE_SIGNIN: 'Veuillez vous connecter pour continuer', PLEASE_SIGNIN: 'Veuillez vous connecter pour continuer',
@@ -47,7 +46,6 @@ const fr: Translation = {
CANCEL: 'Annuler', CANCEL: 'Annuler',
RESET: 'Réinitialiser', RESET: 'Réinitialiser',
SEND: 'Envoyer', SEND: 'Envoyer',
SAVE: 'Sauvegarder',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate
UPDATE: 'Update', // TODO translate UPDATE: 'Update', // TODO translate
REMOVE: 'Enlever', REMOVE: 'Enlever',

View File

@@ -14,7 +14,6 @@ const nl: Translation = {
SU_PASSWORD: 'su Wachtwoord', SU_PASSWORD: 'su Wachtwoord',
DASHBOARD: 'Dashboard', DASHBOARD: 'Dashboard',
SETTINGS_OF: '{0} Instellingen', SETTINGS_OF: '{0} Instellingen',
SAVED: 'opgeslagen',
HELP_OF: '{0} Help', HELP_OF: '{0} Help',
LOGGED_IN: 'Ingelogd als {name}', LOGGED_IN: 'Ingelogd als {name}',
PLEASE_SIGNIN: 'Log in om verder te gaan', PLEASE_SIGNIN: 'Log in om verder te gaan',
@@ -47,7 +46,6 @@ const nl: Translation = {
CANCEL: 'Annuleren', CANCEL: 'Annuleren',
RESET: 'Reset', RESET: 'Reset',
SEND: 'Verzenden', SEND: 'Verzenden',
SAVE: 'Opslaan',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate
UPDATE: 'Update', // TODO translate UPDATE: 'Update', // TODO translate
REMOVE: 'Verwijderen', REMOVE: 'Verwijderen',

View File

@@ -14,7 +14,6 @@ const no: Translation = {
SU_PASSWORD: 'su Passord', SU_PASSWORD: 'su Passord',
DASHBOARD: 'Dashboard', DASHBOARD: 'Dashboard',
SETTINGS_OF: '{0} Innstillinger', SETTINGS_OF: '{0} Innstillinger',
SAVED: 'lagret',
HELP_OF: '{0} Hjelp', HELP_OF: '{0} Hjelp',
LOGGED_IN: 'Logget in som {name}', LOGGED_IN: 'Logget in som {name}',
PLEASE_SIGNIN: 'Venligst logge inn for å fortsetta', PLEASE_SIGNIN: 'Venligst logge inn for å fortsetta',
@@ -47,7 +46,6 @@ const no: Translation = {
CANCEL: 'Avbryt', CANCEL: 'Avbryt',
RESET: 'Nullstill', RESET: 'Nullstill',
SEND: 'Send', SEND: 'Send',
SAVE: 'Lagre',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate
UPDATE: 'Update', // TODO translate UPDATE: 'Update', // TODO translate
REMOVE: 'Fjern', REMOVE: 'Fjern',

View File

@@ -14,7 +14,6 @@ const pl: BaseTranslation = {
SU_PASSWORD: 'Hasło "su"', SU_PASSWORD: 'Hasło "su"',
DASHBOARD: 'Pulpit', DASHBOARD: 'Pulpit',
SETTINGS_OF: 'Ustawienia {0}', SETTINGS_OF: 'Ustawienia {0}',
SAVED: 'zostały zapisane.',
HELP_OF: 'Pomoc {0}', HELP_OF: 'Pomoc {0}',
LOGGED_IN: 'Zalogowano użytkownika {name}.', LOGGED_IN: 'Zalogowano użytkownika {name}.',
PLEASE_SIGNIN: 'Zaloguj się aby kontynuować.', PLEASE_SIGNIN: 'Zaloguj się aby kontynuować.',
@@ -47,7 +46,6 @@ const pl: BaseTranslation = {
CANCEL: 'Anuluj', CANCEL: 'Anuluj',
RESET: 'Reset{{uj|owanie|}}', RESET: 'Reset{{uj|owanie|}}',
SEND: 'Wyślij', SEND: 'Wyślij',
SAVE: 'Zapisz',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate
UPDATE: 'Update', // TODO translate UPDATE: 'Update', // TODO translate
REMOVE: 'Usuń', REMOVE: 'Usuń',

View File

@@ -14,7 +14,6 @@ const sv: Translation = {
SU_PASSWORD: 'su Lösenord', SU_PASSWORD: 'su Lösenord',
DASHBOARD: 'Kontrollpanel', DASHBOARD: 'Kontrollpanel',
SETTINGS_OF: '{0} Inställningar', SETTINGS_OF: '{0} Inställningar',
SAVED: 'Sparat',
HELP_OF: '{0} Hjälp', HELP_OF: '{0} Hjälp',
LOGGED_IN: 'Inloggad som {name}', LOGGED_IN: 'Inloggad som {name}',
PLEASE_SIGNIN: 'Vänligen logga in för att fortsätta', PLEASE_SIGNIN: 'Vänligen logga in för att fortsätta',
@@ -47,7 +46,6 @@ const sv: Translation = {
CANCEL: 'Avbryt', CANCEL: 'Avbryt',
RESET: 'Nollställ', RESET: 'Nollställ',
SEND: 'Skicka', SEND: 'Skicka',
SAVE: 'Spara',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate
UPDATE: 'Update', // TODO translate UPDATE: 'Update', // TODO translate
REMOVE: 'Ta bort', REMOVE: 'Ta bort',

View File

@@ -35,7 +35,7 @@ import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
import AddCircleOutlineOutlinedIcon from '@mui/icons-material/AddCircleOutlineOutlined'; import AddCircleOutlineOutlinedIcon from '@mui/icons-material/AddCircleOutlineOutlined';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import SendIcon from '@mui/icons-material/TrendingFlat'; import SendIcon from '@mui/icons-material/TrendingFlat';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import RemoveIcon from '@mui/icons-material/RemoveCircleOutline'; import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import PlayArrowIcon from '@mui/icons-material/PlayArrow';
import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined'; import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
@@ -628,11 +628,11 @@ const DashboardData: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
variant="outlined" variant="contained"
type="submit" type="submit"
onClick={() => sendSensor()} onClick={() => sendSensor()}
color="warning" color="info"
> >
{LL.UPDATE()} {LL.UPDATE()}
</Button> </Button>
@@ -1229,11 +1229,11 @@ const DashboardData: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
variant="outlined" variant="contained"
type="submit" type="submit"
onClick={() => sendAnalog()} onClick={() => sendAnalog()}
color="warning" color="info"
> >
{LL.UPDATE()} {LL.UPDATE()}
</Button> </Button>

View File

@@ -5,7 +5,7 @@ import { useSnackbar } from 'notistack';
import { Box, Button, Checkbox, MenuItem, Grid, Typography, Divider, InputAdornment } from '@mui/material'; import { Box, Button, Checkbox, MenuItem, Grid, Typography, Divider, InputAdornment } from '@mui/material';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew'; import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
@@ -645,10 +645,10 @@ const SettingsApplication: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
disabled={saving} disabled={saving}
variant="outlined" variant="contained"
color="primary" color="info"
type="submit" type="submit"
onClick={validateAndSubmit} onClick={validateAndSubmit}
> >

View File

@@ -23,7 +23,7 @@ import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/r
import { useSnackbar } from 'notistack'; import { useSnackbar } from 'notistack';
import SaveIcon from '@mui/icons-material/Save'; import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore'; import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
@@ -571,7 +571,12 @@ const SettingsCustomization: FC = () => {
<Box flexGrow={1}> <Box flexGrow={1}>
<ButtonRow> <ButtonRow>
{num_changes !== 0 && ( {num_changes !== 0 && (
<Button startIcon={<SaveIcon />} variant="outlined" color="primary" onClick={() => saveCustomization()}> <Button
startIcon={<WarningIcon color="warning" />}
variant="contained"
color="info"
onClick={() => saveCustomization()}
>
{LL.APPLY_CHANGES(num_changes)} {LL.APPLY_CHANGES(num_changes)}
</Button> </Button>
)} )}
@@ -650,11 +655,11 @@ const SettingsCustomization: FC = () => {
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button <Button
startIcon={<SaveIcon />} startIcon={<WarningIcon color="warning" />}
variant="outlined" variant="contained"
type="submit" type="submit"
onClick={() => updateEntity()} onClick={() => updateEntity()}
color="warning" color="info"
> >
{LL.UPDATE()} {LL.UPDATE()}
</Button> </Button>

View File

@@ -53,7 +53,7 @@ export const useRest = <D>({ read, update }: RestRequestOptions<D>) => {
if (response.status === 202) { if (response.status === 202) {
setRestartNeeded(true); setRestartNeeded(true);
} else { } else {
enqueueSnackbar(LL.SETTINGS_OF('') + ' ' + LL.SAVED(), { variant: 'success' }); enqueueSnackbar(LL.UPDATED_OF(LL.SETTINGS_OF('')), { variant: 'success' });
} }
} catch (error) { } catch (error) {
const message = extractErrorMessage(error, LL.PROBLEM_UPDATING()); const message = extractErrorMessage(error, LL.PROBLEM_UPDATING());