From 4ab150bf7556f12e9fc6961c7afa2b52fe899617 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Mon, 27 Jan 2025 10:54:46 +0000 Subject: [PATCH] refactor: clean up code formatting and improve readability in various files --- Common/Server/Services/IncidentService.ts | 24 ++- Common/Server/Services/Index.ts | 2 +- Common/UI/Components/Forms/BasicForm.tsx | 55 ++++--- Common/UI/Components/Forms/BasicModelForm.tsx | 8 +- Common/UI/Components/Forms/ModelForm.tsx | 8 +- Common/UI/Components/Forms/Types/Field.ts | 4 +- .../Forms/Types/FormFieldSchemaType.ts | 1 - .../Forms/Utils/FormFieldSchemaTypeUtil.ts | 155 +++++++++--------- Probe/Jobs/Monitor/FetchMonitorTest.ts | 2 +- 9 files changed, 133 insertions(+), 126 deletions(-) diff --git a/Common/Server/Services/IncidentService.ts b/Common/Server/Services/IncidentService.ts index 3c6efd7a81..2cd8bb3342 100644 --- a/Common/Server/Services/IncidentService.ts +++ b/Common/Server/Services/IncidentService.ts @@ -735,7 +735,7 @@ ${labels .join("\n")} `; -shouldAddIncidentFeed = true; + shouldAddIncidentFeed = true; } } @@ -769,18 +769,16 @@ ${incidentSeverity.name} } } - if(shouldAddIncidentFeed){ - - await IncidentFeedService.createIncidentFeed({ - incidentId: incidentId, - projectId: onUpdate.updateBy.props.tenantId as ObjectID, - incidentFeedEventType: IncidentFeedEventType.IncidentUpdated, - displayColor: Gray500, - feedInfoInMarkdown: feedInfoInMarkdown, - userId: createdByUserId || undefined, - }); - - } + if (shouldAddIncidentFeed) { + await IncidentFeedService.createIncidentFeed({ + incidentId: incidentId, + projectId: onUpdate.updateBy.props.tenantId as ObjectID, + incidentFeedEventType: IncidentFeedEventType.IncidentUpdated, + displayColor: Gray500, + feedInfoInMarkdown: feedInfoInMarkdown, + userId: createdByUserId || undefined, + }); + } } } diff --git a/Common/Server/Services/Index.ts b/Common/Server/Services/Index.ts index 311b98f50b..74f6bf8722 100644 --- a/Common/Server/Services/Index.ts +++ b/Common/Server/Services/Index.ts @@ -316,7 +316,7 @@ const services: Array = [ AlertFeedService, TableViewService, - MonitorTestService + MonitorTestService, ]; export const AnalyticsServices: Array< diff --git a/Common/UI/Components/Forms/BasicForm.tsx b/Common/UI/Components/Forms/BasicForm.tsx index 353a4cb310..0e50eb3dd2 100644 --- a/Common/UI/Components/Forms/BasicForm.tsx +++ b/Common/UI/Components/Forms/BasicForm.tsx @@ -76,9 +76,11 @@ export interface BaseComponentProps { onIsLastFormStep?: undefined | ((isLastFormStep: boolean) => void); onFormValidationErrorChanged?: ((hasError: boolean) => void) | undefined; showSubmitButtonOnlyIfSomethingChanged?: boolean | undefined; - summary?: { - enabled?: boolean; - } | undefined; + summary?: + | { + enabled?: boolean; + } + | undefined; } export interface ComponentProps @@ -119,11 +121,11 @@ const BasicForm: ForwardRefExoticComponent = forwardRef( id: "summary", title: "Summary", isSummaryStep: true, - } - ] + }, + ]; } return props.steps; - } + }; const [submitButtonText, setSubmitButtonText] = useState( props.submitButtonText || "Submit", @@ -356,7 +358,7 @@ const BasicForm: ForwardRefExoticComponent = forwardRef( formSteps.length > 0 && ( (formSteps as Array>)[ - formSteps.length - 1 + formSteps.length - 1 ] as FormStep ).id === currentFormStepId) || currentFormStepId === null @@ -571,8 +573,9 @@ const BasicForm: ForwardRefExoticComponent = forwardRef( )}
{props.error && ( @@ -583,8 +586,9 @@ const BasicForm: ForwardRefExoticComponent = forwardRef(
{formFields && formFields @@ -628,25 +632,28 @@ const BasicForm: ForwardRefExoticComponent = forwardRef( {/* If Summary, show Model detail */} - { - currentFormStepId === "summary" && ( - ) => { + {currentFormStepId === "summary" && ( + ) => { const detailField: DetailField = { title: field.title || "", - fieldType: FormFieldSchemaTypeUtil.toFieldType(field.fieldType || FormFieldSchemaType.Text), + fieldType: FormFieldSchemaTypeUtil.toFieldType( + field.fieldType || FormFieldSchemaType.Text, + ), description: field.description || "", // getElement: field.getSummaryElement, sideLink: field.sideLink, - key: (Object.keys(field.field || {})[0]?.toString() || "") as keyof T, - } + key: (Object.keys( + field.field || {}, + )[0]?.toString() || "") as keyof T, + }; return detailField; - }) as DetailField[]} - /> - - ) - } + }) as DetailField[] + } + /> + )} diff --git a/Common/UI/Components/Forms/BasicModelForm.tsx b/Common/UI/Components/Forms/BasicModelForm.tsx index 625d068518..8e8786ffb7 100644 --- a/Common/UI/Components/Forms/BasicModelForm.tsx +++ b/Common/UI/Components/Forms/BasicModelForm.tsx @@ -46,9 +46,11 @@ export interface ComponentProps { hideSubmitButton?: undefined | boolean; formRef?: undefined | MutableRefObject>>; initialValues?: FormValues | undefined; - summary?: { - enabled?: boolean; - } | undefined; + summary?: + | { + enabled?: boolean; + } + | undefined; } const BasicModelForm: ( diff --git a/Common/UI/Components/Forms/ModelForm.tsx b/Common/UI/Components/Forms/ModelForm.tsx index 3304952e8e..85a5f5e7dc 100644 --- a/Common/UI/Components/Forms/ModelForm.tsx +++ b/Common/UI/Components/Forms/ModelForm.tsx @@ -101,9 +101,11 @@ export interface ComponentProps { saveRequestOptions?: RequestOptions | undefined; doNotFetchExistingModel?: boolean | undefined; modelAPI?: typeof ModelAPI | undefined; - summary?: { - enabled?: boolean; - } | undefined; + summary?: + | { + enabled?: boolean; + } + | undefined; } const ModelForm: ( diff --git a/Common/UI/Components/Forms/Types/Field.ts b/Common/UI/Components/Forms/Types/Field.ts index 069904f34a..806d48af09 100644 --- a/Common/UI/Components/Forms/Types/Field.ts +++ b/Common/UI/Components/Forms/Types/Field.ts @@ -103,7 +103,5 @@ export default interface Field { hideOptionalLabel?: boolean | undefined; - getSummaryElement?: ( - item: TEntity, - ) => ReactElement | undefined; + getSummaryElement?: (item: TEntity) => ReactElement | undefined; } diff --git a/Common/UI/Components/Forms/Types/FormFieldSchemaType.ts b/Common/UI/Components/Forms/Types/FormFieldSchemaType.ts index 86f8a227d0..0dd1e585aa 100644 --- a/Common/UI/Components/Forms/Types/FormFieldSchemaType.ts +++ b/Common/UI/Components/Forms/Types/FormFieldSchemaType.ts @@ -37,5 +37,4 @@ enum FormFieldSchemaType { Dictionary = "Dictionary", } - export default FormFieldSchemaType; diff --git a/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts b/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts index 60b801c80e..9b33712064 100644 --- a/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts +++ b/Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts @@ -2,82 +2,83 @@ import FieldType from "../../Types/FieldType"; import FormFieldSchemaType from "../Types/FormFieldSchemaType"; export default class FormFieldSchemaTypeUtil { - public static toFieldType(formFieldSchemaType: FormFieldSchemaType): FieldType { - switch (formFieldSchemaType) { - case FormFieldSchemaType.ObjectID: - return FieldType.ObjectID; - case FormFieldSchemaType.Name: - return FieldType.Name; - case FormFieldSchemaType.Hostname: - return FieldType.Hostname; - case FormFieldSchemaType.ImageFile: - return FieldType.ImageFile; - case FormFieldSchemaType.URL: - return FieldType.URL; - case FormFieldSchemaType.Route: - return FieldType.Route; - case FormFieldSchemaType.Number: - return FieldType.Number; - case FormFieldSchemaType.Password: - return FieldType.Password; - case FormFieldSchemaType.Text: - return FieldType.Text; - case FormFieldSchemaType.Time: - return FieldType.DateTime; - case FormFieldSchemaType.Email: - return FieldType.Email; - case FormFieldSchemaType.PositiveNumber: - return FieldType.Number; - case FormFieldSchemaType.Date: - return FieldType.Date; - case FormFieldSchemaType.Phone: - return FieldType.Phone; - case FormFieldSchemaType.DateTime: - return FieldType.DateTime; - case FormFieldSchemaType.Domain: - return FieldType.Text; - case FormFieldSchemaType.LongText: - return FieldType.LongText; - case FormFieldSchemaType.Color: - return FieldType.Color; - case FormFieldSchemaType.Dropdown: - return FieldType.Dropdown; - case FormFieldSchemaType.Radio: - return FieldType.Text; - case FormFieldSchemaType.File: - return FieldType.File; - case FormFieldSchemaType.MultiSelectDropdown: - return FieldType.MultiSelectDropdown; - case FormFieldSchemaType.Toggle: - return FieldType.Boolean; - case FormFieldSchemaType.Port: - return FieldType.Port; - case FormFieldSchemaType.EncryptedText: - return FieldType.HiddenText; - case FormFieldSchemaType.Markdown: - return FieldType.Markdown; - case FormFieldSchemaType.JavaScript: - return FieldType.JavaScript; - case FormFieldSchemaType.CSS: - return FieldType.CSS; - case FormFieldSchemaType.HTML: - return FieldType.HTML; - case FormFieldSchemaType.RadioButton: - return FieldType.Element; - case FormFieldSchemaType.JSON: - return FieldType.JSON; - case FormFieldSchemaType.Query: - return FieldType.Element; - case FormFieldSchemaType.CustomComponent: - return FieldType.Element; - case FormFieldSchemaType.Checkbox: - return FieldType.Boolean; - case FormFieldSchemaType.CategoryCheckbox: - return FieldType.Boolean; + public static toFieldType( + formFieldSchemaType: FormFieldSchemaType, + ): FieldType { + switch (formFieldSchemaType) { + case FormFieldSchemaType.ObjectID: + return FieldType.ObjectID; + case FormFieldSchemaType.Name: + return FieldType.Name; + case FormFieldSchemaType.Hostname: + return FieldType.Hostname; + case FormFieldSchemaType.ImageFile: + return FieldType.ImageFile; + case FormFieldSchemaType.URL: + return FieldType.URL; + case FormFieldSchemaType.Route: + return FieldType.Route; + case FormFieldSchemaType.Number: + return FieldType.Number; + case FormFieldSchemaType.Password: + return FieldType.Password; + case FormFieldSchemaType.Text: + return FieldType.Text; + case FormFieldSchemaType.Time: + return FieldType.DateTime; + case FormFieldSchemaType.Email: + return FieldType.Email; + case FormFieldSchemaType.PositiveNumber: + return FieldType.Number; + case FormFieldSchemaType.Date: + return FieldType.Date; + case FormFieldSchemaType.Phone: + return FieldType.Phone; + case FormFieldSchemaType.DateTime: + return FieldType.DateTime; + case FormFieldSchemaType.Domain: + return FieldType.Text; + case FormFieldSchemaType.LongText: + return FieldType.LongText; + case FormFieldSchemaType.Color: + return FieldType.Color; + case FormFieldSchemaType.Dropdown: + return FieldType.Dropdown; + case FormFieldSchemaType.Radio: + return FieldType.Text; + case FormFieldSchemaType.File: + return FieldType.File; + case FormFieldSchemaType.MultiSelectDropdown: + return FieldType.MultiSelectDropdown; + case FormFieldSchemaType.Toggle: + return FieldType.Boolean; + case FormFieldSchemaType.Port: + return FieldType.Port; + case FormFieldSchemaType.EncryptedText: + return FieldType.HiddenText; + case FormFieldSchemaType.Markdown: + return FieldType.Markdown; + case FormFieldSchemaType.JavaScript: + return FieldType.JavaScript; + case FormFieldSchemaType.CSS: + return FieldType.CSS; + case FormFieldSchemaType.HTML: + return FieldType.HTML; + case FormFieldSchemaType.RadioButton: + return FieldType.Element; + case FormFieldSchemaType.JSON: + return FieldType.JSON; + case FormFieldSchemaType.Query: + return FieldType.Element; + case FormFieldSchemaType.CustomComponent: + return FieldType.Element; + case FormFieldSchemaType.Checkbox: + return FieldType.Boolean; + case FormFieldSchemaType.CategoryCheckbox: + return FieldType.Boolean; - - default: - return FieldType.Text; - } + default: + return FieldType.Text; } -} \ No newline at end of file + } +} diff --git a/Probe/Jobs/Monitor/FetchMonitorTest.ts b/Probe/Jobs/Monitor/FetchMonitorTest.ts index 50096ad5b5..4fd4184fec 100644 --- a/Probe/Jobs/Monitor/FetchMonitorTest.ts +++ b/Probe/Jobs/Monitor/FetchMonitorTest.ts @@ -1,4 +1,4 @@ -import { PROBE_INGEST_URL, PROBE_MONITOR_FETCH_LIMIT } from "../../Config"; +import { PROBE_INGEST_URL } from "../../Config"; import MonitorUtil from "../../Utils/Monitors/Monitor"; import ProbeAPIRequest from "../../Utils/ProbeAPIRequest"; import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";