github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

refactor: clean up code formatting and improve readability in various files

Browse Source
This commit is contained in:
Simon Larsen
2025-01-27 10:54:46 +00:00
parent 951668c982
commit 4ab150bf75
9 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Common/Server/Services/IncidentService.ts
View File

@@ -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,
});
}
}
}

2
Common/Server/Services/Index.ts
View File

@@ -316,7 +316,7 @@ const services: Array<BaseService> = [
AlertFeedService,
TableViewService,
MonitorTestService
MonitorTestService,
];
export const AnalyticsServices: Array<

55
Common/UI/Components/Forms/BasicForm.tsx
View File

@@ -76,9 +76,11 @@ export interface BaseComponentProps<T> {
onIsLastFormStep?: undefined | ((isLastFormStep: boolean) => void);
onFormValidationErrorChanged?: ((hasError: boolean) => void) | undefined;
showSubmitButtonOnlyIfSomethingChanged?: boolean | undefined;
summary?: {
enabled?: boolean;
} | undefined;
summary?:
| {
enabled?: boolean;
}
| undefined;
}
export interface ComponentProps<T extends GenericObject>
@@ -119,11 +121,11 @@ const BasicForm: ForwardRefExoticComponent<any> = forwardRef(
id: "summary",
title: "Summary",
isSummaryStep: true,
}
]
},
];
}
return props.steps;
}
};
const [submitButtonText, setSubmitButtonText] = useState<string>(
props.submitButtonText || "Submit",
@@ -356,7 +358,7 @@ const BasicForm: ForwardRefExoticComponent<any> = forwardRef(
formSteps.length > 0 &&
(
(formSteps as Array<FormStep<T>>)[
formSteps.length - 1
formSteps.length - 1
] as FormStep<T>
).id === currentFormStepId) ||
currentFormStepId === null
@@ -571,8 +573,9 @@ const BasicForm: ForwardRefExoticComponent<any> = forwardRef(
</div>
)}
<div
className={`${formSteps && currentFormStepId ? "w-auto pt-6" : "w-full pt-1"
}`}
className={`${
formSteps && currentFormStepId ? "w-auto pt-6" : "w-full pt-1"
}`}
style={{ flex: "1 1 auto" }}
>
{props.error && (
@@ -583,8 +586,9 @@ const BasicForm: ForwardRefExoticComponent<any> = forwardRef(
<div>
<div
className={`grid md:grid-cols-${props.showAsColumns || 1
} grid-cols-1 gap-4`}
className={`grid md:grid-cols-${
props.showAsColumns || 1
} grid-cols-1 gap-4`}
>
{formFields &&
formFields
@@ -628,25 +632,28 @@ const BasicForm: ForwardRefExoticComponent<any> = forwardRef(
{/* If Summary, show Model detail */}
{
currentFormStepId === "summary" && (
<Detail
item={refCurrentValue.current as T}
fields={formFields.map((field: Field<T>) => {
{currentFormStepId === "summary" && (
<Detail
item={refCurrentValue.current as T}
fields={
formFields.map((field: Field<T>) => {
const detailField: DetailField<T> = {
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<Object>[]}
/>
)
}
}) as DetailField<GenericObject>[]
}
/>
)}
</div>
</div>

8
Common/UI/Components/Forms/BasicModelForm.tsx
View File

@@ -46,9 +46,11 @@ export interface ComponentProps<TBaseModel extends BaseModel> {
hideSubmitButton?: undefined | boolean;
formRef?: undefined | MutableRefObject<FormProps<FormValues<TBaseModel>>>;
initialValues?: FormValues<TBaseModel> | undefined;
summary?: {
enabled?: boolean;
} | undefined;
summary?:
| {
enabled?: boolean;
}
| undefined;
}
const BasicModelForm: <TBaseModel extends BaseModel>(

8
Common/UI/Components/Forms/ModelForm.tsx
View File

@@ -101,9 +101,11 @@ export interface ComponentProps<TBaseModel extends BaseModel> {
saveRequestOptions?: RequestOptions | undefined;
doNotFetchExistingModel?: boolean | undefined;
modelAPI?: typeof ModelAPI | undefined;
summary?: {
enabled?: boolean;
} | undefined;
summary?:
| {
enabled?: boolean;
}
| undefined;
}
const ModelForm: <TBaseModel extends BaseModel>(

4
Common/UI/Components/Forms/Types/Field.ts
View File

@@ -103,7 +103,5 @@ export default interface Field<TEntity> {
hideOptionalLabel?: boolean | undefined;
getSummaryElement?: (
item: TEntity,
) => ReactElement | undefined;
getSummaryElement?: (item: TEntity) => ReactElement | undefined;
}

1
Common/UI/Components/Forms/Types/FormFieldSchemaType.ts
View File

@@ -37,5 +37,4 @@ enum FormFieldSchemaType {
Dictionary = "Dictionary",
}
export default FormFieldSchemaType;

155
Common/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.ts
View File

@@ -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;
}
}
}
}

2
Probe/Jobs/Monitor/FetchMonitorTest.ts
View File

@@ -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";