mirror of
https://github.com/OneUptime/oneuptime
synced 2024-11-21 14:49:07 +00:00
refactor: Update import statements for TimezoneUtil in multiple files
This commit is contained in:
parent
401fbb58e3
commit
786ec6ce7a
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
@ -11,7 +11,7 @@
|
||||
<img class="h-6 mt-2" src="/img/viewsonic.svg" alt="ViewSonic">
|
||||
</div>
|
||||
<div class="mt-4 ml-8 flex justify-center flex-shrink-0 flex-grow lg:ml-4 lg:flex-grow-0">
|
||||
<img class="h-9 mt-1" src="/img/skillable-logo.svg" alt="Skillable">
|
||||
<img class="h-12 -mt-4" src="/img/skillable-logo.svg" alt="Skillable">
|
||||
</div>
|
||||
<div class="mt-4 ml-8 flex justify-center flex-shrink-0 flex-grow lg:ml-4 lg:flex-grow-0">
|
||||
<img class="h-11 -mt-2" src="/img/sodexo.svg" alt="Sodexo">
|
||||
|
@ -19,6 +19,10 @@
|
||||
{{> DetailBoxField title="" text=rootCause }}
|
||||
{{> DetailBoxField title="Description: " text="" }}
|
||||
{{> DetailBoxField title="" text=incidentDescription }}
|
||||
{{#ifNotCond remediationNotes ""}}
|
||||
{{> DetailBoxField title="Remediation Notes: " text="" }}
|
||||
{{> DetailBoxField title="" text=remediationNotes }}
|
||||
{{/ifNotCond}}
|
||||
{{> DetailBoxEnd this }}
|
||||
|
||||
|
||||
|
@ -102,6 +102,7 @@ RunCron(
|
||||
date: incidentIdentifiedDate,
|
||||
timezones: user.timezone ? [user.timezone] : [],
|
||||
}),
|
||||
remediationNotes: incident.remediationNotes || "",
|
||||
rootCause:
|
||||
incident.rootCause || "No root cause identified for this incident",
|
||||
incidentViewLink: (
|
||||
|
@ -5,6 +5,7 @@ export interface CriteriaIncident {
|
||||
description: string;
|
||||
incidentSeverityId?: ObjectID | undefined;
|
||||
autoResolveIncident?: boolean | undefined;
|
||||
remediationNotes?: string | undefined;
|
||||
id: string;
|
||||
onCallPolicyIds?: Array<ObjectID> | undefined;
|
||||
}
|
||||
|
@ -1,10 +1,11 @@
|
||||
import { CriteriaIncident } from "Common/Types/Monitor/CriteriaIncident";
|
||||
import Button, { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
|
||||
import { DropdownOption } from "CommonUI/src/Components/Dropdown/Dropdown";
|
||||
import BasicForm from "CommonUI/src/Components/Forms/BasicForm";
|
||||
import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
|
||||
import FormValues from "CommonUI/src/Components/Forms/Types/FormValues";
|
||||
import Incident from "Model/Models/Incident";
|
||||
import React, { FunctionComponent, ReactElement } from "react";
|
||||
import React, { FunctionComponent, ReactElement, useEffect } from "react";
|
||||
|
||||
export interface ComponentProps {
|
||||
initialValue?: undefined | CriteriaIncident;
|
||||
@ -17,6 +18,16 @@ export interface ComponentProps {
|
||||
const MonitorCriteriaIncidentForm: FunctionComponent<ComponentProps> = (
|
||||
props: ComponentProps,
|
||||
): ReactElement => {
|
||||
|
||||
|
||||
const [showAdvancedFields, setShowAdvancedFields] = React.useState<boolean>(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (props.initialValue && props.initialValue.remediationNotes) {
|
||||
setShowAdvancedFields(true);
|
||||
}
|
||||
}, [props.initialValue]);
|
||||
|
||||
return (
|
||||
<div className="mt-4">
|
||||
<BasicForm
|
||||
@ -98,10 +109,15 @@ const MonitorCriteriaIncidentForm: FunctionComponent<ComponentProps> = (
|
||||
"Notes to help the on-call engineer resolve this incident.",
|
||||
fieldType: FormFieldSchemaType.Markdown,
|
||||
required: false,
|
||||
showIf: () => {
|
||||
return showAdvancedFields;
|
||||
}
|
||||
},
|
||||
]}
|
||||
/>
|
||||
|
||||
{!showAdvancedFields && <Button title="Show Advanced Fields" onClick={() => setShowAdvancedFields(true)} buttonStyle={ButtonStyleType.SECONDARY_LINK} />}
|
||||
|
||||
{/* <div className='mt-4'>
|
||||
<Button
|
||||
onClick={() => {
|
||||
|
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
# Pull base image nodejs image.
|
||||
FROM node:21.6
|
||||
FROM node:22.3.0
|
||||
RUN mkdir /tmp/npm && chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
|
||||
|
||||
ARG GIT_SHA
|
||||
@ -11,6 +11,11 @@ ARG APP_VERSION
|
||||
|
||||
ENV GIT_SHA=${GIT_SHA}
|
||||
ENV APP_VERSION=${APP_VERSION}
|
||||
ENV NODE_OPTIONS="--use-openssl-ca"
|
||||
|
||||
## Add Intermediate Certs
|
||||
COPY ./SslCertificates /usr/local/share/ca-certificates
|
||||
RUN update-ca-certificates
|
||||
|
||||
|
||||
# IF APP_VERSION is not set, set it to 1.0.0
|
||||
|
26
SslCertificates/GlobalSign.crt
Normal file
26
SslCertificates/GlobalSign.crt
Normal file
@ -0,0 +1,26 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIETjCCAzagAwIBAgINAe5fIh38YjvUMzqFVzANBgkqhkiG9w0BAQsFADBMMSAw
|
||||
HgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFs
|
||||
U2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0xODExMjEwMDAwMDBaFw0yODEx
|
||||
MjEwMDAwMDBaMFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52
|
||||
LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODCCASIw
|
||||
DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdaydUMGCEAI9WXD+uu3Vxoa2uP
|
||||
UGATeoHLl+6OimGUSyZ59gSnKvuk2la77qCk8HuKf1UfR5NhDW5xUTolJAgvjOH3
|
||||
idaSz6+zpz8w7bXfIa7+9UQX/dhj2S/TgVprX9NHsKzyqzskeU8fxy7quRU6fBhM
|
||||
abO1IFkJXinDY+YuRluqlJBJDrnw9UqhCS98NE3QvADFBlV5Bs6i0BDxSEPouVq1
|
||||
lVW9MdIbPYa+oewNEtssmSStR8JvA+Z6cLVwzM0nLKWMjsIYPJLJLnNvBhBWk0Cq
|
||||
o8VS++XFBdZpaFwGue5RieGKDkFNm5KQConpFmvv73W+eka440eKHRwup08CAwEA
|
||||
AaOCASkwggElMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G
|
||||
A1UdDgQWBBT473/yzXhnqN5vjySNiPGHAwKz6zAfBgNVHSMEGDAWgBSP8Et/qC5F
|
||||
JK5NUPpjmove4t0bvDA+BggrBgEFBQcBAQQyMDAwLgYIKwYBBQUHMAGGImh0dHA6
|
||||
Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9yb290cjMwNgYDVR0fBC8wLTAroCmgJ4Yl
|
||||
aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9yb290LXIzLmNybDBHBgNVHSAEQDA+
|
||||
MDwGBFUdIAAwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5j
|
||||
b20vcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAJmQyC1fQorUC2bbmANz
|
||||
EdSIhlIoU4r7rd/9c446ZwTbw1MUcBQJfMPg+NccmBqixD7b6QDjynCy8SIwIVbb
|
||||
0615XoFYC20UgDX1b10d65pHBf9ZjQCxQNqQmJYaumxtf4z1s4DfjGRzNpZ5eWl0
|
||||
6r/4ngGPoJVpjemEuunl1Ig423g7mNA2eymw0lIYkN5SQwCuaifIFJ6GlazhgDEw
|
||||
fpolu4usBCOmmQDo8dIm7A9+O4orkjgTHY+GzYZSR+Y0fFukAj6KYXwidlNalFMz
|
||||
hriSqHKvoflShx8xpfywgVcvzfTO3PYkz6fiNJBonf6q8amaEsybwMbDqKWwIX7e
|
||||
SPY=
|
||||
-----END CERTIFICATE-----
|
3
SslCertificates/Readme.md
Normal file
3
SslCertificates/Readme.md
Normal file
@ -0,0 +1,3 @@
|
||||
# SSL Certificates
|
||||
|
||||
If there are missing SSL Certificates in the distro, then add them here. They will be added to Docker images.
|
Loading…
Reference in New Issue
Block a user