rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

prevent fteched settings to set react components as uncontrolled

Browse Source
This commit is contained in:
Sylvain 2021-05-18 16:31:19 +02:00
parent 2a4a4e6d74
commit 28c868587b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/frontend/src/javascript/api/setting.ts
View File

@ -14,7 +14,7 @@ export default class SettingAPI {
params.append('names', `['${names.join("','")}']`);
const res: AxiosResponse = await apiClient.get(`/api/settings?${params.toString()}`);
return SettingAPI.toSettingsMap(res?.data);
return SettingAPI.toSettingsMap(names, res?.data);
}
async update (name: SettingName, value: any): Promise<Setting> {
@ -48,11 +48,10 @@ export default class SettingAPI {
return wrapPromise(api.isPresent(name));
}
private static toSettingsMap(data: Object): Map<SettingName, any> {
const dataArray: Array<Array<string | any>> = Object.entries(data);
private static toSettingsMap(names: Array<SettingName>, data: Object): Map<SettingName, any> {
const map = new Map();
dataArray.forEach(item => {
map.set(item[0] as SettingName, item[1] || '');
names.forEach(name => {
map.set(name, data[name] || '');
});
return map;
}

2
app/frontend/src/javascript/components/select-gateway-modal.tsx
View File

@ -39,7 +39,7 @@ const SelectGatewayModal: React.FC<SelectGatewayModalModalProps> = ({ isOpen, to
useEffect(() => {
const gateway = paymentGateway.read();
setSelectedGateway(gateway.value);
setSelectedGateway(gateway.value ? gateway.value : '');
}, []);
/**