loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-24 07:17:55 +01:00
Code Issues Releases Activity

fix(types): Fix tipi model

Browse Source
This commit is contained in:
Maicol Battistini 2022-01-07 16:04:50 +01:00
parent e940fb5fb2
commit 48b26b372d
No known key found for this signature in database
GPG Key ID: 4FDB0F87CDB1D34A
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/js/Components/Pages/RecordsPage.tsx
View File

@ -14,7 +14,6 @@ import type {
import {
IModel,
IndexedModel,
Model
} from '../../Models';
import type {
@ -36,7 +35,7 @@ export type ColumnT = {
id?: string
title: string
type?: 'checkbox' | 'numeric'
valueModifier?: (instance: IModel<IndexedModel>, property: string) => any
valueModifier?: (instance: IModel, property: string) => any
};
export type SectionT = {
id?: string
@ -49,7 +48,7 @@ export type SectionT = {
| Record<string, TextFieldT | TextAreaT | SelectT>
};
export type ColumnsT = Record<string, string | ColumnT>;
export type RowsT = Collection<IModel<IndexedModel>>;
export type RowsT = Collection<IModel>;
export type SectionsT = Record<string, SectionT> | SectionT[];
/**
@ -63,7 +62,7 @@ export class RecordsPage extends Page {
recordDialogMaxWidth: string | number = 'auto';
model: typeof Model;
customSetter: (
model: IModel<IndexedModel>,
model: IModel,
fields: Collection<File | string>
) => void;
@ -133,7 +132,7 @@ export class RecordsPage extends Page {
}
return this.rows
.map((instance: IModel<IndexedModel>, index: string) => (
.map((instance: IModel, index: string) => (
<TableRow
key={index}
data-model-id={instance.getId()}
@ -154,7 +153,7 @@ export class RecordsPage extends Page {
async updateRecord(id: number) {
// @ts-ignore
const response = await this.model.find(id);
const instance = response.getData() as IModel<IndexedModel>;
const instance = response.getData() as IModel;
const dialog = $('mwc-dialog#add-record-dialog');
dialog
@ -334,7 +333,7 @@ export class RecordsPage extends Page {
if (isFormValid(form)) {
// @ts-ignore
// eslint-disable-next-line new-cap
const instance = new this.model() as IModel<IndexedModel>;
const instance = new this.model() as IModel;
if (this.customSetter) {
this.customSetter(instance, collect(getFormData(form)));
@ -358,7 +357,7 @@ export class RecordsPage extends Page {
if (dialogElement) {
(dialogElement as MWCDialog).close();
}
this.rows.put((model as IndexedModel).getId(), model);
this.rows.put((model as Model).getId(), model);
m.redraw();
await showSnackbar(__('Record salvato'), 4000);
}
@ -369,7 +368,7 @@ export class RecordsPage extends Page {
});
}
getModelValue(model: IndexedModel, field: string): any {
getModelValue(model: IModel, field: string): any {
const column = this.columns[field];
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
let value: any = model[field];

11
resources/js/Models/Model.ts
View File

@ -4,21 +4,18 @@ import {
} from 'coloquent';
import {snakeCase} from 'lodash';
export interface IndexedModel extends Model {
[prop: string]: any;
export interface InstantiableModel<T extends Model> {
new (): Model | T;
}
export interface InstantiableModel<T extends IndexedModel> {
new (): T;
}
export type IModel<T extends IndexedModel> = InstanceType<InstantiableModel<T>>;
export type IModel<T extends Model = Model> = InstanceType<InstantiableModel<T>>;
/**
* The base model for all models.
*/
export abstract class Model extends BaseModel {
jsonApiType: string = '';
[prop: string]: any;
constructor() {
super();