Skip to content

Commit 6e22893

Browse files
authored
Fix user form
* fix issue with checkbox on user form * use consistent style for const char pointers * use unique hostname by default
1 parent 7aed5c0 commit 6e22893

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

factory_settings.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ build_flags =
33
; WiFi settings
44
-D FACTORY_WIFI_SSID=\"\"
55
-D FACTORY_WIFI_PASSWORD=\"\"
6-
-D FACTORY_WIFI_HOSTNAME=\"esp-react\"
6+
; if unspecified the devices hardware ID will be used
7+
; -D FACTORY_WIFI_HOSTNAME=\"esp-react\"
78

89
; Access point settings
910
-D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED

interface/src/security/ManageUsersForm.tsx

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import SaveIcon from '@material-ui/icons/Save';
1313
import PersonAddIcon from '@material-ui/icons/PersonAdd';
1414

1515
import { withAuthenticatedContext, AuthenticatedContextProps } from '../authentication';
16-
import { RestFormProps, FormActions, FormButton } from '../components';
16+
import { RestFormProps, FormActions, FormButton, extractEventValue } from '../components';
1717

1818
import UserForm from './UserForm';
1919
import { SecuritySettings, User } from './types';
@@ -93,13 +93,9 @@ class ManageUsersForm extends React.Component<ManageUsersFormProps, ManageUsersF
9393
};
9494

9595
handleUserValueChange = (name: keyof User) => (event: React.ChangeEvent<HTMLInputElement>) => {
96-
this.setState({ user: { ...this.state.user!, [name]: event.target.value } });
96+
this.setState({ user: { ...this.state.user!, [name]: extractEventValue(event) } });
9797
};
9898

99-
handleUserCheckboxChange = (name: keyof User) => (event: React.ChangeEvent<HTMLInputElement>) => {
100-
this.setState({ user: { ...this.state.user!, [name]: event.target.checked } });
101-
}
102-
10399
onSubmit = () => {
104100
this.props.saveData();
105101
this.props.authenticatedContext.refresh();

lib/framework/FSPersistence.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class FSPersistence {
1111
JsonStateUpdater<T> stateUpdater,
1212
StatefulService<T>* statefulService,
1313
FS* fs,
14-
char const* filePath,
14+
const char* filePath,
1515
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
1616
_stateReader(stateReader),
1717
_stateUpdater(stateUpdater),
@@ -81,7 +81,7 @@ class FSPersistence {
8181
JsonStateUpdater<T> _stateUpdater;
8282
StatefulService<T>* _statefulService;
8383
FS* _fs;
84-
char const* _filePath;
84+
const char* _filePath;
8585
size_t _bufferSize;
8686
update_handler_id_t _updateHandlerId;
8787

lib/framework/WebSocketTxRx.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class WebSocketConnector {
2020

2121
WebSocketConnector(StatefulService<T>* statefulService,
2222
AsyncWebServer* server,
23-
char const* webSocketPath,
23+
const char* webSocketPath,
2424
SecurityManager* securityManager,
2525
AuthenticationPredicate authenticationPredicate,
2626
size_t bufferSize) :
@@ -40,7 +40,7 @@ class WebSocketConnector {
4040

4141
WebSocketConnector(StatefulService<T>* statefulService,
4242
AsyncWebServer* server,
43-
char const* webSocketPath,
43+
const char* webSocketPath,
4444
size_t bufferSize) :
4545
_statefulService(statefulService), _server(server), _webSocket(webSocketPath), _bufferSize(bufferSize) {
4646
_webSocket.onEvent(std::bind(&WebSocketConnector::onWSEvent,
@@ -77,7 +77,7 @@ class WebSocketTx : virtual public WebSocketConnector<T> {
7777
WebSocketTx(JsonStateReader<T> stateReader,
7878
StatefulService<T>* statefulService,
7979
AsyncWebServer* server,
80-
char const* webSocketPath,
80+
const char* webSocketPath,
8181
SecurityManager* securityManager,
8282
AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
8383
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
@@ -95,7 +95,7 @@ class WebSocketTx : virtual public WebSocketConnector<T> {
9595
WebSocketTx(JsonStateReader<T> stateReader,
9696
StatefulService<T>* statefulService,
9797
AsyncWebServer* server,
98-
char const* webSocketPath,
98+
const char* webSocketPath,
9999
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
100100
WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize), _stateReader(stateReader) {
101101
WebSocketConnector<T>::_statefulService->addUpdateHandler(
@@ -166,7 +166,7 @@ class WebSocketRx : virtual public WebSocketConnector<T> {
166166
WebSocketRx(JsonStateUpdater<T> stateUpdater,
167167
StatefulService<T>* statefulService,
168168
AsyncWebServer* server,
169-
char const* webSocketPath,
169+
const char* webSocketPath,
170170
SecurityManager* securityManager,
171171
AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
172172
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
@@ -182,7 +182,7 @@ class WebSocketRx : virtual public WebSocketConnector<T> {
182182
WebSocketRx(JsonStateUpdater<T> stateUpdater,
183183
StatefulService<T>* statefulService,
184184
AsyncWebServer* server,
185-
char const* webSocketPath,
185+
const char* webSocketPath,
186186
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
187187
WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize), _stateUpdater(stateUpdater) {
188188
}
@@ -221,7 +221,7 @@ class WebSocketTxRx : public WebSocketTx<T>, public WebSocketRx<T> {
221221
JsonStateUpdater<T> stateUpdater,
222222
StatefulService<T>* statefulService,
223223
AsyncWebServer* server,
224-
char const* webSocketPath,
224+
const char* webSocketPath,
225225
SecurityManager* securityManager,
226226
AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
227227
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
@@ -251,7 +251,7 @@ class WebSocketTxRx : public WebSocketTx<T>, public WebSocketRx<T> {
251251
JsonStateUpdater<T> stateUpdater,
252252
StatefulService<T>* statefulService,
253253
AsyncWebServer* server,
254-
char const* webSocketPath,
254+
const char* webSocketPath,
255255
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
256256
WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize),
257257
WebSocketTx<T>(stateReader, statefulService, server, webSocketPath, bufferSize),

lib/framework/WiFiSettingsService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#endif
2020

2121
#ifndef FACTORY_WIFI_HOSTNAME
22-
#define FACTORY_WIFI_HOSTNAME ""
22+
#define FACTORY_WIFI_HOSTNAME ESPUtils::defaultDeviceValue("esp-react-")
2323
#endif
2424

2525
class WiFiSettings {

0 commit comments

Comments
 (0)