diff --git a/Common/Models/BaseModel.ts b/Common/Models/BaseModel.ts index 12a132f2fc..338e4e53ee 100644 --- a/Common/Models/BaseModel.ts +++ b/Common/Models/BaseModel.ts @@ -14,27 +14,26 @@ import { JSONArray, JSONObject } from '../Types/JSON'; import ObjectID from '../Types/ObjectID'; export default class BaseModel extends BaseEntity { - @TableColumn({title: "ID"}) + @TableColumn({ title: 'ID' }) @PrimaryGeneratedColumn('uuid') public _id!: string; - @TableColumn({title: "Created"}) + @TableColumn({ title: 'Created' }) @CreateDateColumn() public createdAt!: Date; - @TableColumn({title: "Updated"}) + @TableColumn({ title: 'Updated' }) @UpdateDateColumn() public updatedAt!: Date; - @TableColumn({title: "Deleted"}) + @TableColumn({ title: 'Deleted' }) @DeleteDateColumn() public deletedAt?: Date; - @TableColumn({title: "Version"}) + @TableColumn({ title: 'Version' }) @VersionColumn() public version!: number; - private displayColumnTitleAs: Dictionary = {}; private displayColumnDescriptionAs: Dictionary = {}; @@ -147,7 +146,10 @@ export default class BaseModel extends BaseEntity { return null; } - public addDisplayColumnDescriptionAs(columnName: string, description: string): void { + public addDisplayColumnDescriptionAs( + columnName: string, + description: string + ): void { if (!this.displayColumnDescriptionAs) { this.displayColumnDescriptionAs = {}; } diff --git a/Common/Types/Database/TableColumn.ts b/Common/Types/Database/TableColumn.ts index 7d54578ce5..f6cc8d0ae1 100644 --- a/Common/Types/Database/TableColumn.ts +++ b/Common/Types/Database/TableColumn.ts @@ -1,6 +1,6 @@ import BaseModel from '../../Models/BaseModel'; -export default (props?: {title?: string, description?: string}) => { +export default (props?: { title?: string; description?: string }) => { return (target: Object, propertyKey: string) => { const baseModel: BaseModel = target as BaseModel; baseModel.addTableColumn(propertyKey); diff --git a/CommonUI/src/Components/Basic/Button/ButtonTypes.ts b/CommonUI/src/Components/Basic/Button/ButtonTypes.ts index 18281c8911..9413d4e71d 100644 --- a/CommonUI/src/Components/Basic/Button/ButtonTypes.ts +++ b/CommonUI/src/Components/Basic/Button/ButtonTypes.ts @@ -1,7 +1,7 @@ -enum ButtonType { - Submit = "submit", - Reset = "reset", - Button = "button" +enum ButtonType { + Submit = 'submit', + Reset = 'reset', + Button = 'button', } -export default ButtonType; \ No newline at end of file +export default ButtonType; diff --git a/CommonUI/src/Components/Basic/ShortcutKey/ShortcutKey.ts b/CommonUI/src/Components/Basic/ShortcutKey/ShortcutKey.ts index a747cf830f..461aa6195d 100644 --- a/CommonUI/src/Components/Basic/ShortcutKey/ShortcutKey.ts +++ b/CommonUI/src/Components/Basic/ShortcutKey/ShortcutKey.ts @@ -1,9 +1,8 @@ enum ShortcutKey { - Enter = "Enter", - Esc = "Esc", - New = "N", - Settings = "S" + Enter = 'Enter', + Esc = 'Esc', + New = 'N', + Settings = 'S', } export default ShortcutKey; - diff --git a/CommonUI/src/Components/Forms/Types/Field.ts b/CommonUI/src/Components/Forms/Types/Field.ts index aa422e583d..2de6e712c0 100644 --- a/CommonUI/src/Components/Forms/Types/Field.ts +++ b/CommonUI/src/Components/Forms/Types/Field.ts @@ -1,7 +1,7 @@ import SelectFormFields from './SelectFormField'; -export default interface Field { - title?: string, - description?: string, - field: SelectFormFields -} \ No newline at end of file +export default interface Field { + title?: string; + description?: string; + field: SelectFormFields; +} diff --git a/CommonUI/src/Components/Forms/Types/Fields.ts b/CommonUI/src/Components/Forms/Types/Fields.ts index 8bd0459fe8..fb3d4ee77c 100644 --- a/CommonUI/src/Components/Forms/Types/Fields.ts +++ b/CommonUI/src/Components/Forms/Types/Fields.ts @@ -1,5 +1,5 @@ -import Field from "./Field" +import Field from './Field'; -type Fields = Array> +type Fields = Array>; -export default Fields \ No newline at end of file +export default Fields; diff --git a/CommonUI/src/Components/Forms/Types/FormFieldType.ts b/CommonUI/src/Components/Forms/Types/FormFieldType.ts index c698541dd5..8679205023 100644 --- a/CommonUI/src/Components/Forms/Types/FormFieldType.ts +++ b/CommonUI/src/Components/Forms/Types/FormFieldType.ts @@ -1,8 +1,15 @@ -import Hostname from "Common/Types/API/Hostname"; -import Email from "Common/Types/Email"; -import Name from "Common/Types/Name"; -import ObjectID from "Common/Types/ObjectID"; +import Hostname from 'Common/Types/API/Hostname'; +import Email from 'Common/Types/Email'; +import Name from 'Common/Types/Name'; +import ObjectID from 'Common/Types/ObjectID'; -type FormFieldType = string | number | boolean | ObjectID | Hostname | Email | Name; +type FormFieldType = + | string + | number + | boolean + | ObjectID + | Hostname + | Email + | Name; -export default FormFieldType; \ No newline at end of file +export default FormFieldType; diff --git a/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts b/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts index f484d0fc26..23cb04aacc 100644 --- a/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts +++ b/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts @@ -1,12 +1,13 @@ import Hostname from 'Common/Types/API/Hostname'; import ObjectID from 'Common/Types/ObjectID'; -import FormType from './FormSchemaType' +import FormType from './FormSchemaType'; -type FormField = - Property extends ObjectID ? FormType.ObjectID - : Property extends Hostname ? FormType.Hostname +type FormField = Property extends ObjectID + ? FormType.ObjectID + : Property extends Hostname + ? FormType.Hostname : unknown; export declare type FormFields = { [P in keyof Entity]?: FormField>; -}; \ No newline at end of file +}; diff --git a/CommonUI/src/Components/Forms/Types/FormSchemaType.ts b/CommonUI/src/Components/Forms/Types/FormSchemaType.ts index e1cedc8e43..24d1eb9955 100644 --- a/CommonUI/src/Components/Forms/Types/FormSchemaType.ts +++ b/CommonUI/src/Components/Forms/Types/FormSchemaType.ts @@ -1,12 +1,11 @@ -enum FormType { - ObjectID, - Name, - Hostname, - URL, - String, - Number, - Password, +enum FormType { + ObjectID, + Name, + Hostname, + URL, + String, + Number, + Password, } - -export default FormType \ No newline at end of file +export default FormType; diff --git a/CommonUI/src/Components/Forms/Types/FormValues.ts b/CommonUI/src/Components/Forms/Types/FormValues.ts index 1a0e5d55aa..c0b23a2366 100644 --- a/CommonUI/src/Components/Forms/Types/FormValues.ts +++ b/CommonUI/src/Components/Forms/Types/FormValues.ts @@ -1,4 +1,4 @@ -import FormFieldSchemaTypes from './FormFieldType' +import FormFieldSchemaTypes from './FormFieldType'; export type FormField = Property extends FormFieldSchemaTypes ? Property @@ -8,4 +8,4 @@ declare type FormValues = { [P in keyof Entity]?: FormField>; }; -export default FormValues; \ No newline at end of file +export default FormValues; diff --git a/CommonUI/src/Components/Forms/Types/RequiredFormFields.ts b/CommonUI/src/Components/Forms/Types/RequiredFormFields.ts index d14606d571..27554bb011 100644 --- a/CommonUI/src/Components/Forms/Types/RequiredFormFields.ts +++ b/CommonUI/src/Components/Forms/Types/RequiredFormFields.ts @@ -1,4 +1,4 @@ -import FormFieldSchemaTypes from './FormFieldType' +import FormFieldSchemaTypes from './FormFieldType'; type RequiredFormField = Property extends FormFieldSchemaTypes ? boolean @@ -8,4 +8,4 @@ declare type RequiredFormFields = { [P in keyof Entity]?: RequiredFormField>; }; -export default RequiredFormFields; \ No newline at end of file +export default RequiredFormFields; diff --git a/CommonUI/src/Components/Forms/Types/SelectFormField.ts b/CommonUI/src/Components/Forms/Types/SelectFormField.ts index 50a7ae432e..2f5e2a3299 100644 --- a/CommonUI/src/Components/Forms/Types/SelectFormField.ts +++ b/CommonUI/src/Components/Forms/Types/SelectFormField.ts @@ -1,4 +1,4 @@ -import FormFieldSchemaTypes from "./FormFieldType"; +import FormFieldSchemaTypes from './FormFieldType'; export type SelectFormField = Property extends FormFieldSchemaTypes ? boolean @@ -8,4 +8,4 @@ declare type SelectFormFields = { [P in keyof Entity]?: SelectFormField>; }; -export default SelectFormFields; \ No newline at end of file +export default SelectFormFields; diff --git a/Graveyard/Accounts/src/Store.ts b/Graveyard/Accounts/src/Store.ts index e6d74d13a0..14e4a9d1ef 100755 --- a/Graveyard/Accounts/src/Store.ts +++ b/Graveyard/Accounts/src/Store.ts @@ -7,9 +7,7 @@ import RootReducers from './Reducers/Index'; const store: Store = createStore( RootReducers, {}, - compose( - applyMiddleware(thunk, routerMiddleware(history)) - ) + compose(applyMiddleware(thunk, routerMiddleware(history))) ); export type RootState = ReturnType;