loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

feat: Aggiornare tipi di dati e logiche in AddEditRecordDialog 

È stata rimossa la dipendenza inutile da JSONAPI e aggiornato l'oggetto formState per accettare sia tipi 'Map' che 'Record'. Inoltre, sono state modificate le corrispondenti funzioni 'fillForm' e '#modelAttributesFromFormState' per utilizzare un getter accessorio 'formStateAsMap' per normalizzare l'accesso ai dati del formState.
This commit is contained in:
Maicol Battistini 2023-12-11 10:53:57 +01:00
parent c9a93976fa
commit 11b334b52e
No known key found for this signature in database
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/ts/Components/Dialogs/AddEditRecordDialog.tsx
View File

@ -6,7 +6,6 @@ import {
VnodeCollection,
VnodeCollectionItem
} from '@osm/typings/jsx';
import {JSONAPI} from '@osm/typings/request';
import {
isFormValid,
isVnode,
@ -27,7 +26,7 @@ import {ResponseError} from 'spraypaint/lib-esm/request';
export default abstract class AddEditRecordDialog<M extends Model> extends RecordDialog<M> {
// eslint-disable-next-line unicorn/no-null
protected formElement: HTMLFormElement | null = null;
protected abstract formState: Map<string, Stream<any>>;
protected abstract formState: Map<string, Stream<any>> | Record<string, Stream<any>>;
protected abstract modelType: Class<M>;
// Recommended: <= 3
protected numberOfColumns: number = 3;
@ -52,7 +51,7 @@ export default abstract class AddEditRecordDialog<M extends Model> extends Recor
}
fillForm() {
for (const [key, value] of this.formState) {
for (const [key, value] of this.formStateAsMap) {
// @ts-ignore
value(this.record[key] ?? value());
}
@ -156,9 +155,13 @@ export default abstract class AddEditRecordDialog<M extends Model> extends Recor
get modelAttributesFromFormState(): Record<string, unknown> {
const state: Record<string, unknown> = {};
for (const [key, value] of this.formState) {
for (const [key, value] of this.formStateAsMap) {
state[key] = value();
}
return state;
}
protected get formStateAsMap(): Map<string, Stream<any>> {
return this.formState instanceof Map ? this.formState : new Map(Object.entries(this.formState));
}
}