Skip to content

Commit 42050b8

Browse files
authored
Interface Updates
Remove reset button from forms, rename form loader error "Reset" button to be "Retry" Upgrade typescript and react-scripts
1 parent 2711cb2 commit 42050b8

12 files changed

+520
-662
lines changed

interface/package-lock.json

Lines changed: 517 additions & 632 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

interface/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"react-material-ui-form-validator": "^2.0.10",
2727
"react-router": "^5.1.2",
2828
"react-router-dom": "^5.1.2",
29-
"react-scripts": "3.4.1",
29+
"react-scripts": "3.4.3",
3030
"sockette": "^2.0.6",
31-
"typescript": "^3.9.5",
31+
"typescript": "^4.0.2",
3232
"zlib": "^1.0.5"
3333
},
3434
"scripts": {

interface/src/ap/APSettingsForm.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ class APSettingsForm extends React.Component<APSettingsFormProps> {
9797
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
9898
Save
9999
</FormButton>
100-
<FormButton variant="contained" color="secondary" onClick={loadData}>
101-
Reset
102-
</FormButton>
103100
</FormActions>
104101
</ValidatorForm>
105102
);

interface/src/components/RestFormLoader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default function RestFormLoader<D>(props: RestFormLoaderProps<D>) {
4747
{errorMessage}
4848
</Typography>
4949
<Button variant="contained" color="secondary" className={classes.button} onClick={loadData}>
50-
Reset
50+
Retry
5151
</Button>
5252
</div>
5353
);

interface/src/mqtt/MqttSettingsForm.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ class MqttSettingsForm extends React.Component<MqttSettingsFormProps> {
119119
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
120120
Save
121121
</FormButton>
122-
<FormButton variant="contained" color="secondary" onClick={loadData}>
123-
Reset
124-
</FormButton>
125122
</FormActions>
126123
</ValidatorForm>
127124
);

interface/src/ntp/NTPSettingsForm.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ class NTPSettingsForm extends React.Component<NTPSettingsFormProps> {
7171
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
7272
Save
7373
</FormButton>
74-
<FormButton variant="contained" color="secondary" onClick={loadData}>
75-
Reset
76-
</FormButton>
7774
</FormActions>
7875
</ValidatorForm>
7976
);

interface/src/project/LightMqttSettingsController.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ function LightMqttSettingsControllerForm(props: LightMqttSettingsControllerFormP
8484
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
8585
Save
8686
</FormButton>
87-
<FormButton variant="contained" color="secondary" onClick={loadData}>
88-
Reset
89-
</FormButton>
9087
</FormActions>
9188
</ValidatorForm>
9289
);

interface/src/project/LightStateRestController.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ function LightStateRestControllerForm(props: LightStateRestControllerFormProps)
6161
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
6262
Save
6363
</FormButton>
64-
<FormButton variant="contained" color="secondary" onClick={loadData}>
65-
Reset
66-
</FormButton>
6764
</FormActions>
6865
</ValidatorForm>
6966
);

interface/src/security/ManageUsersForm.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ class ManageUsersForm extends React.Component<ManageUsersFormProps, ManageUsersF
166166
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit" disabled={this.noAdminConfigured()}>
167167
Save
168168
</FormButton>
169-
<FormButton variant="contained" color="secondary" onClick={loadData}>
170-
Reset
171-
</FormButton>
172169
</FormActions>
173170
</ValidatorForm>
174171
{

interface/src/security/SecuritySettingsForm.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ class SecuritySettingsForm extends React.Component<SecuritySettingsFormProps> {
4242
<FormButton startIcon={<SaveIcon />} variant="contained" color="primary" type="submit">
4343
Save
4444
</FormButton>
45-
<FormButton variant="contained" color="secondary" onClick={loadData}>
46-
Reset
47-
</FormButton>
4845
</FormActions>
4946
</ValidatorForm>
5047
);

0 commit comments

Comments
 (0)