From 065a7f3333ec0b8c6f45a9e53c459d14663a37b4 Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:00:11 -0700 Subject: [PATCH 1/8] instace > instance --- Common/Types/Permission.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Types/Permission.ts b/Common/Types/Permission.ts index 500fc7475f..e5d4e6208e 100644 --- a/Common/Types/Permission.ts +++ b/Common/Types/Permission.ts @@ -2537,11 +2537,11 @@ export function instanceOfUserTenantAccessPermission( return object._type === 'UserTenantAccessPermission'; } -export function instaceOfUserPermission(object: any): object is UserPermission { +export function instanceOfUserPermission(object: any): object is UserPermission { return object._type === 'UserPermission'; } -export function instaceOfUserGlobalAccessPermission( +export function instanceOfUserGlobalAccessPermission( object: any ): object is UserGlobalAccessPermission { return object._type === 'UserGlobalAccessPermission'; From 84a9b9ef0ee9386a81d53924fc97763aa8fbcfaf Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:06:38 -0700 Subject: [PATCH 2/8] slight wording change --- CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx b/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx index d3e5b83b55..0226098a99 100644 --- a/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx +++ b/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx @@ -115,7 +115,7 @@ const CustomFieldsDetail: FunctionComponent = (
{isLoading && !error && } {!isLoading && !error && schemaList.length === 0 && ( - + )} {error && } {!model && } From 9a9b85d1d3f261d53018d6d658ddae4a882a254f Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:11:11 -0700 Subject: [PATCH 3/8] slight wording change --- Dashboard/src/Pages/Settings/APIKeys.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dashboard/src/Pages/Settings/APIKeys.tsx b/Dashboard/src/Pages/Settings/APIKeys.tsx index 0706e35ba5..0a3688f025 100644 --- a/Dashboard/src/Pages/Settings/APIKeys.tsx +++ b/Dashboard/src/Pages/Settings/APIKeys.tsx @@ -56,7 +56,7 @@ const APIKeys: FunctionComponent = ( icon: IconProp.Terminal, title: 'API Keys', description: - 'All you can do on the dashboard can be done via the API. Use OneUptime API to automated repetitive work or integrate with other platforms you have.', + 'Everything you can do on the dashboard can also be done via the OneUptime API- use it to automate repetitive work or integrate with other platforms.', }} noItemsMessage={'No API Keys found.'} formFields={[ From f12e7550e3dcf702f2be0d704acdde5f1d470723 Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:14:48 -0700 Subject: [PATCH 4/8] prettier --- Common/Types/Permission.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Common/Types/Permission.ts b/Common/Types/Permission.ts index e5d4e6208e..94f77b604f 100644 --- a/Common/Types/Permission.ts +++ b/Common/Types/Permission.ts @@ -2537,7 +2537,9 @@ export function instanceOfUserTenantAccessPermission( return object._type === 'UserTenantAccessPermission'; } -export function instanceOfUserPermission(object: any): object is UserPermission { +export function instanceOfUserPermission( + object: any +): object is UserPermission { return object._type === 'UserPermission'; } From 692a38c9731f89f8d7d18f1bd8eecceefe175e2c Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:18:38 -0700 Subject: [PATCH 5/8] consistency --- CommonServer/Services/NotificationService.ts | 6 +++--- Docs/architecture.md | 2 +- Notification/Services/CallService.ts | 4 ++-- Notification/Services/SmsService.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CommonServer/Services/NotificationService.ts b/CommonServer/Services/NotificationService.ts index 37cac00760..6209c4afca 100644 --- a/CommonServer/Services/NotificationService.ts +++ b/CommonServer/Services/NotificationService.ts @@ -62,11 +62,11 @@ export class NotificationService extends BaseService { (project.name || ''), `We have tried to recharge your SMS and Call balance for project - ${ project.name || '' - } and failed. We could not find a payment method for the project. Please add a payment method in project settings.` + } and failed. We could not find a payment method for the project. Please add a payment method in Project Settings.` ); } throw new BadDataException( - 'No payment methods found for the project. Please add a payment method in project settings to continue.' + 'No payment methods found for the project. Please add a payment method in Project Settings to continue.' ); } @@ -127,7 +127,7 @@ export class NotificationService extends BaseService { (project.name || ''), `We have tried recharged your SMS and Call balance for project - ${ project.name || '' - } and failed. Please make sure your payment method is upto date and has sufficient balance. You can add new payment methods in project settings.` + } and failed. Please make sure your payment method is upto date and has sufficient balance. You can add new payment methods in Project Settings.` ); logger.error(err); throw err; diff --git a/Docs/architecture.md b/Docs/architecture.md index a13804c55e..7ed9540a47 100644 --- a/Docs/architecture.md +++ b/Docs/architecture.md @@ -83,7 +83,7 @@ In this case, the user will need to install the server monitor agent in the targ For every component, the user can define the different criteria that allow the backend to decide whether this component is working properly, degraded, or down. -In addition to the name, type, and criteria, the user can choose the category to which the resource should belong. The categories can be managed through the same dashboard under project settings. +In addition to the name, type, and criteria, the user can choose the category to which the resource should belong. The categories can be managed through the same dashboard under Project Settings. #### Status pages diff --git a/Notification/Services/CallService.ts b/Notification/Services/CallService.ts index be693c0fc4..96d01323b7 100644 --- a/Notification/Services/CallService.ts +++ b/Notification/Services/CallService.ts @@ -85,7 +85,7 @@ export default class CallService { if (!project.enableCallNotifications) { callLog.status = CallStatus.Error; - callLog.statusMessage = `Call notifications are not enabled for this project. Please enable Call notifications in project settings.`; + callLog.statusMessage = `Call notifications are not enabled for this project. Please enable Call notifications in Project Settings.`; await CallLogService.create({ data: callLog, @@ -109,7 +109,7 @@ export default class CallService { project.id!, 'Call notifications not enabled for ' + (project.name || ''), - `We tried to make a call to ${callRequest.to.toString()}.

This Call was not sent because call notifications are not enabled for this project. Please enable call notifications in project settings.` + `We tried to make a call to ${callRequest.to.toString()}.

This Call was not sent because call notifications are not enabled for this project. Please enable call notifications in Project Settings.` ); } return; diff --git a/Notification/Services/SmsService.ts b/Notification/Services/SmsService.ts index 6deb0fa22b..e0fac14f08 100644 --- a/Notification/Services/SmsService.ts +++ b/Notification/Services/SmsService.ts @@ -82,7 +82,7 @@ export default class SmsService { if (!project.enableSmsNotifications) { smsLog.status = SmsStatus.Error; - smsLog.statusMessage = `SMS notifications are not enabled for this project. Please enable SMS notifications in project settings.`; + smsLog.statusMessage = `SMS notifications are not enabled for this project. Please enable SMS notifications in Project Settings.`; await SmsLogService.create({ data: smsLog, @@ -105,7 +105,7 @@ export default class SmsService { project.id!, 'SMS notifications not enabled for ' + (project.name || ''), - `We tried to send an SMS to ${to.toString()} with message:

${message}

This SMS was not sent because SMS notifications are not enabled for this project. Please enable SMS notifications in project settings.` + `We tried to send an SMS to ${to.toString()} with message:

${message}

This SMS was not sent because SMS notifications are not enabled for this project. Please enable SMS notifications in Project Settings.` ); } return; From bf7f81461cebda0fcb7678646ccb1379de783997 Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:40:51 -0700 Subject: [PATCH 6/8] remove default --- Accounts/public/index.html | 1 - StatusPage/public/index.html | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Accounts/public/index.html b/Accounts/public/index.html index dc05beabea..525ac825a3 100644 --- a/Accounts/public/index.html +++ b/Accounts/public/index.html @@ -5,7 +5,6 @@ - diff --git a/StatusPage/public/index.html b/StatusPage/public/index.html index 12ac25668a..87064c04e7 100644 --- a/StatusPage/public/index.html +++ b/StatusPage/public/index.html @@ -4,10 +4,6 @@ - From b663bf3c733f61476b411563b79fcc144cc1aa9c Mon Sep 17 00:00:00 2001 From: Carl Downing Date: Sun, 30 Jul 2023 10:45:20 -0700 Subject: [PATCH 7/8] update page descriptions --- Accounts/public/index.html | 7 +++---- Dashboard/public/index.html | 25 +++++++++++-------------- StatusPage/public/index.html | 6 +++--- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Accounts/public/index.html b/Accounts/public/index.html index 525ac825a3..e4725783d8 100644 --- a/Accounts/public/index.html +++ b/Accounts/public/index.html @@ -10,8 +10,7 @@ - - + - - + +