diff --git a/Accounts/Serve.ts b/Accounts/Serve.ts index 488231b0f9..d95bb7d1e6 100755 --- a/Accounts/Serve.ts +++ b/Accounts/Serve.ts @@ -1,7 +1,7 @@ -import App from 'CommonServer/Utils/StartServer'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; import logger from 'CommonServer/Utils/Logger'; +import App from 'CommonServer/Utils/StartServer'; export const APP_NAME: string = 'accounts'; diff --git a/Accounts/src/App.tsx b/Accounts/src/App.tsx index 85e3251896..1286c04747 100644 --- a/Accounts/src/App.tsx +++ b/Accounts/src/App.tsx @@ -1,18 +1,18 @@ -import React, { ReactElement } from 'react'; -import { - Routes, - Route, - useNavigate, - useLocation, - useParams, -} from 'react-router-dom'; +import ForgotPasswordPage from './Pages/ForgotPassword'; import LoginPage from './Pages/Login'; import NotFound from './Pages/NotFound'; -import ForgotPasswordPage from './Pages/ForgotPassword'; import RegisterPage from './Pages/Register'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import VerifyEmail from './Pages/VerifyEmail'; import ResetPasswordPage from './Pages/ResetPassword'; +import VerifyEmail from './Pages/VerifyEmail'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import React, { ReactElement } from 'react'; +import { + Route, + Routes, + useLocation, + useNavigate, + useParams, +} from 'react-router-dom'; function App(): ReactElement { Navigation.setNavigateHook(useNavigate()); diff --git a/Accounts/src/Index.tsx b/Accounts/src/Index.tsx index 9e0e747184..5bf03b73ff 100644 --- a/Accounts/src/Index.tsx +++ b/Accounts/src/Index.tsx @@ -1,10 +1,9 @@ +import App from './App'; +import Telemetry from 'CommonUI/src/Utils/Telemetry'; import React from 'react'; import ReactDOM from 'react-dom/client'; -import App from './App'; import { BrowserRouter } from 'react-router-dom'; -import Telemetry from 'CommonUI/src/Utils/Telemetry'; - Telemetry.init({ serviceName: 'Accounts', }); diff --git a/Accounts/src/Pages/ForgotPassword.tsx b/Accounts/src/Pages/ForgotPassword.tsx index 1f4a1f2983..692aab7620 100644 --- a/Accounts/src/Pages/ForgotPassword.tsx +++ b/Accounts/src/Pages/ForgotPassword.tsx @@ -1,12 +1,12 @@ -import React, { useState } from 'react'; -import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; -import User from 'Model/Models/User'; -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; -import Link from 'CommonUI/src/Components/Link/Link'; import { FORGOT_PASSWORD_API_URL } from '../Utils/ApiPaths'; +import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import Link from 'CommonUI/src/Components/Link/Link'; +import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; +import User from 'Model/Models/User'; +import React, { useState } from 'react'; const ForgotPassword: () => JSX.Element = () => { const apiUrl: URL = FORGOT_PASSWORD_API_URL; diff --git a/Accounts/src/Pages/Login.tsx b/Accounts/src/Pages/Login.tsx index 8308772b7e..add98029c1 100644 --- a/Accounts/src/Pages/Login.tsx +++ b/Accounts/src/Pages/Login.tsx @@ -1,19 +1,19 @@ -import React, { useState } from 'react'; -import User from 'Model/Models/User'; -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; -import Link from 'CommonUI/src/Components/Link/Link'; -import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; import { LOGIN_API_URL } from '../Utils/ApiPaths'; +import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; -import LoginUtil from 'CommonUI/src/Utils/Login'; -import UserUtil from 'CommonUI/src/Utils/User'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import { DASHBOARD_URL } from 'CommonUI/src/Config'; import Alert, { AlertType } from 'CommonUI/src/Components/Alerts/Alert'; +import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import Link from 'CommonUI/src/Components/Link/Link'; +import { DASHBOARD_URL } from 'CommonUI/src/Config'; +import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; import UiAnalytics from 'CommonUI/src/Utils/Analytics'; +import LoginUtil from 'CommonUI/src/Utils/Login'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import UserUtil from 'CommonUI/src/Utils/User'; +import User from 'Model/Models/User'; +import React, { useState } from 'react'; import useAsyncEffect from 'use-async-effect'; const LoginPage: () => JSX.Element = () => { diff --git a/Accounts/src/Pages/Register.tsx b/Accounts/src/Pages/Register.tsx index f3e8116053..84abcf16cc 100644 --- a/Accounts/src/Pages/Register.tsx +++ b/Accounts/src/Pages/Register.tsx @@ -1,26 +1,26 @@ -import React, { useState } from 'react'; -import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; -import User from 'Model/Models/User'; -import Link from 'CommonUI/src/Components/Link/Link'; -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; -import LoginUtil from 'CommonUI/src/Utils/Login'; -import { JSONObject } from 'Common/Types/JSON'; -import UserUtil from 'CommonUI/src/Utils/User'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import { BILLING_ENABLED, DASHBOARD_URL } from 'CommonUI/src/Config'; -import URL from 'Common/Types/API/URL'; import { SIGNUP_API_URL } from '../Utils/ApiPaths'; -import Fields from 'CommonUI/src/Components/Forms/Types/Fields'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; +import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage'; +import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; +import Fields from 'CommonUI/src/Components/Forms/Types/Fields'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import Link from 'CommonUI/src/Components/Link/Link'; +import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; +import { BILLING_ENABLED, DASHBOARD_URL } from 'CommonUI/src/Config'; +import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; +import BaseAPI from 'CommonUI/src/Utils/API/API'; import UiAnalytics from 'CommonUI/src/Utils/Analytics'; import LocalStorage from 'CommonUI/src/Utils/LocalStorage'; -import Reseller from 'Model/Models/Reseller'; +import LoginUtil from 'CommonUI/src/Utils/Login'; import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; -import BaseAPI from 'CommonUI/src/Utils/API/API'; -import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage'; -import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import UserUtil from 'CommonUI/src/Utils/User'; +import Reseller from 'Model/Models/Reseller'; +import User from 'Model/Models/User'; +import React, { useState } from 'react'; import useAsyncEffect from 'use-async-effect'; const RegisterPage: () => JSX.Element = () => { diff --git a/Accounts/src/Pages/ResetPassword.tsx b/Accounts/src/Pages/ResetPassword.tsx index 8d000229ce..40f7721f25 100644 --- a/Accounts/src/Pages/ResetPassword.tsx +++ b/Accounts/src/Pages/ResetPassword.tsx @@ -1,14 +1,13 @@ -import React, { useState } from 'react'; -import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; -import User from 'Model/Models/User'; -import Link from 'CommonUI/src/Components/Link/Link'; -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; - -import URL from 'Common/Types/API/URL'; import { RESET_PASSWORD_API_URL } from '../Utils/ApiPaths'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import Link from 'CommonUI/src/Components/Link/Link'; +import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; import Navigation from 'CommonUI/src/Utils/Navigation'; +import User from 'Model/Models/User'; +import React, { useState } from 'react'; const RegisterPage: () => JSX.Element = () => { const apiUrl: URL = RESET_PASSWORD_API_URL; diff --git a/Accounts/src/Pages/VerifyEmail.tsx b/Accounts/src/Pages/VerifyEmail.tsx index d0cb088535..61ec49bbd3 100644 --- a/Accounts/src/Pages/VerifyEmail.tsx +++ b/Accounts/src/Pages/VerifyEmail.tsx @@ -1,17 +1,17 @@ -import React, { useEffect, useState } from 'react'; +import { VERIFY_EMAIL_API_URL } from '../Utils/ApiPaths'; import Route from 'Common/Types/API/Route'; -import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; +import URL from 'Common/Types/API/URL'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import ObjectID from 'Common/Types/ObjectID'; +import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; import Link from 'CommonUI/src/Components/Link/Link'; import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; -import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; -import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; -import { VERIFY_EMAIL_API_URL } from '../Utils/ApiPaths'; -import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import ObjectID from 'Common/Types/ObjectID'; -import URL from 'Common/Types/API/URL'; +import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; import API from 'CommonUI/src/Utils/API/API'; -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; +import React, { useEffect, useState } from 'react'; const VerifyEmail: () => JSX.Element = () => { const apiUrl: URL = VERIFY_EMAIL_API_URL; diff --git a/AdminDashboard/Serve.ts b/AdminDashboard/Serve.ts index a2f89564c6..d6eac8f3d0 100755 --- a/AdminDashboard/Serve.ts +++ b/AdminDashboard/Serve.ts @@ -1,7 +1,7 @@ -import App from 'CommonServer/Utils/StartServer'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; import logger from 'CommonServer/Utils/Logger'; -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import App from 'CommonServer/Utils/StartServer'; export const APP_NAME: string = 'admin'; diff --git a/AdminDashboard/src/App.tsx b/AdminDashboard/src/App.tsx index 52894bf3c8..7d5384ff30 100644 --- a/AdminDashboard/src/App.tsx +++ b/AdminDashboard/src/App.tsx @@ -1,29 +1,28 @@ -import React from 'react'; -import { - Routes, - Route as PageRoute, - useNavigate, - useLocation, - useParams, -} from 'react-router-dom'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import User from 'CommonUI/src/Utils/User'; -import URL from 'Common/Types/API/URL'; -import { ACCOUNTS_URL, DASHBOARD_URL } from 'CommonUI/src/Config'; import MasterPage from './Components/MasterPage/MasterPage'; -import RouteMap from './Utils/RouteMap'; -import PageMap from './Utils/PageMap'; import Init from './Pages/Init/Init'; -import Projects from './Pages/Projects/Index'; -import Users from './Pages/Users/Index'; import Logout from './Pages/Logout/Logout'; - +import Projects from './Pages/Projects/Index'; +import SettingsAPIKey from './Pages/Settings/APIKey/Index'; +import SettingsAuthentication from './Pages/Settings/Authentication/Index'; +import SettingsCallSMS from './Pages/Settings/CallSMS/Index'; // Settings Pages. import SettingsEmail from './Pages/Settings/Email/Index'; -import SettingsCallSMS from './Pages/Settings/CallSMS/Index'; import SettingsProbes from './Pages/Settings/Probes/Index'; -import SettingsAuthentication from './Pages/Settings/Authentication/Index'; -import SettingsAPIKey from './Pages/Settings/APIKey/Index'; +import Users from './Pages/Users/Index'; +import PageMap from './Utils/PageMap'; +import RouteMap from './Utils/RouteMap'; +import URL from 'Common/Types/API/URL'; +import { ACCOUNTS_URL, DASHBOARD_URL } from 'CommonUI/src/Config'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import User from 'CommonUI/src/Utils/User'; +import React from 'react'; +import { + Route as PageRoute, + Routes, + useLocation, + useNavigate, + useParams, +} from 'react-router-dom'; const App: () => JSX.Element = () => { Navigation.setNavigateHook(useNavigate()); diff --git a/AdminDashboard/src/Components/Footer/Footer.tsx b/AdminDashboard/src/Components/Footer/Footer.tsx index 4b147d7557..bb1218635e 100644 --- a/AdminDashboard/src/Components/Footer/Footer.tsx +++ b/AdminDashboard/src/Components/Footer/Footer.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import Footer from 'CommonUI/src/Components/Footer/Footer'; -import URL from 'Common/Types/API/URL'; -import API from 'Common/Utils/API'; -import { HOST, HTTP_PROTOCOL } from 'CommonUI/src/Config'; -import { JSONObject } from 'Common/Types/JSON'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import Dictionary from 'Common/Types/Dictionary'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { JSONObject } from 'Common/Types/JSON'; +import API from 'Common/Utils/API'; +import Footer from 'CommonUI/src/Components/Footer/Footer'; +import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; +import { HOST, HTTP_PROTOCOL } from 'CommonUI/src/Config'; +import React from 'react'; const DashboardFooter: () => JSX.Element = () => { const [showAboutModal, setShowAboutModal] = React.useState(false); diff --git a/AdminDashboard/src/Components/Header/Header.tsx b/AdminDashboard/src/Components/Header/Header.tsx index 7197ba4bf6..4464145cdf 100644 --- a/AdminDashboard/src/Components/Header/Header.tsx +++ b/AdminDashboard/src/Components/Header/Header.tsx @@ -1,11 +1,11 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Help from './Help'; -import Header from 'CommonUI/src/Components/Header/Header'; import Logo from './Logo'; -import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import { DASHBOARD_URL } from 'CommonUI/src/Config'; import UserProfile from './UserProfile'; +import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; +import Header from 'CommonUI/src/Components/Header/Header'; +import { DASHBOARD_URL } from 'CommonUI/src/Config'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import React, { FunctionComponent, ReactElement } from 'react'; const DashboardHeader: FunctionComponent = (): ReactElement => { return ( diff --git a/AdminDashboard/src/Components/Header/Help.tsx b/AdminDashboard/src/Components/Header/Help.tsx index 7d86f62502..9e4ae94178 100644 --- a/AdminDashboard/src/Components/Header/Help.tsx +++ b/AdminDashboard/src/Components/Header/Help.tsx @@ -1,10 +1,10 @@ -import React, { ReactElement, useState } from 'react'; +import URL from 'Common/Types/API/URL'; +import IconProp from 'Common/Types/Icon/IconProp'; import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem'; import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu'; import IconDropdownRow from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownRow'; -import IconProp from 'Common/Types/Icon/IconProp'; -import URL from 'Common/Types/API/URL'; +import React, { ReactElement, useState } from 'react'; const Help: () => JSX.Element = (): ReactElement => { const [isDropdownVisible, setIsDropdownVisible] = useState(false); diff --git a/AdminDashboard/src/Components/Header/Logo.tsx b/AdminDashboard/src/Components/Header/Logo.tsx index 72677e21f3..bcccffa878 100644 --- a/AdminDashboard/src/Components/Header/Logo.tsx +++ b/AdminDashboard/src/Components/Header/Logo.tsx @@ -1,9 +1,8 @@ // Tailwind - -import React, { FunctionComponent, ReactElement } from 'react'; +import Route from 'Common/Types/API/Route'; import Image from 'CommonUI/src/Components/Image/Image'; import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; -import Route from 'Common/Types/API/Route'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onClick: () => void; diff --git a/AdminDashboard/src/Components/Header/Notifications.tsx b/AdminDashboard/src/Components/Header/Notifications.tsx index e89a24937a..4d45d04ae6 100644 --- a/AdminDashboard/src/Components/Header/Notifications.tsx +++ b/AdminDashboard/src/Components/Header/Notifications.tsx @@ -1,8 +1,8 @@ -import React, { ReactElement, useState } from 'react'; -import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; -import Notifications from 'CommonUI/src/Components/Header/Notifications/Notifications'; -import NotificationItem from 'CommonUI/src/Components/Header/Notifications/NotificationItem'; import IconProp from 'Common/Types/Icon/IconProp'; +import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; +import NotificationItem from 'CommonUI/src/Components/Header/Notifications/NotificationItem'; +import Notifications from 'CommonUI/src/Components/Header/Notifications/Notifications'; +import React, { ReactElement, useState } from 'react'; const DashboardHeader: () => JSX.Element = (): ReactElement => { const [isDropdownVisible, setIsDropdownVisible] = useState(false); diff --git a/AdminDashboard/src/Components/Header/ProjectPicker.tsx b/AdminDashboard/src/Components/Header/ProjectPicker.tsx index 529d9c2e9d..7080517acd 100644 --- a/AdminDashboard/src/Components/Header/ProjectPicker.tsx +++ b/AdminDashboard/src/Components/Header/ProjectPicker.tsx @@ -1,22 +1,22 @@ +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; +import Field from 'CommonUI/src/Components/Forms/Types/Field'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import ProjectPicker from 'CommonUI/src/Components/Header/ProjectPicker/ProjectPicker'; +import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal'; +import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons'; +import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; +import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; +import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes'; +import ProjectUtil from 'CommonUI/src/Utils/Project'; +import Project from 'Model/Models/Project'; import React, { FunctionComponent, ReactElement, - useState, useEffect, + useState, } from 'react'; -import ProjectPicker from 'CommonUI/src/Components/Header/ProjectPicker/ProjectPicker'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Project from 'Model/Models/Project'; -import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; -import ProjectUtil from 'CommonUI/src/Utils/Project'; -import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import Field from 'CommonUI/src/Components/Forms/Types/Field'; -import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons'; -import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; -import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes'; export interface ComponentProps { projects: Array; diff --git a/AdminDashboard/src/Components/Header/SearchBox.tsx b/AdminDashboard/src/Components/Header/SearchBox.tsx index d90880fcd7..eb2148856e 100644 --- a/AdminDashboard/src/Components/Header/SearchBox.tsx +++ b/AdminDashboard/src/Components/Header/SearchBox.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import SearchBox from 'CommonUI/src/Components/Header/SearchBox'; import Project from 'Model/Models/Project'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onChange: (search: string) => void; diff --git a/AdminDashboard/src/Components/Header/UserProfile.tsx b/AdminDashboard/src/Components/Header/UserProfile.tsx index 242de4a90d..e4e7f3074a 100644 --- a/AdminDashboard/src/Components/Header/UserProfile.tsx +++ b/AdminDashboard/src/Components/Header/UserProfile.tsx @@ -1,15 +1,15 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Route from 'Common/Types/API/Route'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; import PageMap from '../../Utils/PageMap'; -import BlankProfilePic from 'CommonUI/src/Images/users/blank-profile.svg'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem'; import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu'; -import Navigation from 'CommonUI/src/Utils/Navigation'; import { DASHBOARD_URL } from 'CommonUI/src/Config'; +import BlankProfilePic from 'CommonUI/src/Images/users/blank-profile.svg'; +import Navigation from 'CommonUI/src/Utils/Navigation'; import User from 'CommonUI/src/Utils/User'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; const DashboardUserProfile: FunctionComponent = (): ReactElement => { const [isDropdownVisible, setIsDropdownVisible] = useState(false); diff --git a/AdminDashboard/src/Components/MasterPage/MasterPage.tsx b/AdminDashboard/src/Components/MasterPage/MasterPage.tsx index bc2c761dae..653aac7f20 100644 --- a/AdminDashboard/src/Components/MasterPage/MasterPage.tsx +++ b/AdminDashboard/src/Components/MasterPage/MasterPage.tsx @@ -1,9 +1,9 @@ -import MasterPage from 'CommonUI/src/Components/MasterPage/MasterPage'; import Footer from '../Footer/Footer'; import Header from '../Header/Header'; import NavBar from '../NavBar/NavBar'; -import React, { FunctionComponent, ReactElement } from 'react'; +import MasterPage from 'CommonUI/src/Components/MasterPage/MasterPage'; import TopAlert from 'CommonUI/src/Components/TopAlert/TopAlert'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { children: ReactElement | Array; diff --git a/AdminDashboard/src/Components/NavBar/NavBar.tsx b/AdminDashboard/src/Components/NavBar/NavBar.tsx index 686a041a30..8f761ac18c 100644 --- a/AdminDashboard/src/Components/NavBar/NavBar.tsx +++ b/AdminDashboard/src/Components/NavBar/NavBar.tsx @@ -1,10 +1,10 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import NavBar from 'CommonUI/src/Components/Navbar/NavBar'; -import NavBarItem from 'CommonUI/src/Components/Navbar/NavBarItem'; -import Route from 'Common/Types/API/Route'; -import IconProp from 'Common/Types/Icon/IconProp'; import PageMap from '../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; +import NavBar from 'CommonUI/src/Components/Navbar/NavBar'; +import NavBarItem from 'CommonUI/src/Components/Navbar/NavBarItem'; +import React, { FunctionComponent, ReactElement } from 'react'; const DashboardNavbar: FunctionComponent = (): ReactElement => { return ( diff --git a/AdminDashboard/src/Index.tsx b/AdminDashboard/src/Index.tsx index 8560f62c5f..ec59249bda 100644 --- a/AdminDashboard/src/Index.tsx +++ b/AdminDashboard/src/Index.tsx @@ -1,8 +1,8 @@ +import App from './App'; +import Telemetry from 'CommonUI/src/Utils/Telemetry'; import React from 'react'; import ReactDOM from 'react-dom/client'; -import App from './App'; import { BrowserRouter } from 'react-router-dom'; -import Telemetry from 'CommonUI/src/Utils/Telemetry'; Telemetry.init({ serviceName: 'AdminDashboard', diff --git a/AdminDashboard/src/Pages/Init/Init.tsx b/AdminDashboard/src/Pages/Init/Init.tsx index 5ed848da51..091c7fe1a9 100644 --- a/AdminDashboard/src/Pages/Init/Init.tsx +++ b/AdminDashboard/src/Pages/Init/Init.tsx @@ -1,9 +1,9 @@ +import PageMap from '../../Utils/PageMap'; +import RouteMap from '../../Utils/RouteMap'; import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; import Page from 'CommonUI/src/Components/Page/Page'; import Navigation from 'CommonUI/src/Utils/Navigation'; import React, { FunctionComponent, ReactElement, useEffect } from 'react'; -import RouteMap from '../../Utils/RouteMap'; -import PageMap from '../../Utils/PageMap'; const Init: FunctionComponent = (): ReactElement => { useEffect(() => { diff --git a/AdminDashboard/src/Pages/Logout/Logout.tsx b/AdminDashboard/src/Pages/Logout/Logout.tsx index e405c3566e..75f7c9b20e 100644 --- a/AdminDashboard/src/Pages/Logout/Logout.tsx +++ b/AdminDashboard/src/Pages/Logout/Logout.tsx @@ -1,16 +1,15 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; - -import Page from 'CommonUI/src/Components/Page/Page'; -import Route from 'Common/Types/API/Route'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage'; import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; -import UserUtil from 'CommonUI/src/Utils/User'; -import Navigation from 'CommonUI/src/Utils/Navigation'; +import Page from 'CommonUI/src/Components/Page/Page'; import { ACCOUNTS_URL } from 'CommonUI/src/Config'; import UiAnalytics from 'CommonUI/src/Utils/Analytics'; -import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage'; -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import UserUtil from 'CommonUI/src/Utils/User'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; const Logout: FunctionComponent = (): ReactElement => { const [error, setError] = React.useState(null); diff --git a/AdminDashboard/src/Pages/Projects/Index.tsx b/AdminDashboard/src/Pages/Projects/Index.tsx index bae43c3c91..782307b9fb 100644 --- a/AdminDashboard/src/Pages/Projects/Index.tsx +++ b/AdminDashboard/src/Pages/Projects/Index.tsx @@ -1,26 +1,26 @@ +import AdminModelAPI from '../../Utils/ModelAPI'; +import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; import Route from 'Common/Types/API/Route'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import Field from 'CommonUI/src/Components/Forms/Types/Field'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; import Page from 'CommonUI/src/Components/Page/Page'; +import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons'; +import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; +import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import Project from 'Model/Models/Project'; +import User from 'Model/Models/User'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import PageMap from '../../Utils/PageMap'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; -import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import Project from 'Model/Models/Project'; -import User from 'Model/Models/User'; -import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; -import Field from 'CommonUI/src/Components/Forms/Types/Field'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons'; -import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; -import AdminModelAPI from '../../Utils/ModelAPI'; -import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes'; const Projects: FunctionComponent = (): ReactElement => { const [isSubscriptionPlanYearly, setIsSubscriptionPlanYearly] = diff --git a/AdminDashboard/src/Pages/Settings/APIKey/Index.tsx b/AdminDashboard/src/Pages/Settings/APIKey/Index.tsx index e7e0e275a4..97302c8d12 100644 --- a/AdminDashboard/src/Pages/Settings/APIKey/Index.tsx +++ b/AdminDashboard/src/Pages/Settings/APIKey/Index.tsx @@ -1,14 +1,14 @@ -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; -import Page from 'CommonUI/src/Components/Page/Page'; -import React, { FunctionComponent, ReactElement } from 'react'; import PageMap from '../../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../../Utils/RouteMap'; import DashboardSideMenu from '../SideMenu'; -import GlobalConfig from 'Model/Models/GlobalConfig'; +import Route from 'Common/Types/API/Route'; import ObjectID from 'Common/Types/ObjectID'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; +import Page from 'CommonUI/src/Components/Page/Page'; import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import GlobalConfig from 'Model/Models/GlobalConfig'; +import React, { FunctionComponent, ReactElement } from 'react'; const Settings: FunctionComponent = (): ReactElement => { return ( diff --git a/AdminDashboard/src/Pages/Settings/Authentication/Index.tsx b/AdminDashboard/src/Pages/Settings/Authentication/Index.tsx index 4425df5cc3..bee36cb458 100644 --- a/AdminDashboard/src/Pages/Settings/Authentication/Index.tsx +++ b/AdminDashboard/src/Pages/Settings/Authentication/Index.tsx @@ -1,14 +1,14 @@ -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; -import Page from 'CommonUI/src/Components/Page/Page'; -import React, { FunctionComponent, ReactElement } from 'react'; import PageMap from '../../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../../Utils/RouteMap'; import DashboardSideMenu from '../SideMenu'; -import GlobalConfig from 'Model/Models/GlobalConfig'; +import Route from 'Common/Types/API/Route'; import ObjectID from 'Common/Types/ObjectID'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; +import Page from 'CommonUI/src/Components/Page/Page'; import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import GlobalConfig from 'Model/Models/GlobalConfig'; +import React, { FunctionComponent, ReactElement } from 'react'; const Settings: FunctionComponent = (): ReactElement => { return ( diff --git a/AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx b/AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx index ef3d307128..eabecb3295 100644 --- a/AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx +++ b/AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx @@ -1,14 +1,14 @@ -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; -import Page from 'CommonUI/src/Components/Page/Page'; -import React, { FunctionComponent, ReactElement } from 'react'; import PageMap from '../../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../../Utils/RouteMap'; import DashboardSideMenu from '../SideMenu'; -import GlobalConfig from 'Model/Models/GlobalConfig'; +import Route from 'Common/Types/API/Route'; import ObjectID from 'Common/Types/ObjectID'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; +import Page from 'CommonUI/src/Components/Page/Page'; import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import GlobalConfig from 'Model/Models/GlobalConfig'; +import React, { FunctionComponent, ReactElement } from 'react'; const Settings: FunctionComponent = (): ReactElement => { return ( diff --git a/AdminDashboard/src/Pages/Settings/Email/Index.tsx b/AdminDashboard/src/Pages/Settings/Email/Index.tsx index ee82f7103a..eae5e79768 100644 --- a/AdminDashboard/src/Pages/Settings/Email/Index.tsx +++ b/AdminDashboard/src/Pages/Settings/Email/Index.tsx @@ -1,21 +1,21 @@ -import Route from 'Common/Types/API/Route'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; -import Page from 'CommonUI/src/Components/Page/Page'; -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import PageMap from '../../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../../Utils/RouteMap'; import DashboardSideMenu from '../SideMenu'; -import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig'; -import ObjectID from 'Common/Types/ObjectID'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; -import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; -import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage'; -import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; -import Pill from 'CommonUI/src/Components/Pill/Pill'; +import Route from 'Common/Types/API/Route'; import { Green, Red } from 'Common/Types/BrandColors'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import ObjectID from 'Common/Types/ObjectID'; +import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import PageLoader from 'CommonUI/src/Components/Loader/PageLoader'; +import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail'; +import Page from 'CommonUI/src/Components/Page/Page'; +import Pill from 'CommonUI/src/Components/Pill/Pill'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; +import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; const Settings: FunctionComponent = (): ReactElement => { const [emailServerType, setemailServerType] = diff --git a/AdminDashboard/src/Pages/Settings/Probes/Index.tsx b/AdminDashboard/src/Pages/Settings/Probes/Index.tsx index 72f2b7448c..f711b399b1 100644 --- a/AdminDashboard/src/Pages/Settings/Probes/Index.tsx +++ b/AdminDashboard/src/Pages/Settings/Probes/Index.tsx @@ -1,23 +1,23 @@ -import Route from 'Common/Types/API/Route'; -import Page from 'CommonUI/src/Components/Page/Page'; -import React, { FunctionComponent, ReactElement, useState } from 'react'; +import AdminModelAPI from '../../../Utils/ModelAPI'; import PageMap from '../../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../../Utils/RouteMap'; import DashboardSideMenu from '../SideMenu'; -import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; -import Probe from 'Model/Models/Probe'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import OneUptimeDate from 'Common/Types/Date'; -import { Green, Red } from 'Common/Types/BrandColors'; -import Statusbubble from 'CommonUI/src/Components/StatusBubble/StatusBubble'; -import ProbeElement from 'CommonUI/src/Components/Probe/Probe'; +import Route from 'Common/Types/API/Route'; import IsNull from 'Common/Types/BaseDatabase/IsNull'; -import Banner from 'CommonUI/src/Components/Banner/Banner'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import AdminModelAPI from '../../../Utils/ModelAPI'; +import { Green, Red } from 'Common/Types/BrandColors'; +import OneUptimeDate from 'Common/Types/Date'; import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes'; +import Banner from 'CommonUI/src/Components/Banner/Banner'; +import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; +import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; +import Page from 'CommonUI/src/Components/Page/Page'; +import ProbeElement from 'CommonUI/src/Components/Probe/Probe'; +import Statusbubble from 'CommonUI/src/Components/StatusBubble/StatusBubble'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import Probe from 'Model/Models/Probe'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; const Settings: FunctionComponent = (): ReactElement => { const [showKeyModal, setShowKeyModal] = useState(false); diff --git a/AdminDashboard/src/Pages/Settings/SideMenu.tsx b/AdminDashboard/src/Pages/Settings/SideMenu.tsx index 1e08da5bd4..bf9e2f78e0 100644 --- a/AdminDashboard/src/Pages/Settings/SideMenu.tsx +++ b/AdminDashboard/src/Pages/Settings/SideMenu.tsx @@ -1,11 +1,11 @@ -import React, { ReactElement } from 'react'; +import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; import Route from 'Common/Types/API/Route'; import IconProp from 'Common/Types/Icon/IconProp'; import SideMenu from 'CommonUI/src/Components/SideMenu/SideMenu'; import SideMenuItem from 'CommonUI/src/Components/SideMenu/SideMenuItem'; import SideMenuSection from 'CommonUI/src/Components/SideMenu/SideMenuSection'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; -import PageMap from '../../Utils/PageMap'; +import React, { ReactElement } from 'react'; const DashboardSideMenu: () => JSX.Element = (): ReactElement => { return ( diff --git a/AdminDashboard/src/Pages/Users/Index.tsx b/AdminDashboard/src/Pages/Users/Index.tsx index 41868258fc..5a9344de46 100644 --- a/AdminDashboard/src/Pages/Users/Index.tsx +++ b/AdminDashboard/src/Pages/Users/Index.tsx @@ -1,18 +1,18 @@ -import Route from 'Common/Types/API/Route'; -import Page from 'CommonUI/src/Components/Page/Page'; -import React, { FunctionComponent, ReactElement, useState } from 'react'; import PageMap from '../../Utils/PageMap'; import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; -import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import User from 'Model/Models/User'; +import Route from 'Common/Types/API/Route'; import { ErrorFunction } from 'Common/Types/FunctionTypes'; import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; +import Page from 'CommonUI/src/Components/Page/Page'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; import API from 'CommonUI/src/Utils/API/API'; +import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import User from 'Model/Models/User'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; const Users: FunctionComponent = (): ReactElement => { const [showConfirmVerifyEmailModal, setShowConfirmVerifyEmailModal] = diff --git a/AdminDashboard/src/Utils/RouteMap.ts b/AdminDashboard/src/Utils/RouteMap.ts index 7ec8bd7948..1bb45ac7a6 100644 --- a/AdminDashboard/src/Utils/RouteMap.ts +++ b/AdminDashboard/src/Utils/RouteMap.ts @@ -1,7 +1,7 @@ -import Route from 'Common/Types/API/Route'; -import Dictionary from 'Common/Types/Dictionary'; import PageMap from './PageMap'; import RouteParams from './RouteParams'; +import Route from 'Common/Types/API/Route'; +import Dictionary from 'Common/Types/Dictionary'; import ObjectID from 'Common/Types/ObjectID'; const RouteMap: Dictionary = { diff --git a/App/FeatureSet/ApiReference/Index.ts b/App/FeatureSet/ApiReference/Index.ts index e8b13b8b61..3321e60f1e 100755 --- a/App/FeatureSet/ApiReference/Index.ts +++ b/App/FeatureSet/ApiReference/Index.ts @@ -1,22 +1,22 @@ +import AuthenticationServiceHandler from './Service/Authentication'; +import DataTypeServiceHandler from './Service/DataType'; +import ErrorServiceHandler from './Service/Errors'; +import IntroductionServiceHandler from './Service/Introduction'; +import ModelServiceHandler from './Service/Model'; +import PageNotFoundServiceHandler from './Service/PageNotFound'; +import PaginationServiceHandler from './Service/Pagination'; +import PermissionServiceHandler from './Service/Permissions'; +import StatusServiceHandler from './Service/Status'; +import { StaticPath } from './Utils/Config'; +import ResourceUtil, { ModelDocumentation } from './Utils/Resources'; +import Dictionary from 'Common/Types/Dictionary'; +import FeatureSet from 'CommonServer/Types/FeatureSet'; import Express, { ExpressApplication, ExpressRequest, ExpressResponse, ExpressStatic, } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from './Utils/Resources'; -import IntroductionServiceHandler from './Service/Introduction'; -import ErrorServiceHandler from './Service/Errors'; -import PermissionServiceHandler from './Service/Permissions'; -import AuthenticationServiceHandler from './Service/Authentication'; -import PageNotFoundServiceHandler from './Service/PageNotFound'; -import ModelServiceHandler from './Service/Model'; -import PaginationServiceHandler from './Service/Pagination'; -import StatusServiceHandler from './Service/Status'; -import DataTypeServiceHandler from './Service/DataType'; -import Dictionary from 'Common/Types/Dictionary'; -import { StaticPath } from './Utils/Config'; -import FeatureSet from 'CommonServer/Types/FeatureSet'; const APIReferenceFeatureSet: FeatureSet = { init: async (): Promise => { diff --git a/App/FeatureSet/ApiReference/Service/Authentication.ts b/App/FeatureSet/ApiReference/Service/Authentication.ts index d08e25efa7..1f3ffdfa53 100644 --- a/App/FeatureSet/ApiReference/Service/Authentication.ts +++ b/App/FeatureSet/ApiReference/Service/Authentication.ts @@ -1,6 +1,6 @@ -import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import { ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Service/DataType.ts b/App/FeatureSet/ApiReference/Service/DataType.ts index 81941f1bd8..cd70bcfe3d 100644 --- a/App/FeatureSet/ApiReference/Service/DataType.ts +++ b/App/FeatureSet/ApiReference/Service/DataType.ts @@ -1,8 +1,8 @@ +import { CodeExamplesPath, ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import LocalCache from 'CommonServer/Infrastructure/LocalCache'; import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; import LocalFile from 'CommonServer/Utils/LocalFile'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; -import { CodeExamplesPath, ViewsPath } from '../Utils/Config'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Service/Errors.ts b/App/FeatureSet/ApiReference/Service/Errors.ts index 2e9a4cb5b8..bb8b9a3261 100644 --- a/App/FeatureSet/ApiReference/Service/Errors.ts +++ b/App/FeatureSet/ApiReference/Service/Errors.ts @@ -1,6 +1,6 @@ -import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import { ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Service/Introduction.ts b/App/FeatureSet/ApiReference/Service/Introduction.ts index 21de6eea78..dde1a675d8 100644 --- a/App/FeatureSet/ApiReference/Service/Introduction.ts +++ b/App/FeatureSet/ApiReference/Service/Introduction.ts @@ -1,6 +1,6 @@ -import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import { ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; const Resources: Array = ResourceUtil.getResources(); const FeaturedResources: Array = diff --git a/App/FeatureSet/ApiReference/Service/Model.ts b/App/FeatureSet/ApiReference/Service/Model.ts index 02346161e3..eb3fe74fec 100644 --- a/App/FeatureSet/ApiReference/Service/Model.ts +++ b/App/FeatureSet/ApiReference/Service/Model.ts @@ -1,3 +1,7 @@ +import { CodeExamplesPath, ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import PageNotFoundServiceHandler from './PageNotFound'; +import { AppApiRoute } from 'Common/ServiceRoute'; import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; import { getTableColumns } from 'Common/Types/Database/TableColumn'; import Dictionary from 'Common/Types/Dictionary'; @@ -6,13 +10,9 @@ import Permission, { PermissionHelper, PermissionProps, } from 'Common/Types/Permission'; -import { AppApiRoute } from 'Common/ServiceRoute'; import LocalCache from 'CommonServer/Infrastructure/LocalCache'; import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; import LocalFile from 'CommonServer/Utils/LocalFile'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; -import PageNotFoundServiceHandler from './PageNotFound'; -import { CodeExamplesPath, ViewsPath } from '../Utils/Config'; const Resources: Array = ResourceUtil.getResources(); const ResourceDictionary: Dictionary = diff --git a/App/FeatureSet/ApiReference/Service/PageNotFound.ts b/App/FeatureSet/ApiReference/Service/PageNotFound.ts index f5c979a4b4..be1c236b0b 100644 --- a/App/FeatureSet/ApiReference/Service/PageNotFound.ts +++ b/App/FeatureSet/ApiReference/Service/PageNotFound.ts @@ -1,6 +1,6 @@ -import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import { ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Service/Pagination.ts b/App/FeatureSet/ApiReference/Service/Pagination.ts index 4cdf8376ab..013d32f1e8 100644 --- a/App/FeatureSet/ApiReference/Service/Pagination.ts +++ b/App/FeatureSet/ApiReference/Service/Pagination.ts @@ -1,8 +1,8 @@ -import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; -import LocalFile from 'CommonServer/Utils/LocalFile'; -import LocalCache from 'CommonServer/Infrastructure/LocalCache'; import { CodeExamplesPath, ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import LocalCache from 'CommonServer/Infrastructure/LocalCache'; +import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; +import LocalFile from 'CommonServer/Utils/LocalFile'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Service/Permissions.ts b/App/FeatureSet/ApiReference/Service/Permissions.ts index 3962c4698b..b0f93738b9 100644 --- a/App/FeatureSet/ApiReference/Service/Permissions.ts +++ b/App/FeatureSet/ApiReference/Service/Permissions.ts @@ -1,7 +1,7 @@ +import { ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import { PermissionHelper, PermissionProps } from 'Common/Types/Permission'; import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; -import { ViewsPath } from '../Utils/Config'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Service/Status.ts b/App/FeatureSet/ApiReference/Service/Status.ts index f78776f60d..541cf08964 100644 --- a/App/FeatureSet/ApiReference/Service/Status.ts +++ b/App/FeatureSet/ApiReference/Service/Status.ts @@ -1,6 +1,6 @@ -import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; -import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; import { ViewsPath } from '../Utils/Config'; +import ResourceUtil, { ModelDocumentation } from '../Utils/Resources'; +import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express'; const Resources: Array = ResourceUtil.getResources(); diff --git a/App/FeatureSet/ApiReference/Utils/Resources.ts b/App/FeatureSet/ApiReference/Utils/Resources.ts index 97a4e00b83..dabfa2f0e9 100644 --- a/App/FeatureSet/ApiReference/Utils/Resources.ts +++ b/App/FeatureSet/ApiReference/Utils/Resources.ts @@ -1,8 +1,8 @@ import BaseModel from 'Common/Models/BaseModel'; -import Models from 'Model/Models/Index'; import ArrayUtil from 'Common/Types/ArrayUtil'; import Dictionary from 'Common/Types/Dictionary'; import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; +import Models from 'Model/Models/Index'; export interface ModelDocumentation { name: string; diff --git a/App/FeatureSet/Docs/Index.ts b/App/FeatureSet/Docs/Index.ts index a1dc851c1a..a4f15ca6ff 100755 --- a/App/FeatureSet/Docs/Index.ts +++ b/App/FeatureSet/Docs/Index.ts @@ -1,16 +1,16 @@ -import 'ejs'; +import { ContentPath, StaticPath, ViewsPath } from './Utils/Config'; +import DocsNav, { NavGroup, NavLink } from './Utils/Nav'; +import DocsRender from './Utils/Render'; +import FeatureSet from 'CommonServer/Types/FeatureSet'; import Express, { + ExpressApplication, ExpressRequest, ExpressResponse, ExpressStatic, - ExpressApplication, } from 'CommonServer/Utils/Express'; -import { ContentPath, StaticPath, ViewsPath } from './Utils/Config'; -import DocsNav, { NavGroup, NavLink } from './Utils/Nav'; import LocalFile from 'CommonServer/Utils/LocalFile'; -import DocsRender from './Utils/Render'; import logger from 'CommonServer/Utils/Logger'; -import FeatureSet from 'CommonServer/Types/FeatureSet'; +import 'ejs'; const DocsFeatureSet: FeatureSet = { init: async (): Promise => { diff --git a/App/FeatureSet/Home/API/BlogAPI.ts b/App/FeatureSet/Home/API/BlogAPI.ts index 7e7ba36d0c..7785a68903 100644 --- a/App/FeatureSet/Home/API/BlogAPI.ts +++ b/App/FeatureSet/Home/API/BlogAPI.ts @@ -1,14 +1,14 @@ +import BlogPostUtil, { BlogPost, BlogPostHeader } from '../Utils/BlogPost'; +import { ViewsPath } from '../Utils/Config'; +import NotFoundUtil from '../Utils/NotFound'; +import ServerErrorUtil from '../Utils/ServerError'; +import Text from 'Common/Types/Text'; import Express, { ExpressApplication, ExpressRequest, ExpressResponse, } from 'CommonServer/Utils/Express'; -import BlogPostUtil, { BlogPost, BlogPostHeader } from '../Utils/BlogPost'; -import { ViewsPath } from '../Utils/Config'; import logger from 'CommonServer/Utils/Logger'; -import ServerErrorUtil from '../Utils/ServerError'; -import NotFoundUtil from '../Utils/NotFound'; -import Text from 'Common/Types/Text'; const app: ExpressApplication = Express.getExpressApp(); diff --git a/App/FeatureSet/Home/Index.ts b/App/FeatureSet/Home/Index.ts index f38461faaa..d7496b0183 100755 --- a/App/FeatureSet/Home/Index.ts +++ b/App/FeatureSet/Home/Index.ts @@ -1,26 +1,25 @@ -import 'ejs'; +// improt API +import './API/BlogAPI'; +import { StaticPath, ViewsPath } from './Utils/Config'; +import NotFoundUtil from './Utils/NotFound'; +import ProductCompare, { Product } from './Utils/ProductCompare'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; +import API from 'Common/Utils/API'; +import FeatureSet from 'CommonServer/Types/FeatureSet'; import Express, { + ExpressApplication, ExpressRequest, ExpressResponse, ExpressStatic, - ExpressApplication, } from 'CommonServer/Utils/Express'; -import Dictionary from 'Common/Types/Dictionary'; -import OneUptimeDate from 'Common/Types/Date'; -import URL from 'Common/Types/API/URL'; -import ProductCompare, { Product } from './Utils/ProductCompare'; +import 'ejs'; import builder from 'xmlbuilder2'; import { XMLBuilder } from 'xmlbuilder2/lib/interfaces'; -import API from 'Common/Utils/API'; -import { JSONObject } from 'Common/Types/JSON'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import { StaticPath, ViewsPath } from './Utils/Config'; -import NotFoundUtil from './Utils/NotFound'; - -// improt API -import './API/BlogAPI'; -import FeatureSet from 'CommonServer/Types/FeatureSet'; const HomeFeatureSet: FeatureSet = { init: async (): Promise => { diff --git a/App/FeatureSet/Home/Utils/BlogPost.ts b/App/FeatureSet/Home/Utils/BlogPost.ts index 8dbb546144..653c6ee7a0 100644 --- a/App/FeatureSet/Home/Utils/BlogPost.ts +++ b/App/FeatureSet/Home/Utils/BlogPost.ts @@ -1,15 +1,15 @@ -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import API from 'Common/Utils/API'; -import URL from 'Common/Types/API/URL'; -import { JSONArray, JSONObject, JSONObjectOrArray } from 'Common/Types/JSON'; -import BaseModel from 'Common/Models/BaseModel'; import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; -import LocalCache from 'CommonServer/Infrastructure/LocalCache'; -import JSONFunctions from 'Common/Types/JSONFunctions'; +import BaseModel from 'Common/Models/BaseModel'; import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONArray, JSONObject, JSONObjectOrArray } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import Text from 'Common/Types/Text'; +import API from 'Common/Utils/API'; +import LocalCache from 'CommonServer/Infrastructure/LocalCache'; import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; export interface BlogPostAuthor { diff --git a/App/FeatureSet/Home/Utils/NotFound.ts b/App/FeatureSet/Home/Utils/NotFound.ts index b7dcb36861..17bd54dcc2 100644 --- a/App/FeatureSet/Home/Utils/NotFound.ts +++ b/App/FeatureSet/Home/Utils/NotFound.ts @@ -1,5 +1,5 @@ -import { ExpressResponse } from 'CommonServer/Utils/Express'; import { ViewsPath } from './Config'; +import { ExpressResponse } from 'CommonServer/Utils/Express'; export default class NotFoundUtil { public static renderNotFound(res: ExpressResponse): void { diff --git a/App/FeatureSet/Home/Utils/ServerError.ts b/App/FeatureSet/Home/Utils/ServerError.ts index 9ae23603e2..266faa4de3 100644 --- a/App/FeatureSet/Home/Utils/ServerError.ts +++ b/App/FeatureSet/Home/Utils/ServerError.ts @@ -1,5 +1,5 @@ -import { ExpressResponse } from 'CommonServer/Utils/Express'; import { ViewsPath } from './Config'; +import { ExpressResponse } from 'CommonServer/Utils/Express'; export default class ServerErrorUtil { public static renderServerError(res: ExpressResponse): void { diff --git a/App/FeatureSet/Identity/API/Authentication.ts b/App/FeatureSet/Identity/API/Authentication.ts index 9cee63bbeb..ea2d25d425 100644 --- a/App/FeatureSet/Identity/API/Authentication.ts +++ b/App/FeatureSet/Identity/API/Authentication.ts @@ -1,40 +1,40 @@ -import { - IsBillingEnabled, - EncryptionSecret, -} from 'CommonServer/EnvironmentConfig'; +import AuthenticationEmail from '../Utils/AuthenticationEmail'; +import BaseModel from 'Common/Models/BaseModel'; import { AccountsRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import Email from 'Common/Types/Email'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; +import { JSONObject } from 'Common/Types/JSON'; +import Name from 'Common/Types/Name'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import { + EncryptionSecret, + IsBillingEnabled, +} from 'CommonServer/EnvironmentConfig'; +import AccessTokenService from 'CommonServer/Services/AccessTokenService'; +import EmailVerificationTokenService from 'CommonServer/Services/EmailVerificationTokenService'; +import MailService from 'CommonServer/Services/MailService'; +import UserService from 'CommonServer/Services/UserService'; +import CookieUtil from 'CommonServer/Utils/Cookie'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, NextFunction, } from 'CommonServer/Utils/Express'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; -import { JSONObject } from 'Common/Types/JSON'; -import User from 'Model/Models/User'; -import EmailVerificationTokenService from 'CommonServer/Services/EmailVerificationTokenService'; -import UserService from 'CommonServer/Services/UserService'; -import ObjectID from 'Common/Types/ObjectID'; -import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import URL from 'Common/Types/API/URL'; -import Response from 'CommonServer/Utils/Response'; import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; -import OneUptimeDate from 'Common/Types/Date'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import Route from 'Common/Types/API/Route'; import logger from 'CommonServer/Utils/Logger'; -import Email from 'Common/Types/Email'; -import Name from 'Common/Types/Name'; -import AuthenticationEmail from '../Utils/AuthenticationEmail'; -import AccessTokenService from 'CommonServer/Services/AccessTokenService'; -import Hostname from 'Common/Types/API/Hostname'; -import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import CookieUtil from 'CommonServer/Utils/Cookie'; -import BaseModel from 'Common/Models/BaseModel'; +import Response from 'CommonServer/Utils/Response'; +import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; +import User from 'Model/Models/User'; const router: ExpressRouter = Express.getRouter(); diff --git a/App/FeatureSet/Identity/API/Reseller.ts b/App/FeatureSet/Identity/API/Reseller.ts index 50cb532403..11de5a3bf9 100644 --- a/App/FeatureSet/Identity/API/Reseller.ts +++ b/App/FeatureSet/Identity/API/Reseller.ts @@ -1,15 +1,15 @@ +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ResellerService from 'CommonServer/Services/ResellerService'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, NextFunction, } from 'CommonServer/Utils/Express'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Reseller from 'Model/Models/Reseller'; -import ResellerService from 'CommonServer/Services/ResellerService'; import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; -import OneUptimeDate from 'Common/Types/Date'; import Response from 'CommonServer/Utils/Response'; +import Reseller from 'Model/Models/Reseller'; const router: ExpressRouter = Express.getRouter(); diff --git a/App/FeatureSet/Identity/API/SSO.ts b/App/FeatureSet/Identity/API/SSO.ts index 363b13ee41..5031ca0f82 100644 --- a/App/FeatureSet/Identity/API/SSO.ts +++ b/App/FeatureSet/Identity/API/SSO.ts @@ -1,38 +1,38 @@ +import AuthenticationEmail from '../Utils/AuthenticationEmail'; +import SSOUtil from '../Utils/SSO'; +import { DashboardRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import Email from 'Common/Types/Email'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; +import Exception from 'Common/Types/Exception/Exception'; +import ServerException from 'Common/Types/Exception/ServerException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import { Host, HttpProtocol } from 'CommonServer/EnvironmentConfig'; +import AccessTokenService from 'CommonServer/Services/AccessTokenService'; +import ProjectSSOService from 'CommonServer/Services/ProjectSsoService'; +import TeamMemberService from 'CommonServer/Services/TeamMemberService'; +import UserService from 'CommonServer/Services/UserService'; +import CookieUtil from 'CommonServer/Utils/Cookie'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, NextFunction, } from 'CommonServer/Utils/Express'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; -import ServerException from 'Common/Types/Exception/ServerException'; +import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; +import logger from 'CommonServer/Utils/Logger'; import Response from 'CommonServer/Utils/Response'; import ProjectSSO from 'Model/Models/ProjectSso'; -import ProjectSSOService from 'CommonServer/Services/ProjectSsoService'; -import ObjectID from 'Common/Types/ObjectID'; -import xml2js from 'xml2js'; -import { JSONObject } from 'Common/Types/JSON'; -import logger from 'CommonServer/Utils/Logger'; -import Email from 'Common/Types/Email'; -import User from 'Model/Models/User'; -import UserService from 'CommonServer/Services/UserService'; -import AuthenticationEmail from '../Utils/AuthenticationEmail'; -import OneUptimeDate from 'Common/Types/Date'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; -import URL from 'Common/Types/API/URL'; -import { DashboardRoute } from 'Common/ServiceRoute'; -import Route from 'Common/Types/API/Route'; import TeamMember from 'Model/Models/TeamMember'; -import TeamMemberService from 'CommonServer/Services/TeamMemberService'; -import AccessTokenService from 'CommonServer/Services/AccessTokenService'; -import SSOUtil from '../Utils/SSO'; -import Exception from 'Common/Types/Exception/Exception'; -import Hostname from 'Common/Types/API/Hostname'; -import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import CookieUtil from 'CommonServer/Utils/Cookie'; -import { Host, HttpProtocol } from 'CommonServer/EnvironmentConfig'; +import User from 'Model/Models/User'; +import xml2js from 'xml2js'; const router: ExpressRouter = Express.getRouter(); diff --git a/App/FeatureSet/Identity/API/StatusPageAuthentication.ts b/App/FeatureSet/Identity/API/StatusPageAuthentication.ts index 7097da14bd..e17712f7be 100644 --- a/App/FeatureSet/Identity/API/StatusPageAuthentication.ts +++ b/App/FeatureSet/Identity/API/StatusPageAuthentication.ts @@ -1,32 +1,32 @@ -import { EncryptionSecret } from 'CommonServer/EnvironmentConfig'; +import BaseModel from 'Common/Models/BaseModel'; import { FileRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import { EncryptionSecret } from 'CommonServer/EnvironmentConfig'; +import MailService from 'CommonServer/Services/MailService'; +import StatusPagePrivateUserService from 'CommonServer/Services/StatusPagePrivateUserService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import CookieUtil from 'CommonServer/Utils/Cookie'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, NextFunction, } from 'CommonServer/Utils/Express'; -import { JSONObject } from 'Common/Types/JSON'; -import StatusPagePrivateUserService from 'CommonServer/Services/StatusPagePrivateUserService'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import URL from 'Common/Types/API/URL'; -import Response from 'CommonServer/Utils/Response'; import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; -import OneUptimeDate from 'Common/Types/Date'; -import PositiveNumber from 'Common/Types/PositiveNumber'; import logger from 'CommonServer/Utils/Logger'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import StatusPagePrivateUser from 'Model/Models/StatusPagePrivateUser'; +import Response from 'CommonServer/Utils/Response'; import StatusPage from 'Model/Models/StatusPage'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import Protocol from 'Common/Types/API/Protocol'; -import Hostname from 'Common/Types/API/Hostname'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import CookieUtil from 'CommonServer/Utils/Cookie'; -import BaseModel from 'Common/Models/BaseModel'; +import StatusPagePrivateUser from 'Model/Models/StatusPagePrivateUser'; const router: ExpressRouter = Express.getRouter(); diff --git a/App/FeatureSet/Identity/API/StatusPageSSO.ts b/App/FeatureSet/Identity/API/StatusPageSSO.ts index e0f9cb7681..fadc6e6a28 100644 --- a/App/FeatureSet/Identity/API/StatusPageSSO.ts +++ b/App/FeatureSet/Identity/API/StatusPageSSO.ts @@ -1,31 +1,31 @@ +import SSOUtil from '../Utils/SSO'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import Email from 'Common/Types/Email'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; +import Exception from 'Common/Types/Exception/Exception'; +import ServerException from 'Common/Types/Exception/ServerException'; +import HashedString from 'Common/Types/HashedString'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import { Host, HttpProtocol } from 'CommonServer/EnvironmentConfig'; +import StatusPagePrivateUserService from 'CommonServer/Services/StatusPagePrivateUserService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPageSsoService from 'CommonServer/Services/StatusPageSsoService'; +import CookieUtil from 'CommonServer/Utils/Cookie'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, NextFunction, } from 'CommonServer/Utils/Express'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; -import ServerException from 'Common/Types/Exception/ServerException'; -import Response from 'CommonServer/Utils/Response'; -import StatusPageSsoService from 'CommonServer/Services/StatusPageSsoService'; -import ObjectID from 'Common/Types/ObjectID'; -import xml2js from 'xml2js'; -import { JSONObject } from 'Common/Types/JSON'; -import logger from 'CommonServer/Utils/Logger'; -import Email from 'Common/Types/Email'; -import OneUptimeDate from 'Common/Types/Date'; -import PositiveNumber from 'Common/Types/PositiveNumber'; import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; -import URL from 'Common/Types/API/URL'; -import SSOUtil from '../Utils/SSO'; -import Exception from 'Common/Types/Exception/Exception'; -import StatusPageSSO from 'Model/Models/StatusPageSso'; +import logger from 'CommonServer/Utils/Logger'; +import Response from 'CommonServer/Utils/Response'; import StatusPagePrivateUser from 'Model/Models/StatusPagePrivateUser'; -import StatusPagePrivateUserService from 'CommonServer/Services/StatusPagePrivateUserService'; -import HashedString from 'Common/Types/HashedString'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import CookieUtil from 'CommonServer/Utils/Cookie'; -import { Host, HttpProtocol } from 'CommonServer/EnvironmentConfig'; +import StatusPageSSO from 'Model/Models/StatusPageSso'; +import xml2js from 'xml2js'; const router: ExpressRouter = Express.getRouter(); diff --git a/App/FeatureSet/Identity/Index.ts b/App/FeatureSet/Identity/Index.ts index fcdc352639..2f0769cbf4 100644 --- a/App/FeatureSet/Identity/Index.ts +++ b/App/FeatureSet/Identity/Index.ts @@ -1,11 +1,11 @@ -import 'ejs'; -import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; import AuthenticationAPI from './API/Authentication'; -import SsoAPI from './API/SSO'; import ResellerAPI from './API/Reseller'; -import StatusPageSsoAPI from './API/StatusPageSSO'; +import SsoAPI from './API/SSO'; import StatusPageAuthenticationAPI from './API/StatusPageAuthentication'; +import StatusPageSsoAPI from './API/StatusPageSSO'; import FeatureSet from 'CommonServer/Types/FeatureSet'; +import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; +import 'ejs'; const IdentityFeatureSet: FeatureSet = { init: async (): Promise => { diff --git a/App/FeatureSet/Identity/Utils/AuthenticationEmail.ts b/App/FeatureSet/Identity/Utils/AuthenticationEmail.ts index 7f8826eba4..7e5109abb6 100644 --- a/App/FeatureSet/Identity/Utils/AuthenticationEmail.ts +++ b/App/FeatureSet/Identity/Utils/AuthenticationEmail.ts @@ -1,23 +1,18 @@ import { AccountsRoute } from 'Common/ServiceRoute'; - -import EmailVerificationTokenService from 'CommonServer/Services/EmailVerificationTokenService'; - -import ObjectID from 'Common/Types/ObjectID'; -import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; - -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import URL from 'Common/Types/API/URL'; - -import OneUptimeDate from 'Common/Types/Date'; - -import Route from 'Common/Types/API/Route'; -import logger from 'CommonServer/Utils/Logger'; -import User from 'Model/Models/User'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; import Email from 'Common/Types/Email'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import EmailVerificationTokenService from 'CommonServer/Services/EmailVerificationTokenService'; +import MailService from 'CommonServer/Services/MailService'; +import logger from 'CommonServer/Utils/Logger'; +import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; +import User from 'Model/Models/User'; export default class AuthenticationEmail { public static async sendVerificationEmail(user: User): Promise { diff --git a/App/FeatureSet/Identity/Utils/SSO.ts b/App/FeatureSet/Identity/Utils/SSO.ts index 0cd22cb418..d279823da8 100644 --- a/App/FeatureSet/Identity/Utils/SSO.ts +++ b/App/FeatureSet/Identity/Utils/SSO.ts @@ -1,12 +1,12 @@ -import { JSONArray, JSONObject } from 'Common/Types/JSON'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; -import Email from 'Common/Types/Email'; -import xmldom from 'xmldom'; -import xmlCrypto, { FileKeyInfo } from 'xml-crypto'; -import logger from 'CommonServer/Utils/Logger'; -import OneUptimeDate from 'Common/Types/Date'; -import Text from 'Common/Types/Text'; import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import Email from 'Common/Types/Email'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; +import { JSONArray, JSONObject } from 'Common/Types/JSON'; +import Text from 'Common/Types/Text'; +import logger from 'CommonServer/Utils/Logger'; +import xmlCrypto, { FileKeyInfo } from 'xml-crypto'; +import xmldom from 'xmldom'; import zlib from 'zlib'; export default class SSOUtil { diff --git a/App/FeatureSet/Notification/API/Call.ts b/App/FeatureSet/Notification/API/Call.ts index 2cac0bdaa7..4752a44668 100644 --- a/App/FeatureSet/Notification/API/Call.ts +++ b/App/FeatureSet/Notification/API/Call.ts @@ -1,22 +1,23 @@ +import CallService from '../Services/CallService'; +import CallRequest from 'Common/Types/Call/CallRequest'; +import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import Phone from 'Common/Types/Phone'; +import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; +import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from 'CommonServer/Utils/Express'; -const router: ExpressRouter = Express.getRouter(); -import Response from 'CommonServer/Utils/Response'; -import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; -import { JSONObject } from 'Common/Types/JSON'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import Phone from 'Common/Types/Phone'; -import ObjectID from 'Common/Types/ObjectID'; -import CallService from '../Services/CallService'; -import CallRequest from 'Common/Types/Call/CallRequest'; -import ProjectCallSMSConfig from 'Model/Models/ProjectCallSMSConfig'; -import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; import logger from 'CommonServer/Utils/Logger'; +import Response from 'CommonServer/Utils/Response'; +import ProjectCallSMSConfig from 'Model/Models/ProjectCallSMSConfig'; + +const router: ExpressRouter = Express.getRouter(); router.post( '/make-call', diff --git a/App/FeatureSet/Notification/API/Mail.ts b/App/FeatureSet/Notification/API/Mail.ts index c1996b36ca..d954804b17 100644 --- a/App/FeatureSet/Notification/API/Mail.ts +++ b/App/FeatureSet/Notification/API/Mail.ts @@ -1,19 +1,20 @@ +import MailService from '../Services/MailService'; +import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import EmailMessage from 'Common/Types/Email/EmailMessage'; +import EmailServer from 'Common/Types/Email/EmailServer'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from 'CommonServer/Utils/Express'; -const router: ExpressRouter = Express.getRouter(); import Response from 'CommonServer/Utils/Response'; -import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; -import MailService from '../Services/MailService'; -import EmailMessage from 'Common/Types/Email/EmailMessage'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import { JSONObject } from 'Common/Types/JSON'; -import Email from 'Common/Types/Email'; -import Dictionary from 'Common/Types/Dictionary'; -import EmailServer from 'Common/Types/Email/EmailServer'; -import ObjectID from 'Common/Types/ObjectID'; + +const router: ExpressRouter = Express.getRouter(); router.post( '/send', diff --git a/App/FeatureSet/Notification/API/SMS.ts b/App/FeatureSet/Notification/API/SMS.ts index c20a954de9..7f0c49321a 100644 --- a/App/FeatureSet/Notification/API/SMS.ts +++ b/App/FeatureSet/Notification/API/SMS.ts @@ -1,21 +1,22 @@ +import SmsService from '../Services/SmsService'; +import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import Phone from 'Common/Types/Phone'; +import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; +import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from 'CommonServer/Utils/Express'; -const router: ExpressRouter = Express.getRouter(); -import Response from 'CommonServer/Utils/Response'; -import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; -import { JSONObject } from 'Common/Types/JSON'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import SmsService from '../Services/SmsService'; -import Phone from 'Common/Types/Phone'; -import ObjectID from 'Common/Types/ObjectID'; -import ProjectCallSMSConfig from 'Model/Models/ProjectCallSMSConfig'; -import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; import logger from 'CommonServer/Utils/Logger'; +import Response from 'CommonServer/Utils/Response'; +import ProjectCallSMSConfig from 'Model/Models/ProjectCallSMSConfig'; + +const router: ExpressRouter = Express.getRouter(); router.post( '/send', diff --git a/App/FeatureSet/Notification/API/SMTPConfig.ts b/App/FeatureSet/Notification/API/SMTPConfig.ts index 5da9187ea6..36c5e50091 100644 --- a/App/FeatureSet/Notification/API/SMTPConfig.ts +++ b/App/FeatureSet/Notification/API/SMTPConfig.ts @@ -1,22 +1,22 @@ +import MailService from '../Services/MailService'; +import Email from 'Common/Types/Email'; +import EmailMessage from 'Common/Types/Email/EmailMessage'; +import EmailServer from 'Common/Types/Email/EmailServer'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from 'CommonServer/Utils/Express'; -const router: ExpressRouter = Express.getRouter(); - -import Response from 'CommonServer/Utils/Response'; -import MailService from '../Services/MailService'; -import EmailMessage from 'Common/Types/Email/EmailMessage'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import { JSONObject } from 'Common/Types/JSON'; -import Email from 'Common/Types/Email'; -import EmailServer from 'Common/Types/Email/EmailServer'; -import ProjectSmtpConfig from 'Model/Models/ProjectSmtpConfig'; -import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; import logger from 'CommonServer/Utils/Logger'; +import Response from 'CommonServer/Utils/Response'; +import ProjectSmtpConfig from 'Model/Models/ProjectSmtpConfig'; + +const router: ExpressRouter = Express.getRouter(); router.post('/test', async (req: ExpressRequest, res: ExpressResponse) => { const body: JSONObject = req.body; diff --git a/App/FeatureSet/Notification/Config.ts b/App/FeatureSet/Notification/Config.ts index c866760cd2..b3aa05bbd9 100644 --- a/App/FeatureSet/Notification/Config.ts +++ b/App/FeatureSet/Notification/Config.ts @@ -1,12 +1,12 @@ -import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig'; import Hostname from 'Common/Types/API/Hostname'; +import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; import Email from 'Common/Types/Email'; +import EmailServer from 'Common/Types/Email/EmailServer'; import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; import Port from 'Common/Types/Port'; import GlobalConfigService from 'CommonServer/Services/GlobalConfigService'; -import EmailServer from 'Common/Types/Email/EmailServer'; -import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig'; export const InternalSmtpPassword: string = process.env['INTERNAL_SMTP_PASSWORD'] || ''; diff --git a/App/FeatureSet/Notification/Index.ts b/App/FeatureSet/Notification/Index.ts index 8e4a8afcaf..0cc3455e54 100644 --- a/App/FeatureSet/Notification/Index.ts +++ b/App/FeatureSet/Notification/Index.ts @@ -1,13 +1,12 @@ -import 'ejs'; -import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; - +import CallAPI from './API/Call'; // API import MailAPI from './API/Mail'; import SmsAPI from './API/SMS'; -import CallAPI from './API/Call'; import SMTPConfigAPI from './API/SMTPConfig'; import './Utils/Handlebars'; import FeatureSet from 'CommonServer/Types/FeatureSet'; +import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; +import 'ejs'; const NotificationFeatureSet: FeatureSet = { init: async (): Promise => { diff --git a/App/FeatureSet/Notification/Services/CallService.ts b/App/FeatureSet/Notification/Services/CallService.ts index 1f611ec923..522c2c7a53 100644 --- a/App/FeatureSet/Notification/Services/CallService.ts +++ b/App/FeatureSet/Notification/Services/CallService.ts @@ -1,31 +1,31 @@ -import ObjectID from 'Common/Types/ObjectID'; import { CallDefaultCostInCentsPerMinute, CallHighRiskCostInCentsPerMinute, getTwilioConfig, } from '../Config'; -import Twilio from 'twilio'; -import CallLog from 'Model/Models/CallLog'; -import CallStatus from 'Common/Types/Call/CallStatus'; import CallRequest, { GatherInput, Say, isHighRiskPhoneNumber, } from 'Common/Types/Call/CallRequest'; +import CallStatus from 'Common/Types/Call/CallStatus'; +import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; import CallLogService from 'CommonServer/Services/CallLogService'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Project from 'Model/Models/Project'; import NotificationService from 'CommonServer/Services/NotificationService'; -import logger from 'CommonServer/Utils/Logger'; -import { CallInstance } from 'twilio/lib/rest/api/v2010/account/call'; -import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; -import OneUptimeDate from 'Common/Types/Date'; -import JSONFunctions from 'Common/Types/JSONFunctions'; +import ProjectService from 'CommonServer/Services/ProjectService'; import UserOnCallLogTimelineService from 'CommonServer/Services/UserOnCallLogTimelineService'; -import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import JSONWebToken from 'CommonServer/Utils/JsonWebToken'; +import logger from 'CommonServer/Utils/Logger'; +import CallLog from 'Model/Models/CallLog'; +import Project from 'Model/Models/Project'; +import Twilio from 'twilio'; +import { CallInstance } from 'twilio/lib/rest/api/v2010/account/call'; export default class CallService { public static async makeCall( diff --git a/App/FeatureSet/Notification/Services/MailService.ts b/App/FeatureSet/Notification/Services/MailService.ts index f2ec1a6faa..552f212cd8 100755 --- a/App/FeatureSet/Notification/Services/MailService.ts +++ b/App/FeatureSet/Notification/Services/MailService.ts @@ -1,20 +1,3 @@ -import nodemailer, { Transporter } from 'nodemailer'; -import Handlebars from 'handlebars'; -import fsp from 'fs/promises'; -import EmailMessage from 'Common/Types/Email/EmailMessage'; -import Path from 'path'; -import Email from 'Common/Types/Email'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import EmailServer from 'Common/Types/Email/EmailServer'; -import LocalCache from 'CommonServer/Infrastructure/LocalCache'; -import OneUptimeDate from 'Common/Types/Date'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Hostname from 'Common/Types/API/Hostname'; -import Port from 'Common/Types/Port'; -import { JSONObject } from 'Common/Types/JSON'; -import logger from 'CommonServer/Utils/Logger'; -import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import { InternalSmtpEmail, InternalSmtpFromName, @@ -22,19 +5,36 @@ import { InternalSmtpPassword, InternalSmtpPort, InternalSmtpSecure, + SendGridConfig, getEmailServerType, getGlobalSMTPConfig, - SendGridConfig, getSendgridConfig, } from '../Config'; import SendgridMail, { MailDataRequired } from '@sendgrid/mail'; -import ObjectID from 'Common/Types/ObjectID'; -import UserOnCallLogTimelineService from 'CommonServer/Services/UserOnCallLogTimelineService'; -import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; -import EmailLog from 'Model/Models/EmailLog'; +import Hostname from 'Common/Types/API/Hostname'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import EmailMessage from 'Common/Types/Email/EmailMessage'; +import EmailServer from 'Common/Types/Email/EmailServer'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import MailStatus from 'Common/Types/Mail/MailStatus'; +import ObjectID from 'Common/Types/ObjectID'; +import Port from 'Common/Types/Port'; +import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; +import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; +import LocalCache from 'CommonServer/Infrastructure/LocalCache'; import EmailLogService from 'CommonServer/Services/EmailLogService'; +import UserOnCallLogTimelineService from 'CommonServer/Services/UserOnCallLogTimelineService'; +import logger from 'CommonServer/Utils/Logger'; +import EmailLog from 'Model/Models/EmailLog'; import { EmailServerType } from 'Model/Models/GlobalConfig'; +import fsp from 'fs/promises'; +import Handlebars from 'handlebars'; +import nodemailer, { Transporter } from 'nodemailer'; +import Path from 'path'; export default class MailService { public static isSMTPConfigValid(obj: JSONObject): boolean { diff --git a/App/FeatureSet/Notification/Services/SmsService.ts b/App/FeatureSet/Notification/Services/SmsService.ts index f587e88774..947a366310 100644 --- a/App/FeatureSet/Notification/Services/SmsService.ts +++ b/App/FeatureSet/Notification/Services/SmsService.ts @@ -1,26 +1,26 @@ -import ObjectID from 'Common/Types/ObjectID'; -import Phone from 'Common/Types/Phone'; import { SMSDefaultCostInCents, SMSHighRiskCostInCents, getTwilioConfig, } from '../Config'; -import Twilio from 'twilio'; -import SmsLog from 'Model/Models/SmsLog'; -import SmsStatus from 'Common/Types/SmsStatus'; -import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; -import SmsLogService from 'CommonServer/Services/SmsLogService'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Project from 'Model/Models/Project'; -import { MessageInstance } from 'twilio/lib/rest/api/v2010/account/message'; -import NotificationService from 'CommonServer/Services/NotificationService'; -import logger from 'CommonServer/Utils/Logger'; -import UserOnCallLogTimelineService from 'CommonServer/Services/UserOnCallLogTimelineService'; -import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import { isHighRiskPhoneNumber } from 'Common/Types/Call/CallRequest'; -import Text from 'Common/Types/Text'; import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Phone from 'Common/Types/Phone'; +import SmsStatus from 'Common/Types/SmsStatus'; +import Text from 'Common/Types/Text'; +import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; +import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; +import NotificationService from 'CommonServer/Services/NotificationService'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import SmsLogService from 'CommonServer/Services/SmsLogService'; +import UserOnCallLogTimelineService from 'CommonServer/Services/UserOnCallLogTimelineService'; +import logger from 'CommonServer/Utils/Logger'; +import Project from 'Model/Models/Project'; +import SmsLog from 'Model/Models/SmsLog'; +import Twilio from 'twilio'; +import { MessageInstance } from 'twilio/lib/rest/api/v2010/account/message'; export default class SmsService { public static async sendSms( diff --git a/App/FeatureSet/Notification/Utils/Handlebars.ts b/App/FeatureSet/Notification/Utils/Handlebars.ts index a2d8476173..3ef5561508 100644 --- a/App/FeatureSet/Notification/Utils/Handlebars.ts +++ b/App/FeatureSet/Notification/Utils/Handlebars.ts @@ -1,8 +1,8 @@ -import Handlebars from 'handlebars'; -import fsp from 'fs/promises'; -import Path from 'path'; -import logger from 'CommonServer/Utils/Logger'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import logger from 'CommonServer/Utils/Logger'; +import fsp from 'fs/promises'; +import Handlebars from 'handlebars'; +import Path from 'path'; const loadPartials: PromiseVoidFunction = async (): Promise => { // get all partials in the partial folder and comile then and register then as partials in handlebars. diff --git a/App/FeatureSet/Workers/DataMigrations/AddAttributesColumnToSpanAndLog.ts b/App/FeatureSet/Workers/DataMigrations/AddAttributesColumnToSpanAndLog.ts index 1819431e9f..c0690f6076 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddAttributesColumnToSpanAndLog.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddAttributesColumnToSpanAndLog.ts @@ -1,10 +1,10 @@ import DataMigrationBase from './DataMigrationBase'; import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; -import LogService from 'CommonServer/Services/LogService'; import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; +import LogService from 'CommonServer/Services/LogService'; +import SpanService from 'CommonServer/Services/SpanService'; import Log from 'Model/AnalyticsModels/Log'; import Span from 'Model/AnalyticsModels/Span'; -import SpanService from 'CommonServer/Services/SpanService'; export default class AddAttributeColumnToSpanAndLog extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddDefaultGlobalConfig.ts b/App/FeatureSet/Workers/DataMigrations/AddDefaultGlobalConfig.ts index 343f2ed611..cb65921baa 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddDefaultGlobalConfig.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddDefaultGlobalConfig.ts @@ -1,7 +1,7 @@ import DataMigrationBase from './DataMigrationBase'; -import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig'; import ObjectID from 'Common/Types/ObjectID'; import GlobalConfigService from 'CommonServer/Services/GlobalConfigService'; +import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig'; export default class AddDefaultGlobalConfig extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddDowntimeMonitorStatusToStatusPage.ts b/App/FeatureSet/Workers/DataMigrations/AddDowntimeMonitorStatusToStatusPage.ts index 915c9fae88..df5c2e8f38 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddDowntimeMonitorStatusToStatusPage.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddDowntimeMonitorStatusToStatusPage.ts @@ -1,11 +1,11 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import StatusPage from 'Model/Models/StatusPage'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import MonitorStatusService from 'CommonServer/Services/MonitorStatusService'; import { Green } from 'Common/Types/BrandColors'; import Color from 'Common/Types/Color'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import MonitorStatusService from 'CommonServer/Services/MonitorStatusService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import StatusPage from 'Model/Models/StatusPage'; export default class AddDowntimeMonitorStatusToStatusPage extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddDurationColumnToSpanTable.ts b/App/FeatureSet/Workers/DataMigrations/AddDurationColumnToSpanTable.ts index bea72f3558..fbe497403b 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddDurationColumnToSpanTable.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddDurationColumnToSpanTable.ts @@ -1,7 +1,7 @@ -import Span from 'Model/AnalyticsModels/Span'; import DataMigrationBase from './DataMigrationBase'; -import SpanService from 'CommonServer/Services/SpanService'; import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; +import SpanService from 'CommonServer/Services/SpanService'; +import Span from 'Model/AnalyticsModels/Span'; export default class AddDurationColumnToSpanTable extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddEndDateToIncidentStateTimeline.ts b/App/FeatureSet/Workers/DataMigrations/AddEndDateToIncidentStateTimeline.ts index 276b7e051e..a6376f4204 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddEndDateToIncidentStateTimeline.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddEndDateToIncidentStateTimeline.ts @@ -1,13 +1,13 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import ProjectService from 'CommonServer/Services/ProjectService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; +import ProjectService from 'CommonServer/Services/ProjectService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; +import Project from 'Model/Models/Project'; export default class AddEndDateToIncidentStateTimeline extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimeline.ts b/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimeline.ts index d4cb5506e2..897b3272e0 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimeline.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimeline.ts @@ -1,13 +1,13 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from 'CommonServer/Services/MonitorService'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; +import ProjectService from 'CommonServer/Services/ProjectService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Monitor from 'Model/Models/Monitor'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import Project from 'Model/Models/Project'; export default class AddEndDateToMonitorStatusTimeline extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing.ts b/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing.ts index 9117a15e25..afbbf9db16 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing.ts @@ -1,12 +1,12 @@ import DataMigrationBase from './DataMigrationBase'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; import ProjectService from 'CommonServer/Services/ProjectService'; import Monitor from 'Model/Models/Monitor'; -import MonitorService from 'CommonServer/Services/MonitorService'; import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import Project from 'Model/Models/Project'; export default class AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddEndDateToScheduledEventsStateTimeline.ts b/App/FeatureSet/Workers/DataMigrations/AddEndDateToScheduledEventsStateTimeline.ts index 70555ec1ba..eab48d49e0 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddEndDateToScheduledEventsStateTimeline.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddEndDateToScheduledEventsStateTimeline.ts @@ -1,13 +1,13 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import ProjectService from 'CommonServer/Services/ProjectService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import ProjectService from 'CommonServer/Services/ProjectService'; import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; import ScheduledMaintenanceStateTimelineService from 'CommonServer/Services/ScheduledMaintenanceStateTimelineService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Project from 'Model/Models/Project'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; export default class AddEndDateToScheduledEventsStateTimeline extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddEndedState.ts b/App/FeatureSet/Workers/DataMigrations/AddEndedState.ts index 3be52cc30b..9794e55224 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddEndedState.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddEndedState.ts @@ -1,10 +1,10 @@ import DataMigrationBase from './DataMigrationBase'; +import Color from 'Common/Types/Color'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; import ProjectService from 'CommonServer/Services/ProjectService'; import ScheduledMaintenanceStateService from 'CommonServer/Services/ScheduledMaintenanceStateService'; +import Project from 'Model/Models/Project'; import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import Color from 'Common/Types/Color'; export default class AddEndedState extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddMonitoringDatesToMonitors.ts b/App/FeatureSet/Workers/DataMigrations/AddMonitoringDatesToMonitors.ts index 7215840b8a..12011719be 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddMonitoringDatesToMonitors.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddMonitoringDatesToMonitors.ts @@ -1,9 +1,9 @@ import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import MonitorProbeService from 'CommonServer/Services/MonitorProbeService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import MonitorProbe from 'Model/Models/MonitorProbe'; -import MonitorProbeService from 'CommonServer/Services/MonitorProbeService'; -import OneUptimeDate from 'Common/Types/Date'; export default class AddMonitoringDatesToMonitor extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddOwnerInfoToProject.ts b/App/FeatureSet/Workers/DataMigrations/AddOwnerInfoToProject.ts index fc8e67aae5..972fe274d3 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddOwnerInfoToProject.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddOwnerInfoToProject.ts @@ -1,10 +1,10 @@ -import User from 'Model/Models/User'; import DataMigrationBase from './DataMigrationBase'; -import UserService from 'CommonServer/Services/UserService'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; import ProjectService from 'CommonServer/Services/ProjectService'; +import UserService from 'CommonServer/Services/UserService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Project from 'Model/Models/Project'; +import User from 'Model/Models/User'; export default class AddOwnerInfoToProjects extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddPostedAtToPublicNotes.ts b/App/FeatureSet/Workers/DataMigrations/AddPostedAtToPublicNotes.ts index b807e31c02..de0a0afa8e 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddPostedAtToPublicNotes.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddPostedAtToPublicNotes.ts @@ -1,9 +1,9 @@ import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; import IncidentPublicNoteService from 'CommonServer/Services/IncidentPublicNoteService'; -import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; import ScheduledMaintenancePublicNoteService from 'CommonServer/Services/ScheduledMaintenancePublicNoteService'; +import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; +import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; export default class AddPostedAtToPublicNotes extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddSecretKeyToIncomingRequestMonitor.ts b/App/FeatureSet/Workers/DataMigrations/AddSecretKeyToIncomingRequestMonitor.ts index 6a1fe464fb..90f4a24f46 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddSecretKeyToIncomingRequestMonitor.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddSecretKeyToIncomingRequestMonitor.ts @@ -1,8 +1,8 @@ import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; import MonitorService from 'CommonServer/Services/MonitorService'; import Monitor from 'Model/Models/Monitor'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; export default class AddSecretKeyToIncomingRequestMonitor extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddStartDateToIncidentStateTimeline.ts b/App/FeatureSet/Workers/DataMigrations/AddStartDateToIncidentStateTimeline.ts index 93c9ad4282..e5589868b9 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddStartDateToIncidentStateTimeline.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddStartDateToIncidentStateTimeline.ts @@ -1,13 +1,13 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import ProjectService from 'CommonServer/Services/ProjectService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; +import ProjectService from 'CommonServer/Services/ProjectService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; +import Project from 'Model/Models/Project'; export default class AddStartDateToIncidentStateTimeline extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddStartDateToMonitorStatusTimeline.ts b/App/FeatureSet/Workers/DataMigrations/AddStartDateToMonitorStatusTimeline.ts index bede4e1992..ce2b382d40 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddStartDateToMonitorStatusTimeline.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddStartDateToMonitorStatusTimeline.ts @@ -1,13 +1,13 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from 'CommonServer/Services/MonitorService'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; +import ProjectService from 'CommonServer/Services/ProjectService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Monitor from 'Model/Models/Monitor'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import Project from 'Model/Models/Project'; export default class AddStartDateToMonitorStatusTimeline extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddStartDateToScheduledEventsStateTimeline.ts b/App/FeatureSet/Workers/DataMigrations/AddStartDateToScheduledEventsStateTimeline.ts index fbf164ee4b..f1b62eaf80 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddStartDateToScheduledEventsStateTimeline.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddStartDateToScheduledEventsStateTimeline.ts @@ -1,13 +1,13 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import ProjectService from 'CommonServer/Services/ProjectService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import ProjectService from 'CommonServer/Services/ProjectService'; import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; import ScheduledMaintenanceStateTimelineService from 'CommonServer/Services/ScheduledMaintenanceStateTimelineService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Project from 'Model/Models/Project'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; export default class AddStartDateToScheduledEventsStateTimeline extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/AddTelemetryServiceColor.ts b/App/FeatureSet/Workers/DataMigrations/AddTelemetryServiceColor.ts index 2dbd7b7895..f4415fe550 100644 --- a/App/FeatureSet/Workers/DataMigrations/AddTelemetryServiceColor.ts +++ b/App/FeatureSet/Workers/DataMigrations/AddTelemetryServiceColor.ts @@ -1,9 +1,9 @@ import DataMigrationBase from './DataMigrationBase'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import TelemetryService from 'Model/Models/TelemetryService'; -import TelemetryServiceService from 'CommonServer/Services/TelemetryServiceService'; -import { BrightColors } from 'Common/Types/BrandColors'; import ArrayUtil from 'Common/Types/ArrayUtil'; +import { BrightColors } from 'Common/Types/BrandColors'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import TelemetryServiceService from 'CommonServer/Services/TelemetryServiceService'; +import TelemetryService from 'Model/Models/TelemetryService'; export default class AddTelemetryServiceColor extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/ChangeLogSeverityColumnTypeFromTextToNumber.ts b/App/FeatureSet/Workers/DataMigrations/ChangeLogSeverityColumnTypeFromTextToNumber.ts index cdb64b7570..c48da5f4b0 100644 --- a/App/FeatureSet/Workers/DataMigrations/ChangeLogSeverityColumnTypeFromTextToNumber.ts +++ b/App/FeatureSet/Workers/DataMigrations/ChangeLogSeverityColumnTypeFromTextToNumber.ts @@ -1,7 +1,7 @@ import DataMigrationBase from './DataMigrationBase'; import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; -import LogService from 'CommonServer/Services/LogService'; import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; +import LogService from 'CommonServer/Services/LogService'; import Log from 'Model/AnalyticsModels/Log'; export default class ChangeLogSeverityColumnTypeFromTextToNumber extends DataMigrationBase { diff --git a/App/FeatureSet/Workers/DataMigrations/Index.ts b/App/FeatureSet/Workers/DataMigrations/Index.ts index 17872a7b48..3b3d62f402 100644 --- a/App/FeatureSet/Workers/DataMigrations/Index.ts +++ b/App/FeatureSet/Workers/DataMigrations/Index.ts @@ -4,6 +4,7 @@ import AddDowntimeMonitorStatusToStatusPage from './AddDowntimeMonitorStatusToSt import AddDurationColumnToSpanTable from './AddDurationColumnToSpanTable'; import AddEndDateToIncidentStateTimeline from './AddEndDateToIncidentStateTimeline'; import AddEndDateToMonitorStatusTimeline from './AddEndDateToMonitorStatusTimeline'; +import AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing from './AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing'; import AddEndDateToScheduledEventsStateTimeline from './AddEndDateToScheduledEventsStateTimeline'; import AddEndedState from './AddEndedState'; import AddMonitoringDatesToMonitor from './AddMonitoringDatesToMonitors'; @@ -13,18 +14,17 @@ import AddSecretKeyToIncomingRequestMonitor from './AddSecretKeyToIncomingReques import AddStartDateToIncidentStateTimeline from './AddStartDateToIncidentStateTimeline'; import AddStartDateToMonitorStatusTimeline from './AddStartDateToMonitorStatusTimeline'; import AddStartDateToScheduledEventsStateTimeline from './AddStartDateToScheduledEventsStateTimeline'; +import AddTelemetryServiceColor from './AddTelemetryServiceColor'; import ChangeLogSeverityColumnTypeFromTextToNumber from './ChangeLogSeverityColumnTypeFromTextToNumber'; import DataMigrationBase from './DataMigrationBase'; +import GenerateNewCertsForStatusPage from './GenerateNewCertsForStatusPage'; import MigrateDefaultUserNotificationRule from './MigrateDefaultUserNotificationRule'; import MigrateDefaultUserNotificationSetting from './MigrateDefaultUserSettingNotification'; import MigrateToMeteredSubscription from './MigrateToMeteredSubscription'; import MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage from './MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage'; +import MoveGreenlockCertsToAcmeCerts from './MoveGreenlockCertsToAcmeCerts'; import UpdateActiveMonitorCountToBillingProvider from './UpdateActiveMonitorCountToBillingProvider'; import UpdateGlobalConfigFromEnv from './UpdateGlobalCongfigFromEnv'; -import AddTelemetryServiceColor from './AddTelemetryServiceColor'; -import MoveGreenlockCertsToAcmeCerts from './MoveGreenlockCertsToAcmeCerts'; -import GenerateNewCertsForStatusPage from './GenerateNewCertsForStatusPage'; -import AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing from './AddEndDateToMonitorStatusTimelineWhereEndDateIsMissing'; // This is the order in which the migrations will be run. Add new migrations to the end of the array. diff --git a/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserNotificationRule.ts b/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserNotificationRule.ts index 4120b2a405..b2b219eac2 100644 --- a/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserNotificationRule.ts +++ b/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserNotificationRule.ts @@ -1,10 +1,10 @@ -import User from 'Model/Models/User'; import DataMigrationBase from './DataMigrationBase'; -import UserService from 'CommonServer/Services/UserService'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import TeamMember from 'Model/Models/TeamMember'; import TeamMemberService from 'CommonServer/Services/TeamMemberService'; import UserNotificationRuleService from 'CommonServer/Services/UserNotificationRuleService'; +import UserService from 'CommonServer/Services/UserService'; +import TeamMember from 'Model/Models/TeamMember'; +import User from 'Model/Models/User'; export default class MigrateDefaultUserNotificationRule extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserSettingNotification.ts b/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserSettingNotification.ts index cae01eefa1..7a681c59ec 100644 --- a/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserSettingNotification.ts +++ b/App/FeatureSet/Workers/DataMigrations/MigrateDefaultUserSettingNotification.ts @@ -1,10 +1,10 @@ -import User from 'Model/Models/User'; import DataMigrationBase from './DataMigrationBase'; -import UserService from 'CommonServer/Services/UserService'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import TeamMember from 'Model/Models/TeamMember'; import TeamMemberService from 'CommonServer/Services/TeamMemberService'; import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import UserService from 'CommonServer/Services/UserService'; +import TeamMember from 'Model/Models/TeamMember'; +import User from 'Model/Models/User'; export default class MigrateDefaultUserNotificationSetting extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/MigrateToMeteredSubscription.ts b/App/FeatureSet/Workers/DataMigrations/MigrateToMeteredSubscription.ts index a583107285..d5a047752e 100644 --- a/App/FeatureSet/Workers/DataMigrations/MigrateToMeteredSubscription.ts +++ b/App/FeatureSet/Workers/DataMigrations/MigrateToMeteredSubscription.ts @@ -1,14 +1,14 @@ import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Project from 'Model/Models/Project'; +import Sleep from 'Common/Types/Sleep'; +import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; import BillingService, { SubscriptionItem, } from 'CommonServer/Services/BillingService'; -import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; +import ProjectService from 'CommonServer/Services/ProjectService'; import AllMeteredPlans from 'CommonServer/Types/Billing/MeteredPlan/AllMeteredPlans'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import Sleep from 'Common/Types/Sleep'; +import Project from 'Model/Models/Project'; export default class MigrateToMeteredSubscription extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage.ts b/App/FeatureSet/Workers/DataMigrations/MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage.ts index f6c915a953..9a8a3e0943 100644 --- a/App/FeatureSet/Workers/DataMigrations/MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage.ts +++ b/App/FeatureSet/Workers/DataMigrations/MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage.ts @@ -1,7 +1,7 @@ import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import StatusPage from 'Model/Models/StatusPage'; import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPage from 'Model/Models/StatusPage'; export default class MoveEnableSubscribersToEnableEmailSubscribersOnStatusPage extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/MoveGreenlockCertsToAcmeCerts.ts b/App/FeatureSet/Workers/DataMigrations/MoveGreenlockCertsToAcmeCerts.ts index 3c533613cc..1c9986f565 100644 --- a/App/FeatureSet/Workers/DataMigrations/MoveGreenlockCertsToAcmeCerts.ts +++ b/App/FeatureSet/Workers/DataMigrations/MoveGreenlockCertsToAcmeCerts.ts @@ -1,6 +1,6 @@ -import GreenlockCertificateService from 'CommonServer/Services/GreenlockCertificateService'; import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import GreenlockCertificateService from 'CommonServer/Services/GreenlockCertificateService'; import StatusPageDomainService from 'CommonServer/Services/StatusPageDomainService'; import logger from 'CommonServer/Utils/Logger'; import GreenlockCertificate from 'Model/Models/GreenlockCertificate'; diff --git a/App/FeatureSet/Workers/DataMigrations/UpdateActiveMonitorCountToBillingProvider.ts b/App/FeatureSet/Workers/DataMigrations/UpdateActiveMonitorCountToBillingProvider.ts index a860cffbfc..9e162a7242 100644 --- a/App/FeatureSet/Workers/DataMigrations/UpdateActiveMonitorCountToBillingProvider.ts +++ b/App/FeatureSet/Workers/DataMigrations/UpdateActiveMonitorCountToBillingProvider.ts @@ -1,11 +1,11 @@ import DataMigrationBase from './DataMigrationBase'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Project from 'Model/Models/Project'; +import Sleep from 'Common/Types/Sleep'; import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; +import ProjectService from 'CommonServer/Services/ProjectService'; import AllMeteredPlans from 'CommonServer/Types/Billing/MeteredPlan/AllMeteredPlans'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import Sleep from 'Common/Types/Sleep'; +import Project from 'Model/Models/Project'; export default class UpdateActiveMonitorCountToBillingProvider extends DataMigrationBase { public constructor() { diff --git a/App/FeatureSet/Workers/DataMigrations/UpdateGlobalCongfigFromEnv.ts b/App/FeatureSet/Workers/DataMigrations/UpdateGlobalCongfigFromEnv.ts index 3b699450d9..897b234323 100644 --- a/App/FeatureSet/Workers/DataMigrations/UpdateGlobalCongfigFromEnv.ts +++ b/App/FeatureSet/Workers/DataMigrations/UpdateGlobalCongfigFromEnv.ts @@ -1,8 +1,8 @@ import DataMigrationBase from './DataMigrationBase'; -import ObjectID from 'Common/Types/ObjectID'; -import GlobalConfigService from 'CommonServer/Services/GlobalConfigService'; import Hostname from 'Common/Types/API/Hostname'; +import ObjectID from 'Common/Types/ObjectID'; import Port from 'Common/Types/Port'; +import GlobalConfigService from 'CommonServer/Services/GlobalConfigService'; import { EmailServerType } from 'Model/Models/GlobalConfig'; export default class UpdateGlobalConfigFromEnv extends DataMigrationBase { diff --git a/App/FeatureSet/Workers/Index.ts b/App/FeatureSet/Workers/Index.ts index fd6e32fe43..5a11585a09 100644 --- a/App/FeatureSet/Workers/Index.ts +++ b/App/FeatureSet/Workers/Index.ts @@ -1,86 +1,65 @@ -import logger from 'CommonServer/Utils/Logger'; -import { QueueJob, QueueName } from 'CommonServer/Infrastructure/Queue'; -import QueueWorker from 'CommonServer/Infrastructure/QueueWorker'; -import FeatureSet from 'CommonServer/Types/FeatureSet'; - -// Payments. -import './Jobs/PaymentProvider/CheckSubscriptionStatus'; -import './Jobs/PaymentProvider/UpdateTeamMembersIfNull'; -import './Jobs/PaymentProvider/PopulatePlanNameInProject'; - // Announcements. import './Jobs/Announcement/SendNotificationToSubscribers'; - -// Incidents -import './Jobs/Incident/SendNotificationToSubscribers'; -import './Jobs/IncidentStateTimeline/SendNotificationToSubscribers'; - -// Incident Notes -import './Jobs/IncidentPublicNote/SendNotificationToSubscribers'; - // Hard Delete import './Jobs/HardDelete/HardDeleteItemsInDatabase'; - -// Scheduled Event -import './Jobs/ScheduledMaintenance/ChangeStateToOngoing'; -import './Jobs/ScheduledMaintenance/ChangeStateToEnded'; -import './Jobs/ScheduledMaintenance/SendNotificationToSubscribers'; -import './Jobs/ScheduledMaintenanceStateTimeline/SendNotificationToSubscribers'; - -// Telemetry Service -import './Jobs/TelemetryService/DeleteOldData'; - -// Scheduled Event Notes -import './Jobs/ScheduledMaintenancePublicNote/SendNotificationToSubscribers'; - -// Certs Routers -import './Jobs/StatusPageCerts/StatusPageCerts'; - -import JobDictionary from './Utils/JobDictionary'; - +// Incidents +import './Jobs/Incident/SendNotificationToSubscribers'; +// Incident Owners +import './Jobs/IncidentOwners/SendCreatedResourceNotification'; +import './Jobs/IncidentOwners/SendNotePostedNotification'; +import './Jobs/IncidentOwners/SendOwnerAddedNotification'; +import './Jobs/IncidentOwners/SendStateChangeNotification'; +// Incident Notes +import './Jobs/IncidentPublicNote/SendNotificationToSubscribers'; +import './Jobs/IncidentStateTimeline/SendNotificationToSubscribers'; +import './Jobs/IncomingRequestMonitor/CheckHeartbeat'; +import './Jobs/MeteredPlan/ReportTelemetryMeteredPlan'; +// Monitor Metrics +import './Jobs/MonitorMetrics/MonitorMetricsByMinute'; // Monitor Owners import './Jobs/MonitorOwners/SendCreatedResourceNotification'; import './Jobs/MonitorOwners/SendOwnerAddedNotification'; import './Jobs/MonitorOwners/SendStatusChangeNotification'; - -// Incident Owners -import './Jobs/IncidentOwners/SendCreatedResourceNotification'; -import './Jobs/IncidentOwners/SendOwnerAddedNotification'; -import './Jobs/IncidentOwners/SendStateChangeNotification'; -import './Jobs/IncidentOwners/SendNotePostedNotification'; - -// Scheduled Event Owners -import './Jobs/ScheduledMaintenanceOwners/SendCreatedResourceNotification'; -import './Jobs/ScheduledMaintenanceOwners/SendOwnerAddedNotification'; -import './Jobs/ScheduledMaintenanceOwners/SendStateChangeNotification'; -import './Jobs/ScheduledMaintenanceOwners/SendNotePostedNotification'; - -// Status Page Owners -import './Jobs/StatusPageOwners/SendCreatedResourceNotification'; -import './Jobs/StatusPageOwners/SendOwnerAddedNotification'; -import './Jobs/StatusPageOwners/SendAnnouncementCreatedNotification'; -import RunDatabaseMigrations from './Utils/DataMigration'; - // On-Call Duty Policy Executions. import './Jobs/OnCallDutyPolicyExecutionLog/ExecutePendingExecutions'; import './Jobs/OnCallDutyPolicyExecutionLog/TimeoutStuckExecutions'; - +// Payments. +import './Jobs/PaymentProvider/CheckSubscriptionStatus'; +import './Jobs/PaymentProvider/PopulatePlanNameInProject'; +import './Jobs/PaymentProvider/UpdateTeamMembersIfNull'; +import './Jobs/ScheduledMaintenance/ChangeStateToEnded'; +// Scheduled Event +import './Jobs/ScheduledMaintenance/ChangeStateToOngoing'; +import './Jobs/ScheduledMaintenance/SendNotificationToSubscribers'; +// Scheduled Event Owners +import './Jobs/ScheduledMaintenanceOwners/SendCreatedResourceNotification'; +import './Jobs/ScheduledMaintenanceOwners/SendNotePostedNotification'; +import './Jobs/ScheduledMaintenanceOwners/SendOwnerAddedNotification'; +import './Jobs/ScheduledMaintenanceOwners/SendStateChangeNotification'; +// Scheduled Event Notes +import './Jobs/ScheduledMaintenancePublicNote/SendNotificationToSubscribers'; +import './Jobs/ScheduledMaintenanceStateTimeline/SendNotificationToSubscribers'; +import './Jobs/ServerMonitor/CheckOnlineStatus'; +// Certs Routers +import './Jobs/StatusPageCerts/StatusPageCerts'; +import './Jobs/StatusPageOwners/SendAnnouncementCreatedNotification'; +// Status Page Owners +import './Jobs/StatusPageOwners/SendCreatedResourceNotification'; +import './Jobs/StatusPageOwners/SendOwnerAddedNotification'; +// Telemetry Service +import './Jobs/TelemetryService/DeleteOldData'; // User Notifications Log import './Jobs/UserOnCallLog/ExecutePendingExecutions'; import './Jobs/UserOnCallLog/TimeoutStuckExecutions'; - -import './Jobs/IncomingRequestMonitor/CheckHeartbeat'; -import './Jobs/ServerMonitor/CheckOnlineStatus'; - -import AnalyticsTableManagement from './Utils/AnalyticsDatabase/TableManegement'; - import './Jobs/Workflow/TimeoutJobs'; -import './Jobs/MeteredPlan/ReportTelemetryMeteredPlan'; - -// Monitor Metrics -import './Jobs/MonitorMetrics/MonitorMetricsByMinute'; - +import AnalyticsTableManagement from './Utils/AnalyticsDatabase/TableManegement'; +import RunDatabaseMigrations from './Utils/DataMigration'; +import JobDictionary from './Utils/JobDictionary'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { QueueJob, QueueName } from 'CommonServer/Infrastructure/Queue'; +import QueueWorker from 'CommonServer/Infrastructure/QueueWorker'; +import FeatureSet from 'CommonServer/Types/FeatureSet'; +import logger from 'CommonServer/Utils/Logger'; const WorkersFeatureSet: FeatureSet = { init: async (): Promise => { diff --git a/App/FeatureSet/Workers/Jobs/Announcement/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/Announcement/SendNotificationToSubscribers.ts index cf47029b9f..211c229153 100644 --- a/App/FeatureSet/Workers/Jobs/Announcement/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/Announcement/SendNotificationToSubscribers.ts @@ -1,27 +1,27 @@ +import RunCron from '../../Utils/Cron'; +import { FileRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import SMS from 'Common/Types/SMS/SMS'; import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import MailService from 'CommonServer/Services/MailService'; +import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageAnnouncementService from 'CommonServer/Services/StatusPageAnnouncementService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import StatusPageAnnouncementService from 'CommonServer/Services/StatusPageAnnouncementService'; -import RunCron from '../../Utils/Cron'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import logger from 'CommonServer/Utils/Logger'; +import StatusPage from 'Model/Models/StatusPage'; import StatusPageAnnouncement from 'Model/Models/StatusPageAnnouncement'; import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; -import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import Protocol from 'Common/Types/API/Protocol'; -import Hostname from 'Common/Types/API/Hostname'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import SMS from 'Common/Types/SMS/SMS'; -import SmsService from 'CommonServer/Services/SmsService'; -import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; RunCron( 'Announcement:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts b/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts index cdc897145b..9424a412d6 100644 --- a/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts +++ b/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts @@ -1,14 +1,14 @@ +import RunCron from '../../Utils/Cron'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import { EVERY_DAY, EVERY_MINUTE } from 'Common/Utils/CronTime'; import { IsBillingEnabled, IsDevelopment, } from 'CommonServer/EnvironmentConfig'; -import RunCron from '../../Utils/Cron'; -import { EVERY_DAY, EVERY_MINUTE } from 'Common/Utils/CronTime'; -import Services from 'CommonServer/Services/Index'; import DatabaseService from 'CommonServer/Services/DatabaseService'; -import OneUptimeDate from 'Common/Types/Date'; +import Services from 'CommonServer/Services/Index'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import logger from 'CommonServer/Utils/Logger'; RunCron( diff --git a/App/FeatureSet/Workers/Jobs/Incident/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/Incident/SendNotificationToSubscribers.ts index 066a4fbc90..573b433ce5 100644 --- a/App/FeatureSet/Workers/Jobs/Incident/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/Incident/SendNotificationToSubscribers.ts @@ -1,32 +1,32 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import IncidentService from 'CommonServer/Services/IncidentService'; import RunCron from '../../Utils/Cron'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import Incident from 'Model/Models/Incident'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import Monitor from 'Model/Models/Monitor'; -import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import SmsService from 'CommonServer/Services/SmsService'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; import SMS from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import MailService from 'CommonServer/Services/MailService'; import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import logger from 'CommonServer/Utils/Logger'; +import Incident from 'Model/Models/Incident'; +import Monitor from 'Model/Models/Monitor'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; RunCron( 'Incident:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendCreatedResourceNotification.ts b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendCreatedResourceNotification.ts index 7d3565cd1a..502c86f1a0 100644 --- a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendCreatedResourceNotification.ts +++ b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendCreatedResourceNotification.ts @@ -1,19 +1,19 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Incident from 'Model/Models/Incident'; import Monitor from 'Model/Models/Monitor'; +import User from 'Model/Models/User'; RunCron( 'IncidentOwner:SendCreatedResourceEmail', diff --git a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendNotePostedNotification.ts b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendNotePostedNotification.ts index da6c03ea16..ae81695896 100644 --- a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendNotePostedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendNotePostedNotification.ts @@ -1,25 +1,25 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; -import IncidentPublicNoteService from 'CommonServer/Services/IncidentPublicNoteService'; import BaseModel from 'Common/Models/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import IncidentInternalNote from 'Model/Models/IncidentInternalNote'; -import IncidentInternalNoteService from 'CommonServer/Services/IncidentInternalNoteService'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import IncidentInternalNoteService from 'CommonServer/Services/IncidentInternalNoteService'; +import IncidentPublicNoteService from 'CommonServer/Services/IncidentPublicNoteService'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Incident from 'Model/Models/Incident'; +import IncidentInternalNote from 'Model/Models/IncidentInternalNote'; +import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; import Monitor from 'Model/Models/Monitor'; +import User from 'Model/Models/User'; RunCron( 'IncidentOwner:SendsNotePostedEmail', diff --git a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendOwnerAddedNotification.ts b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendOwnerAddedNotification.ts index 111e771c78..b4415996ce 100644 --- a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendOwnerAddedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendOwnerAddedNotification.ts @@ -1,24 +1,24 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; -import User from 'Model/Models/User'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import IncidentOwnerTeamService from 'CommonServer/Services/IncidentOwnerTeamService'; -import TeamMemberService from 'CommonServer/Services/TeamMemberService'; -import ObjectID from 'Common/Types/ObjectID'; -import IncidentOwnerUser from 'Model/Models/IncidentOwnerUser'; -import IncidentOwnerUserService from 'CommonServer/Services/IncidentOwnerUserService'; -import IncidentOwnerTeam from 'Model/Models/IncidentOwnerTeam'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import IncidentOwnerTeamService from 'CommonServer/Services/IncidentOwnerTeamService'; +import IncidentOwnerUserService from 'CommonServer/Services/IncidentOwnerUserService'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import TeamMemberService from 'CommonServer/Services/TeamMemberService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Incident from 'Model/Models/Incident'; +import IncidentOwnerTeam from 'Model/Models/IncidentOwnerTeam'; +import IncidentOwnerUser from 'Model/Models/IncidentOwnerUser'; import Monitor from 'Model/Models/Monitor'; +import User from 'Model/Models/User'; RunCron( 'IncidentOwner:SendOwnerAddedEmail', diff --git a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendStateChangeNotification.ts b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendStateChangeNotification.ts index 24cc184bf3..95ddea2485 100644 --- a/App/FeatureSet/Workers/Jobs/IncidentOwners/SendStateChangeNotification.ts +++ b/App/FeatureSet/Workers/Jobs/IncidentOwners/SendStateChangeNotification.ts @@ -1,24 +1,24 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; -import IncidentState from 'Model/Models/IncidentState'; -import OneUptimeDate from 'Common/Types/Date'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Incident from 'Model/Models/Incident'; +import IncidentState from 'Model/Models/IncidentState'; +import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; import Monitor from 'Model/Models/Monitor'; +import User from 'Model/Models/User'; RunCron( 'IncidentOwner:SendStateChangeEmail', diff --git a/App/FeatureSet/Workers/Jobs/IncidentPublicNote/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/IncidentPublicNote/SendNotificationToSubscribers.ts index 4f1922c74a..7e0faa72a8 100644 --- a/App/FeatureSet/Workers/Jobs/IncidentPublicNote/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/IncidentPublicNote/SendNotificationToSubscribers.ts @@ -1,34 +1,34 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import IncidentService from 'CommonServer/Services/IncidentService'; import RunCron from '../../Utils/Cron'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import Incident from 'Model/Models/Incident'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import Monitor from 'Model/Models/Monitor'; -import IncidentPublicNoteService from 'CommonServer/Services/IncidentPublicNoteService'; -import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import SmsService from 'CommonServer/Services/SmsService'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; import SMS from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import IncidentPublicNoteService from 'CommonServer/Services/IncidentPublicNoteService'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import MailService from 'CommonServer/Services/MailService'; import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import logger from 'CommonServer/Utils/Logger'; +import Incident from 'Model/Models/Incident'; +import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; +import Monitor from 'Model/Models/Monitor'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; RunCron( 'IncidentPublicNote:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/IncidentStateTimeline/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/IncidentStateTimeline/SendNotificationToSubscribers.ts index 7a35db1da8..b60d00559a 100644 --- a/App/FeatureSet/Workers/Jobs/IncidentStateTimeline/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/IncidentStateTimeline/SendNotificationToSubscribers.ts @@ -1,33 +1,33 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import IncidentService from 'CommonServer/Services/IncidentService'; import RunCron from '../../Utils/Cron'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import Incident from 'Model/Models/Incident'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import Monitor from 'Model/Models/Monitor'; -import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; import SMS from 'Common/Types/SMS/SMS'; -import SmsService from 'CommonServer/Services/SmsService'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import IncidentStateTimelineService from 'CommonServer/Services/IncidentStateTimelineService'; +import MailService from 'CommonServer/Services/MailService'; import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSMTPConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import logger from 'CommonServer/Utils/Logger'; +import Incident from 'Model/Models/Incident'; +import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; +import Monitor from 'Model/Models/Monitor'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; RunCron( 'IncidentStateTimeline:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts b/App/FeatureSet/Workers/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts index be4b21d25e..37bb431067 100644 --- a/App/FeatureSet/Workers/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts +++ b/App/FeatureSet/Workers/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts @@ -1,12 +1,12 @@ import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import MonitorService from 'CommonServer/Services/MonitorService'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; -import ProbeMonitorResponseService from 'CommonServer/Utils/Probe/ProbeMonitorResponse'; -import IncomingMonitorRequest from 'Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest'; -import Monitor from 'Model/Models/Monitor'; import { CheckOn } from 'Common/Types/Monitor/CriteriaFilter'; +import IncomingMonitorRequest from 'Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import ProbeMonitorResponseService from 'CommonServer/Utils/Probe/ProbeMonitorResponse'; +import Monitor from 'Model/Models/Monitor'; RunCron( 'IncomingRequestMonitor:CheckHeartbeat', diff --git a/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts b/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts index 24a026f7b6..c1a38808ad 100644 --- a/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts +++ b/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts @@ -1,20 +1,20 @@ +import RunCron from '../../Utils/Cron'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Sleep from 'Common/Types/Sleep'; +import { EVERY_DAY, EVERY_FIVE_MINUTE } from 'Common/Utils/CronTime'; import { IsBillingEnabled, IsDevelopment, } from 'CommonServer/EnvironmentConfig'; -import RunCron from '../../Utils/Cron'; -import { EVERY_DAY, EVERY_FIVE_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import logger from 'CommonServer/Utils/Logger'; -import Project from 'Model/Models/Project'; import ProjectService from 'CommonServer/Services/ProjectService'; import { - LogDataIngestMeteredPlan, - TracesDataIngestMetredPlan, - MetricsDataIngestMeteredPlan, ActiveMonitoringMeteredPlan, + LogDataIngestMeteredPlan, + MetricsDataIngestMeteredPlan, + TracesDataIngestMetredPlan, } from 'CommonServer/Types/Billing/MeteredPlan/AllMeteredPlans'; -import Sleep from 'Common/Types/Sleep'; +import logger from 'CommonServer/Utils/Logger'; +import Project from 'Model/Models/Project'; RunCron( 'MeteredPlan:ReportTelemetryMeteredPlan', diff --git a/App/FeatureSet/Workers/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts b/App/FeatureSet/Workers/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts index ef878efa9d..02500c1a6b 100644 --- a/App/FeatureSet/Workers/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts +++ b/App/FeatureSet/Workers/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts @@ -1,8 +1,8 @@ import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import OneUptimeDate from 'Common/Types/Date'; -import MonitorMetricsByMinuteService from 'CommonServer/Services/MonitorMetricsByMinuteService'; import LessThan from 'Common/Types/BaseDatabase/LessThan'; +import OneUptimeDate from 'Common/Types/Date'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import MonitorMetricsByMinuteService from 'CommonServer/Services/MonitorMetricsByMinuteService'; RunCron( 'MonitorMetrics:HardDeleteMonitorMetricsByMinute', diff --git a/App/FeatureSet/Workers/Jobs/MonitorOwners/SendCreatedResourceNotification.ts b/App/FeatureSet/Workers/Jobs/MonitorOwners/SendCreatedResourceNotification.ts index 8ff03c59f6..b0dd425a41 100644 --- a/App/FeatureSet/Workers/Jobs/MonitorOwners/SendCreatedResourceNotification.ts +++ b/App/FeatureSet/Workers/Jobs/MonitorOwners/SendCreatedResourceNotification.ts @@ -1,18 +1,18 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from 'CommonServer/Services/MonitorService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Monitor from 'Model/Models/Monitor'; +import User from 'Model/Models/User'; RunCron( 'MonitorOwner:SendCreatedResourceEmail', diff --git a/App/FeatureSet/Workers/Jobs/MonitorOwners/SendOwnerAddedNotification.ts b/App/FeatureSet/Workers/Jobs/MonitorOwners/SendOwnerAddedNotification.ts index fd7e769648..92f95e4c10 100644 --- a/App/FeatureSet/Workers/Jobs/MonitorOwners/SendOwnerAddedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/MonitorOwners/SendOwnerAddedNotification.ts @@ -1,23 +1,23 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from 'CommonServer/Services/MonitorService'; -import User from 'Model/Models/User'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import MonitorOwnerTeamService from 'CommonServer/Services/MonitorOwnerTeamService'; -import TeamMemberService from 'CommonServer/Services/TeamMemberService'; -import ObjectID from 'Common/Types/ObjectID'; -import MonitorOwnerUser from 'Model/Models/MonitorOwnerUser'; -import MonitorOwnerUserService from 'CommonServer/Services/MonitorOwnerUserService'; -import MonitorOwnerTeam from 'Model/Models/MonitorOwnerTeam'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import MonitorOwnerTeamService from 'CommonServer/Services/MonitorOwnerTeamService'; +import MonitorOwnerUserService from 'CommonServer/Services/MonitorOwnerUserService'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import TeamMemberService from 'CommonServer/Services/TeamMemberService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Monitor from 'Model/Models/Monitor'; +import MonitorOwnerTeam from 'Model/Models/MonitorOwnerTeam'; +import MonitorOwnerUser from 'Model/Models/MonitorOwnerUser'; +import User from 'Model/Models/User'; RunCron( 'MonitorOwner:SendOwnerAddedEmail', diff --git a/App/FeatureSet/Workers/Jobs/MonitorOwners/SendStatusChangeNotification.ts b/App/FeatureSet/Workers/Jobs/MonitorOwners/SendStatusChangeNotification.ts index 927eb52b1f..da40acf5cd 100644 --- a/App/FeatureSet/Workers/Jobs/MonitorOwners/SendStatusChangeNotification.ts +++ b/App/FeatureSet/Workers/Jobs/MonitorOwners/SendStatusChangeNotification.ts @@ -1,22 +1,22 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from 'CommonServer/Services/MonitorService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import OneUptimeDate from 'Common/Types/Date'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import MonitorStatusTimelineService from 'CommonServer/Services/MonitorStatusTimelineService'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import Monitor from 'Model/Models/Monitor'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import User from 'Model/Models/User'; RunCron( 'MonitorOwner:SendStatusChangeEmail', diff --git a/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/ExecutePendingExecutions.ts b/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/ExecutePendingExecutions.ts index 02509f70ae..27bde2a59e 100644 --- a/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/ExecutePendingExecutions.ts +++ b/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/ExecutePendingExecutions.ts @@ -1,13 +1,13 @@ import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import OnCallDutyPolicyExecutionLog from 'Model/Models/OnCallDutyPolicyExecutionLog'; -import OnCallDutyPolicyExecutionLogService from 'CommonServer/Services/OnCallDutyPolicyExecutionLogService'; -import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; import OneUptimeDate from 'Common/Types/Date'; +import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import OnCallDutyPolicyEscalationRuleService from 'CommonServer/Services/OnCallDutyPolicyEscalationRuleService'; -import OnCallDutyPolicyEscalationRule from 'Model/Models/OnCallDutyPolicyEscalationRule'; +import OnCallDutyPolicyExecutionLogService from 'CommonServer/Services/OnCallDutyPolicyExecutionLogService'; import logger from 'CommonServer/Utils/Logger'; +import OnCallDutyPolicyEscalationRule from 'Model/Models/OnCallDutyPolicyEscalationRule'; +import OnCallDutyPolicyExecutionLog from 'Model/Models/OnCallDutyPolicyExecutionLog'; RunCron( 'OnCallDutyPolicyExecutionLog:ExecutePendingExecutions', diff --git a/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/TimeoutStuckExecutions.ts b/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/TimeoutStuckExecutions.ts index 2718562db3..007cb73521 100644 --- a/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/TimeoutStuckExecutions.ts +++ b/App/FeatureSet/Workers/Jobs/OnCallDutyPolicyExecutionLog/TimeoutStuckExecutions.ts @@ -1,12 +1,12 @@ -import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import OnCallDutyPolicyExecutionLog from 'Model/Models/OnCallDutyPolicyExecutionLog'; -import OnCallDutyPolicyExecutionLogService from 'CommonServer/Services/OnCallDutyPolicyExecutionLogService'; -import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; import OneUptimeDate from 'Common/Types/Date'; +import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; +import OnCallDutyPolicyExecutionLogService from 'CommonServer/Services/OnCallDutyPolicyExecutionLogService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import OnCallDutyPolicyExecutionLog from 'Model/Models/OnCallDutyPolicyExecutionLog'; /** * Jobs move from Started to Executing in seconds. If it takes more than 5 minutes, it's stuck. So, mark them as error diff --git a/App/FeatureSet/Workers/Jobs/PaymentProvider/CheckSubscriptionStatus.ts b/App/FeatureSet/Workers/Jobs/PaymentProvider/CheckSubscriptionStatus.ts index 9c411703e2..0925137a2d 100644 --- a/App/FeatureSet/Workers/Jobs/PaymentProvider/CheckSubscriptionStatus.ts +++ b/App/FeatureSet/Workers/Jobs/PaymentProvider/CheckSubscriptionStatus.ts @@ -1,16 +1,16 @@ -import { EVERY_DAY, EVERY_MINUTE } from 'Common/Utils/CronTime'; import RunCron from '../../Utils/Cron'; -import ProjectService from 'CommonServer/Services/ProjectService'; +import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import BillingService from 'CommonServer/Services/BillingService'; +import Sleep from 'Common/Types/Sleep'; +import { EVERY_DAY, EVERY_MINUTE } from 'Common/Utils/CronTime'; import { IsBillingEnabled, IsDevelopment, } from 'CommonServer/EnvironmentConfig'; +import BillingService from 'CommonServer/Services/BillingService'; +import ProjectService from 'CommonServer/Services/ProjectService'; import logger from 'CommonServer/Utils/Logger'; -import Sleep from 'Common/Types/Sleep'; -import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; +import Project from 'Model/Models/Project'; RunCron( 'PaymentProvider:CheckSubscriptionStatus', diff --git a/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts b/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts index f811ef2d20..4a43a2e9c0 100644 --- a/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts +++ b/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts @@ -1,14 +1,14 @@ -import { EVERY_WEEK } from 'Common/Utils/CronTime'; import RunCron from '../../Utils/Cron'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; -import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; -import logger from 'CommonServer/Utils/Logger'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import SubscriptionPlan, { PlanSelect, } from 'Common/Types/Billing/SubscriptionPlan'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import { EVERY_WEEK } from 'Common/Utils/CronTime'; +import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import logger from 'CommonServer/Utils/Logger'; +import Project from 'Model/Models/Project'; RunCron( 'PaymentProvider:PopulatePlanNameInProject', diff --git a/App/FeatureSet/Workers/Jobs/PaymentProvider/UpdateTeamMembersIfNull.ts b/App/FeatureSet/Workers/Jobs/PaymentProvider/UpdateTeamMembersIfNull.ts index d2fa17f0cd..51f186e6bc 100644 --- a/App/FeatureSet/Workers/Jobs/PaymentProvider/UpdateTeamMembersIfNull.ts +++ b/App/FeatureSet/Workers/Jobs/PaymentProvider/UpdateTeamMembersIfNull.ts @@ -1,11 +1,11 @@ -import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import RunCron from '../../Utils/Cron'; -import { EVERY_DAY, EVERY_MINUTE } from 'Common/Utils/CronTime'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Project from 'Model/Models/Project'; +import { EVERY_DAY, EVERY_MINUTE } from 'Common/Utils/CronTime'; +import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import ProjectService from 'CommonServer/Services/ProjectService'; import TeamMemberService from 'CommonServer/Services/TeamMemberService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Project from 'Model/Models/Project'; RunCron( 'PaymentProvider:UpdateTeamMembersIfNull', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToEnded.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToEnded.ts index 727e0705c1..d9a2739b2a 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToEnded.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToEnded.ts @@ -1,12 +1,12 @@ +import RunCron from '../../Utils/Cron'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import ScheduledMaintenanceStateService from 'CommonServer/Services/ScheduledMaintenanceStateService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import ScheduledMaintenanceStateService from 'CommonServer/Services/ScheduledMaintenanceStateService'; -import RunCron from '../../Utils/Cron'; RunCron( 'ScheduledMaintenance:ChangeStateToEnded', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToOngoing.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToOngoing.ts index 5e9b42888c..fd6d393e35 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToOngoing.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/ChangeStateToOngoing.ts @@ -1,12 +1,12 @@ +import RunCron from '../../Utils/Cron'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import ScheduledMaintenanceStateService from 'CommonServer/Services/ScheduledMaintenanceStateService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import ScheduledMaintenanceStateService from 'CommonServer/Services/ScheduledMaintenanceStateService'; -import RunCron from '../../Utils/Cron'; RunCron( 'ScheduledMaintenance:ChangeStateToOngoing', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/SendNotificationToSubscribers.ts index b426aaa04e..2b115b39ae 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenance/SendNotificationToSubscribers.ts @@ -1,32 +1,32 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import Monitor from 'Model/Models/Monitor'; -import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import SmsService from 'CommonServer/Services/SmsService'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; import SMS from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import MailService from 'CommonServer/Services/MailService'; import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import logger from 'CommonServer/Utils/Logger'; +import Monitor from 'Model/Models/Monitor'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; RunCron( 'ScheduledMaintenance:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendCreatedResourceNotification.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendCreatedResourceNotification.ts index be811310c0..4754ff679c 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendCreatedResourceNotification.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendCreatedResourceNotification.ts @@ -1,18 +1,18 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import User from 'Model/Models/User'; RunCron( 'ScheduledMaintenanceOwner:SendCreatedResourceEmail', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendNotePostedNotification.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendNotePostedNotification.ts index 58f23ee6dc..ac0ac0d7e2 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendNotePostedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendNotePostedNotification.ts @@ -1,24 +1,24 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; -import ScheduledMaintenancePublicNoteService from 'CommonServer/Services/ScheduledMaintenancePublicNoteService'; import BaseModel from 'Common/Models/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import ScheduledMaintenanceInternalNote from 'Model/Models/ScheduledMaintenanceInternalNote'; -import ScheduledMaintenanceInternalNoteService from 'CommonServer/Services/ScheduledMaintenanceInternalNoteService'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import ScheduledMaintenanceInternalNoteService from 'CommonServer/Services/ScheduledMaintenanceInternalNoteService'; +import ScheduledMaintenancePublicNoteService from 'CommonServer/Services/ScheduledMaintenancePublicNoteService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceInternalNote from 'Model/Models/ScheduledMaintenanceInternalNote'; +import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; +import User from 'Model/Models/User'; RunCron( 'ScheduledMaintenanceOwner:SendsNotePostedEmail', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendOwnerAddedNotification.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendOwnerAddedNotification.ts index 690fc15cbe..8e50d7ca49 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendOwnerAddedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendOwnerAddedNotification.ts @@ -1,23 +1,23 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import User from 'Model/Models/User'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import ScheduledMaintenanceOwnerTeamService from 'CommonServer/Services/ScheduledMaintenanceOwnerTeamService'; -import TeamMemberService from 'CommonServer/Services/TeamMemberService'; -import ObjectID from 'Common/Types/ObjectID'; -import ScheduledMaintenanceOwnerUser from 'Model/Models/ScheduledMaintenanceOwnerUser'; -import ScheduledMaintenanceOwnerUserService from 'CommonServer/Services/ScheduledMaintenanceOwnerUserService'; -import ScheduledMaintenanceOwnerTeam from 'Model/Models/ScheduledMaintenanceOwnerTeam'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import ScheduledMaintenanceOwnerTeamService from 'CommonServer/Services/ScheduledMaintenanceOwnerTeamService'; +import ScheduledMaintenanceOwnerUserService from 'CommonServer/Services/ScheduledMaintenanceOwnerUserService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import TeamMemberService from 'CommonServer/Services/TeamMemberService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceOwnerTeam from 'Model/Models/ScheduledMaintenanceOwnerTeam'; +import ScheduledMaintenanceOwnerUser from 'Model/Models/ScheduledMaintenanceOwnerUser'; +import User from 'Model/Models/User'; RunCron( 'ScheduledMaintenanceOwner:SendOwnerAddedEmail', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendStateChangeNotification.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendStateChangeNotification.ts index 896dfb61ee..bb6d3fea30 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendStateChangeNotification.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceOwners/SendStateChangeNotification.ts @@ -1,22 +1,22 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; -import ScheduledMaintenanceStateTimelineService from 'CommonServer/Services/ScheduledMaintenanceStateTimelineService'; -import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import OneUptimeDate from 'Common/Types/Date'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import ScheduledMaintenanceStateTimelineService from 'CommonServer/Services/ScheduledMaintenanceStateTimelineService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; +import User from 'Model/Models/User'; RunCron( 'ScheduledMaintenanceOwner:SendStateChangeEmail', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenancePublicNote/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenancePublicNote/SendNotificationToSubscribers.ts index acec9e4fff..8888b27a3d 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenancePublicNote/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenancePublicNote/SendNotificationToSubscribers.ts @@ -1,34 +1,34 @@ +import RunCron from '../../Utils/Cron'; +import { FileRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; +import SMS from 'Common/Types/SMS/SMS'; import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import MailService from 'CommonServer/Services/MailService'; +import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import ScheduledMaintenancePublicNoteService from 'CommonServer/Services/ScheduledMaintenancePublicNoteService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import RunCron from '../../Utils/Cron'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; -import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import Monitor from 'Model/Models/Monitor'; -import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; -import ScheduledMaintenancePublicNoteService from 'CommonServer/Services/ScheduledMaintenancePublicNoteService'; import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import Protocol from 'Common/Types/API/Protocol'; -import Hostname from 'Common/Types/API/Hostname'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; -import SMS from 'Common/Types/SMS/SMS'; -import SmsService from 'CommonServer/Services/SmsService'; -import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import logger from 'CommonServer/Utils/Logger'; +import Monitor from 'Model/Models/Monitor'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; RunCron( 'ScheduledMaintenancePublicNote:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceStateTimeline/SendNotificationToSubscribers.ts b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceStateTimeline/SendNotificationToSubscribers.ts index 173077285c..6a73e68acd 100644 --- a/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceStateTimeline/SendNotificationToSubscribers.ts +++ b/App/FeatureSet/Workers/Jobs/ScheduledMaintenanceStateTimeline/SendNotificationToSubscribers.ts @@ -1,33 +1,33 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import { FileRoute } from 'Common/ServiceRoute'; -import URL from 'Common/Types/API/URL'; -import MailService from 'CommonServer/Services/MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from 'CommonServer/Utils/Logger'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; -import Monitor from 'Model/Models/Monitor'; -import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; -import ScheduledMaintenanceStateTimelineService from 'CommonServer/Services/ScheduledMaintenanceStateTimelineService'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import ObjectID from 'Common/Types/ObjectID'; import SMS from 'Common/Types/SMS/SMS'; -import SmsService from 'CommonServer/Services/SmsService'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import DatabaseConfig from 'CommonServer/DatabaseConfig'; +import MailService from 'CommonServer/Services/MailService'; import ProjectCallSMSConfigService from 'CommonServer/Services/ProjectCallSMSConfigService'; +import ProjectSmtpConfigService from 'CommonServer/Services/ProjectSmtpConfigService'; +import ScheduledMaintenanceService from 'CommonServer/Services/ScheduledMaintenanceService'; +import ScheduledMaintenanceStateTimelineService from 'CommonServer/Services/ScheduledMaintenanceStateTimelineService'; +import SmsService from 'CommonServer/Services/SmsService'; +import StatusPageResourceService from 'CommonServer/Services/StatusPageResourceService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import StatusPageSubscriberService from 'CommonServer/Services/StatusPageSubscriberService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import logger from 'CommonServer/Utils/Logger'; +import Monitor from 'Model/Models/Monitor'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; RunCron( 'ScheduledMaintenanceStateTimeline:SendNotificationToSubscribers', diff --git a/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts b/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts index a5f0239285..58d3c5e39a 100644 --- a/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts +++ b/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts @@ -1,14 +1,14 @@ import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import MonitorService from 'CommonServer/Services/MonitorService'; +import OneUptimeDate from 'Common/Types/Date'; +import { CheckOn } from 'Common/Types/Monitor/CriteriaFilter'; import MonitorType from 'Common/Types/Monitor/MonitorType'; +import ServerMonitorResponse from 'Common/Types/Monitor/ServerMonitor/ServerMonitorResponse'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import MonitorService from 'CommonServer/Services/MonitorService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import ProbeMonitorResponseService from 'CommonServer/Utils/Probe/ProbeMonitorResponse'; import Monitor from 'Model/Models/Monitor'; -import { CheckOn } from 'Common/Types/Monitor/CriteriaFilter'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import OneUptimeDate from 'Common/Types/Date'; -import ServerMonitorResponse from 'Common/Types/Monitor/ServerMonitor/ServerMonitorResponse'; RunCron( 'ServerMonitor:CheckOnlineStatus', diff --git a/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts b/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts index b9754f4366..7e66721010 100644 --- a/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts +++ b/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts @@ -1,5 +1,5 @@ -import { EVERY_FIFTEEN_MINUTE } from 'Common/Utils/CronTime'; import RunCron from '../../Utils/Cron'; +import { EVERY_FIFTEEN_MINUTE } from 'Common/Utils/CronTime'; import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import StatusPageDomainService from 'CommonServer/Services/StatusPageDomainService'; import logger from 'CommonServer/Utils/Logger'; diff --git a/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendAnnouncementCreatedNotification.ts b/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendAnnouncementCreatedNotification.ts index 3d70e7e2a0..4ee4b0915a 100644 --- a/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendAnnouncementCreatedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendAnnouncementCreatedNotification.ts @@ -1,20 +1,20 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPage from 'Model/Models/StatusPage'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import StatusPageAnnouncement from 'Model/Models/StatusPageAnnouncement'; -import StatusPageAnnouncementService from 'CommonServer/Services/StatusPageAnnouncementService'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import StatusPageAnnouncementService from 'CommonServer/Services/StatusPageAnnouncementService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageAnnouncement from 'Model/Models/StatusPageAnnouncement'; +import User from 'Model/Models/User'; RunCron( 'StatusPageOwner:SendAnnouncementCreatedEmail', diff --git a/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendCreatedResourceNotification.ts b/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendCreatedResourceNotification.ts index f2bba0cd33..861bec10e2 100644 --- a/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendCreatedResourceNotification.ts +++ b/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendCreatedResourceNotification.ts @@ -1,18 +1,18 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPage from 'Model/Models/StatusPage'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import User from 'Model/Models/User'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import ProjectService from 'CommonServer/Services/ProjectService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import StatusPage from 'Model/Models/StatusPage'; +import User from 'Model/Models/User'; RunCron( 'StatusPageOwner:SendCreatedResourceEmail', diff --git a/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendOwnerAddedNotification.ts b/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendOwnerAddedNotification.ts index ca591c7fd0..dbdb0cb959 100644 --- a/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendOwnerAddedNotification.ts +++ b/App/FeatureSet/Workers/Jobs/StatusPageOwners/SendOwnerAddedNotification.ts @@ -1,23 +1,23 @@ -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import RunCron from '../../Utils/Cron'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusPage from 'Model/Models/StatusPage'; -import StatusPageService from 'CommonServer/Services/StatusPageService'; -import User from 'Model/Models/User'; -import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; -import StatusPageOwnerTeamService from 'CommonServer/Services/StatusPageOwnerTeamService'; -import TeamMemberService from 'CommonServer/Services/TeamMemberService'; -import ObjectID from 'Common/Types/ObjectID'; -import StatusPageOwnerUser from 'Model/Models/StatusPageOwnerUser'; -import StatusPageOwnerUserService from 'CommonServer/Services/StatusPageOwnerUserService'; -import StatusPageOwnerTeam from 'Model/Models/StatusPageOwnerTeam'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import StatusPageOwnerTeamService from 'CommonServer/Services/StatusPageOwnerTeamService'; +import StatusPageOwnerUserService from 'CommonServer/Services/StatusPageOwnerUserService'; +import StatusPageService from 'CommonServer/Services/StatusPageService'; +import TeamMemberService from 'CommonServer/Services/TeamMemberService'; +import UserNotificationSettingService from 'CommonServer/Services/UserNotificationSettingService'; +import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageOwnerTeam from 'Model/Models/StatusPageOwnerTeam'; +import StatusPageOwnerUser from 'Model/Models/StatusPageOwnerUser'; +import User from 'Model/Models/User'; RunCron( 'StatusPageOwner:SendOwnerAddedEmail', diff --git a/App/FeatureSet/Workers/Jobs/TelemetryService/DeleteOldData.ts b/App/FeatureSet/Workers/Jobs/TelemetryService/DeleteOldData.ts index 37cd013603..94ca19860e 100644 --- a/App/FeatureSet/Workers/Jobs/TelemetryService/DeleteOldData.ts +++ b/App/FeatureSet/Workers/Jobs/TelemetryService/DeleteOldData.ts @@ -1,13 +1,13 @@ -import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import RunCron from '../../Utils/Cron'; -import { EVERY_HOUR, EVERY_MINUTE } from 'Common/Utils/CronTime'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import TelemetryService from 'Model/Models/TelemetryService'; -import TelemetryServiceService from 'CommonServer/Services/TelemetryServiceService'; -import LogService from 'CommonServer/Services/LogService'; -import QueryHelper from 'CommonServer/Types/AnalyticsDatabase/QueryHelper'; import OneUptimeDate from 'Common/Types/Date'; +import { EVERY_HOUR, EVERY_MINUTE } from 'Common/Utils/CronTime'; +import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; +import LogService from 'CommonServer/Services/LogService'; import SpanService from 'CommonServer/Services/SpanService'; +import TelemetryServiceService from 'CommonServer/Services/TelemetryServiceService'; +import QueryHelper from 'CommonServer/Types/AnalyticsDatabase/QueryHelper'; +import TelemetryService from 'Model/Models/TelemetryService'; RunCron( 'TelemetryService:DeleteOldData', diff --git a/App/FeatureSet/Workers/Jobs/UserOnCallLog/ExecutePendingExecutions.ts b/App/FeatureSet/Workers/Jobs/UserOnCallLog/ExecutePendingExecutions.ts index d2dbdd6776..120b34344b 100644 --- a/App/FeatureSet/Workers/Jobs/UserOnCallLog/ExecutePendingExecutions.ts +++ b/App/FeatureSet/Workers/Jobs/UserOnCallLog/ExecutePendingExecutions.ts @@ -1,18 +1,18 @@ -import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import UserOnCallLog from 'Model/Models/UserOnCallLog'; -import UserOnCallLogService from 'CommonServer/Services/UserOnCallLogService'; import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; -import logger from 'CommonServer/Utils/Logger'; -import UserNotificationRuleService from 'CommonServer/Services/UserNotificationRuleService'; -import NotificationRuleType from 'Common/Types/NotificationRule/NotificationRuleType'; -import UserNotificationRule from 'Model/Models/UserNotificationRule'; import OneUptimeDate from 'Common/Types/Date'; -import Incident from 'Model/Models/Incident'; -import IncidentService from 'CommonServer/Services/IncidentService'; +import NotificationRuleType from 'Common/Types/NotificationRule/NotificationRuleType'; import ObjectID from 'Common/Types/ObjectID'; +import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; +import IncidentService from 'CommonServer/Services/IncidentService'; +import UserNotificationRuleService from 'CommonServer/Services/UserNotificationRuleService'; +import UserOnCallLogService from 'CommonServer/Services/UserOnCallLogService'; +import logger from 'CommonServer/Utils/Logger'; +import Incident from 'Model/Models/Incident'; +import UserNotificationRule from 'Model/Models/UserNotificationRule'; +import UserOnCallLog from 'Model/Models/UserOnCallLog'; RunCron( 'UserOnCallLog:ExecutePendingExecutions', diff --git a/App/FeatureSet/Workers/Jobs/UserOnCallLog/TimeoutStuckExecutions.ts b/App/FeatureSet/Workers/Jobs/UserOnCallLog/TimeoutStuckExecutions.ts index 0187f4d0de..dfaea92ede 100644 --- a/App/FeatureSet/Workers/Jobs/UserOnCallLog/TimeoutStuckExecutions.ts +++ b/App/FeatureSet/Workers/Jobs/UserOnCallLog/TimeoutStuckExecutions.ts @@ -1,12 +1,12 @@ -import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import OneUptimeDate from 'Common/Types/Date'; +import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import { IsDevelopment } from 'CommonServer/EnvironmentConfig'; +import UserOnCallLogService from 'CommonServer/Services/UserOnCallLogService'; import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import UserOnCallLog from 'Model/Models/UserOnCallLog'; -import UserOnCallLogService from 'CommonServer/Services/UserOnCallLogService'; -import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; /** * Jobs move from Started to Executing in seconds. If it takes more than 5 minutes, it's stuck. So, mark them as error diff --git a/App/FeatureSet/Workers/Jobs/Workflow/TimeoutJobs.ts b/App/FeatureSet/Workers/Jobs/Workflow/TimeoutJobs.ts index 0e42e7c986..f356c268b5 100644 --- a/App/FeatureSet/Workers/Jobs/Workflow/TimeoutJobs.ts +++ b/App/FeatureSet/Workers/Jobs/Workflow/TimeoutJobs.ts @@ -1,11 +1,11 @@ import RunCron from '../../Utils/Cron'; -import { EVERY_MINUTE } from 'Common/Utils/CronTime'; -import OneUptimeDate from 'Common/Types/Date'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import WorkflowLog from 'Model/Models/WorkflowLog'; -import WorkflowLogService from 'CommonServer/Services/WorkflowLogService'; +import OneUptimeDate from 'Common/Types/Date'; import WorkflowStatus from 'Common/Types/Workflow/WorkflowStatus'; +import { EVERY_MINUTE } from 'Common/Utils/CronTime'; +import WorkflowLogService from 'CommonServer/Services/WorkflowLogService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; +import WorkflowLog from 'Model/Models/WorkflowLog'; RunCron( 'Workflow:TimeoutJobs', diff --git a/App/FeatureSet/Workers/Utils/Cron.ts b/App/FeatureSet/Workers/Utils/Cron.ts index 0ab8d9776f..2d8b9f32f6 100644 --- a/App/FeatureSet/Workers/Utils/Cron.ts +++ b/App/FeatureSet/Workers/Utils/Cron.ts @@ -1,5 +1,5 @@ -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import JobDictionary from './JobDictionary'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import Queue, { QueueName } from 'CommonServer/Infrastructure/Queue'; import logger from 'CommonServer/Utils/Logger'; diff --git a/App/FeatureSet/Workers/Utils/DataMigration.ts b/App/FeatureSet/Workers/Utils/DataMigration.ts index 2e39873d9a..615d4929b4 100644 --- a/App/FeatureSet/Workers/Utils/DataMigration.ts +++ b/App/FeatureSet/Workers/Utils/DataMigration.ts @@ -1,9 +1,9 @@ -import DataMigration from 'Model/Models/DataMigration'; import DataMigrations from '../DataMigrations/Index'; -import logger from 'CommonServer/Utils/Logger'; import OneUptimeDate from 'Common/Types/Date'; -import DataMigrationService from 'CommonServer/Services/DataMigrationService'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import DataMigrationService from 'CommonServer/Services/DataMigrationService'; +import logger from 'CommonServer/Utils/Logger'; +import DataMigration from 'Model/Models/DataMigration'; const RunDatabaseMigrations: PromiseVoidFunction = async (): Promise => { for (const migration of DataMigrations) { diff --git a/App/FeatureSet/Workflow/API/ComponentCode.ts b/App/FeatureSet/Workflow/API/ComponentCode.ts index f3d6214ee1..36977e1231 100644 --- a/App/FeatureSet/Workflow/API/ComponentCode.ts +++ b/App/FeatureSet/Workflow/API/ComponentCode.ts @@ -1,12 +1,12 @@ -import Express, { ExpressRouter } from 'CommonServer/Utils/Express'; +import QueueWorkflow from '../Services/QueueWorkflow'; +import ObjectID from 'Common/Types/ObjectID'; +import ComponentCode from 'CommonServer/Types/Workflow/ComponentCode'; import Components from 'CommonServer/Types/Workflow/Components/Index'; import TriggerCode, { ExecuteWorkflowType, } from 'CommonServer/Types/Workflow/TriggerCode'; -import ComponentCode from 'CommonServer/Types/Workflow/ComponentCode'; -import QueueWorkflow from '../Services/QueueWorkflow'; +import Express, { ExpressRouter } from 'CommonServer/Utils/Express'; import logger from 'CommonServer/Utils/Logger'; -import ObjectID from 'Common/Types/ObjectID'; export default class ComponentCodeAPI { public router!: ExpressRouter; diff --git a/App/FeatureSet/Workflow/API/Manual.ts b/App/FeatureSet/Workflow/API/Manual.ts index ead0889b30..2a16fe9259 100644 --- a/App/FeatureSet/Workflow/API/Manual.ts +++ b/App/FeatureSet/Workflow/API/Manual.ts @@ -1,12 +1,12 @@ +import QueueWorkflow from '../Services/QueueWorkflow'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from 'CommonServer/Utils/Express'; import Response from 'CommonServer/Utils/Response'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueueWorkflow from '../Services/QueueWorkflow'; export default class ManualAPI { public router!: ExpressRouter; diff --git a/App/FeatureSet/Workflow/API/Workflow.ts b/App/FeatureSet/Workflow/API/Workflow.ts index 9cb7d1dd90..d7808a65bc 100644 --- a/App/FeatureSet/Workflow/API/Workflow.ts +++ b/App/FeatureSet/Workflow/API/Workflow.ts @@ -1,17 +1,17 @@ +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; +import WorkflowService from 'CommonServer/Services/WorkflowService'; +import ComponentCode from 'CommonServer/Types/Workflow/ComponentCode'; +import Components from 'CommonServer/Types/Workflow/Components/Index'; +import TriggerCode from 'CommonServer/Types/Workflow/TriggerCode'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from 'CommonServer/Utils/Express'; import Response from 'CommonServer/Utils/Response'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import WorkflowService from 'CommonServer/Services/WorkflowService'; import Workflow from 'Model/Models/Workflow'; -import ClusterKeyAuthorization from 'CommonServer/Middleware/ClusterKeyAuthorization'; -import ComponentCode from 'CommonServer/Types/Workflow/ComponentCode'; -import Components from 'CommonServer/Types/Workflow/Components/Index'; -import TriggerCode from 'CommonServer/Types/Workflow/TriggerCode'; export default class WorkflowAPI { public router!: ExpressRouter; diff --git a/App/FeatureSet/Workflow/Index.ts b/App/FeatureSet/Workflow/Index.ts index 8bbe6ffd3c..32da362fed 100644 --- a/App/FeatureSet/Workflow/Index.ts +++ b/App/FeatureSet/Workflow/Index.ts @@ -1,18 +1,18 @@ +import ComponentCodeAPI from './API/ComponentCode'; +import ManualAPI from './API/Manual'; +import WorkflowAPI from './API/Workflow'; +import RunWorkflow from './Services/RunWorkflow'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import { QueueJob, QueueName } from 'CommonServer/Infrastructure/Queue'; +import QueueWorker from 'CommonServer/Infrastructure/QueueWorker'; +import FeatureSet from 'CommonServer/Types/FeatureSet'; import Express, { ExpressApplication, ExpressRequest, ExpressResponse, } from 'CommonServer/Utils/Express'; import logger from 'CommonServer/Utils/Logger'; -import ManualAPI from './API/Manual'; -import ComponentCodeAPI from './API/ComponentCode'; -import { QueueJob, QueueName } from 'CommonServer/Infrastructure/Queue'; -import QueueWorker from 'CommonServer/Infrastructure/QueueWorker'; -import RunWorkflow from './Services/RunWorkflow'; -import { JSONObject } from 'Common/Types/JSON'; -import ObjectID from 'Common/Types/ObjectID'; -import WorkflowAPI from './API/Workflow'; -import FeatureSet from 'CommonServer/Types/FeatureSet'; const APP_NAME: string = 'api/workflow'; diff --git a/App/FeatureSet/Workflow/Services/QueueWorkflow.ts b/App/FeatureSet/Workflow/Services/QueueWorkflow.ts index e7b860868a..cde34f7c5a 100644 --- a/App/FeatureSet/Workflow/Services/QueueWorkflow.ts +++ b/App/FeatureSet/Workflow/Services/QueueWorkflow.ts @@ -1,18 +1,18 @@ +import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import WorkflowPlan from 'Common/Types/Workflow/WorkflowPlan'; import WorkflowStatus from 'Common/Types/Workflow/WorkflowStatus'; import Queue, { QueueName } from 'CommonServer/Infrastructure/Queue'; +import ProjectService from 'CommonServer/Services/ProjectService'; import WorkflowLogService from 'CommonServer/Services/WorkflowLogService'; import WorkflowService from 'CommonServer/Services/WorkflowService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import { ExecuteWorkflowType } from 'CommonServer/Types/Workflow/TriggerCode'; import Workflow from 'Model/Models/Workflow'; import WorkflowLog from 'Model/Models/WorkflowLog'; -import ObjectID from 'Common/Types/ObjectID'; -import ProjectService from 'CommonServer/Services/ProjectService'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import WorkflowPlan from 'Common/Types/Workflow/WorkflowPlan'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; export default class QueueWorkflow { public static async removeWorkflow(workflowId: ObjectID): Promise { diff --git a/App/FeatureSet/Workflow/Services/RunWorkflow.ts b/App/FeatureSet/Workflow/Services/RunWorkflow.ts index c6ceb51709..f62790dc30 100644 --- a/App/FeatureSet/Workflow/Services/RunWorkflow.ts +++ b/App/FeatureSet/Workflow/Services/RunWorkflow.ts @@ -1,5 +1,10 @@ +import { loadAllComponentMetadata } from '../Utils/ComponentMetadata'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; import Dictionary from 'Common/Types/Dictionary'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import Exception from 'Common/Types/Exception/Exception'; +import TimeoutException from 'Common/Types/Exception/TimeoutException'; import { JSONArray, JSONObject, JSONValue } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import ComponentMetadata, { @@ -9,26 +14,21 @@ import ComponentMetadata, { NodeType, Port, } from 'Common/Types/Workflow/Component'; +import WorkflowStatus from 'Common/Types/Workflow/WorkflowStatus'; +import WorkflowLogService from 'CommonServer/Services/WorkflowLogService'; import WorkflowService from 'CommonServer/Services/WorkflowService'; +import WorkflowVariableService from 'CommonServer/Services/WorkflowVariableService'; +import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; import ComponentCode, { RunReturnType, } from 'CommonServer/Types/Workflow/ComponentCode'; -import { RunProps } from 'CommonServer/Types/Workflow/Workflow'; -import WorkflowVariable from 'Model/Models/WorkflowVariable'; -import WorkflowVariableService from 'CommonServer/Services/WorkflowVariableService'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import QueryHelper from 'CommonServer/Types/Database/QueryHelper'; -import WorkflowLogService from 'CommonServer/Services/WorkflowLogService'; -import WorkflowStatus from 'Common/Types/Workflow/WorkflowStatus'; import Components from 'CommonServer/Types/Workflow/Components/Index'; -import OneUptimeDate from 'Common/Types/Date'; -import { loadAllComponentMetadata } from '../Utils/ComponentMetadata'; -import Workflow from 'Model/Models/Workflow'; +import { RunProps } from 'CommonServer/Types/Workflow/Workflow'; import logger from 'CommonServer/Utils/Logger'; -import TimeoutException from 'Common/Types/Exception/TimeoutException'; -import Exception from 'Common/Types/Exception/Exception'; -import WorkflowLog from 'Model/Models/WorkflowLog'; import VMAPI from 'CommonServer/Utils/VM/VMAPI'; +import Workflow from 'Model/Models/Workflow'; +import WorkflowLog from 'Model/Models/WorkflowLog'; +import WorkflowVariable from 'Model/Models/WorkflowVariable'; const AllComponents: Dictionary = loadAllComponentMetadata(); diff --git a/App/FeatureSet/Workflow/Utils/ComponentMetadata.ts b/App/FeatureSet/Workflow/Utils/ComponentMetadata.ts index 21bdd4cca0..3ffa9d6150 100644 --- a/App/FeatureSet/Workflow/Utils/ComponentMetadata.ts +++ b/App/FeatureSet/Workflow/Utils/ComponentMetadata.ts @@ -1,8 +1,8 @@ -import ComponentMetadata from 'Common/Types/Workflow/Component'; -import Entities from 'Model/Models/Index'; -import BaseModelComponentFactory from 'Common/Types/Workflow/Components/BaseModel'; -import Components from 'Common/Types/Workflow/Components'; import Dictionary from 'Common/Types/Dictionary'; +import ComponentMetadata from 'Common/Types/Workflow/Component'; +import Components from 'Common/Types/Workflow/Components'; +import BaseModelComponentFactory from 'Common/Types/Workflow/Components/BaseModel'; +import Entities from 'Model/Models/Index'; type LoadAllComponentMetadataFunction = () => Dictionary; diff --git a/App/Index.ts b/App/Index.ts index a6a6900f9f..6499930d20 100755 --- a/App/Index.ts +++ b/App/Index.ts @@ -1,26 +1,24 @@ -process.env['SERVICE_NAME'] = 'app'; - -import 'CommonServer/Utils/Telemetry'; -import 'ejs'; -import Redis from 'CommonServer/Infrastructure/Redis'; -import logger from 'CommonServer/Utils/Logger'; -import App from 'CommonServer/Utils/StartServer'; -import { PostgresAppInstance } from 'CommonServer/Infrastructure/PostgresDatabase'; -import { ClickhouseAppInstance } from 'CommonServer/Infrastructure/ClickhouseDatabase'; -import Realtime from 'CommonServer/Utils/Realtime'; - +import APIReferenceRoutes from './FeatureSet/ApiReference/Index'; +import BaseAPIRoutes from './FeatureSet/BaseAPI/Index'; +import DocsRoutes from './FeatureSet/Docs/Index'; +import HomeRoutes from './FeatureSet/Home/Index'; // import FeatureSets. import IdentityRoutes from './FeatureSet/Identity/Index'; import NotificationRoutes from './FeatureSet/Notification/Index'; -import DocsRoutes from './FeatureSet/Docs/Index'; -import BaseAPIRoutes from './FeatureSet/BaseAPI/Index'; -import APIReferenceRoutes from './FeatureSet/ApiReference/Index'; import Workers from './FeatureSet/Workers/Index'; import Workflow from './FeatureSet/Workflow/Index'; -import HomeRoutes from './FeatureSet/Home/Index'; -import InfrastructureStatus from 'CommonServer/Infrastructure/Status'; - import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { ClickhouseAppInstance } from 'CommonServer/Infrastructure/ClickhouseDatabase'; +import { PostgresAppInstance } from 'CommonServer/Infrastructure/PostgresDatabase'; +import Redis from 'CommonServer/Infrastructure/Redis'; +import InfrastructureStatus from 'CommonServer/Infrastructure/Status'; +import logger from 'CommonServer/Utils/Logger'; +import Realtime from 'CommonServer/Utils/Realtime'; +import App from 'CommonServer/Utils/StartServer'; +import 'CommonServer/Utils/Telemetry'; +import 'ejs'; + +process.env['SERVICE_NAME'] = 'app'; const init: PromiseVoidFunction = async (): Promise => { try { diff --git a/Common/AnalyticsModels/BaseModel.ts b/Common/AnalyticsModels/BaseModel.ts index 48ae69b8da..e7195251c7 100644 --- a/Common/AnalyticsModels/BaseModel.ts +++ b/Common/AnalyticsModels/BaseModel.ts @@ -1,24 +1,24 @@ -import TableColumnType from '../Types/AnalyticsDatabase/TableColumnType'; -import AnalyticsTableColumn from '../Types/AnalyticsDatabase/TableColumn'; -import BadDataException from '../Types/Exception/BadDataException'; +import Route from '../Types/API/Route'; import AnalyticsTableEngine from '../Types/AnalyticsDatabase/AnalyticsTableEngine'; -import ColumnBillingAccessControl from '../Types/BaseDatabase/ColumnBillingAccessControl'; -import TableBillingAccessControl from '../Types/BaseDatabase/TableBillingAccessControl'; +import AnalyticsTableColumn from '../Types/AnalyticsDatabase/TableColumn'; +import TableColumnType from '../Types/AnalyticsDatabase/TableColumnType'; import { ColumnAccessControl, TableAccessControl, } from '../Types/BaseDatabase/AccessControl'; +import ColumnBillingAccessControl from '../Types/BaseDatabase/ColumnBillingAccessControl'; import EnableWorkflowOn from '../Types/BaseDatabase/EnableWorkflowOn'; -import ObjectID from '../Types/ObjectID'; -import CommonModel from './CommonModel'; -import Route from '../Types/API/Route'; -import { EnableRealtimeEventsOn } from '../Utils/Realtime'; -import Text from '../Types/Text'; -import Dictionary from '../Types/Dictionary'; import ModelPermission from '../Types/BaseDatabase/ModelPermission'; -import Permission, { UserTenantAccessPermission } from '../Types/Permission'; +import TableBillingAccessControl from '../Types/BaseDatabase/TableBillingAccessControl'; import { PlanSelect } from '../Types/Billing/SubscriptionPlan'; +import Dictionary from '../Types/Dictionary'; +import BadDataException from '../Types/Exception/BadDataException'; import { JSONValue } from '../Types/JSON'; +import ObjectID from '../Types/ObjectID'; +import Permission, { UserTenantAccessPermission } from '../Types/Permission'; +import Text from '../Types/Text'; +import { EnableRealtimeEventsOn } from '../Utils/Realtime'; +import CommonModel from './CommonModel'; export type AnalyticsBaseModelType = { new (): AnalyticsBaseModel }; diff --git a/Common/AnalyticsModels/CommonModel.ts b/Common/AnalyticsModels/CommonModel.ts index 629f7f874a..d620aeff08 100644 --- a/Common/AnalyticsModels/CommonModel.ts +++ b/Common/AnalyticsModels/CommonModel.ts @@ -1,5 +1,4 @@ // This model will be extended by BaseModel and Nested Mdoel - import AnalyticsTableColumn from '../Types/AnalyticsDatabase/TableColumn'; import TableColumnType from '../Types/AnalyticsDatabase/TableColumnType'; import GreaterThan from '../Types/BaseDatabase/GreaterThan'; diff --git a/Common/Models/BaseModel.ts b/Common/Models/BaseModel.ts index 91d76f9651..2bc9650511 100644 --- a/Common/Models/BaseModel.ts +++ b/Common/Models/BaseModel.ts @@ -1,39 +1,38 @@ -import { - DeleteDateColumn, - UpdateDateColumn, - CreateDateColumn, - VersionColumn, - PrimaryGeneratedColumn, - BaseEntity, -} from 'typeorm'; - +import Route from '../Types/API/Route'; +import { ColumnAccessControl } from '../Types/BaseDatabase/AccessControl'; +import ColumnBillingAccessControl from '../Types/BaseDatabase/ColumnBillingAccessControl'; +import EnableWorkflowOn from '../Types/BaseDatabase/EnableWorkflowOn'; +import ModelPermission from '../Types/BaseDatabase/ModelPermission'; +import { PlanSelect } from '../Types/Billing/SubscriptionPlan'; +import { getColumnAccessControlForAllColumns } from '../Types/Database/AccessControl/ColumnAccessControl'; +import { getColumnBillingAccessControlForAllColumns } from '../Types/Database/AccessControl/ColumnBillingAccessControl'; import Columns from '../Types/Database/Columns'; import TableColumn, { + TableColumnMetadata, getTableColumn, getTableColumns, - TableColumnMetadata, } from '../Types/Database/TableColumn'; -import { JSONArray, JSONObject, JSONValue } from '../Types/JSON'; -import ObjectID from '../Types/ObjectID'; +import TableColumnType from '../Types/Database/TableColumnType'; import Dictionary from '../Types/Dictionary'; -import HashedString from '../Types/HashedString'; import Email from '../Types/Email'; +import BadDataException from '../Types/Exception/BadDataException'; +import HashedString from '../Types/HashedString'; +import IconProp from '../Types/Icon/IconProp'; +import { JSONArray, JSONObject, JSONValue } from '../Types/JSON'; +import JSONFunctions from '../Types/JSONFunctions'; +import ObjectID from '../Types/ObjectID'; +import Permission, { UserTenantAccessPermission } from '../Types/Permission'; import Phone from '../Types/Phone'; import PositiveNumber from '../Types/PositiveNumber'; -import Route from '../Types/API/Route'; -import TableColumnType from '../Types/Database/TableColumnType'; -import Permission, { UserTenantAccessPermission } from '../Types/Permission'; -import { ColumnAccessControl } from '../Types/BaseDatabase/AccessControl'; -import { getColumnAccessControlForAllColumns } from '../Types/Database/AccessControl/ColumnAccessControl'; -import BadDataException from '../Types/Exception/BadDataException'; -import { PlanSelect } from '../Types/Billing/SubscriptionPlan'; -import EnableWorkflowOn from '../Types/BaseDatabase/EnableWorkflowOn'; -import IconProp from '../Types/Icon/IconProp'; import Text from '../Types/Text'; -import { getColumnBillingAccessControlForAllColumns } from '../Types/Database/AccessControl/ColumnBillingAccessControl'; -import ColumnBillingAccessControl from '../Types/BaseDatabase/ColumnBillingAccessControl'; -import JSONFunctions from '../Types/JSONFunctions'; -import ModelPermission from '../Types/BaseDatabase/ModelPermission'; +import { + BaseEntity, + CreateDateColumn, + DeleteDateColumn, + PrimaryGeneratedColumn, + UpdateDateColumn, + VersionColumn, +} from 'typeorm'; export type BaseModelType = { new (): BaseModel }; diff --git a/Common/Models/FileModel.ts b/Common/Models/FileModel.ts index 24966b9528..751525a573 100644 --- a/Common/Models/FileModel.ts +++ b/Common/Models/FileModel.ts @@ -1,4 +1,3 @@ -import { Column } from 'typeorm'; import ColumnAccessControl from '../Types/Database/AccessControl/ColumnAccessControl'; import ColumnLength from '../Types/Database/ColumnLength'; import ColumnType from '../Types/Database/ColumnType'; @@ -9,6 +8,7 @@ import MimeType from '../Types/File/MimeType'; import ObjectID from '../Types/ObjectID'; import Permission from '../Types/Permission'; import BaseModel from './BaseModel'; +import { Column } from 'typeorm'; @SlugifyColumn('name', 'slug') export default class FileModel extends BaseModel { diff --git a/Common/Tests/Types/API/ErrorResponse.test.ts b/Common/Tests/Types/API/ErrorResponse.test.ts index 0c908815b4..4fb3a7e73a 100644 --- a/Common/Tests/Types/API/ErrorResponse.test.ts +++ b/Common/Tests/Types/API/ErrorResponse.test.ts @@ -1,4 +1,5 @@ import ErrorResponse from '../../../Types/API/HTTPErrorResponse'; + describe('ErrorResponse', () => { test('should return a valid error response object', () => { const errorResponseObject: ErrorResponse = new ErrorResponse( diff --git a/Common/Tests/Types/API/Headers.test.ts b/Common/Tests/Types/API/Headers.test.ts index 3d31d08a2f..f786728433 100644 --- a/Common/Tests/Types/API/Headers.test.ts +++ b/Common/Tests/Types/API/Headers.test.ts @@ -1,5 +1,6 @@ import Headers from '../../../Types/API/Headers'; import Faker from '../../../Utils/Faker'; + describe('Headers', () => { test('should compile', () => { const apiKey: string = Faker.randomNumbers(16); diff --git a/Common/Tests/Types/API/Hostname.test.ts b/Common/Tests/Types/API/Hostname.test.ts index bfddb277cd..009d84d24a 100644 --- a/Common/Tests/Types/API/Hostname.test.ts +++ b/Common/Tests/Types/API/Hostname.test.ts @@ -1,5 +1,6 @@ import Hostname from '../../../Types/API/Hostname'; import BadDataException from '../../../Types/Exception/BadDataException'; + describe('Hostname', () => { test('new Hostname(hostname) should throw an error if invalid hostname is given', () => { expect(() => { diff --git a/Common/Tests/Types/API/ResponseType.test.ts b/Common/Tests/Types/API/ResponseType.test.ts index 98dadaa415..c8fb6eaa42 100644 --- a/Common/Tests/Types/API/ResponseType.test.ts +++ b/Common/Tests/Types/API/ResponseType.test.ts @@ -1,4 +1,5 @@ import ResponseType from '../../../Types/API/ResponseType'; + describe('ResponseType', () => { test('ResponseType.CSV to be csv', () => { expect(ResponseType.CSV).toBe('csv'); diff --git a/Common/Tests/Types/API/Route.test.ts b/Common/Tests/Types/API/Route.test.ts index f56ef5355a..9288d3bc84 100644 --- a/Common/Tests/Types/API/Route.test.ts +++ b/Common/Tests/Types/API/Route.test.ts @@ -1,5 +1,6 @@ import Route from '../../../Types/API/Route'; import BadDataException from '../../../Types/Exception/BadDataException'; + describe('Route', () => { test('new Route() should throw an error if invalid route is passed', () => { expect(() => { diff --git a/Common/Tests/Types/API/StatusCode.test.ts b/Common/Tests/Types/API/StatusCode.test.ts index 13a1768c4d..cba401aeb8 100644 --- a/Common/Tests/Types/API/StatusCode.test.ts +++ b/Common/Tests/Types/API/StatusCode.test.ts @@ -1,5 +1,6 @@ import StatusCode from '../../../Types/API/StatusCode'; import BadDataException from '../../../Types/Exception/BadDataException'; + describe('Route', () => { test('new StatusCode should throw if number is not passed', () => { expect(() => { diff --git a/Common/Tests/Types/AppEnvironment.test.ts b/Common/Tests/Types/AppEnvironment.test.ts index 3daa9187b9..cd25bd6254 100644 --- a/Common/Tests/Types/AppEnvironment.test.ts +++ b/Common/Tests/Types/AppEnvironment.test.ts @@ -1,4 +1,5 @@ import AppEnvironment from '../../Types/AppEnvironment'; + describe('AppEnvironment', () => { test('AppEnvironment.Production should be production', () => { expect(AppEnvironment.Production).toEqual('production'); diff --git a/Common/Tests/Types/Billing/SubscriptionPlan.test.ts b/Common/Tests/Types/Billing/SubscriptionPlan.test.ts index 9ef1bab6af..cb6a006ff6 100644 --- a/Common/Tests/Types/Billing/SubscriptionPlan.test.ts +++ b/Common/Tests/Types/Billing/SubscriptionPlan.test.ts @@ -1,9 +1,9 @@ import SubscriptionPlan, { PlanSelect, } from '../../../Types/Billing/SubscriptionPlan'; -import { describe, expect, it } from '@jest/globals'; -import { JSONObject } from '../../../Types/JSON'; import BadDataException from '../../../Types/Exception/BadDataException'; +import { JSONObject } from '../../../Types/JSON'; +import { describe, expect, it } from '@jest/globals'; describe('SubscriptionPlan', () => { const monthlyPlanId: string = 'monthly_plan_id'; diff --git a/Common/Tests/Types/BrandColors.test.ts b/Common/Tests/Types/BrandColors.test.ts index 1536546959..4b211dc5b0 100644 --- a/Common/Tests/Types/BrandColors.test.ts +++ b/Common/Tests/Types/BrandColors.test.ts @@ -1,23 +1,23 @@ -import Color from '../../Types/Color'; -import { describe, expect, it } from '@jest/globals'; import { Black, - White, - Slate500, - Purple500, - Pink500, - Red500, - Orange500, - Yellow500, - Green500, - Teal500, + Blue500, Cyan500, - VeryLightGray, Gray500, + Green500, LightGray, Moroon500, - Blue500, + Orange500, + Pink500, + Purple500, + Red500, + Slate500, + Teal500, + VeryLightGray, + White, + Yellow500, } from '../../Types/BrandColors'; +import Color from '../../Types/Color'; +import { describe, expect, it } from '@jest/globals'; describe('Color', () => { describe('Verify color hex', () => { diff --git a/Common/Tests/Types/Database/Date.test.ts b/Common/Tests/Types/Database/Date.test.ts index 8bb5846b90..952163ba2d 100644 --- a/Common/Tests/Types/Database/Date.test.ts +++ b/Common/Tests/Types/Database/Date.test.ts @@ -1,8 +1,8 @@ -import DatabaseDate from '../../../Types/Database/Date'; -import moment from 'moment'; import InBetween from '../../../Types/BaseDatabase/InBetween'; +import DatabaseDate from '../../../Types/Database/Date'; import { JSONObject } from '../../../Types/JSON'; import { describe, expect, it } from '@jest/globals'; +import moment from 'moment'; describe('DatabaseDate', () => { describe('asDateStartOfTheDayEndOfTheDayForDatabaseQuery', () => { diff --git a/Common/Tests/Types/Date.test.ts b/Common/Tests/Types/Date.test.ts index 2bb506f544..48825c46c8 100644 --- a/Common/Tests/Types/Date.test.ts +++ b/Common/Tests/Types/Date.test.ts @@ -1,6 +1,6 @@ -import moment, { isMoment } from 'moment'; import OneUptimeDate from '../../Types/Date'; import PositiveNumber from '../../Types/PositiveNumber'; +import moment, { isMoment } from 'moment'; describe('class OneUptimeDate', () => { test('OneUptimeDate.getCurrentDate should return current date', () => { diff --git a/Common/Tests/Types/Dictionary.test.ts b/Common/Tests/Types/Dictionary.test.ts index 4913e5ebeb..8b97137378 100644 --- a/Common/Tests/Types/Dictionary.test.ts +++ b/Common/Tests/Types/Dictionary.test.ts @@ -1,4 +1,5 @@ import Dictionary from '../../Types/Dictionary'; + describe('Dictionary', () => { test('should allow basic types compile', () => { const dictionary: Dictionary = { diff --git a/Common/Tests/Types/HashedString.test.ts b/Common/Tests/Types/HashedString.test.ts index a38aa101e4..4a25a87ff5 100644 --- a/Common/Tests/Types/HashedString.test.ts +++ b/Common/Tests/Types/HashedString.test.ts @@ -1,5 +1,6 @@ import HashedString from '../../Types/HashedString'; import ObjectID from '../../Types/ObjectID'; + describe('class HashedString', () => { test('HashedString.constructor() should return valid hashedString', () => { const hashedString: HashedString = new HashedString('stringToHash'); diff --git a/Common/Tests/Utils/API.test.ts b/Common/Tests/Utils/API.test.ts index 75ba5b0fa4..6a36fcd0ff 100644 --- a/Common/Tests/Utils/API.test.ts +++ b/Common/Tests/Utils/API.test.ts @@ -1,25 +1,25 @@ -import Protocol from '../../Types/API/Protocol'; -import API from '../../Utils/API'; -import Hostname from '../../Types/API/Hostname'; -import HTTPMethod from '../../Types/API/HTTPMethod'; -import URL from '../../Types/API/URL'; -import Route from '../../Types/API/Route'; -import axios, { - AxiosResponse, - AxiosError, - AxiosStatic, - AxiosRequestConfig, - Method, - AxiosHeaders, -} from 'axios'; -import { expect, jest } from '@jest/globals'; -import HTTPResponse from '../../Types/API/HTTPResponse'; import HTTPErrorResponse from '../../Types/API/HTTPErrorResponse'; -import APIException from '../../Types/Exception/ApiException'; -import Dictionary from '../../Types/Dictionary'; +import HTTPMethod from '../../Types/API/HTTPMethod'; +import HTTPResponse from '../../Types/API/HTTPResponse'; import Headers from '../../Types/API/Headers'; -import { JSONObject } from '../../Types/JSON'; +import Hostname from '../../Types/API/Hostname'; +import Protocol from '../../Types/API/Protocol'; +import Route from '../../Types/API/Route'; +import URL from '../../Types/API/URL'; +import Dictionary from '../../Types/Dictionary'; +import APIException from '../../Types/Exception/ApiException'; import GenericObject from '../../Types/GenericObject'; +import { JSONObject } from '../../Types/JSON'; +import API from '../../Utils/API'; +import { expect, jest } from '@jest/globals'; +import axios, { + AxiosError, + AxiosHeaders, + AxiosRequestConfig, + AxiosResponse, + AxiosStatic, + Method, +} from 'axios'; const DEFAULT_HEADERS: Headers = { 'Access-Control-Allow-Origin': '*', diff --git a/Common/Tests/Utils/Analytics.test.ts b/Common/Tests/Utils/Analytics.test.ts index 1c981d4919..988fe22092 100644 --- a/Common/Tests/Utils/Analytics.test.ts +++ b/Common/Tests/Utils/Analytics.test.ts @@ -1,8 +1,8 @@ -import Analytics from '../../Utils/Analytics'; import Email from '../../Types/Email'; import { JSONObject } from '../../Types/JSON'; -import posthog from 'posthog-js'; +import Analytics from '../../Utils/Analytics'; import { describe, expect, it } from '@jest/globals'; +import posthog from 'posthog-js'; jest.mock('posthog-js', () => { return { diff --git a/Common/Tests/Utils/CronTime.test.ts b/Common/Tests/Utils/CronTime.test.ts index 996da92929..d19b2d09ed 100644 --- a/Common/Tests/Utils/CronTime.test.ts +++ b/Common/Tests/Utils/CronTime.test.ts @@ -1,9 +1,9 @@ import { - EVERY_MINUTE, EVERY_DAY, - EVERY_HOUR, EVERY_FIVE_MINUTE, EVERY_FIVE_SECONDS, + EVERY_HOUR, + EVERY_MINUTE, EVERY_WEEK, } from '../../Utils/CronTime'; diff --git a/Common/Tests/Utils/Faker.test.ts b/Common/Tests/Utils/Faker.test.ts index 56a96171fe..85bd065321 100644 --- a/Common/Tests/Utils/Faker.test.ts +++ b/Common/Tests/Utils/Faker.test.ts @@ -1,7 +1,7 @@ -import Faker from '../../Utils/Faker'; import Email from '../../Types/Email'; import Name from '../../Types/Name'; import Phone from '../../Types/Phone'; +import Faker from '../../Utils/Faker'; import { describe, expect, it } from '@jest/globals'; describe('Faker Class', () => { diff --git a/Common/Tests/Utils/Slug.test.ts b/Common/Tests/Utils/Slug.test.ts index 25cd29a260..56f2f09679 100644 --- a/Common/Tests/Utils/Slug.test.ts +++ b/Common/Tests/Utils/Slug.test.ts @@ -1,4 +1,5 @@ import Slug from '../../Utils/Slug'; + describe('Slug.getSlug()', () => { test('should return empty string, if name is empty ', () => { expect(Slug.getSlug('')).toEqual(''); diff --git a/Common/Types/API/HTTPResponse.ts b/Common/Types/API/HTTPResponse.ts index 0ec8f674b2..994a84147c 100644 --- a/Common/Types/API/HTTPResponse.ts +++ b/Common/Types/API/HTTPResponse.ts @@ -1,5 +1,5 @@ -import BaseModel from '../../Models/BaseModel'; import AnalyticsBaseModel from '../../AnalyticsModels/BaseModel'; +import BaseModel from '../../Models/BaseModel'; import { JSONArray, JSONObject, JSONObjectOrArray } from '../JSON'; import JSONFunctions from '../JSONFunctions'; import Typeof from '../Typeof'; diff --git a/Common/Types/API/Hostname.ts b/Common/Types/API/Hostname.ts index 4e5dc91379..1383eee43b 100644 --- a/Common/Types/API/Hostname.ts +++ b/Common/Types/API/Hostname.ts @@ -1,9 +1,9 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; import BadDataException from '../Exception/BadDataException'; +import { JSONObject, ObjectType } from '../JSON'; import Port from '../Port'; import Typeof from '../Typeof'; -import { JSONObject, ObjectType } from '../JSON'; +import { FindOperator } from 'typeorm'; export default class Hostname extends DatabaseProperty { private _route: string = ''; diff --git a/Common/Types/API/Route.ts b/Common/Types/API/Route.ts index 25ac8c34e6..97aea11720 100644 --- a/Common/Types/API/Route.ts +++ b/Common/Types/API/Route.ts @@ -1,7 +1,7 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; +import { FindOperator } from 'typeorm'; export default class Route extends DatabaseProperty { private _route: string = ''; diff --git a/Common/Types/API/URL.ts b/Common/Types/API/URL.ts index 1540589187..2ed7c27611 100644 --- a/Common/Types/API/URL.ts +++ b/Common/Types/API/URL.ts @@ -1,13 +1,13 @@ +import DatabaseProperty from '../Database/DatabaseProperty'; +import Dictionary from '../Dictionary'; +import Email from '../Email'; +import BadDataException from '../Exception/BadDataException'; +import { JSONObject, ObjectType } from '../JSON'; +import Typeof from '../Typeof'; +import Hostname from './Hostname'; import Protocol from './Protocol'; import Route from './Route'; -import Hostname from './Hostname'; -import DatabaseProperty from '../Database/DatabaseProperty'; import { FindOperator } from 'typeorm'; -import Dictionary from '../Dictionary'; -import Typeof from '../Typeof'; -import Email from '../Email'; -import { JSONObject, ObjectType } from '../JSON'; -import BadDataException from '../Exception/BadDataException'; export default class URL extends DatabaseProperty { private _route: Route = new Route(); diff --git a/Common/Types/AnalyticsDatabase/TableColumn.ts b/Common/Types/AnalyticsDatabase/TableColumn.ts index 542680191e..72a62480af 100644 --- a/Common/Types/AnalyticsDatabase/TableColumn.ts +++ b/Common/Types/AnalyticsDatabase/TableColumn.ts @@ -1,8 +1,8 @@ +import NestedModel from '../../AnalyticsModels/NestedModel'; +import TableColumnType from '../AnalyticsDatabase/TableColumnType'; import { ColumnAccessControl } from '../BaseDatabase/AccessControl'; import ColumnBillingAccessControl from '../BaseDatabase/ColumnBillingAccessControl'; -import TableColumnType from '../AnalyticsDatabase/TableColumnType'; import { JSONValue } from '../JSON'; -import NestedModel from '../../AnalyticsModels/NestedModel'; export default class AnalyticsTableColumn { private _key: string = 'id'; diff --git a/Common/Types/BaseDatabase/GreaterThan.ts b/Common/Types/BaseDatabase/GreaterThan.ts index cab6b4a668..e7c76faca9 100644 --- a/Common/Types/BaseDatabase/GreaterThan.ts +++ b/Common/Types/BaseDatabase/GreaterThan.ts @@ -1,6 +1,6 @@ +import CompareBase from '../Database/CompareBase'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; -import CompareBase from '../Database/CompareBase'; export default class GreaterThan extends CompareBase { public constructor(value: number | Date) { diff --git a/Common/Types/BaseDatabase/GreaterThanOrEqual.ts b/Common/Types/BaseDatabase/GreaterThanOrEqual.ts index 4390dec12d..2cbdeb4a18 100644 --- a/Common/Types/BaseDatabase/GreaterThanOrEqual.ts +++ b/Common/Types/BaseDatabase/GreaterThanOrEqual.ts @@ -1,6 +1,6 @@ +import CompareBase from '../Database/CompareBase'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; -import CompareBase from '../Database/CompareBase'; export default class GreaterThanOrEqual extends CompareBase { public constructor(value: number | Date) { diff --git a/Common/Types/BaseDatabase/LessThan.ts b/Common/Types/BaseDatabase/LessThan.ts index 12feeaa72f..47753e6e0b 100644 --- a/Common/Types/BaseDatabase/LessThan.ts +++ b/Common/Types/BaseDatabase/LessThan.ts @@ -1,6 +1,6 @@ +import CompareBase from '../Database/CompareBase'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; -import CompareBase from '../Database/CompareBase'; export default class LessThan extends CompareBase { public constructor(value: number | Date) { diff --git a/Common/Types/BaseDatabase/LessThanOrEqual.ts b/Common/Types/BaseDatabase/LessThanOrEqual.ts index 3ab180e726..455950edae 100644 --- a/Common/Types/BaseDatabase/LessThanOrEqual.ts +++ b/Common/Types/BaseDatabase/LessThanOrEqual.ts @@ -1,6 +1,6 @@ +import CompareBase from '../Database/CompareBase'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; -import CompareBase from '../Database/CompareBase'; export default class LessThanOrEqual extends CompareBase { public constructor(value: number | Date) { diff --git a/Common/Types/Color.ts b/Common/Types/Color.ts index 556f3bc477..4686b6d92b 100644 --- a/Common/Types/Color.ts +++ b/Common/Types/Color.ts @@ -1,7 +1,7 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from './Database/DatabaseProperty'; import BadDataException from './Exception/BadDataException'; import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; export interface RGB { red: number; diff --git a/Common/Types/Database/AccessControl/ColumnAccessControl.ts b/Common/Types/Database/AccessControl/ColumnAccessControl.ts index 20bc26dbe3..f436fd74eb 100644 --- a/Common/Types/Database/AccessControl/ColumnAccessControl.ts +++ b/Common/Types/Database/AccessControl/ColumnAccessControl.ts @@ -1,8 +1,8 @@ -import 'reflect-metadata'; import BaseModel from '../../../Models/BaseModel'; +import { ColumnAccessControl } from '../../BaseDatabase/AccessControl'; import Dictionary from '../../Dictionary'; import { ReflectionMetadataType } from '../../Reflection'; -import { ColumnAccessControl } from '../../BaseDatabase/AccessControl'; +import 'reflect-metadata'; const accessControlSymbol: Symbol = Symbol('ColumnAccessControl'); diff --git a/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts b/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts index 36684be019..74236a9bfc 100644 --- a/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts +++ b/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts @@ -1,8 +1,8 @@ -import 'reflect-metadata'; import BaseModel from '../../../Models/BaseModel'; +import ColumnBillingAccessControl from '../../BaseDatabase/ColumnBillingAccessControl'; import Dictionary from '../../Dictionary'; import { ReflectionMetadataType } from '../../Reflection'; -import ColumnBillingAccessControl from '../../BaseDatabase/ColumnBillingAccessControl'; +import 'reflect-metadata'; const accessControlSymbol: Symbol = Symbol('ColumnBillingAccessControl'); diff --git a/Common/Types/Database/DatabaseProperty.ts b/Common/Types/Database/DatabaseProperty.ts index db4a726742..bc61d89e1b 100644 --- a/Common/Types/Database/DatabaseProperty.ts +++ b/Common/Types/Database/DatabaseProperty.ts @@ -1,8 +1,8 @@ -import { FindOperator } from 'typeorm'; -import { ValueTransformer } from 'typeorm/decorator/options/ValueTransformer'; import NotImplementedException from '../Exception/NotImplementedException'; import { JSONArray, JSONObject } from '../JSON'; import SerializableObject from '../SerializableObject'; +import { FindOperator } from 'typeorm'; +import { ValueTransformer } from 'typeorm/decorator/options/ValueTransformer'; export default class DatabaseProperty extends SerializableObject { public constructor() { diff --git a/Common/Types/Database/Date.ts b/Common/Types/Database/Date.ts index f6e1098787..e53ce97b49 100644 --- a/Common/Types/Database/Date.ts +++ b/Common/Types/Database/Date.ts @@ -1,5 +1,5 @@ -import OneUptimeDate from '../Date'; import InBetween from '../BaseDatabase/InBetween'; +import OneUptimeDate from '../Date'; export default class DatabaseDate { public static asDateStartOfTheDayEndOfTheDayForDatabaseQuery( diff --git a/Common/Types/Database/IsPermissionsIf.ts b/Common/Types/Database/IsPermissionsIf.ts index a5d3be1af5..e078eb7118 100644 --- a/Common/Types/Database/IsPermissionsIf.ts +++ b/Common/Types/Database/IsPermissionsIf.ts @@ -1,5 +1,5 @@ -import Permission from '../Permission'; import GenericFunction from '../GenericFunction'; +import Permission from '../Permission'; export default ( permission: Permission, diff --git a/Common/Types/Database/TableColumn.ts b/Common/Types/Database/TableColumn.ts index 36a4689038..0ee0150a8c 100644 --- a/Common/Types/Database/TableColumn.ts +++ b/Common/Types/Database/TableColumn.ts @@ -1,8 +1,8 @@ -import 'reflect-metadata'; import BaseModel, { BaseModelType } from '../../Models/BaseModel'; import Dictionary from '../Dictionary'; import { ReflectionMetadataType } from '../Reflection'; import TableColumnType from './TableColumnType'; +import 'reflect-metadata'; const tableColumn: Symbol = Symbol('TableColumn'); diff --git a/Common/Types/Database/TableMetadata.ts b/Common/Types/Database/TableMetadata.ts index 4236b9d0ea..d175d35edb 100644 --- a/Common/Types/Database/TableMetadata.ts +++ b/Common/Types/Database/TableMetadata.ts @@ -1,5 +1,5 @@ -import IconProp from '../Icon/IconProp'; import GenericFunction from '../GenericFunction'; +import IconProp from '../Icon/IconProp'; export default (props: { tableName: string; diff --git a/Common/Types/Database/UniqueColumnBy.ts b/Common/Types/Database/UniqueColumnBy.ts index 06f2ce3063..30eb6c2660 100644 --- a/Common/Types/Database/UniqueColumnBy.ts +++ b/Common/Types/Database/UniqueColumnBy.ts @@ -1,7 +1,7 @@ -import 'reflect-metadata'; import BaseModel from '../../Models/BaseModel'; import Dictionary from '../Dictionary'; import { ReflectionMetadataType } from '../Reflection'; +import 'reflect-metadata'; const uniqueColumnBy: Symbol = Symbol('UniqueColumnBy'); diff --git a/Common/Types/Decimal.ts b/Common/Types/Decimal.ts index 84452edd32..5110db3604 100644 --- a/Common/Types/Decimal.ts +++ b/Common/Types/Decimal.ts @@ -1,8 +1,8 @@ // This is for Object ID for all the things in our database. -import { FindOperator } from 'typeorm'; import DatabaseProperty from './Database/DatabaseProperty'; -import { JSONObject, ObjectType } from './JSON'; import BadDataException from './Exception/BadDataException'; +import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; export default class Decimal extends DatabaseProperty { private _value: number = 0; diff --git a/Common/Types/Domain.ts b/Common/Types/Domain.ts index 0bec2963f9..c16a3333f7 100644 --- a/Common/Types/Domain.ts +++ b/Common/Types/Domain.ts @@ -1,7 +1,7 @@ -import { FindOperator } from 'typeorm/find-options/FindOperator'; import DatabaseProperty from './Database/DatabaseProperty'; import BadDataException from './Exception/BadDataException'; import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm/find-options/FindOperator'; export default class Domain extends DatabaseProperty { private _domain: string = ''; diff --git a/Common/Types/Email.ts b/Common/Types/Email.ts index 575b7fee39..a81fcf7161 100644 --- a/Common/Types/Email.ts +++ b/Common/Types/Email.ts @@ -1,8 +1,8 @@ -import { FindOperator } from 'typeorm'; import Hostname from './API/Hostname'; import DatabaseProperty from './Database/DatabaseProperty'; import BadDataException from './Exception/BadDataException'; import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; const nonBusinessEmailDomains: Array = [ 'gmail', diff --git a/Common/Types/Email/EmailMessage.ts b/Common/Types/Email/EmailMessage.ts index 2ea19aff85..3f313a96a2 100644 --- a/Common/Types/Email/EmailMessage.ts +++ b/Common/Types/Email/EmailMessage.ts @@ -1,5 +1,5 @@ -import Email from '../Email'; import Dictionary from '../Dictionary'; +import Email from '../Email'; import EmailTemplateType from './EmailTemplateType'; export interface EmailEnvelope { diff --git a/Common/Types/Email/EmailServer.ts b/Common/Types/Email/EmailServer.ts index 0b6cab2be7..84d100fe94 100644 --- a/Common/Types/Email/EmailServer.ts +++ b/Common/Types/Email/EmailServer.ts @@ -1,7 +1,7 @@ -import Email from '../Email'; -import Port from '../Port'; import Hostname from '../API/Hostname'; +import Email from '../Email'; import ObjectID from '../ObjectID'; +import Port from '../Port'; export default interface EmailServer { id?: ObjectID | undefined; // If this is custom SMTP, this is the ID of the SMTP config. Otherwise, it's undefined diff --git a/Common/Types/Events/Recurring.ts b/Common/Types/Events/Recurring.ts index a2bf89771c..beac175d6b 100644 --- a/Common/Types/Events/Recurring.ts +++ b/Common/Types/Events/Recurring.ts @@ -1,10 +1,10 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; -import EventInterval from './EventInterval'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; import JSONFunctions from '../JSONFunctions'; import PositiveNumber from '../PositiveNumber'; +import EventInterval from './EventInterval'; +import { FindOperator } from 'typeorm'; export interface RecurringData extends JSONObject { intervalType: EventInterval; diff --git a/Common/Types/HashedString.ts b/Common/Types/HashedString.ts index 4c8368575b..4db27c536f 100644 --- a/Common/Types/HashedString.ts +++ b/Common/Types/HashedString.ts @@ -1,11 +1,11 @@ -import { FindOperator } from 'typeorm'; import UUID from '../Utils/UUID'; import DatabaseProperty from './Database/DatabaseProperty'; +import BadDataException from './Exception/BadDataException'; import BadOperationException from './Exception/BadOperationException'; +import { JSONObject, ObjectType } from './JSON'; import ObjectID from './ObjectID'; import CryptoJS from 'crypto-js'; -import { JSONObject, ObjectType } from './JSON'; -import BadDataException from './Exception/BadDataException'; +import { FindOperator } from 'typeorm'; export default class HashedString extends DatabaseProperty { private isHashed: boolean = false; diff --git a/Common/Types/IP/IP.ts b/Common/Types/IP/IP.ts index 9bab7d75eb..0016692cb0 100644 --- a/Common/Types/IP/IP.ts +++ b/Common/Types/IP/IP.ts @@ -1,9 +1,9 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; import Typeof from '../Typeof'; import IPType from './IPType'; +import { FindOperator } from 'typeorm'; export default class IP extends DatabaseProperty { private _ip: string = ''; diff --git a/Common/Types/Mixins.ts b/Common/Types/Mixins.ts index 2623cf4b4f..e73c363dca 100644 --- a/Common/Types/Mixins.ts +++ b/Common/Types/Mixins.ts @@ -1,5 +1,4 @@ // https://www.typescriptlang.org/docs/handbook/mixins.html - import GenericObject from './GenericObject'; export type GConstructor = new (...args: any[]) => T; diff --git a/Common/Types/Monitor/MonitorCriteria.ts b/Common/Types/Monitor/MonitorCriteria.ts index e3e3305932..5b80f2f295 100644 --- a/Common/Types/Monitor/MonitorCriteria.ts +++ b/Common/Types/Monitor/MonitorCriteria.ts @@ -1,11 +1,11 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; -import { JSONArray, JSONObject, ObjectType } from '../JSON'; -import MonitorCriteriaInstance from './MonitorCriteriaInstance'; import BadDataException from '../Exception/BadDataException'; -import MonitorType from './MonitorType'; -import ObjectID from '../ObjectID'; +import { JSONArray, JSONObject, ObjectType } from '../JSON'; import JSONFunctions from '../JSONFunctions'; +import ObjectID from '../ObjectID'; +import MonitorCriteriaInstance from './MonitorCriteriaInstance'; +import MonitorType from './MonitorType'; +import { FindOperator } from 'typeorm'; export interface MonitorCriteriaType { monitorCriteriaInstanceArray: Array; diff --git a/Common/Types/Monitor/MonitorCriteriaInstance.ts b/Common/Types/Monitor/MonitorCriteriaInstance.ts index 047a4c560c..3c41426728 100644 --- a/Common/Types/Monitor/MonitorCriteriaInstance.ts +++ b/Common/Types/Monitor/MonitorCriteriaInstance.ts @@ -1,18 +1,18 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; +import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; +import JSONFunctions from '../JSONFunctions'; import ObjectID from '../ObjectID'; -import { CriteriaIncident } from './CriteriaIncident'; +import Typeof from '../Typeof'; import { CheckOn, CriteriaFilter, FilterCondition, FilterType, } from './CriteriaFilter'; -import BadDataException from '../Exception/BadDataException'; +import { CriteriaIncident } from './CriteriaIncident'; import MonitorType from './MonitorType'; -import Typeof from '../Typeof'; -import JSONFunctions from '../JSONFunctions'; +import { FindOperator } from 'typeorm'; export interface MonitorCriteriaInstanceType { monitorStatusId: ObjectID | undefined; diff --git a/Common/Types/Monitor/MonitorStep.ts b/Common/Types/Monitor/MonitorStep.ts index 63ee64a34f..4a7eb13588 100644 --- a/Common/Types/Monitor/MonitorStep.ts +++ b/Common/Types/Monitor/MonitorStep.ts @@ -1,19 +1,19 @@ -import { FindOperator } from 'typeorm'; -import DatabaseProperty from '../Database/DatabaseProperty'; -import { JSONObject, ObjectType } from '../JSON'; -import URL from '../API/URL'; -import IP from '../IP/IP'; -import MonitorCriteria from './MonitorCriteria'; -import BadDataException from '../Exception/BadDataException'; import HTTPMethod from '../API/HTTPMethod'; -import Dictionary from '../Dictionary'; -import ObjectID from '../ObjectID'; -import MonitorType from './MonitorType'; -import JSONFunctions from '../JSONFunctions'; import Hostname from '../API/Hostname'; +import URL from '../API/URL'; +import DatabaseProperty from '../Database/DatabaseProperty'; +import Dictionary from '../Dictionary'; +import BadDataException from '../Exception/BadDataException'; +import IP from '../IP/IP'; +import { JSONObject, ObjectType } from '../JSON'; +import JSONFunctions from '../JSONFunctions'; +import ObjectID from '../ObjectID'; import Port from '../Port'; -import ScreenSizeType from './SyntheticMonitors/ScreenSizeType'; +import MonitorCriteria from './MonitorCriteria'; +import MonitorType from './MonitorType'; import BrowserType from './SyntheticMonitors//BrowserType'; +import ScreenSizeType from './SyntheticMonitors/ScreenSizeType'; +import { FindOperator } from 'typeorm'; export interface MonitorStepType { id: string; diff --git a/Common/Types/Monitor/MonitorSteps.ts b/Common/Types/Monitor/MonitorSteps.ts index 761afa1133..36276d37e0 100644 --- a/Common/Types/Monitor/MonitorSteps.ts +++ b/Common/Types/Monitor/MonitorSteps.ts @@ -1,11 +1,11 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; -import { JSONArray, JSONObject, ObjectType } from '../JSON'; -import MonitorStep from './MonitorStep'; import BadDataException from '../Exception/BadDataException'; -import MonitorType from './MonitorType'; -import ObjectID from '../ObjectID'; +import { JSONArray, JSONObject, ObjectType } from '../JSON'; import JSONFunctions from '../JSONFunctions'; +import ObjectID from '../ObjectID'; +import MonitorStep from './MonitorStep'; +import MonitorType from './MonitorType'; +import { FindOperator } from 'typeorm'; export interface MonitorStepsType { monitorStepsInstanceArray: Array; diff --git a/Common/Types/Name.ts b/Common/Types/Name.ts index 9d590249c8..2121953076 100644 --- a/Common/Types/Name.ts +++ b/Common/Types/Name.ts @@ -1,7 +1,7 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from './Database/DatabaseProperty'; -import { JSONObject, ObjectType } from './JSON'; import BadDataException from './Exception/BadDataException'; +import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; export default class Name extends DatabaseProperty { private _title: string = ''; diff --git a/Common/Types/ObjectID.ts b/Common/Types/ObjectID.ts index c028ebac50..377866344a 100644 --- a/Common/Types/ObjectID.ts +++ b/Common/Types/ObjectID.ts @@ -1,9 +1,9 @@ // This is for Object ID for all the things in our database. -import { FindOperator } from 'typeorm'; import UUID from '../Utils/UUID'; import DatabaseProperty from './Database/DatabaseProperty'; -import { JSONObject, ObjectType } from './JSON'; import BadDataException from './Exception/BadDataException'; +import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; export default class ObjectID extends DatabaseProperty { private _id: string = ''; diff --git a/Common/Types/OnCallDutyPolicy/Layer.ts b/Common/Types/OnCallDutyPolicy/Layer.ts index 512fc66557..17c6fd36ee 100644 --- a/Common/Types/OnCallDutyPolicy/Layer.ts +++ b/Common/Types/OnCallDutyPolicy/Layer.ts @@ -1,15 +1,15 @@ import UserModel from '../../Models/UserModel'; -import Recurring from '../Events/Recurring'; import CalendarEvent from '../Calendar/CalendarEvent'; +import OneUptimeDate from '../Date'; +import DayOfWeek from '../Day/DayOfWeek'; +import EventInterval from '../Events/EventInterval'; +import Recurring from '../Events/Recurring'; +import StartAndEndTime from '../Time/StartAndEndTime'; +import Typeof from '../Typeof'; import RestrictionTimes, { RestrictionType, WeeklyResctriction, } from './RestrictionTimes'; -import OneUptimeDate from '../Date'; -import EventInterval from '../Events/EventInterval'; -import StartAndEndTime from '../Time/StartAndEndTime'; -import Typeof from '../Typeof'; -import DayOfWeek from '../Day/DayOfWeek'; export interface LayerProps { users: Array; diff --git a/Common/Types/OnCallDutyPolicy/RestrictionTimes.ts b/Common/Types/OnCallDutyPolicy/RestrictionTimes.ts index 8d679a7118..14ecade6a4 100644 --- a/Common/Types/OnCallDutyPolicy/RestrictionTimes.ts +++ b/Common/Types/OnCallDutyPolicy/RestrictionTimes.ts @@ -1,4 +1,3 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from '../Database/DatabaseProperty'; import OneUptimeDate from '../Date'; import DayOfWeek from '../Day/DayOfWeek'; @@ -6,6 +5,7 @@ import BadDataException from '../Exception/BadDataException'; import { JSONObject, ObjectType } from '../JSON'; import JSONFunctions from '../JSONFunctions'; import StartAndEndTime from '../Time/StartAndEndTime'; +import { FindOperator } from 'typeorm'; export enum RestrictionType { Daily = 'Daily', diff --git a/Common/Types/Phone.ts b/Common/Types/Phone.ts index 01871b013f..b52397c570 100644 --- a/Common/Types/Phone.ts +++ b/Common/Types/Phone.ts @@ -1,7 +1,7 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from './Database/DatabaseProperty'; import BadDataException from './Exception/BadDataException'; import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; export default class Phone extends DatabaseProperty { private _phone: string = ''; diff --git a/Common/Types/Port.ts b/Common/Types/Port.ts index 865392aaa4..65d246d55f 100644 --- a/Common/Types/Port.ts +++ b/Common/Types/Port.ts @@ -1,9 +1,9 @@ -import { FindOperator } from 'typeorm/find-options/FindOperator'; import DatabaseProperty from './Database/DatabaseProperty'; import BadDataException from './Exception/BadDataException'; +import { JSONObject, ObjectType } from './JSON'; import PositiveNumber from './PositiveNumber'; import Typeof from './Typeof'; -import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm/find-options/FindOperator'; export default class Port extends DatabaseProperty { private _port: PositiveNumber = new PositiveNumber(0); diff --git a/Common/Types/SerializableObjectDictionary.ts b/Common/Types/SerializableObjectDictionary.ts index 8b45306aa2..84f6bb227c 100644 --- a/Common/Types/SerializableObjectDictionary.ts +++ b/Common/Types/SerializableObjectDictionary.ts @@ -1,33 +1,33 @@ -import Dictionary from './Dictionary'; -import Phone from './Phone'; -import { ObjectType } from './JSON'; -import ObjectID from './ObjectID'; -import Name from './Name'; -import EqualToOrNull from './BaseDatabase/EqualToOrNull'; -import MonitorSteps from './Monitor/MonitorSteps'; -import MonitorStep from './Monitor/MonitorStep'; -import MonitorCriteria from './Monitor/MonitorCriteria'; -import MonitorCriteriaInstance from './Monitor/MonitorCriteriaInstance'; -import NotEqual from './BaseDatabase/NotEqual'; -import Email from './Email'; -import Color from './Color'; -import Domain from './Domain'; -import Version from './Version'; +import Hostname from './API/Hostname'; import Route from './API/Route'; import URL from './API/URL'; -import Search from './BaseDatabase/Search'; +import EqualToOrNull from './BaseDatabase/EqualToOrNull'; import GreaterThan from './BaseDatabase/GreaterThan'; import GreaterThanOrEqual from './BaseDatabase/GreaterThanOrEqual'; +import InBetween from './BaseDatabase/InBetween'; +import Includes from './BaseDatabase/Includes'; +import IsNull from './BaseDatabase/IsNull'; import LessThan from './BaseDatabase/LessThan'; import LessThanOrEqual from './BaseDatabase/LessThanOrEqual'; -import Port from './Port'; -import Hostname from './API/Hostname'; -import HashedString from './HashedString'; -import InBetween from './BaseDatabase/InBetween'; +import NotEqual from './BaseDatabase/NotEqual'; import NotNull from './BaseDatabase/NotNull'; -import IsNull from './BaseDatabase/IsNull'; +import Search from './BaseDatabase/Search'; +import Color from './Color'; import OneUptimeDate from './Date'; -import Includes from './BaseDatabase/Includes'; +import Dictionary from './Dictionary'; +import Domain from './Domain'; +import Email from './Email'; +import HashedString from './HashedString'; +import { ObjectType } from './JSON'; +import MonitorCriteria from './Monitor/MonitorCriteria'; +import MonitorCriteriaInstance from './Monitor/MonitorCriteriaInstance'; +import MonitorStep from './Monitor/MonitorStep'; +import MonitorSteps from './Monitor/MonitorSteps'; +import Name from './Name'; +import ObjectID from './ObjectID'; +import Phone from './Phone'; +import Port from './Port'; +import Version from './Version'; const SerializableObjectDictionary: Dictionary = { [ObjectType.Phone]: Phone, diff --git a/Common/Types/Version.ts b/Common/Types/Version.ts index f146193e81..3de4c2e404 100644 --- a/Common/Types/Version.ts +++ b/Common/Types/Version.ts @@ -1,7 +1,7 @@ -import { FindOperator } from 'typeorm'; import DatabaseProperty from './Database/DatabaseProperty'; import BadDataException from './Exception/BadDataException'; import { JSONObject, ObjectType } from './JSON'; +import { FindOperator } from 'typeorm'; export default class Version extends DatabaseProperty { private _version: string = ''; diff --git a/Common/Types/WebsiteRequest.ts b/Common/Types/WebsiteRequest.ts index 2c28c8757a..e8a854599b 100644 --- a/Common/Types/WebsiteRequest.ts +++ b/Common/Types/WebsiteRequest.ts @@ -1,9 +1,9 @@ -import axios, { AxiosRequestConfig, AxiosResponse } from 'axios'; +import HTTPMethod from './API/HTTPMethod'; import Headers from './API/Headers'; import URL from './API/URL'; -import HTML from './Html'; -import HTTPMethod from './API/HTTPMethod'; import Dictionary from './Dictionary'; +import HTML from './Html'; +import axios, { AxiosRequestConfig, AxiosResponse } from 'axios'; export interface WebsiteResponse { url: URL; diff --git a/Common/Types/Workflow/Components.ts b/Common/Types/Workflow/Components.ts index d26c5f3054..59c2125f89 100644 --- a/Common/Types/Workflow/Components.ts +++ b/Common/Types/Workflow/Components.ts @@ -1,18 +1,17 @@ +import IconProp from '../Icon/IconProp'; import ComponentMetadata, { ComponentCategory } from './Component'; -import LogComponents from './Components/Log'; import APIComponents from './Components/API'; -import ScheduleComponents from './Components/Schedule'; -import SlackComponents from './Components/Slack'; import ConditionComponents from './Components/Condition'; +import EmailComponents from './Components/Email'; import JsonComponents from './Components/JSON'; import JavaScriptComponents from './Components/JavaScript'; -import EmailComponents from './Components/Email'; -import WebhookComponents from './Components/Webhook'; +import LogComponents from './Components/Log'; import ManualComponents from './Components/Manual'; -import WorkflowComponents from './Components/Workflow'; import MicrosoftTeamsComponents from './Components/MicrosoftTeams'; - -import IconProp from '../Icon/IconProp'; +import ScheduleComponents from './Components/Schedule'; +import SlackComponents from './Components/Slack'; +import WebhookComponents from './Components/Webhook'; +import WorkflowComponents from './Components/Workflow'; const components: Array = [ ...LogComponents, diff --git a/Common/Types/Workflow/Components/BaseModel.ts b/Common/Types/Workflow/Components/BaseModel.ts index b3fd35cd2b..1faf7141b0 100644 --- a/Common/Types/Workflow/Components/BaseModel.ts +++ b/Common/Types/Workflow/Components/BaseModel.ts @@ -1,10 +1,10 @@ +import BaseModel from '../../../Models/BaseModel'; import IconProp from '../../Icon/IconProp'; +import Text from '../../Text'; import ComponentMetadata, { ComponentInputType, ComponentType, } from './../Component'; -import BaseModel from '../../../Models/BaseModel'; -import Text from '../../Text'; export default class BaseModelComponent { public static getComponents(model: BaseModel): Array { diff --git a/Common/Types/Workflow/Components/Webhook.ts b/Common/Types/Workflow/Components/Webhook.ts index f8c92da93d..c087e62120 100644 --- a/Common/Types/Workflow/Components/Webhook.ts +++ b/Common/Types/Workflow/Components/Webhook.ts @@ -1,10 +1,10 @@ +import Route from '../../API/Route'; import IconProp from '../../Icon/IconProp'; +import ComponentID from '../ComponentID'; import ComponentMetadata, { ComponentInputType, ComponentType, } from './../Component'; -import ComponentID from '../ComponentID'; -import Route from '../../API/Route'; const components: Array = [ { diff --git a/Common/Types/XML.ts b/Common/Types/XML.ts index 2ecbc181fc..4555faea9b 100644 --- a/Common/Types/XML.ts +++ b/Common/Types/XML.ts @@ -1,4 +1,5 @@ import BadDataException from './Exception/BadDataException'; + export default class XML { private _xml: string = ''; public get xml(): string { diff --git a/Common/Utils/API.ts b/Common/Utils/API.ts index cdc728d0da..135ee4cfc8 100644 --- a/Common/Utils/API.ts +++ b/Common/Utils/API.ts @@ -1,17 +1,17 @@ -import axios, { AxiosError, AxiosResponse } from 'axios'; -import URL from '../Types/API/URL'; -import { JSONObject, JSONArray } from '../Types/JSON'; -import Headers from '../Types/API/Headers'; -import HTTPResponse from '../Types/API/HTTPResponse'; +import AnalyticsBaseModel from '../AnalyticsModels/BaseModel'; +import BaseModel from '../Models/BaseModel'; import HTTPErrorResponse from '../Types/API/HTTPErrorResponse'; import HTTPMethod from '../Types/API/HTTPMethod'; -import APIException from '../Types/Exception/ApiException'; -import Protocol from '../Types/API/Protocol'; +import HTTPResponse from '../Types/API/HTTPResponse'; +import Headers from '../Types/API/Headers'; import Hostname from '../Types/API/Hostname'; +import Protocol from '../Types/API/Protocol'; import Route from '../Types/API/Route'; -import BaseModel from '../Models/BaseModel'; +import URL from '../Types/API/URL'; import Dictionary from '../Types/Dictionary'; -import AnalyticsBaseModel from '../AnalyticsModels/BaseModel'; +import APIException from '../Types/Exception/ApiException'; +import { JSONArray, JSONObject } from '../Types/JSON'; +import axios, { AxiosError, AxiosResponse } from 'axios'; export default class API { private _protocol: Protocol = Protocol.HTTPS; diff --git a/Common/Utils/Faker.ts b/Common/Utils/Faker.ts index 9515f4172a..6189eb1edb 100644 --- a/Common/Utils/Faker.ts +++ b/Common/Utils/Faker.ts @@ -1,7 +1,7 @@ -import { faker } from '@faker-js/faker'; import Email from '../Types/Email'; import Name from '../Types/Name'; import Phone from '../Types/Phone'; +import { faker } from '@faker-js/faker'; export default class Faker { public static generateName(): string { diff --git a/Common/Utils/Slug.ts b/Common/Utils/Slug.ts index d47bacd12d..de3e3c22b5 100644 --- a/Common/Utils/Slug.ts +++ b/Common/Utils/Slug.ts @@ -1,5 +1,5 @@ -import slugify from 'slugify'; import Faker from './Faker'; +import slugify from 'slugify'; export default class Slug { public static getSlug(name: string | null): string { diff --git a/CommonServer/API/BaseAPI.ts b/CommonServer/API/BaseAPI.ts index 31bb8f23d6..1a6c98ea3f 100644 --- a/CommonServer/API/BaseAPI.ts +++ b/CommonServer/API/BaseAPI.ts @@ -1,5 +1,10 @@ -import BaseModel from 'Common/Models/BaseModel'; +import UserMiddleware from '../Middleware/UserAuthorization'; import DatabaseService from '../Services/DatabaseService'; +import CreateBy from '../Types/Database/CreateBy'; +import GroupBy from '../Types/Database/GroupBy'; +import Query from '../Types/Database/Query'; +import Select from '../Types/Database/Select'; +import Sort from '../Types/Database/Sort'; import Express, { ExpressRequest, ExpressResponse, @@ -7,26 +12,21 @@ import Express, { NextFunction, OneUptimeRequest, } from '../Utils/Express'; -import UserMiddleware from '../Middleware/UserAuthorization'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; import Response from '../Utils/Response'; -import ObjectID from 'Common/Types/ObjectID'; -import { JSONObject } from 'Common/Types/JSON'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import CreateBy from '../Types/Database/CreateBy'; +import CommonAPI from './CommonAPI'; +import BaseModel from 'Common/Models/BaseModel'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from '../Types/Database/Query'; -import Select from '../Types/Database/Select'; -import Sort from '../Types/Database/Sort'; import { DEFAULT_LIMIT, LIMIT_PER_PROJECT, } from 'Common/Types/Database/LimitMax'; import PartialEntity from 'Common/Types/Database/PartialEntity'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; import { UserPermission } from 'Common/Types/Permission'; -import CommonAPI from './CommonAPI'; -import GroupBy from '../Types/Database/GroupBy'; +import PositiveNumber from 'Common/Types/PositiveNumber'; export default class BaseAPI< TBaseModel extends BaseModel, diff --git a/CommonServer/API/BaseAnalyticsAPI.ts b/CommonServer/API/BaseAnalyticsAPI.ts index 34b4253a21..caaeb7e21a 100644 --- a/CommonServer/API/BaseAnalyticsAPI.ts +++ b/CommonServer/API/BaseAnalyticsAPI.ts @@ -1,3 +1,10 @@ +import UserMiddleware from '../Middleware/UserAuthorization'; +import AnalyticsDatabaseService from '../Services/AnalyticsDatabaseService'; +import CreateBy from '../Types/AnalyticsDatabase/CreateBy'; +import GroupBy from '../Types/AnalyticsDatabase/GroupBy'; +import Query from '../Types/AnalyticsDatabase/Query'; +import Select from '../Types/AnalyticsDatabase/Select'; +import Sort from '../Types/AnalyticsDatabase/Sort'; import Express, { ExpressRequest, ExpressResponse, @@ -5,27 +12,20 @@ import Express, { NextFunction, OneUptimeRequest, } from '../Utils/Express'; -import UserMiddleware from '../Middleware/UserAuthorization'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; import Response from '../Utils/Response'; -import ObjectID from 'Common/Types/ObjectID'; -import { JSONObject } from 'Common/Types/JSON'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import CreateBy from '../Types/AnalyticsDatabase/CreateBy'; +import CommonAPI from './CommonAPI'; +import AnalyticsDataModel from 'Common/AnalyticsModels/BaseModel'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from '../Types/AnalyticsDatabase/Query'; -import Select from '../Types/AnalyticsDatabase/Select'; -import Sort from '../Types/AnalyticsDatabase/Sort'; import { DEFAULT_LIMIT, LIMIT_PER_PROJECT, } from 'Common/Types/Database/LimitMax'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; import { UserPermission } from 'Common/Types/Permission'; -import AnalyticsDataModel from 'Common/AnalyticsModels/BaseModel'; -import AnalyticsDatabaseService from '../Services/AnalyticsDatabaseService'; -import CommonAPI from './CommonAPI'; -import GroupBy from '../Types/AnalyticsDatabase/GroupBy'; +import PositiveNumber from 'Common/Types/PositiveNumber'; export default class BaseAnalyticsAPI< TAnalyticsDataModel extends AnalyticsDataModel, diff --git a/CommonServer/API/BillingInvoiceAPI.ts b/CommonServer/API/BillingInvoiceAPI.ts index 20497583af..d1849dc542 100644 --- a/CommonServer/API/BillingInvoiceAPI.ts +++ b/CommonServer/API/BillingInvoiceAPI.ts @@ -1,8 +1,3 @@ -import BadDataException from 'Common/Types/Exception/BadDataException'; -import { JSONObject } from 'Common/Types/JSON'; -import Permission, { UserPermission } from 'Common/Types/Permission'; -import BillingInvoice, { InvoiceStatus } from 'Model/Models/BillingInvoice'; -import Project from 'Model/Models/Project'; import { IsBillingEnabled } from '../EnvironmentConfig'; import UserMiddleware from '../Middleware/UserAuthorization'; import BillingInvoiceService, { @@ -17,8 +12,13 @@ import { } from '../Utils/Express'; import Response from '../Utils/Response'; import BaseAPI from './BaseAPI'; -import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; import BaseModel from 'Common/Models/BaseModel'; +import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import Permission, { UserPermission } from 'Common/Types/Permission'; +import BillingInvoice, { InvoiceStatus } from 'Model/Models/BillingInvoice'; +import Project from 'Model/Models/Project'; export default class UserAPI extends BaseAPI< BillingInvoice, diff --git a/CommonServer/API/BillingPaymentMethodAPI.ts b/CommonServer/API/BillingPaymentMethodAPI.ts index fabd94d6d4..48a76ba4c4 100644 --- a/CommonServer/API/BillingPaymentMethodAPI.ts +++ b/CommonServer/API/BillingPaymentMethodAPI.ts @@ -1,7 +1,3 @@ -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Permission, { UserPermission } from 'Common/Types/Permission'; -import BillingPaymentMethod from 'Model/Models/BillingPaymentMethod'; -import Project from 'Model/Models/Project'; import { IsBillingEnabled } from '../EnvironmentConfig'; import UserMiddleware from '../Middleware/UserAuthorization'; import BillingPaymentMethodService, { @@ -16,6 +12,10 @@ import { } from '../Utils/Express'; import Response from '../Utils/Response'; import BaseAPI from './BaseAPI'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import Permission, { UserPermission } from 'Common/Types/Permission'; +import BillingPaymentMethod from 'Model/Models/BillingPaymentMethod'; +import Project from 'Model/Models/Project'; export default class UserAPI extends BaseAPI< BillingPaymentMethod, diff --git a/CommonServer/API/CommonAPI.ts b/CommonServer/API/CommonAPI.ts index e2ded6907e..fb8ac56a70 100644 --- a/CommonServer/API/CommonAPI.ts +++ b/CommonServer/API/CommonAPI.ts @@ -1,9 +1,9 @@ import { IsBillingEnabled } from '../EnvironmentConfig'; import ProjectService from '../Services/ProjectService'; -import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; -import UserType from 'Common/Types/UserType'; import { ExpressRequest, OneUptimeRequest } from '../Utils/Express'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; +import UserType from 'Common/Types/UserType'; export default class CommonAPI { public static async getDatabaseCommonInteractionProps( diff --git a/CommonServer/API/FileAPI.ts b/CommonServer/API/FileAPI.ts index afb502ed99..16db78d9b8 100644 --- a/CommonServer/API/FileAPI.ts +++ b/CommonServer/API/FileAPI.ts @@ -1,16 +1,16 @@ +import FileService, { + Service as FileServiceType, +} from '../Services/FileService'; import { ExpressRequest, ExpressResponse, NextFunction, } from '../Utils/Express'; import Response from '../Utils/Response'; -import FileService, { - Service as FileServiceType, -} from '../Services/FileService'; import BaseAPI from './BaseAPI'; +import NotFoundException from 'Common/Types/Exception/NotFoundException'; import ObjectID from 'Common/Types/ObjectID'; import File from 'Model/Models/File'; -import NotFoundException from 'Common/Types/Exception/NotFoundException'; export default class FileAPI extends BaseAPI { public constructor() { diff --git a/CommonServer/API/GlobalConfigAPI.ts b/CommonServer/API/GlobalConfigAPI.ts index 2eaca99120..af0b1950f8 100644 --- a/CommonServer/API/GlobalConfigAPI.ts +++ b/CommonServer/API/GlobalConfigAPI.ts @@ -1,4 +1,3 @@ -import GlobalConfig from 'Model/Models/GlobalConfig'; import GlobalConfigService, { Service as GlobalConfigServiceType, } from '../Services/GlobalConfigService'; @@ -9,6 +8,8 @@ import { } from '../Utils/Express'; import Response from '../Utils/Response'; import BaseAPI from './BaseAPI'; +import GlobalConfig from 'Model/Models/GlobalConfig'; + // import ObjectID from 'Common/Types/ObjectID'; export default class GlobalConfigAPI extends BaseAPI< diff --git a/CommonServer/API/Index.ts b/CommonServer/API/Index.ts index 5cc2ad253c..1d9a77172d 100644 --- a/CommonServer/API/Index.ts +++ b/CommonServer/API/Index.ts @@ -1,6 +1,6 @@ -import version from './VersionAPI'; -import StatusAPI, { StatusAPIOptions } from './StatusAPI'; import Express, { ExpressApplication } from '../Utils/Express'; +import StatusAPI, { StatusAPIOptions } from './StatusAPI'; +import version from './VersionAPI'; const app: ExpressApplication = Express.getExpressApp(); diff --git a/CommonServer/API/MonitorGroupAPI.ts b/CommonServer/API/MonitorGroupAPI.ts index a286f27a51..dfb60b3f1a 100644 --- a/CommonServer/API/MonitorGroupAPI.ts +++ b/CommonServer/API/MonitorGroupAPI.ts @@ -1,4 +1,4 @@ -import MonitorGroup from 'Model/Models/MonitorGroup'; +import UserMiddleware from '../Middleware/UserAuthorization'; import MonitorGroupService, { Service as MonitorGroupServiceType, } from '../Services/MonitorGroupService'; @@ -9,13 +9,13 @@ import { } from '../Utils/Express'; import Response from '../Utils/Response'; import BaseAPI from './BaseAPI'; -import ObjectID from 'Common/Types/ObjectID'; -import UserMiddleware from '../Middleware/UserAuthorization'; +import CommonAPI from './CommonAPI'; +import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import MonitorGroup from 'Model/Models/MonitorGroup'; import MonitorStatus from 'Model/Models/MonitorStatus'; import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import OneUptimeDate from 'Common/Types/Date'; -import CommonAPI from './CommonAPI'; export default class MonitorGroupAPI extends BaseAPI< MonitorGroup, diff --git a/CommonServer/API/NotificationAPI.ts b/CommonServer/API/NotificationAPI.ts index ed77df1667..cb0361e60d 100644 --- a/CommonServer/API/NotificationAPI.ts +++ b/CommonServer/API/NotificationAPI.ts @@ -1,17 +1,17 @@ +import UserMiddleware from '../Middleware/UserAuthorization'; +import NotificationService from '../Services/NotificationService'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, OneUptimeRequest, } from '../Utils/Express'; -import UserMiddleware from '../Middleware/UserAuthorization'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Response from '../Utils/Response'; -import NotificationService from '../Services/NotificationService'; -import ObjectID from 'Common/Types/ObjectID'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import Permission, { UserPermission } from 'Common/Types/Permission'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import Exception from 'Common/Types/Exception/Exception'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import Permission, { UserPermission } from 'Common/Types/Permission'; import PositiveNumber from 'Common/Types/PositiveNumber'; const router: ExpressRouter = Express.getRouter(); diff --git a/CommonServer/API/ProbeAPI.ts b/CommonServer/API/ProbeAPI.ts index d6675f8978..60b367a5c1 100644 --- a/CommonServer/API/ProbeAPI.ts +++ b/CommonServer/API/ProbeAPI.ts @@ -1,4 +1,3 @@ -import Probe from 'Model/Models/Probe'; import UserMiddleware from '../Middleware/UserAuthorization'; import ProbeService, { Service as ProbeServiceType, @@ -12,6 +11,7 @@ import Response from '../Utils/Response'; import BaseAPI from './BaseAPI'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Probe from 'Model/Models/Probe'; export default class Ingestor extends BaseAPI { public constructor() { diff --git a/CommonServer/API/ProjectAPI.ts b/CommonServer/API/ProjectAPI.ts index 9db799a602..0bd186584a 100644 --- a/CommonServer/API/ProjectAPI.ts +++ b/CommonServer/API/ProjectAPI.ts @@ -1,23 +1,23 @@ -import Project from 'Model/Models/Project'; +import UserMiddleware from '../Middleware/UserAuthorization'; import ProjectService, { Service as ProjectServiceType, } from '../Services/ProjectService'; -import BaseAPI from './BaseAPI'; -import UserMiddleware from '../Middleware/UserAuthorization'; +import ResellerService from '../Services/ResellerService'; +import TeamMemberService from '../Services/TeamMemberService'; import { ExpressRequest, ExpressResponse, NextFunction, OneUptimeRequest, } from '../Utils/Express'; -import TeamMemberService from '../Services/TeamMemberService'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import PositiveNumber from 'Common/Types/PositiveNumber'; import Response from '../Utils/Response'; -import TeamMember from 'Model/Models/TeamMember'; +import BaseAPI from './BaseAPI'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; -import ResellerService from '../Services/ResellerService'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Project from 'Model/Models/Project'; import Reseller from 'Model/Models/Reseller'; +import TeamMember from 'Model/Models/TeamMember'; export default class ProjectAPI extends BaseAPI { public constructor() { diff --git a/CommonServer/API/ProjectSSO.ts b/CommonServer/API/ProjectSSO.ts index 545e36a022..e3e754db71 100644 --- a/CommonServer/API/ProjectSSO.ts +++ b/CommonServer/API/ProjectSSO.ts @@ -1,15 +1,14 @@ -import ObjectID from 'Common/Types/ObjectID'; -import { ExpressRequest, ExpressResponse } from '../Utils/Express'; -import BaseAPI from './BaseAPI'; -import Response from '../Utils/Response'; -import BadDataException from 'Common/Types/Exception/BadDataException'; - -import ProjectSSO from 'Model/Models/ProjectSso'; import ProjectSsoService, { Service as ProjectSsoServiceType, } from '../Services/ProjectSsoService'; +import { ExpressRequest, ExpressResponse } from '../Utils/Express'; +import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import ProjectSSO from 'Model/Models/ProjectSso'; export default class ProjectSsoAPI extends BaseAPI< ProjectSSO, diff --git a/CommonServer/API/ResellerPlanAPI.ts b/CommonServer/API/ResellerPlanAPI.ts index abeb0eea5a..2714560c65 100644 --- a/CommonServer/API/ResellerPlanAPI.ts +++ b/CommonServer/API/ResellerPlanAPI.ts @@ -1,27 +1,27 @@ -import ResellerPlan from 'Model/Models/ResellerPlan'; +import DatabaseConfig from '../DatabaseConfig'; +import BearerTokenAuthorization from '../Middleware/BearerTokenAuthorization'; +import BillingService from '../Services/BillingService'; +import ProjectService from '../Services/ProjectService'; +import PromoCodeService from '../Services/PromoCodeService'; import ResellerPlanService, { Service as ResellerPlanServiceType, } from '../Services/ResellerPlanService'; -import BaseAPI from './BaseAPI'; import { ExpressRequest, ExpressResponse, NextFunction, } from '../Utils/Express'; -import BearerTokenAuthorization from '../Middleware/BearerTokenAuthorization'; +import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; +import StatusCode from 'Common/Types/API/StatusCode'; +import URL from 'Common/Types/API/URL'; +import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; import Email from 'Common/Types/Email'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import BillingService from '../Services/BillingService'; -import Response from '../Utils/Response'; -import URL from 'Common/Types/API/URL'; -import PromoCode from 'Model/Models/PromoCode'; -import PromoCodeService from '../Services/PromoCodeService'; -import StatusCode from 'Common/Types/API/StatusCode'; -import Project from 'Model/Models/Project'; -import ProjectService from '../Services/ProjectService'; -import DatabaseConfig from '../DatabaseConfig'; -import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; import ObjectID from 'Common/Types/ObjectID'; +import Project from 'Model/Models/Project'; +import PromoCode from 'Model/Models/PromoCode'; +import ResellerPlan from 'Model/Models/ResellerPlan'; export default class ResellerPlanAPI extends BaseAPI< ResellerPlan, diff --git a/CommonServer/API/ShortLinkAPI.ts b/CommonServer/API/ShortLinkAPI.ts index e2fb93cce0..7a7aff76a4 100644 --- a/CommonServer/API/ShortLinkAPI.ts +++ b/CommonServer/API/ShortLinkAPI.ts @@ -1,11 +1,11 @@ -import { ExpressRequest, ExpressResponse } from '../Utils/Express'; -import Response from '../Utils/Response'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import ShortLinkService, { Service as ShortLinkServiceType, } from '../Services/ShortLinkService'; -import ShortLink from 'Model/Models/ShortLink'; +import { ExpressRequest, ExpressResponse } from '../Utils/Express'; +import Response from '../Utils/Response'; import BaseAPI from './BaseAPI'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ShortLink from 'Model/Models/ShortLink'; export default class ShortLinkAPI extends BaseAPI< ShortLink, diff --git a/CommonServer/API/StatusAPI.ts b/CommonServer/API/StatusAPI.ts index 3061099cd9..1e098b3464 100644 --- a/CommonServer/API/StatusAPI.ts +++ b/CommonServer/API/StatusAPI.ts @@ -1,13 +1,13 @@ +import LocalCache from '../Infrastructure/LocalCache'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from '../Utils/Express'; -import LocalCache from '../Infrastructure/LocalCache'; -import Response from '../Utils/Response'; -import ServerException from 'Common/Types/Exception/ServerException'; import logger from '../Utils/Logger'; +import Response from '../Utils/Response'; import Exception from 'Common/Types/Exception/Exception'; +import ServerException from 'Common/Types/Exception/ServerException'; export interface StatusAPIOptions { readyCheck: () => Promise; diff --git a/CommonServer/API/StatusPageAPI.ts b/CommonServer/API/StatusPageAPI.ts index afda51b733..e7825e33cf 100644 --- a/CommonServer/API/StatusPageAPI.ts +++ b/CommonServer/API/StatusPageAPI.ts @@ -1,79 +1,79 @@ -import ObjectID from 'Common/Types/ObjectID'; -import StatusPage from 'Model/Models/StatusPage'; import UserMiddleware from '../Middleware/UserAuthorization'; +import AcmeChallengeService from '../Services/AcmeChallengeService'; +import IncidentPublicNoteService from '../Services/IncidentPublicNoteService'; +import IncidentService from '../Services/IncidentService'; +import IncidentStateService from '../Services/IncidentStateService'; +import IncidentStateTimelineService from '../Services/IncidentStateTimelineService'; +import MonitorGroupResourceService from '../Services/MonitorGroupResourceService'; +import MonitorGroupService from '../Services/MonitorGroupService'; +import MonitorStatusService from '../Services/MonitorStatusService'; +import MonitorStatusTimelineService from '../Services/MonitorStatusTimelineService'; +import ScheduledMaintenancePublicNoteService from '../Services/ScheduledMaintenancePublicNoteService'; +import ScheduledMaintenanceService from '../Services/ScheduledMaintenanceService'; +import ScheduledMaintenanceStateService from '../Services/ScheduledMaintenanceStateService'; +import ScheduledMaintenanceStateTimelineService from '../Services/ScheduledMaintenanceStateTimelineService'; +import StatusPageAnnouncementService from '../Services/StatusPageAnnouncementService'; +import StatusPageDomainService from '../Services/StatusPageDomainService'; +import StatusPageFooterLinkService from '../Services/StatusPageFooterLinkService'; +import StatusPageGroupService from '../Services/StatusPageGroupService'; +import StatusPageHeaderLinkService from '../Services/StatusPageHeaderLinkService'; +import StatusPageHistoryChartBarColorRuleService from '../Services/StatusPageHistoryChartBarColorRuleService'; +import StatusPageResourceService from '../Services/StatusPageResourceService'; import StatusPageService, { Service as StatusPageServiceType, } from '../Services/StatusPageService'; +import StatusPageSsoService from '../Services/StatusPageSsoService'; +import StatusPageSubscriberService from '../Services/StatusPageSubscriberService'; +import Query from '../Types/Database/Query'; +import QueryHelper from '../Types/Database/QueryHelper'; import Select from '../Types/Database/Select'; import { ExpressRequest, ExpressResponse, NextFunction, } from '../Utils/Express'; -import BaseAPI from './BaseAPI'; +import logger from '../Utils/Logger'; import Response from '../Utils/Response'; -import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import StatusPageFooterLinkService from '../Services/StatusPageFooterLinkService'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import StatusPageFooterLink from 'Model/Models/StatusPageFooterLink'; -import StatusPageHeaderLinkService from '../Services/StatusPageHeaderLinkService'; -import StatusPageHeaderLink from 'Model/Models/StatusPageHeaderLink'; -import StatusPageDomain from 'Model/Models/StatusPageDomain'; -import StatusPageDomainService from '../Services/StatusPageDomainService'; -import { JSONObject } from 'Common/Types/JSON'; -import StatusPageGroup from 'Model/Models/StatusPageGroup'; -import StatusPageGroupService from '../Services/StatusPageGroupService'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import StatusPageResourceService from '../Services/StatusPageResourceService'; -import MonitorStatusService from '../Services/MonitorStatusService'; -import OneUptimeDate from 'Common/Types/Date'; -import MonitorStatusTimelineService from '../Services/MonitorStatusTimelineService'; -import QueryHelper from '../Types/Database/QueryHelper'; +import BaseAPI from './BaseAPI'; +import CommonAPI from './CommonAPI'; +import BaseModel from 'Common/Models/BaseModel'; +import ArrayUtil from 'Common/Types/ArrayUtil'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import IncidentService from '../Services/IncidentService'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; +import NotFoundException from 'Common/Types/Exception/NotFoundException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import Phone from 'Common/Types/Phone'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import AcmeChallenge from 'Model/Models/AcmeChallenge'; +import Incident from 'Model/Models/Incident'; import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; -import IncidentPublicNoteService from '../Services/IncidentPublicNoteService'; -import StatusPageAnnouncementService from '../Services/StatusPageAnnouncementService'; -import ScheduledMaintenanceService from '../Services/ScheduledMaintenanceService'; -import ScheduledMaintenancePublicNoteService from '../Services/ScheduledMaintenancePublicNoteService'; -import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; +import IncidentState from 'Model/Models/IncidentState'; +import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; +import MonitorGroupResource from 'Model/Models/MonitorGroupResource'; import MonitorStatus from 'Model/Models/MonitorStatus'; import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import Incident from 'Model/Models/Incident'; -import StatusPageAnnouncement from 'Model/Models/StatusPageAnnouncement'; import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from '../Services/IncidentStateTimelineService'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; -import ScheduledMaintenanceStateTimelineService from '../Services/ScheduledMaintenanceStateTimelineService'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from '../Types/Database/Query'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import NotFoundException from 'Common/Types/Exception/NotFoundException'; -import logger from '../Utils/Logger'; -import Email from 'Common/Types/Email'; -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; -import StatusPageSubscriberService from '../Services/StatusPageSubscriberService'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import StatusPageSsoService from '../Services/StatusPageSsoService'; -import StatusPageSSO from 'Model/Models/StatusPageSso'; -import ArrayUtil from 'Common/Types/ArrayUtil'; -import Dictionary from 'Common/Types/Dictionary'; -import MonitorGroupService from '../Services/MonitorGroupService'; -import MonitorGroupResource from 'Model/Models/MonitorGroupResource'; -import MonitorGroupResourceService from '../Services/MonitorGroupResourceService'; -import IncidentState from 'Model/Models/IncidentState'; -import IncidentStateService from '../Services/IncidentStateService'; +import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import ScheduledMaintenanceStateService from '../Services/ScheduledMaintenanceStateService'; -import BaseModel from 'Common/Models/BaseModel'; -import CommonAPI from './CommonAPI'; -import Phone from 'Common/Types/Phone'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageAnnouncement from 'Model/Models/StatusPageAnnouncement'; +import StatusPageDomain from 'Model/Models/StatusPageDomain'; +import StatusPageFooterLink from 'Model/Models/StatusPageFooterLink'; +import StatusPageGroup from 'Model/Models/StatusPageGroup'; +import StatusPageHeaderLink from 'Model/Models/StatusPageHeaderLink'; import StatusPageHistoryChartBarColorRule from 'Model/Models/StatusPageHistoryChartBarColorRule'; -import StatusPageHistoryChartBarColorRuleService from '../Services/StatusPageHistoryChartBarColorRuleService'; -import AcmeChallenge from 'Model/Models/AcmeChallenge'; -import AcmeChallengeService from '../Services/AcmeChallengeService'; +import StatusPageResource from 'Model/Models/StatusPageResource'; +import StatusPageSSO from 'Model/Models/StatusPageSso'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; export default class StatusPageAPI extends BaseAPI< StatusPage, diff --git a/CommonServer/API/StatusPageDomainAPI.ts b/CommonServer/API/StatusPageDomainAPI.ts index 8c6b18d3a4..3fe9241ad4 100644 --- a/CommonServer/API/StatusPageDomainAPI.ts +++ b/CommonServer/API/StatusPageDomainAPI.ts @@ -1,5 +1,5 @@ -import StatusPageDomain from 'Model/Models/StatusPageDomain'; -import BaseAPI from './BaseAPI'; +import { StatusPageCNameRecord } from '../EnvironmentConfig'; +import UserMiddleware from '../Middleware/UserAuthorization'; import StatusPageDomainService, { Service as StatusPageDomainServiceType, } from '../Services/StatusPageDomainService'; @@ -8,15 +8,15 @@ import { ExpressResponse, NextFunction, } from '../Utils/Express'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Response from '../Utils/Response'; -import ObjectID from 'Common/Types/ObjectID'; -import UserMiddleware from '../Middleware/UserAuthorization'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import CommonAPI from './CommonAPI'; import logger from '../Utils/Logger'; +import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; +import CommonAPI from './CommonAPI'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import { StatusPageCNameRecord } from '../EnvironmentConfig'; +import StatusPageDomain from 'Model/Models/StatusPageDomain'; export default class StatusPageDomainAPI extends BaseAPI< StatusPageDomain, diff --git a/CommonServer/API/StatusPageSubscriberAPI.ts b/CommonServer/API/StatusPageSubscriberAPI.ts index 7d2ec1d6e4..df1230e2b5 100644 --- a/CommonServer/API/StatusPageSubscriberAPI.ts +++ b/CommonServer/API/StatusPageSubscriberAPI.ts @@ -1,4 +1,3 @@ -import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; import StatusPageSubscriberService, { Service as StatusPageSubscriberServiceType, } from '../Services/StatusPageSubscriberService'; @@ -7,8 +6,9 @@ import { ExpressResponse, NextFunction, } from '../Utils/Express'; -import BaseAPI from './BaseAPI'; import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; +import StatusPageSubscriber from 'Model/Models/StatusPageSubscriber'; export default class StatusPageSubscriberAPI extends BaseAPI< StatusPageSubscriber, diff --git a/CommonServer/API/UserAPI.ts b/CommonServer/API/UserAPI.ts index 74f9698d3f..aeee65878c 100644 --- a/CommonServer/API/UserAPI.ts +++ b/CommonServer/API/UserAPI.ts @@ -1,8 +1,8 @@ -import User from 'Model/Models/User'; import UserService, { Service as UserServiceType, } from '../Services/UserService'; import BaseAPI from './BaseAPI'; +import User from 'Model/Models/User'; export default class UserAPI extends BaseAPI { public constructor() { diff --git a/CommonServer/API/UserCallAPI.ts b/CommonServer/API/UserCallAPI.ts index 0d2130f195..6292d4ff83 100644 --- a/CommonServer/API/UserCallAPI.ts +++ b/CommonServer/API/UserCallAPI.ts @@ -1,16 +1,16 @@ -import UserCall from 'Model/Models/UserCall'; +import UserMiddleware from '../Middleware/UserAuthorization'; import UserCallService, { Service as UserCallServiceType, } from '../Services/UserCallService'; -import BaseAPI from './BaseAPI'; -import UserMiddleware from '../Middleware/UserAuthorization'; import { ExpressRequest, ExpressResponse, OneUptimeRequest, } from '../Utils/Express'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import UserCall from 'Model/Models/UserCall'; import UserSMS from 'Model/Models/UserSMS'; export default class UserCallAPI extends BaseAPI< diff --git a/CommonServer/API/UserEmailAPI.ts b/CommonServer/API/UserEmailAPI.ts index f83ce304d2..7338d8f67a 100644 --- a/CommonServer/API/UserEmailAPI.ts +++ b/CommonServer/API/UserEmailAPI.ts @@ -1,16 +1,16 @@ -import UserEmail from 'Model/Models/UserEmail'; +import UserMiddleware from '../Middleware/UserAuthorization'; import UserEmailService, { Service as UserEmailServiceType, } from '../Services/UserEmailService'; -import BaseAPI from './BaseAPI'; import { ExpressRequest, ExpressResponse, OneUptimeRequest, } from '../Utils/Express'; -import UserMiddleware from '../Middleware/UserAuthorization'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import UserEmail from 'Model/Models/UserEmail'; export default class UserEmailAPI extends BaseAPI< UserEmail, diff --git a/CommonServer/API/UserOnCallLogTimelineAPI.ts b/CommonServer/API/UserOnCallLogTimelineAPI.ts index ee598e7eb6..26168c6f04 100644 --- a/CommonServer/API/UserOnCallLogTimelineAPI.ts +++ b/CommonServer/API/UserOnCallLogTimelineAPI.ts @@ -1,25 +1,25 @@ -import UserOnCallLogTimeline from 'Model/Models/UserOnCallLogTimeline'; +import DatabaseConfig from '../DatabaseConfig'; +import NotificationMiddleware from '../Middleware/NotificationMiddleware'; import UserOnCallLogTimelineService, { Service as UserNotificationLogTimelineServiceType, } from '../Services/UserOnCallLogTimelineService'; -import BaseAPI from './BaseAPI'; import { ExpressRequest, ExpressResponse, OneUptimeRequest, } from '../Utils/Express'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Response from '../Utils/Response'; -import ObjectID from 'Common/Types/ObjectID'; -import { JSONObject } from 'Common/Types/JSON'; -import NotificationMiddleware from '../Middleware/NotificationMiddleware'; -import OneUptimeDate from 'Common/Types/Date'; -import URL from 'Common/Types/API/URL'; +import BaseAPI from './BaseAPI'; import { DashboardRoute } from 'Common/ServiceRoute'; -import DatabaseConfig from '../DatabaseConfig'; -import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; +import UserOnCallLogTimeline from 'Model/Models/UserOnCallLogTimeline'; export default class UserNotificationLogTimelineAPI extends BaseAPI< UserOnCallLogTimeline, diff --git a/CommonServer/API/UserSmsAPI.ts b/CommonServer/API/UserSmsAPI.ts index c0777a036b..b25e9b82e5 100644 --- a/CommonServer/API/UserSmsAPI.ts +++ b/CommonServer/API/UserSmsAPI.ts @@ -1,16 +1,16 @@ -import UserSMS from 'Model/Models/UserSMS'; +import UserMiddleware from '../Middleware/UserAuthorization'; import UserSMSService, { Service as UserSMSServiceType, } from '../Services/UserSmsService'; -import BaseAPI from './BaseAPI'; -import UserMiddleware from '../Middleware/UserAuthorization'; import { ExpressRequest, ExpressResponse, OneUptimeRequest, } from '../Utils/Express'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Response from '../Utils/Response'; +import BaseAPI from './BaseAPI'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import UserSMS from 'Model/Models/UserSMS'; export default class UserSMSAPI extends BaseAPI { public constructor() { diff --git a/CommonServer/API/VersionAPI.ts b/CommonServer/API/VersionAPI.ts index 1d9b4ab8f7..dd6223a012 100644 --- a/CommonServer/API/VersionAPI.ts +++ b/CommonServer/API/VersionAPI.ts @@ -1,9 +1,10 @@ +import { AppVersion, GitSha } from '../EnvironmentConfig'; import Express, { ExpressRequest, ExpressResponse, ExpressRouter, } from '../Utils/Express'; -import { AppVersion, GitSha } from '../EnvironmentConfig'; + const router: ExpressRouter = Express.getRouter(); router.get('/version', (_req: ExpressRequest, res: ExpressResponse) => { diff --git a/CommonServer/DatabaseConfig.ts b/CommonServer/DatabaseConfig.ts index 5224538644..099f3803d1 100644 --- a/CommonServer/DatabaseConfig.ts +++ b/CommonServer/DatabaseConfig.ts @@ -1,12 +1,12 @@ -import Protocol from 'Common/Types/API/Protocol'; -import ObjectID from 'Common/Types/ObjectID'; -import Hostname from 'Common/Types/API/Hostname'; -import { JSONValue } from 'Common/Types/JSON'; -import URL from 'Common/Types/API/URL'; import GlobalConfigService from './Services/GlobalConfigService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import GlobalConfig from 'Model/Models/GlobalConfig'; import { AccountsRoute, DashboardRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import URL from 'Common/Types/API/URL'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONValue } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import GlobalConfig from 'Model/Models/GlobalConfig'; export default class DatabaseConfig { public static async getFromGlobalConfig(key: string): Promise { diff --git a/CommonServer/EnvironmentConfig.ts b/CommonServer/EnvironmentConfig.ts index 41c51e0521..9891fdc3c3 100644 --- a/CommonServer/EnvironmentConfig.ts +++ b/CommonServer/EnvironmentConfig.ts @@ -1,11 +1,11 @@ +import BillingConfig from './BillingConfig'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import Email from 'Common/Types/Email'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import Port from 'Common/Types/Port'; -import Hostname from 'Common/Types/API/Hostname'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import { JSONObject } from 'Common/Types/JSON'; -import BillingConfig from './BillingConfig'; -import Email from 'Common/Types/Email'; -import Protocol from 'Common/Types/API/Protocol'; export enum ConfigLogLevel { INFO = 'INFO', diff --git a/CommonServer/Infrastructure/ClickhouseDatabase.ts b/CommonServer/Infrastructure/ClickhouseDatabase.ts index 3ee0239249..a3ed917c05 100644 --- a/CommonServer/Infrastructure/ClickhouseDatabase.ts +++ b/CommonServer/Infrastructure/ClickhouseDatabase.ts @@ -1,13 +1,13 @@ import logger from '../Utils/Logger'; import { + ClickHouseClientConfigOptions, dataSourceOptions, testDataSourceOptions, - ClickHouseClientConfigOptions, } from './ClickhouseConfig'; -import Sleep from 'Common/Types/Sleep'; import { ClickHouseClient, PingResult, createClient } from '@clickhouse/client'; -import Stream from 'stream'; import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; +import Sleep from 'Common/Types/Sleep'; +import Stream from 'stream'; export type ClickhouseClient = ClickHouseClient; diff --git a/CommonServer/Infrastructure/GlobalCache.ts b/CommonServer/Infrastructure/GlobalCache.ts index 8391507437..d327f942a7 100644 --- a/CommonServer/Infrastructure/GlobalCache.ts +++ b/CommonServer/Infrastructure/GlobalCache.ts @@ -1,10 +1,10 @@ +import logger from '../Utils/Logger'; +import Redis, { ClientType } from './Redis'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; import { JSONArray, JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import Redis, { ClientType } from './Redis'; -import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; -import OneUptimeDate from 'Common/Types/Date'; -import logger from '../Utils/Logger'; -import BadDataException from 'Common/Types/Exception/BadDataException'; export default abstract class GlobalCache { public static async getJSONObject( diff --git a/CommonServer/Infrastructure/PostgresConfig.ts b/CommonServer/Infrastructure/PostgresConfig.ts index f907659e70..db9c695737 100644 --- a/CommonServer/Infrastructure/PostgresConfig.ts +++ b/CommonServer/Infrastructure/PostgresConfig.ts @@ -1,22 +1,22 @@ -import { DataSource, DataSourceOptions } from 'typeorm'; import { DatabaseHost, DatabaseName, DatabasePassword, DatabasePort, - DatabaseUsername, - DatabaseSslCa, - DatabaseSslKey, - DatabaseSslCert, DatabaseRejectUnauthorized, - ShouldDatabaseSslEnable, + DatabaseSslCa, + DatabaseSslCert, + DatabaseSslKey, + DatabaseUsername, Env, + ShouldDatabaseSslEnable, } from '../EnvironmentConfig'; -import Entities from 'Model/Models/Index'; -import Migrations from 'Model/Migrations/Index'; -import DatabaseType from 'Common/Types/DatabaseType'; import AppEnvironment from 'Common/Types/AppEnvironment'; +import DatabaseType from 'Common/Types/DatabaseType'; import Faker from 'Common/Utils/Faker'; +import Migrations from 'Model/Migrations/Index'; +import Entities from 'Model/Models/Index'; +import { DataSource, DataSourceOptions } from 'typeorm'; export const dataSourceOptions: DataSourceOptions = { type: DatabaseType.Postgres, diff --git a/CommonServer/Infrastructure/PostgresDatabase.ts b/CommonServer/Infrastructure/PostgresDatabase.ts index 95c451f132..2fca6c113b 100644 --- a/CommonServer/Infrastructure/PostgresDatabase.ts +++ b/CommonServer/Infrastructure/PostgresDatabase.ts @@ -1,7 +1,7 @@ -import { DataSource, DataSourceOptions } from 'typeorm'; import logger from '../Utils/Logger'; import { dataSourceOptions, testDataSourceOptions } from './PostgresConfig'; import Sleep from 'Common/Types/Sleep'; +import { DataSource, DataSourceOptions } from 'typeorm'; export default class Database { private dataSource!: DataSource | null; diff --git a/CommonServer/Infrastructure/Queue.ts b/CommonServer/Infrastructure/Queue.ts index c660ca4ae8..dc8611cdfa 100644 --- a/CommonServer/Infrastructure/Queue.ts +++ b/CommonServer/Infrastructure/Queue.ts @@ -1,7 +1,7 @@ -import { Queue as BullQueue, JobsOptions, Job } from 'bullmq'; -import { JSONObject } from 'Common/Types/JSON'; import { RedisHostname, RedisPassword, RedisPort } from '../EnvironmentConfig'; import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; +import { Queue as BullQueue, Job, JobsOptions } from 'bullmq'; export enum QueueName { Workflow = 'Workflow', diff --git a/CommonServer/Infrastructure/QueueWorker.ts b/CommonServer/Infrastructure/QueueWorker.ts index 9295c984b0..23643a6356 100644 --- a/CommonServer/Infrastructure/QueueWorker.ts +++ b/CommonServer/Infrastructure/QueueWorker.ts @@ -1,12 +1,12 @@ -import { Worker } from 'bullmq'; -import TimeoutException from 'Common/Types/Exception/TimeoutException'; import { RedisHostname, RedisPassword, RedisPort } from '../EnvironmentConfig'; import { QueueJob, QueueName } from './Queue'; +import TimeoutException from 'Common/Types/Exception/TimeoutException'; import { PromiseRejectErrorFunction, PromiseVoidFunction, VoidFunction, } from 'Common/Types/FunctionTypes'; +import { Worker } from 'bullmq'; export default class QueueWorker { public static getWorker( diff --git a/CommonServer/Infrastructure/Redis.ts b/CommonServer/Infrastructure/Redis.ts index 042b41b9c9..995bb69be8 100644 --- a/CommonServer/Infrastructure/Redis.ts +++ b/CommonServer/Infrastructure/Redis.ts @@ -1,16 +1,16 @@ -import Sleep from 'Common/Types/Sleep'; -import { Redis as RedisClient, RedisOptions } from 'ioredis'; import { - RedisHostname, - RedisPort, - RedisUsername, - RedisPassword, RedisDb, + RedisHostname, + RedisPassword, + RedisPort, RedisTlsCa, RedisTlsSentinelMode, + RedisUsername, ShouldRedisTlsEnable, } from '../EnvironmentConfig'; import logger from '../Utils/Logger'; +import Sleep from 'Common/Types/Sleep'; +import { Redis as RedisClient, RedisOptions } from 'ioredis'; export type ClientType = RedisClient; diff --git a/CommonServer/Infrastructure/Semaphore.ts b/CommonServer/Infrastructure/Semaphore.ts index 00e1527be6..85e6432810 100644 --- a/CommonServer/Infrastructure/Semaphore.ts +++ b/CommonServer/Infrastructure/Semaphore.ts @@ -1,7 +1,7 @@ -import Dictionary from 'Common/Types/Dictionary'; -import { Mutex } from 'redis-semaphore'; import Redis, { ClientType } from './Redis'; +import Dictionary from 'Common/Types/Dictionary'; import ObjectID from 'Common/Types/ObjectID'; +import { Mutex } from 'redis-semaphore'; export default class Semaphore { private static mutexDictionary: Dictionary = {}; diff --git a/CommonServer/Infrastructure/SocketIO.ts b/CommonServer/Infrastructure/SocketIO.ts index 000b28b360..9450ee6cc5 100644 --- a/CommonServer/Infrastructure/SocketIO.ts +++ b/CommonServer/Infrastructure/SocketIO.ts @@ -1,9 +1,9 @@ -import SocketIO from 'socket.io'; -import http from 'http'; import Express from '../Utils/Express'; import Redis from './Redis'; -import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; import { RealtimeRoute } from 'Common/ServiceRoute'; +import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; +import http from 'http'; +import SocketIO from 'socket.io'; export type Socket = SocketIO.Socket; export type SocketServer = SocketIO.Server; diff --git a/CommonServer/Infrastructure/Status.ts b/CommonServer/Infrastructure/Status.ts index de01e1cc02..51b651c2bb 100644 --- a/CommonServer/Infrastructure/Status.ts +++ b/CommonServer/Infrastructure/Status.ts @@ -1,9 +1,8 @@ // This class checks the status of all the datasources. - -import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; -import Redis from './Redis'; -import { PostgresAppInstance } from './PostgresDatabase'; import { ClickhouseAppInstance } from './ClickhouseDatabase'; +import { PostgresAppInstance } from './PostgresDatabase'; +import Redis from './Redis'; +import DatabaseNotConnectedException from 'Common/Types/Exception/DatabaseNotConnectedException'; export default class InfrastructureStatus { public static async checkStatus(data: { diff --git a/CommonServer/Middleware/BearerTokenAuthorization.ts b/CommonServer/Middleware/BearerTokenAuthorization.ts index deccac67f7..602453cdc8 100644 --- a/CommonServer/Middleware/BearerTokenAuthorization.ts +++ b/CommonServer/Middleware/BearerTokenAuthorization.ts @@ -4,8 +4,8 @@ import { NextFunction, OneUptimeRequest, } from '../Utils/Express'; -import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; import JSONWebToken from '../Utils/JsonWebToken'; +import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; import { JSONObject } from 'Common/Types/JSON'; export default class BearerTokenAuthorization { diff --git a/CommonServer/Middleware/ClusterKeyAuthorization.ts b/CommonServer/Middleware/ClusterKeyAuthorization.ts index de157b3625..a0442ac594 100644 --- a/CommonServer/Middleware/ClusterKeyAuthorization.ts +++ b/CommonServer/Middleware/ClusterKeyAuthorization.ts @@ -4,11 +4,10 @@ import { ExpressResponse, NextFunction, } from '../Utils/Express'; - import Response from '../Utils/Response'; +import Dictionary from 'Common/Types/Dictionary'; import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; -import Dictionary from 'Common/Types/Dictionary'; export default class ClusterKeyAuthorization { public static getClusterKeyHeaders(): Dictionary { diff --git a/CommonServer/Middleware/NotificationMiddleware.ts b/CommonServer/Middleware/NotificationMiddleware.ts index 7bbfa1cf11..de1da64486 100644 --- a/CommonServer/Middleware/NotificationMiddleware.ts +++ b/CommonServer/Middleware/NotificationMiddleware.ts @@ -4,12 +4,11 @@ import { NextFunction, OneUptimeRequest, } from '../Utils/Express'; - +import JSONWebToken from '../Utils/JsonWebToken'; import Response from '../Utils/Response'; +import { OnCallInputRequest } from 'Common/Types/Call/CallRequest'; import BadDataException from 'Common/Types/Exception/BadDataException'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import JSONWebToken from '../Utils/JsonWebToken'; -import { OnCallInputRequest } from 'Common/Types/Call/CallRequest'; import VoiceResponse from 'twilio/lib/twiml/VoiceResponse'; export default class NotificationMiddleware { diff --git a/CommonServer/Middleware/ProjectAuthorization.ts b/CommonServer/Middleware/ProjectAuthorization.ts index fefd1991c3..058f193cbe 100644 --- a/CommonServer/Middleware/ProjectAuthorization.ts +++ b/CommonServer/Middleware/ProjectAuthorization.ts @@ -1,24 +1,23 @@ +import AccessTokenService from '../Services/AccessTokenService'; import ApiKeyService from '../Services/ApiKeyService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; +import GlobalConfigService from '../Services/GlobalConfigService'; +import UserService from '../Services/UserService'; +import QueryHelper from '../Types/Database/QueryHelper'; import { ExpressRequest, ExpressResponse, NextFunction, OneUptimeRequest, } from '../Utils/Express'; - -import ApiKey from 'Model/Models/ApiKey'; import OneUptimeDate from 'Common/Types/Date'; -import UserType from 'Common/Types/UserType'; -import AccessTokenService from '../Services/AccessTokenService'; -import { UserTenantAccessPermission } from 'Common/Types/Permission'; import Dictionary from 'Common/Types/Dictionary'; -import QueryHelper from '../Types/Database/QueryHelper'; -import GlobalConfigService from '../Services/GlobalConfigService'; -import User from 'Model/Models/User'; -import UserService from '../Services/UserService'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import { UserTenantAccessPermission } from 'Common/Types/Permission'; +import UserType from 'Common/Types/UserType'; +import ApiKey from 'Model/Models/ApiKey'; import GlobalConfig from 'Model/Models/GlobalConfig'; +import User from 'Model/Models/User'; export default class ProjectMiddleware { public static getProjectId(req: ExpressRequest): ObjectID | null { diff --git a/CommonServer/Middleware/UserAuthorization.ts b/CommonServer/Middleware/UserAuthorization.ts index 6ee53e0dc7..dac568c3c0 100644 --- a/CommonServer/Middleware/UserAuthorization.ts +++ b/CommonServer/Middleware/UserAuthorization.ts @@ -1,36 +1,36 @@ +import AccessTokenService from '../Services/AccessTokenService'; +import ProjectService from '../Services/ProjectService'; +import UserService from '../Services/UserService'; +import QueryHelper from '../Types/Database/QueryHelper'; +import CookieUtil from '../Utils/Cookie'; import { - ExpressResponse, ExpressRequest, + ExpressResponse, NextFunction, OneUptimeRequest, } from '../Utils/Express'; -import UserService from '../Services/UserService'; -import ProjectMiddleware from './ProjectAuthorization'; import JSONWebToken from '../Utils/JsonWebToken'; -import ObjectID from 'Common/Types/ObjectID'; +import logger from '../Utils/Logger'; +import Response from '../Utils/Response'; +import ProjectMiddleware from './ProjectAuthorization'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import OneUptimeDate from 'Common/Types/Date'; -import UserType from 'Common/Types/UserType'; +import Dictionary from 'Common/Types/Dictionary'; +import Exception from 'Common/Types/Exception/Exception'; +import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; +import SsoAuthorizationException from 'Common/Types/Exception/SsoAuthorizationException'; +import TenantNotFoundException from 'Common/Types/Exception/TenantNotFoundException'; +import HashedString from 'Common/Types/HashedString'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; +import ObjectID from 'Common/Types/ObjectID'; import { UserGlobalAccessPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; -import AccessTokenService from '../Services/AccessTokenService'; -import { JSONObject } from 'Common/Types/JSON'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import HashedString from 'Common/Types/HashedString'; -import Dictionary from 'Common/Types/Dictionary'; +import UserType from 'Common/Types/UserType'; import Project from 'Model/Models/Project'; -import ProjectService from '../Services/ProjectService'; -import QueryHelper from '../Types/Database/QueryHelper'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import Response from '../Utils/Response'; -import TenantNotFoundException from 'Common/Types/Exception/TenantNotFoundException'; -import SsoAuthorizationException from 'Common/Types/Exception/SsoAuthorizationException'; -import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; -import logger from '../Utils/Logger'; -import Exception from 'Common/Types/Exception/Exception'; -import CookieUtil from '../Utils/Cookie'; -import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; export default class UserMiddleware { /* diff --git a/CommonServer/Services/AccessTokenService.ts b/CommonServer/Services/AccessTokenService.ts index 674225b188..f78332fca7 100644 --- a/CommonServer/Services/AccessTokenService.ts +++ b/CommonServer/Services/AccessTokenService.ts @@ -1,21 +1,21 @@ -import ObjectID from 'Common/Types/ObjectID'; -import TeamMemberService from './TeamMemberService'; -import TeamMember from 'Model/Models/TeamMember'; import GlobalCache from '../Infrastructure/GlobalCache'; +import QueryHelper from '../Types/Database/QueryHelper'; +import ApiKeyPermissionService from './ApiKeyPermissionService'; +import BaseService from './BaseService'; +import TeamMemberService from './TeamMemberService'; +import TeamPermissionService from './TeamPermissionService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; import Permission, { UserGlobalAccessPermission, UserPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; -import TeamPermission from 'Model/Models/TeamPermission'; -import TeamPermissionService from './TeamPermissionService'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Label from 'Model/Models/Label'; -import QueryHelper from '../Types/Database/QueryHelper'; import APIKeyPermission from 'Model/Models/ApiKeyPermission'; -import ApiKeyPermissionService from './ApiKeyPermissionService'; -import BaseService from './BaseService'; +import Label from 'Model/Models/Label'; +import TeamMember from 'Model/Models/TeamMember'; +import TeamPermission from 'Model/Models/TeamPermission'; enum PermissionNamespace { GlobalPermission = 'global-permissions', diff --git a/CommonServer/Services/AcmeCertificateService.ts b/CommonServer/Services/AcmeCertificateService.ts index c529c9c8f9..38579dc400 100644 --- a/CommonServer/Services/AcmeCertificateService.ts +++ b/CommonServer/Services/AcmeCertificateService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/AcmeCertificate'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/AcmeCertificate'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/AcmeChallengeService.ts b/CommonServer/Services/AcmeChallengeService.ts index 7525246c91..3e51634762 100644 --- a/CommonServer/Services/AcmeChallengeService.ts +++ b/CommonServer/Services/AcmeChallengeService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/AcmeChallenge'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/AcmeChallenge'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/AnalyticsDatabaseService.ts b/CommonServer/Services/AnalyticsDatabaseService.ts index ff98cd2206..d6dc913a01 100644 --- a/CommonServer/Services/AnalyticsDatabaseService.ts +++ b/CommonServer/Services/AnalyticsDatabaseService.ts @@ -1,13 +1,16 @@ +import { AppApiHostname } from '../EnvironmentConfig'; import ClickhouseDatabase, { ClickhouseAppInstance, ClickhouseClient, } from '../Infrastructure/ClickhouseDatabase'; -import BaseService from './BaseService'; -import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import logger from '../Utils/Logger'; -import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; +import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; +import CountBy from '../Types/AnalyticsDatabase/CountBy'; import CreateBy from '../Types/AnalyticsDatabase/CreateBy'; +import CreateManyBy from '../Types/AnalyticsDatabase/CreateManyBy'; +import DeleteBy from '../Types/AnalyticsDatabase/DeleteBy'; +import FindBy from '../Types/AnalyticsDatabase/FindBy'; +import FindOneBy from '../Types/AnalyticsDatabase/FindOneBy'; +import FindOneByID from '../Types/AnalyticsDatabase/FindOneByID'; import { DatabaseTriggerType, OnCreate, @@ -15,40 +18,37 @@ import { OnFind, OnUpdate, } from '../Types/AnalyticsDatabase/Hooks'; -import Typeof from 'Common/Types/Typeof'; import ModelPermission, { CheckReadPermissionType, } from '../Types/AnalyticsDatabase/ModelPermission'; -import ObjectID from 'Common/Types/ObjectID'; -import Exception from 'Common/Types/Exception/Exception'; -import API from 'Common/Utils/API'; -import URL from 'Common/Types/API/URL'; -import Protocol from 'Common/Types/API/Protocol'; -import { AppApiHostname } from '../EnvironmentConfig'; -import Route from 'Common/Types/API/Route'; -import { WorkflowRoute } from 'Common/ServiceRoute'; -import Text from 'Common/Types/Text'; -import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; -import DeleteBy from '../Types/AnalyticsDatabase/DeleteBy'; -import UpdateBy from '../Types/AnalyticsDatabase/UpdateBy'; -import FindBy from '../Types/AnalyticsDatabase/FindBy'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; import Select from '../Types/AnalyticsDatabase/Select'; -import { ExecResult } from '@clickhouse/client'; -import { Stream } from 'node:stream'; -import StreamUtil from '../Utils/Stream'; -import { JSONObject } from 'Common/Types/JSON'; -import FindOneBy from '../Types/AnalyticsDatabase/FindOneBy'; -import FindOneByID from '../Types/AnalyticsDatabase/FindOneByID'; -import OneUptimeDate from 'Common/Types/Date'; -import CreateManyBy from '../Types/AnalyticsDatabase/CreateManyBy'; -import StatementGenerator from '../Utils/AnalyticsDatabase/StatementGenerator'; -import CountBy from '../Types/AnalyticsDatabase/CountBy'; -import Realtime from '../Utils/Realtime'; -import { ModelEventType } from 'Common/Utils/Realtime'; +import UpdateBy from '../Types/AnalyticsDatabase/UpdateBy'; import { SQL, Statement } from '../Utils/AnalyticsDatabase/Statement'; +import StatementGenerator from '../Utils/AnalyticsDatabase/StatementGenerator'; +import logger from '../Utils/Logger'; +import Realtime from '../Utils/Realtime'; +import StreamUtil from '../Utils/Stream'; +import BaseService from './BaseService'; +import { ExecResult } from '@clickhouse/client'; +import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import { WorkflowRoute } from 'Common/ServiceRoute'; +import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import Exception from 'Common/Types/Exception/Exception'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Text from 'Common/Types/Text'; +import Typeof from 'Common/Types/Typeof'; +import API from 'Common/Utils/API'; +import { ModelEventType } from 'Common/Utils/Realtime'; +import { Stream } from 'node:stream'; export default class AnalyticsDatabaseService< TBaseModel extends AnalyticsBaseModel diff --git a/CommonServer/Services/ApiKeyPermissionService.ts b/CommonServer/Services/ApiKeyPermissionService.ts index c900c8af29..53c8c62637 100644 --- a/CommonServer/Services/ApiKeyPermissionService.ts +++ b/CommonServer/Services/ApiKeyPermissionService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ApiKeyPermission'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ApiKeyPermission'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ApiKeyService.ts b/CommonServer/Services/ApiKeyService.ts index e1aafc6e9b..0144c68f7a 100644 --- a/CommonServer/Services/ApiKeyService.ts +++ b/CommonServer/Services/ApiKeyService.ts @@ -1,9 +1,9 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ApiKey'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; import ObjectID from 'Common/Types/ObjectID'; +import Model from 'Model/Models/ApiKey'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/BillingInvoiceService.ts b/CommonServer/Services/BillingInvoiceService.ts index cb6342b75b..120aafc6d7 100644 --- a/CommonServer/Services/BillingInvoiceService.ts +++ b/CommonServer/Services/BillingInvoiceService.ts @@ -1,14 +1,14 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model, { InvoiceStatus } from 'Model/Models/BillingInvoice'; -import DatabaseService from './DatabaseService'; import FindBy from '../Types/Database/FindBy'; import { OnFind } from '../Types/Database/Hooks'; -import ProjectService from './ProjectService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Project from 'Model/Models/Project'; import BillingService, { Invoice } from './BillingService'; +import DatabaseService from './DatabaseService'; +import ProjectService from './ProjectService'; import URL from 'Common/Types/API/URL'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import Model, { InvoiceStatus } from 'Model/Models/BillingInvoice'; +import Project from 'Model/Models/Project'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/BillingPaymentMethodService.ts b/CommonServer/Services/BillingPaymentMethodService.ts index 75a033c45d..fa4ffb9ba5 100644 --- a/CommonServer/Services/BillingPaymentMethodService.ts +++ b/CommonServer/Services/BillingPaymentMethodService.ts @@ -1,14 +1,14 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/BillingPaymentMethod'; -import DatabaseService from './DatabaseService'; -import { OnDelete, OnFind } from '../Types/Database/Hooks'; -import FindBy from '../Types/Database/FindBy'; -import ProjectService from './ProjectService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Project from 'Model/Models/Project'; -import BillingService, { PaymentMethod } from './BillingService'; import DeleteBy from '../Types/Database/DeleteBy'; +import FindBy from '../Types/Database/FindBy'; +import { OnDelete, OnFind } from '../Types/Database/Hooks'; +import BillingService, { PaymentMethod } from './BillingService'; +import DatabaseService from './DatabaseService'; +import ProjectService from './ProjectService'; import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import Model from 'Model/Models/BillingPaymentMethod'; +import Project from 'Model/Models/Project'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/BillingService.ts b/CommonServer/Services/BillingService.ts index 84270de00d..06d1c3144a 100644 --- a/CommonServer/Services/BillingService.ts +++ b/CommonServer/Services/BillingService.ts @@ -1,20 +1,20 @@ -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import OneUptimeDate from 'Common/Types/Date'; -import APIException from 'Common/Types/Exception/ApiException'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; -import logger from '../Utils/Logger'; -import Stripe from 'stripe'; import { BillingPrivateKey, IsBillingEnabled } from '../EnvironmentConfig'; import ServerMeteredPlan from '../Types/Billing/MeteredPlan/ServerMeteredPlan'; +import Errors from '../Utils/Errors'; +import logger from '../Utils/Logger'; +import BaseService from './BaseService'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; import SubscriptionStatus, { SubscriptionStatusUtil, } from 'Common/Types/Billing/SubscriptionStatus'; -import BaseService from './BaseService'; -import Email from 'Common/Types/Email'; +import OneUptimeDate from 'Common/Types/Date'; import Dictionary from 'Common/Types/Dictionary'; -import Errors from '../Utils/Errors'; +import Email from 'Common/Types/Email'; +import APIException from 'Common/Types/Exception/ApiException'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import ObjectID from 'Common/Types/ObjectID'; +import Stripe from 'stripe'; export type SubscriptionItem = Stripe.SubscriptionItem; diff --git a/CommonServer/Services/CallLogService.ts b/CommonServer/Services/CallLogService.ts index a7700afda8..b2c8425851 100644 --- a/CommonServer/Services/CallLogService.ts +++ b/CommonServer/Services/CallLogService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/CallLog'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/CallLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/CallService.ts b/CommonServer/Services/CallService.ts index 5f0e5e804e..3eba6c49bc 100644 --- a/CommonServer/Services/CallService.ts +++ b/CommonServer/Services/CallService.ts @@ -1,16 +1,16 @@ +import { AppApiHostname } from '../EnvironmentConfig'; +import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; +import BaseService from './BaseService'; import EmptyResponseData from 'Common/Types/API/EmptyResponse'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import Protocol from 'Common/Types/API/Protocol'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; -import { JSONObject } from 'Common/Types/JSON'; -import API from 'Common/Utils/API'; -import { AppApiHostname } from '../EnvironmentConfig'; -import Protocol from 'Common/Types/API/Protocol'; -import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; -import ObjectID from 'Common/Types/ObjectID'; import CallRequest from 'Common/Types/Call/CallRequest'; -import BaseService from './BaseService'; import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import API from 'Common/Utils/API'; export class CallService extends BaseService { public constructor() { diff --git a/CommonServer/Services/DataMigrationService.ts b/CommonServer/Services/DataMigrationService.ts index 8f0f991b90..b7d33cab78 100644 --- a/CommonServer/Services/DataMigrationService.ts +++ b/CommonServer/Services/DataMigrationService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/DataMigration'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/DataMigration'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/DomainService.ts b/CommonServer/Services/DomainService.ts index a03066f112..94ff90b5f7 100644 --- a/CommonServer/Services/DomainService.ts +++ b/CommonServer/Services/DomainService.ts @@ -1,12 +1,12 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Domain'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import Text from 'Common/Types/Text'; +import { OnCreate, OnUpdate } from '../Types/Database/Hooks'; import UpdateBy from '../Types/Database/UpdateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Domain from '../Types/Domain'; +import DatabaseService from './DatabaseService'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import Text from 'Common/Types/Text'; +import Model from 'Model/Models/Domain'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/EmailLogService.ts b/CommonServer/Services/EmailLogService.ts index a564ee1b0e..a743d8884f 100644 --- a/CommonServer/Services/EmailLogService.ts +++ b/CommonServer/Services/EmailLogService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/EmailLog'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/EmailLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/EmailVerificationTokenService.ts b/CommonServer/Services/EmailVerificationTokenService.ts index 8fe87a84ce..d17ad545c5 100644 --- a/CommonServer/Services/EmailVerificationTokenService.ts +++ b/CommonServer/Services/EmailVerificationTokenService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/EmailVerificationToken'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/EmailVerificationToken'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/FileService.ts b/CommonServer/Services/FileService.ts index 849a369a83..b95d26ae80 100644 --- a/CommonServer/Services/FileService.ts +++ b/CommonServer/Services/FileService.ts @@ -1,11 +1,11 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import File from 'Model/Models/File'; -import DatabaseService from './DatabaseService'; -import { OnDelete, OnFind, OnUpdate } from '../Types/Database/Hooks'; -import FindBy from '../Types/Database/FindBy'; import DeleteBy from '../Types/Database/DeleteBy'; -import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; +import FindBy from '../Types/Database/FindBy'; +import { OnDelete, OnFind, OnUpdate } from '../Types/Database/Hooks'; import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; +import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; +import File from 'Model/Models/File'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/GlobalConfigService.ts b/CommonServer/Services/GlobalConfigService.ts index 97d9d4c9e7..20b68b99e0 100644 --- a/CommonServer/Services/GlobalConfigService.ts +++ b/CommonServer/Services/GlobalConfigService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/GlobalConfig'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/GlobalConfig'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/GreenlockCertificateService.ts b/CommonServer/Services/GreenlockCertificateService.ts index 70ea020bd6..abf8ad6c5b 100644 --- a/CommonServer/Services/GreenlockCertificateService.ts +++ b/CommonServer/Services/GreenlockCertificateService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/GreenlockCertificate'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/GreenlockCertificate'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/GreenlockChallengeService.ts b/CommonServer/Services/GreenlockChallengeService.ts index 1a6f4b518e..393d8ffd96 100644 --- a/CommonServer/Services/GreenlockChallengeService.ts +++ b/CommonServer/Services/GreenlockChallengeService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/GreenlockChallenge'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/GreenlockChallenge'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentCustomFieldService.ts b/CommonServer/Services/IncidentCustomFieldService.ts index 9123792d64..2db5b307b2 100644 --- a/CommonServer/Services/IncidentCustomFieldService.ts +++ b/CommonServer/Services/IncidentCustomFieldService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentCustomField'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentCustomField'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentInternalNoteService.ts b/CommonServer/Services/IncidentInternalNoteService.ts index 62536f391c..1d3a4a921f 100644 --- a/CommonServer/Services/IncidentInternalNoteService.ts +++ b/CommonServer/Services/IncidentInternalNoteService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentInternalNote'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentInternalNote'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentNoteTemplateService.ts b/CommonServer/Services/IncidentNoteTemplateService.ts index 5097ca579b..7e97c20dbc 100644 --- a/CommonServer/Services/IncidentNoteTemplateService.ts +++ b/CommonServer/Services/IncidentNoteTemplateService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentNoteTemplate'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentNoteTemplate'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentOwnerTeamService.ts b/CommonServer/Services/IncidentOwnerTeamService.ts index 7dc7e1630a..28521e94a6 100644 --- a/CommonServer/Services/IncidentOwnerTeamService.ts +++ b/CommonServer/Services/IncidentOwnerTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentOwnerTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentOwnerTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentOwnerUserService.ts b/CommonServer/Services/IncidentOwnerUserService.ts index cdfa587c37..8f177bbaf9 100644 --- a/CommonServer/Services/IncidentOwnerUserService.ts +++ b/CommonServer/Services/IncidentOwnerUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentOwnerUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentOwnerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentPublicNoteService.ts b/CommonServer/Services/IncidentPublicNoteService.ts index c8f412c234..532b8f9fd3 100644 --- a/CommonServer/Services/IncidentPublicNoteService.ts +++ b/CommonServer/Services/IncidentPublicNoteService.ts @@ -1,9 +1,9 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentPublicNote'; -import DatabaseService from './DatabaseService'; import CreateBy from '../Types/Database/CreateBy'; import { OnCreate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; import OneUptimeDate from 'Common/Types/Date'; +import Model from 'Model/Models/IncidentPublicNote'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentService.ts b/CommonServer/Services/IncidentService.ts index 02c4431570..78b35fa368 100644 --- a/CommonServer/Services/IncidentService.ts +++ b/CommonServer/Services/IncidentService.ts @@ -1,39 +1,39 @@ +import DatabaseConfig from '../DatabaseConfig'; import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Incident'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from './MonitorService'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from './IncidentStateTimelineService'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import IncidentState from 'Model/Models/IncidentState'; -import IncidentStateService from './IncidentStateService'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import DatabaseService from './DatabaseService'; import IncidentOwnerTeamService from './IncidentOwnerTeamService'; +import IncidentOwnerUserService from './IncidentOwnerUserService'; +import IncidentStateService from './IncidentStateService'; +import IncidentStateTimelineService from './IncidentStateTimelineService'; +import MonitorService from './MonitorService'; +import MonitorStatusService from './MonitorStatusService'; +import MonitorStatusTimelineService from './MonitorStatusTimelineService'; +import OnCallDutyPolicyService from './OnCallDutyPolicyService'; +import TeamMemberService from './TeamMemberService'; +import UserService from './UserService'; +import URL from 'Common/Types/API/URL'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Typeof from 'Common/Types/Typeof'; +import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import Model from 'Model/Models/Incident'; import IncidentOwnerTeam from 'Model/Models/IncidentOwnerTeam'; import IncidentOwnerUser from 'Model/Models/IncidentOwnerUser'; -import IncidentOwnerUserService from './IncidentOwnerUserService'; -import Typeof from 'Common/Types/Typeof'; -import URL from 'Common/Types/API/URL'; -import User from 'Model/Models/User'; -import TeamMemberService from './TeamMemberService'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import UserService from './UserService'; -import { JSONObject } from 'Common/Types/JSON'; -import OnCallDutyPolicyService from './OnCallDutyPolicyService'; -import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import DatabaseConfig from '../DatabaseConfig'; +import IncidentState from 'Model/Models/IncidentState'; +import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; +import Monitor from 'Model/Models/Monitor'; import MonitorStatus from 'Model/Models/MonitorStatus'; -import MonitorStatusService from './MonitorStatusService'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import QueryHelper from '../Types/Database/QueryHelper'; import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from './MonitorStatusTimelineService'; -import DeleteBy from '../Types/Database/DeleteBy'; +import User from 'Model/Models/User'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentSeverityService.ts b/CommonServer/Services/IncidentSeverityService.ts index 5fe3cbbdad..1dc98c8b44 100644 --- a/CommonServer/Services/IncidentSeverityService.ts +++ b/CommonServer/Services/IncidentSeverityService.ts @@ -1,15 +1,15 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentSeverity'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from '../Types/Database/QueryHelper'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import UpdateBy from '../Types/Database/UpdateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Model from 'Model/Models/IncidentSeverity'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentStateService.ts b/CommonServer/Services/IncidentStateService.ts index 174c69a9d8..7776a03601 100644 --- a/CommonServer/Services/IncidentStateService.ts +++ b/CommonServer/Services/IncidentStateService.ts @@ -1,16 +1,16 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import IncidentState from 'Model/Models/IncidentState'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from '../Types/Database/QueryHelper'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import UpdateBy from '../Types/Database/UpdateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import IncidentState from 'Model/Models/IncidentState'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentStateTimelineService.ts b/CommonServer/Services/IncidentStateTimelineService.ts index b7d1b2ca28..94a3e6c8cb 100644 --- a/CommonServer/Services/IncidentStateTimelineService.ts +++ b/CommonServer/Services/IncidentStateTimelineService.ts @@ -1,25 +1,24 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import DatabaseService from './DatabaseService'; - -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import IncidentService from './IncidentService'; +import CreateBy from '../Types/Database/CreateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import DatabaseService from './DatabaseService'; +import IncidentPublicNoteService from './IncidentPublicNoteService'; +import IncidentService from './IncidentService'; +import IncidentStateService from './IncidentStateService'; +import UserService from './UserService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import IncidentState from 'Model/Models/IncidentState'; -import IncidentStateService from './IncidentStateService'; -import CreateBy from '../Types/Database/CreateBy'; -import UserService from './UserService'; -import User from 'Model/Models/User'; import Incident from 'Model/Models/Incident'; -import OneUptimeDate from 'Common/Types/Date'; -import QueryHelper from '../Types/Database/QueryHelper'; -import { JSONObject } from 'Common/Types/JSON'; import IncidentPublicNote from 'Model/Models/IncidentPublicNote'; -import IncidentPublicNoteService from './IncidentPublicNoteService'; +import IncidentState from 'Model/Models/IncidentState'; +import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; +import User from 'Model/Models/User'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentTemplateOwnerTeamService.ts b/CommonServer/Services/IncidentTemplateOwnerTeamService.ts index 140999b2cb..8b65fc6cff 100644 --- a/CommonServer/Services/IncidentTemplateOwnerTeamService.ts +++ b/CommonServer/Services/IncidentTemplateOwnerTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentTemplateOwnerTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentTemplateOwnerTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentTemplateOwnerUserService.ts b/CommonServer/Services/IncidentTemplateOwnerUserService.ts index d35ddfd92b..e9ce834121 100644 --- a/CommonServer/Services/IncidentTemplateOwnerUserService.ts +++ b/CommonServer/Services/IncidentTemplateOwnerUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentTemplateOwnerUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/IncidentTemplateOwnerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/IncidentTemplateService.ts b/CommonServer/Services/IncidentTemplateService.ts index 364e28a29c..c6759f44f3 100644 --- a/CommonServer/Services/IncidentTemplateService.ts +++ b/CommonServer/Services/IncidentTemplateService.ts @@ -1,13 +1,13 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/IncidentTemplate'; -import DatabaseService from './DatabaseService'; import { OnCreate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Typeof from 'Common/Types/Typeof'; -import IncidentTemplateOwnerTeam from 'Model/Models/IncidentTemplateOwnerTeam'; +import DatabaseService from './DatabaseService'; import IncidentTemplateOwnerTeamService from './IncidentTemplateOwnerTeamService'; import IncidentTemplateOwnerUserService from './IncidentTemplateOwnerUserService'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import ObjectID from 'Common/Types/ObjectID'; +import Typeof from 'Common/Types/Typeof'; +import Model from 'Model/Models/IncidentTemplate'; +import IncidentTemplateOwnerTeam from 'Model/Models/IncidentTemplateOwnerTeam'; import IncidentTemplateOwnerUser from 'Model/Models/IncidentTemplateOwnerUser'; export class Service extends DatabaseService { diff --git a/CommonServer/Services/LabelService.ts b/CommonServer/Services/LabelService.ts index a933c09699..7014ef9cbc 100644 --- a/CommonServer/Services/LabelService.ts +++ b/CommonServer/Services/LabelService.ts @@ -1,10 +1,10 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Label'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; import QueryHelper from '../Types/Database/QueryHelper'; +import DatabaseService from './DatabaseService'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import Model from 'Model/Models/Label'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/LogService.ts b/CommonServer/Services/LogService.ts index b9eee37f9b..3a120f5a3e 100644 --- a/CommonServer/Services/LogService.ts +++ b/CommonServer/Services/LogService.ts @@ -1,6 +1,6 @@ -import Log from 'Model/AnalyticsModels/Log'; -import AnalyticsDatabaseService from './AnalyticsDatabaseService'; import ClickhouseDatabase from '../Infrastructure/ClickhouseDatabase'; +import AnalyticsDatabaseService from './AnalyticsDatabaseService'; +import Log from 'Model/AnalyticsModels/Log'; export class LogService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/CommonServer/Services/MailService.ts b/CommonServer/Services/MailService.ts index 148529bd30..5a92a1b9dc 100644 --- a/CommonServer/Services/MailService.ts +++ b/CommonServer/Services/MailService.ts @@ -1,16 +1,16 @@ +import { AppApiHostname } from '../EnvironmentConfig'; +import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; +import BaseService from './BaseService'; import EmptyResponseData from 'Common/Types/API/EmptyResponse'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import Protocol from 'Common/Types/API/Protocol'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; -import { JSONObject } from 'Common/Types/JSON'; -import API from 'Common/Utils/API'; -import { AppApiHostname } from '../EnvironmentConfig'; import Email from 'Common/Types/Email/EmailMessage'; import EmailServer from 'Common/Types/Email/EmailServer'; -import Protocol from 'Common/Types/API/Protocol'; -import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; -import BaseService from './BaseService'; +import API from 'Common/Utils/API'; export class MailService extends BaseService { public async sendMail( diff --git a/CommonServer/Services/MetricService.ts b/CommonServer/Services/MetricService.ts index f8758e361c..becae2ccf7 100644 --- a/CommonServer/Services/MetricService.ts +++ b/CommonServer/Services/MetricService.ts @@ -1,6 +1,6 @@ -import MetricSum from 'Model/AnalyticsModels/Metric'; -import AnalyticsDatabaseService from './AnalyticsDatabaseService'; import ClickhouseDatabase from '../Infrastructure/ClickhouseDatabase'; +import AnalyticsDatabaseService from './AnalyticsDatabaseService'; +import MetricSum from 'Model/AnalyticsModels/Metric'; export class MetricService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/CommonServer/Services/MonitorCustomFieldService.ts b/CommonServer/Services/MonitorCustomFieldService.ts index 627a3bca98..fcaac9c89f 100644 --- a/CommonServer/Services/MonitorCustomFieldService.ts +++ b/CommonServer/Services/MonitorCustomFieldService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorCustomField'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/MonitorCustomField'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorGroupOwnerTeamService.ts b/CommonServer/Services/MonitorGroupOwnerTeamService.ts index 570ee4598a..5c104c9cb5 100644 --- a/CommonServer/Services/MonitorGroupOwnerTeamService.ts +++ b/CommonServer/Services/MonitorGroupOwnerTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorGroupOwnerTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/MonitorGroupOwnerTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorGroupOwnerUserService.ts b/CommonServer/Services/MonitorGroupOwnerUserService.ts index 44bc9f9ba0..b4bf2b0121 100644 --- a/CommonServer/Services/MonitorGroupOwnerUserService.ts +++ b/CommonServer/Services/MonitorGroupOwnerUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorGroupOwnerUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/MonitorGroupOwnerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorGroupResourceService.ts b/CommonServer/Services/MonitorGroupResourceService.ts index 36d595a4a4..106cb6cc89 100644 --- a/CommonServer/Services/MonitorGroupResourceService.ts +++ b/CommonServer/Services/MonitorGroupResourceService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorGroupResource'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/MonitorGroupResource'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorGroupService.ts b/CommonServer/Services/MonitorGroupService.ts index 428b8879af..bc5727e1e4 100644 --- a/CommonServer/Services/MonitorGroupService.ts +++ b/CommonServer/Services/MonitorGroupService.ts @@ -1,18 +1,18 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import QueryHelper from '../Types/Database/QueryHelper'; import DatabaseService from './DatabaseService'; +import MonitorGroupResourceService from './MonitorGroupResourceService'; +import MonitorStatusService from './MonitorStatusService'; +import MonitorStatusTimelineService from './MonitorStatusTimelineService'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; import MonitorGroup from 'Model/Models/MonitorGroup'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import MonitorGroupResourceService from './MonitorGroupResourceService'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import MonitorStatusService from './MonitorStatusService'; import MonitorGroupResource from 'Model/Models/MonitorGroupResource'; +import MonitorStatus from 'Model/Models/MonitorStatus'; import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from './MonitorStatusTimelineService'; -import QueryHelper from '../Types/Database/QueryHelper'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorMetricsByMinuteService.ts b/CommonServer/Services/MonitorMetricsByMinuteService.ts index ee2c3df5fc..ae45739e20 100644 --- a/CommonServer/Services/MonitorMetricsByMinuteService.ts +++ b/CommonServer/Services/MonitorMetricsByMinuteService.ts @@ -1,6 +1,6 @@ -import MonitorMetricsByMinute from 'Model/AnalyticsModels/MonitorMetricsByMinute'; -import AnalyticsDatabaseService from './AnalyticsDatabaseService'; import ClickhouseDatabase from '../Infrastructure/ClickhouseDatabase'; +import AnalyticsDatabaseService from './AnalyticsDatabaseService'; +import MonitorMetricsByMinute from 'Model/AnalyticsModels/MonitorMetricsByMinute'; export class MonitorMetricsByMinuteService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/CommonServer/Services/MonitorOwnerTeamService.ts b/CommonServer/Services/MonitorOwnerTeamService.ts index a75df0c479..3da51c2eaf 100644 --- a/CommonServer/Services/MonitorOwnerTeamService.ts +++ b/CommonServer/Services/MonitorOwnerTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorOwnerTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/MonitorOwnerTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorOwnerUserService.ts b/CommonServer/Services/MonitorOwnerUserService.ts index 57ce90b694..3858588202 100644 --- a/CommonServer/Services/MonitorOwnerUserService.ts +++ b/CommonServer/Services/MonitorOwnerUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorOwnerUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/MonitorOwnerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorProbeService.ts b/CommonServer/Services/MonitorProbeService.ts index 48d80f8fc6..789bb24a51 100644 --- a/CommonServer/Services/MonitorProbeService.ts +++ b/CommonServer/Services/MonitorProbeService.ts @@ -1,10 +1,10 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; +import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; import MonitorProbe from 'Model/Models/MonitorProbe'; -import OneUptimeDate from 'Common/Types/Date'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorService.ts b/CommonServer/Services/MonitorService.ts index f20e9ad38d..67fd516dff 100644 --- a/CommonServer/Services/MonitorService.ts +++ b/CommonServer/Services/MonitorService.ts @@ -1,36 +1,36 @@ +import DatabaseConfig from '../DatabaseConfig'; +import { IsBillingEnabled } from '../EnvironmentConfig'; import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Monitor'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import { ActiveMonitoringMeteredPlan } from '../Types/Billing/MeteredPlan/AllMeteredPlans'; import CreateBy from '../Types/Database/CreateBy'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import MonitorStatusService from './MonitorStatusService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import MonitorStatusTimelineService from './MonitorStatusTimelineService'; -import ObjectID from 'Common/Types/ObjectID'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import ProbeService from './ProbeService'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import MonitorProbe from 'Model/Models/MonitorProbe'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; +import MonitorOwnerTeamService from './MonitorOwnerTeamService'; +import MonitorOwnerUserService from './MonitorOwnerUserService'; import MonitorProbeService from './MonitorProbeService'; +import MonitorStatusService from './MonitorStatusService'; +import MonitorStatusTimelineService from './MonitorStatusTimelineService'; +import ProbeService from './ProbeService'; +import TeamMemberService from './TeamMemberService'; +import URL from 'Common/Types/API/URL'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import MonitorType, { MonitorTypeHelper, } from 'Common/Types/Monitor/MonitorType'; -import Probe from 'Model/Models/Probe'; -import { IsBillingEnabled } from '../EnvironmentConfig'; -import MonitorOwnerUserService from './MonitorOwnerUserService'; -import MonitorOwnerUser from 'Model/Models/MonitorOwnerUser'; -import MonitorOwnerTeamService from './MonitorOwnerTeamService'; -import MonitorOwnerTeam from 'Model/Models/MonitorOwnerTeam'; +import ObjectID from 'Common/Types/ObjectID'; import Typeof from 'Common/Types/Typeof'; -import TeamMemberService from './TeamMemberService'; +import Model from 'Model/Models/Monitor'; +import MonitorOwnerTeam from 'Model/Models/MonitorOwnerTeam'; +import MonitorOwnerUser from 'Model/Models/MonitorOwnerUser'; +import MonitorProbe from 'Model/Models/MonitorProbe'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import Probe from 'Model/Models/Probe'; import User from 'Model/Models/User'; -import URL from 'Common/Types/API/URL'; -import { JSONObject } from 'Common/Types/JSON'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import DatabaseConfig from '../DatabaseConfig'; -import { ActiveMonitoringMeteredPlan } from '../Types/Billing/MeteredPlan/AllMeteredPlans'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorStatusService.ts b/CommonServer/Services/MonitorStatusService.ts index 1cb14d0447..fc2cb15db9 100644 --- a/CommonServer/Services/MonitorStatusService.ts +++ b/CommonServer/Services/MonitorStatusService.ts @@ -1,15 +1,15 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/MonitorStatus'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; -import UpdateBy from '../Types/Database/UpdateBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import QueryHelper from '../Types/Database/QueryHelper'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Model from 'Model/Models/MonitorStatus'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/MonitorStatusTimelineService.ts b/CommonServer/Services/MonitorStatusTimelineService.ts index 3f5d3fdb8e..a38d855d51 100644 --- a/CommonServer/Services/MonitorStatusTimelineService.ts +++ b/CommonServer/Services/MonitorStatusTimelineService.ts @@ -1,20 +1,19 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import DatabaseService from './DatabaseService'; - -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; -import MonitorService from './MonitorService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import DeleteBy from '../Types/Database/DeleteBy'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import ObjectID from 'Common/Types/ObjectID'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import CreateBy from '../Types/Database/CreateBy'; -import UserService from './UserService'; -import User from 'Model/Models/User'; -import OneUptimeDate from 'Common/Types/Date'; -import QueryHelper from '../Types/Database/QueryHelper'; import Semaphore from '../Infrastructure/Semaphore'; +import CreateBy from '../Types/Database/CreateBy'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import DatabaseService from './DatabaseService'; +import MonitorService from './MonitorService'; +import UserService from './UserService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import User from 'Model/Models/User'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/NotificationService.ts b/CommonServer/Services/NotificationService.ts index dcf33a15fe..abdb99a6af 100644 --- a/CommonServer/Services/NotificationService.ts +++ b/CommonServer/Services/NotificationService.ts @@ -1,11 +1,11 @@ import { IsBillingEnabled } from '../EnvironmentConfig'; +import logger from '../Utils/Logger'; +import BaseService from './BaseService'; +import BillingService from './BillingService'; +import ProjectService from './ProjectService'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; import Project from 'Model/Models/Project'; -import ProjectService from './ProjectService'; -import BillingService from './BillingService'; -import logger from '../Utils/Logger'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import BaseService from './BaseService'; export class NotificationService extends BaseService { public constructor() { diff --git a/CommonServer/Services/OnCallDutyPolicyCustomFieldService.ts b/CommonServer/Services/OnCallDutyPolicyCustomFieldService.ts index 72df756d2c..77c8b62218 100644 --- a/CommonServer/Services/OnCallDutyPolicyCustomFieldService.ts +++ b/CommonServer/Services/OnCallDutyPolicyCustomFieldService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyCustomField'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/OnCallDutyPolicyCustomField'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts b/CommonServer/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts index 0660eaf127..3b50ac8e97 100644 --- a/CommonServer/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts +++ b/CommonServer/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyEscalationRuleSchedule'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/OnCallDutyPolicyEscalationRuleSchedule'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyEscalationRuleService.ts b/CommonServer/Services/OnCallDutyPolicyEscalationRuleService.ts index 4d105f4a7d..29c8b422c6 100644 --- a/CommonServer/Services/OnCallDutyPolicyEscalationRuleService.ts +++ b/CommonServer/Services/OnCallDutyPolicyEscalationRuleService.ts @@ -1,36 +1,36 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyEscalationRule'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; -import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from '../Types/Database/QueryHelper'; -import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import UpdateBy from '../Types/Database/UpdateBy'; -import Query from '../Types/Database/Query'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import OnCallDutyPolicyEscalationRuleUser from 'Model/Models/OnCallDutyPolicyEscalationRuleUser'; -import OnCallDutyPolicyEscalationRuleUserService from './OnCallDutyPolicyEscalationRuleUserService'; -import OnCallDutyPolicyEscalationRuleTeam from 'Model/Models/OnCallDutyPolicyEscalationRuleTeam'; -import OnCallDutyPolicyEscalationRuleTeamService from './OnCallDutyPolicyEscalationRuleTeamService'; -import TeamMemberService from './TeamMemberService'; -import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; -import UserNotificationRuleService from './UserNotificationRuleService'; -import OnCallDutyPolicyExecutionLogTimeline from 'Model/Models/OnCallDutyPolicyExecutionLogTimeline'; -import OnCallDutyPolicyExecutionLogTimelineService from './OnCallDutyPolicyExecutionLogTimelineService'; -import OnCallDutyExecutionLogTimelineStatus from 'Common/Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus'; -import User from 'Model/Models/User'; -import OneUptimeDate from 'Common/Types/Date'; -import OnCallDutyPolicyExecutionLogService from './OnCallDutyPolicyExecutionLogService'; import { IsBillingEnabled } from '../EnvironmentConfig'; -import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; -import OnCallDutyPolicyEscalationRuleSchedule from 'Model/Models/OnCallDutyPolicyEscalationRuleSchedule'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import Query from '../Types/Database/Query'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; import OnCallDutyPolicyEscalationRuleScheduleService from './OnCallDutyPolicyEscalationRuleScheduleService'; +import OnCallDutyPolicyEscalationRuleTeamService from './OnCallDutyPolicyEscalationRuleTeamService'; +import OnCallDutyPolicyEscalationRuleUserService from './OnCallDutyPolicyEscalationRuleUserService'; +import OnCallDutyPolicyExecutionLogService from './OnCallDutyPolicyExecutionLogService'; +import OnCallDutyPolicyExecutionLogTimelineService from './OnCallDutyPolicyExecutionLogTimelineService'; import OnCallDutyPolicyScheduleService from './OnCallDutyPolicyScheduleService'; +import TeamMemberService from './TeamMemberService'; +import UserNotificationRuleService from './UserNotificationRuleService'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import OnCallDutyExecutionLogTimelineStatus from 'Common/Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import Model from 'Model/Models/OnCallDutyPolicyEscalationRule'; +import OnCallDutyPolicyEscalationRuleSchedule from 'Model/Models/OnCallDutyPolicyEscalationRuleSchedule'; +import OnCallDutyPolicyEscalationRuleTeam from 'Model/Models/OnCallDutyPolicyEscalationRuleTeam'; +import OnCallDutyPolicyEscalationRuleUser from 'Model/Models/OnCallDutyPolicyEscalationRuleUser'; +import OnCallDutyPolicyExecutionLogTimeline from 'Model/Models/OnCallDutyPolicyExecutionLogTimeline'; +import User from 'Model/Models/User'; export class Service extends DatabaseService { public async startRuleExecution( diff --git a/CommonServer/Services/OnCallDutyPolicyEscalationRuleTeamService.ts b/CommonServer/Services/OnCallDutyPolicyEscalationRuleTeamService.ts index fe77252d1d..8dd2274143 100644 --- a/CommonServer/Services/OnCallDutyPolicyEscalationRuleTeamService.ts +++ b/CommonServer/Services/OnCallDutyPolicyEscalationRuleTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyEscalationRuleTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/OnCallDutyPolicyEscalationRuleTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyEscalationRuleUserService.ts b/CommonServer/Services/OnCallDutyPolicyEscalationRuleUserService.ts index 2d591ba1b9..848e0b69ef 100644 --- a/CommonServer/Services/OnCallDutyPolicyEscalationRuleUserService.ts +++ b/CommonServer/Services/OnCallDutyPolicyEscalationRuleUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyEscalationRuleUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/OnCallDutyPolicyEscalationRuleUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyExecutionLogService.ts b/CommonServer/Services/OnCallDutyPolicyExecutionLogService.ts index cd48a33fad..698a51f4d9 100644 --- a/CommonServer/Services/OnCallDutyPolicyExecutionLogService.ts +++ b/CommonServer/Services/OnCallDutyPolicyExecutionLogService.ts @@ -1,12 +1,12 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyExecutionLog'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; -import OnCallDutyPolicyEscalationRule from 'Model/Models/OnCallDutyPolicyEscalationRule'; +import { OnCreate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; import OnCallDutyPolicyEscalationRuleService from './OnCallDutyPolicyEscalationRuleService'; +import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import OnCallDutyPolicyEscalationRule from 'Model/Models/OnCallDutyPolicyEscalationRule'; +import Model from 'Model/Models/OnCallDutyPolicyExecutionLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyExecutionLogTimelineService.ts b/CommonServer/Services/OnCallDutyPolicyExecutionLogTimelineService.ts index c502d597af..dd6e64f4b9 100644 --- a/CommonServer/Services/OnCallDutyPolicyExecutionLogTimelineService.ts +++ b/CommonServer/Services/OnCallDutyPolicyExecutionLogTimelineService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyExecutionLogTimeline'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/OnCallDutyPolicyExecutionLogTimeline'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyScheduleLayerService.ts b/CommonServer/Services/OnCallDutyPolicyScheduleLayerService.ts index 19e5448b32..3faf161a00 100644 --- a/CommonServer/Services/OnCallDutyPolicyScheduleLayerService.ts +++ b/CommonServer/Services/OnCallDutyPolicyScheduleLayerService.ts @@ -1,15 +1,15 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyScheduleLayer'; -import DatabaseService from './DatabaseService'; import CreateBy from '../Types/Database/CreateBy'; -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import QueryHelper from '../Types/Database/QueryHelper'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import DatabaseService from './DatabaseService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/OnCallDutyPolicyScheduleLayer'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyScheduleLayerUserService.ts b/CommonServer/Services/OnCallDutyPolicyScheduleLayerUserService.ts index e614e1915e..e8c8f1e289 100644 --- a/CommonServer/Services/OnCallDutyPolicyScheduleLayerUserService.ts +++ b/CommonServer/Services/OnCallDutyPolicyScheduleLayerUserService.ts @@ -1,16 +1,16 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicyScheduleLayerUser'; -import DatabaseService from './DatabaseService'; import CreateBy from '../Types/Database/CreateBy'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import QueryHelper from '../Types/Database/QueryHelper'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/OnCallDutyPolicyScheduleLayerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/OnCallDutyPolicyScheduleService.ts b/CommonServer/Services/OnCallDutyPolicyScheduleService.ts index 50c874848e..d63ea5afa3 100644 --- a/CommonServer/Services/OnCallDutyPolicyScheduleService.ts +++ b/CommonServer/Services/OnCallDutyPolicyScheduleService.ts @@ -1,16 +1,16 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/OnCallDutyPolicySchedule'; import DatabaseService from './DatabaseService'; -import ObjectID from 'Common/Types/ObjectID'; -import OnCallDutyPolicyScheduleLayer from 'Model/Models/OnCallDutyPolicyScheduleLayer'; import OnCallDutyPolicyScheduleLayerService from './OnCallDutyPolicyScheduleLayerService'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import OnCallDutyPolicyScheduleLayerUser from 'Model/Models/OnCallDutyPolicyScheduleLayerUser'; import OnCallDutyPolicyScheduleLayerUserService from './OnCallDutyPolicyScheduleLayerUserService'; -import OneUptimeDate from 'Common/Types/Date'; -import LayerUtil, { LayerProps } from 'Common/Types/OnCallDutyPolicy/Layer'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; import CalendarEvent from 'Common/Types/Calendar/CalendarEvent'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import ObjectID from 'Common/Types/ObjectID'; +import LayerUtil, { LayerProps } from 'Common/Types/OnCallDutyPolicy/Layer'; +import Model from 'Model/Models/OnCallDutyPolicySchedule'; +import OnCallDutyPolicyScheduleLayer from 'Model/Models/OnCallDutyPolicyScheduleLayer'; +import OnCallDutyPolicyScheduleLayerUser from 'Model/Models/OnCallDutyPolicyScheduleLayerUser'; import User from 'Model/Models/User'; export class Service extends DatabaseService { diff --git a/CommonServer/Services/OnCallDutyPolicyService.ts b/CommonServer/Services/OnCallDutyPolicyService.ts index 078b2a71e5..bea2ee546d 100644 --- a/CommonServer/Services/OnCallDutyPolicyService.ts +++ b/CommonServer/Services/OnCallDutyPolicyService.ts @@ -1,12 +1,12 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; import DatabaseService from './DatabaseService'; -import ObjectID from 'Common/Types/ObjectID'; -import OnCallDutyPolicyExecutionLog from 'Model/Models/OnCallDutyPolicyExecutionLog'; -import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import OnCallDutyPolicyExecutionLogService from './OnCallDutyPolicyExecutionLogService'; -import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; +import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; +import OnCallDutyPolicyExecutionLog from 'Model/Models/OnCallDutyPolicyExecutionLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ProbeService.ts b/CommonServer/Services/ProbeService.ts index 7d7c01cec6..c0ee03f42d 100644 --- a/CommonServer/Services/ProbeService.ts +++ b/CommonServer/Services/ProbeService.ts @@ -1,10 +1,10 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Probe'; -import DatabaseService from './DatabaseService'; +import CreateBy from '../Types/Database/CreateBy'; import { OnCreate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; import ObjectID from 'Common/Types/ObjectID'; import Version from 'Common/Types/Version'; -import CreateBy from '../Types/Database/CreateBy'; +import Model from 'Model/Models/Probe'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ProjectCallSMSConfigService.ts b/CommonServer/Services/ProjectCallSMSConfigService.ts index f889fe2c3c..8a81f241ed 100644 --- a/CommonServer/Services/ProjectCallSMSConfigService.ts +++ b/CommonServer/Services/ProjectCallSMSConfigService.ts @@ -1,8 +1,8 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ProjectCallSMSConfig'; import DatabaseService from './DatabaseService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import Model from 'Model/Models/ProjectCallSMSConfig'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ProjectService.ts b/CommonServer/Services/ProjectService.ts index 4e2448995c..6b569e24fb 100755 --- a/CommonServer/Services/ProjectService.ts +++ b/CommonServer/Services/ProjectService.ts @@ -1,54 +1,54 @@ +import { IsBillingEnabled, getAllEnvVars } from '../EnvironmentConfig'; import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Project'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnUpdate, OnDelete, OnFind } from '../Types/Database/Hooks'; +import AllMeteredPlans from '../Types/Billing/MeteredPlan/AllMeteredPlans'; import CreateBy from '../Types/Database/CreateBy'; -import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; -import TeamService from './TeamService'; -import Team from 'Model/Models/Team'; -import TeamMemberService from './TeamMemberService'; -import TeamMember from 'Model/Models/TeamMember'; -import TeamPermission from 'Model/Models/TeamPermission'; -import Permission from 'Common/Types/Permission'; -import TeamPermissionService from './TeamPermissionService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import FindBy from '../Types/Database/FindBy'; -import { In } from 'typeorm'; -import QueryHelper from '../Types/Database/QueryHelper'; -import ObjectID from 'Common/Types/ObjectID'; -import OneUptimeDate from 'Common/Types/Date'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import { Yellow, Green, Red, Moroon500, Black } from 'Common/Types/BrandColors'; -import MonitorStatusService from './MonitorStatusService'; -import IncidentState from 'Model/Models/IncidentState'; -import IncidentStateService from './IncidentStateService'; -import IncidentSeverity from 'Model/Models/IncidentSeverity'; -import IncidentSeverityService from './IncidentSeverityService'; -import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import ScheduledMaintenanceStateService from './ScheduledMaintenanceStateService'; -import { getAllEnvVars, IsBillingEnabled } from '../EnvironmentConfig'; -import BillingService from './BillingService'; import DeleteBy from '../Types/Database/DeleteBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import FindBy from '../Types/Database/FindBy'; +import { OnCreate, OnDelete, OnFind, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import logger from '../Utils/Logger'; +import AccessTokenService from './AccessTokenService'; +import BillingService from './BillingService'; +import DatabaseService from './DatabaseService'; +import IncidentSeverityService from './IncidentSeverityService'; +import IncidentStateService from './IncidentStateService'; +import MailService from './MailService'; +import MonitorStatusService from './MonitorStatusService'; +import NotificationService from './NotificationService'; +import PromoCodeService from './PromoCodeService'; +import ScheduledMaintenanceStateService from './ScheduledMaintenanceStateService'; +import TeamMemberService from './TeamMemberService'; +import TeamPermissionService from './TeamPermissionService'; +import TeamService from './TeamService'; +import UserNotificationRuleService from './UserNotificationRuleService'; +import UserNotificationSettingService from './UserNotificationSettingService'; +import UserService from './UserService'; import SubscriptionPlan, { PlanSelect, } from 'Common/Types/Billing/SubscriptionPlan'; -import UpdateBy from '../Types/Database/UpdateBy'; -import AllMeteredPlans from '../Types/Billing/MeteredPlan/AllMeteredPlans'; -import AccessTokenService from './AccessTokenService'; -import User from 'Model/Models/User'; -import NotificationService from './NotificationService'; -import MailService from './MailService'; -import logger from '../Utils/Logger'; +import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; +import { Black, Green, Moroon500, Red, Yellow } from 'Common/Types/BrandColors'; +import Color from 'Common/Types/Color'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; import Email from 'Common/Types/Email'; import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import UserService from './UserService'; -import UserNotificationRuleService from './UserNotificationRuleService'; -import UserNotificationSettingService from './UserNotificationSettingService'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; +import ObjectID from 'Common/Types/ObjectID'; +import Permission from 'Common/Types/Permission'; +import IncidentSeverity from 'Model/Models/IncidentSeverity'; +import IncidentState from 'Model/Models/IncidentState'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import Model from 'Model/Models/Project'; import PromoCode from 'Model/Models/PromoCode'; -import PromoCodeService from './PromoCodeService'; -import Color from 'Common/Types/Color'; -import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; +import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; +import Team from 'Model/Models/Team'; +import TeamMember from 'Model/Models/TeamMember'; +import TeamPermission from 'Model/Models/TeamPermission'; +import User from 'Model/Models/User'; +import { In } from 'typeorm'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ProjectSmtpConfigService.ts b/CommonServer/Services/ProjectSmtpConfigService.ts index 31a24e4969..86fc4f9df8 100755 --- a/CommonServer/Services/ProjectSmtpConfigService.ts +++ b/CommonServer/Services/ProjectSmtpConfigService.ts @@ -1,8 +1,8 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ProjectSmtpConfig'; import DatabaseService from './DatabaseService'; import EmailServer from 'Common/Types/Email/EmailServer'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import Model from 'Model/Models/ProjectSmtpConfig'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ProjectSsoService.ts b/CommonServer/Services/ProjectSsoService.ts index 1b4463f002..08e7f4e50b 100644 --- a/CommonServer/Services/ProjectSsoService.ts +++ b/CommonServer/Services/ProjectSsoService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ProjectSso'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ProjectSso'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/PromoCodeService.ts b/CommonServer/Services/PromoCodeService.ts index e89b06e998..ef260aa4e9 100644 --- a/CommonServer/Services/PromoCodeService.ts +++ b/CommonServer/Services/PromoCodeService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/PromoCode'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/PromoCode'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ResellerPlanService.ts b/CommonServer/Services/ResellerPlanService.ts index 4e244e28b4..f15517d6bc 100644 --- a/CommonServer/Services/ResellerPlanService.ts +++ b/CommonServer/Services/ResellerPlanService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ResellerPlan'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ResellerPlan'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ResellerService.ts b/CommonServer/Services/ResellerService.ts index 87ead92960..4622e9319b 100644 --- a/CommonServer/Services/ResellerService.ts +++ b/CommonServer/Services/ResellerService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Reseller'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/Reseller'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceCustomFieldService.ts b/CommonServer/Services/ScheduledMaintenanceCustomFieldService.ts index fbd6db0d62..f949fa44c0 100644 --- a/CommonServer/Services/ScheduledMaintenanceCustomFieldService.ts +++ b/CommonServer/Services/ScheduledMaintenanceCustomFieldService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenanceCustomField'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ScheduledMaintenanceCustomField'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceInternalNoteService.ts b/CommonServer/Services/ScheduledMaintenanceInternalNoteService.ts index ae7a102053..5f29523f09 100644 --- a/CommonServer/Services/ScheduledMaintenanceInternalNoteService.ts +++ b/CommonServer/Services/ScheduledMaintenanceInternalNoteService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenanceInternalNote'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ScheduledMaintenanceInternalNote'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceNoteTemplateService.ts b/CommonServer/Services/ScheduledMaintenanceNoteTemplateService.ts index 707ee03535..17f6f5745c 100644 --- a/CommonServer/Services/ScheduledMaintenanceNoteTemplateService.ts +++ b/CommonServer/Services/ScheduledMaintenanceNoteTemplateService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenanceNoteTemplate'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ScheduledMaintenanceNoteTemplate'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceOwnerTeamService.ts b/CommonServer/Services/ScheduledMaintenanceOwnerTeamService.ts index 8dd4d25d66..fdbad7142e 100644 --- a/CommonServer/Services/ScheduledMaintenanceOwnerTeamService.ts +++ b/CommonServer/Services/ScheduledMaintenanceOwnerTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenanceOwnerTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ScheduledMaintenanceOwnerTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceOwnerUserService.ts b/CommonServer/Services/ScheduledMaintenanceOwnerUserService.ts index a5a607f014..1181b72942 100644 --- a/CommonServer/Services/ScheduledMaintenanceOwnerUserService.ts +++ b/CommonServer/Services/ScheduledMaintenanceOwnerUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenanceOwnerUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/ScheduledMaintenanceOwnerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenancePublicNoteService.ts b/CommonServer/Services/ScheduledMaintenancePublicNoteService.ts index bc1be20484..cacb996a55 100644 --- a/CommonServer/Services/ScheduledMaintenancePublicNoteService.ts +++ b/CommonServer/Services/ScheduledMaintenancePublicNoteService.ts @@ -1,9 +1,9 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenancePublicNote'; +import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; import DatabaseService from './DatabaseService'; import OneUptimeDate from 'Common/Types/Date'; -import { OnCreate } from '../Types/Database/Hooks'; -import CreateBy from '../Types/Database/CreateBy'; +import Model from 'Model/Models/ScheduledMaintenancePublicNote'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceService.ts b/CommonServer/Services/ScheduledMaintenanceService.ts index c241cc472e..76f02e751e 100644 --- a/CommonServer/Services/ScheduledMaintenanceService.ts +++ b/CommonServer/Services/ScheduledMaintenanceService.ts @@ -1,29 +1,29 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenance'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import Monitor from 'Model/Models/Monitor'; -import MonitorService from './MonitorService'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; -import ScheduledMaintenanceStateTimelineService from './ScheduledMaintenanceStateTimelineService'; -import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import ScheduledMaintenanceStateService from './ScheduledMaintenanceStateService'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import ScheduledMaintenanceOwnerUserService from './ScheduledMaintenanceOwnerUserService'; -import ScheduledMaintenanceOwnerUser from 'Model/Models/ScheduledMaintenanceOwnerUser'; -import Typeof from 'Common/Types/Typeof'; -import ScheduledMaintenanceOwnerTeamService from './ScheduledMaintenanceOwnerTeamService'; -import ScheduledMaintenanceOwnerTeam from 'Model/Models/ScheduledMaintenanceOwnerTeam'; -import TeamMemberService from './TeamMemberService'; -import User from 'Model/Models/User'; -import URL from 'Common/Types/API/URL'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; import DatabaseConfig from '../DatabaseConfig'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; +import MonitorService from './MonitorService'; +import ScheduledMaintenanceOwnerTeamService from './ScheduledMaintenanceOwnerTeamService'; +import ScheduledMaintenanceOwnerUserService from './ScheduledMaintenanceOwnerUserService'; +import ScheduledMaintenanceStateService from './ScheduledMaintenanceStateService'; +import ScheduledMaintenanceStateTimelineService from './ScheduledMaintenanceStateTimelineService'; +import TeamMemberService from './TeamMemberService'; +import URL from 'Common/Types/API/URL'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Typeof from 'Common/Types/Typeof'; +import Monitor from 'Model/Models/Monitor'; +import Model from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceOwnerTeam from 'Model/Models/ScheduledMaintenanceOwnerTeam'; +import ScheduledMaintenanceOwnerUser from 'Model/Models/ScheduledMaintenanceOwnerUser'; +import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; +import User from 'Model/Models/User'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceStateService.ts b/CommonServer/Services/ScheduledMaintenanceStateService.ts index ec1e0d5c70..698ceed9ad 100644 --- a/CommonServer/Services/ScheduledMaintenanceStateService.ts +++ b/CommonServer/Services/ScheduledMaintenanceStateService.ts @@ -1,15 +1,15 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ScheduledMaintenanceState'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from '../Types/Database/QueryHelper'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import UpdateBy from '../Types/Database/UpdateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Model from 'Model/Models/ScheduledMaintenanceState'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ScheduledMaintenanceStateTimelineService.ts b/CommonServer/Services/ScheduledMaintenanceStateTimelineService.ts index b0d134963d..11df401327 100644 --- a/CommonServer/Services/ScheduledMaintenanceStateTimelineService.ts +++ b/CommonServer/Services/ScheduledMaintenanceStateTimelineService.ts @@ -1,29 +1,28 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; -import DatabaseService from './DatabaseService'; - -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ScheduledMaintenanceService from './ScheduledMaintenanceService'; +import CreateBy from '../Types/Database/CreateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import DatabaseService from './DatabaseService'; +import MonitorService from './MonitorService'; +import MonitorStatusService from './MonitorStatusService'; +import MonitorStatusTimelineService from './MonitorStatusTimelineService'; +import ScheduledMaintenancePublicNoteService from './ScheduledMaintenancePublicNoteService'; +import ScheduledMaintenanceService from './ScheduledMaintenanceService'; +import ScheduledMaintenanceStateService from './ScheduledMaintenanceStateService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; -import ScheduledMaintenanceStateService from './ScheduledMaintenanceStateService'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import MonitorStatusService from './MonitorStatusService'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import MonitorStatusTimelineService from './MonitorStatusTimelineService'; -import MonitorService from './MonitorService'; import Monitor from 'Model/Models/Monitor'; -import QueryHelper from '../Types/Database/QueryHelper'; -import CreateBy from '../Types/Database/CreateBy'; -import OneUptimeDate from 'Common/Types/Date'; -import { JSONObject } from 'Common/Types/JSON'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; import ScheduledMaintenancePublicNote from 'Model/Models/ScheduledMaintenancePublicNote'; -import ScheduledMaintenancePublicNoteService from './ScheduledMaintenancePublicNoteService'; +import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; +import ScheduledMaintenanceStateTimeline from 'Model/Models/ScheduledMaintenanceStateTimeline'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/ShortLinkService.ts b/CommonServer/Services/ShortLinkService.ts index ca643b3e1f..abf1e29b35 100644 --- a/CommonServer/Services/ShortLinkService.ts +++ b/CommonServer/Services/ShortLinkService.ts @@ -1,15 +1,15 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/ShortLink'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; -import CreateBy from '../Types/Database/CreateBy'; -import Text from 'Common/Types/Text'; -import URL from 'Common/Types/API/URL'; -import { LinkShortenerRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; -import Route from 'Common/Types/API/Route'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; +import DatabaseService from './DatabaseService'; +import { LinkShortenerRoute } from 'Common/ServiceRoute'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import Text from 'Common/Types/Text'; +import Model from 'Model/Models/ShortLink'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/SmsLogService.ts b/CommonServer/Services/SmsLogService.ts index 6749297c64..70ae990b6d 100644 --- a/CommonServer/Services/SmsLogService.ts +++ b/CommonServer/Services/SmsLogService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/SmsLog'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/SmsLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/SmsService.ts b/CommonServer/Services/SmsService.ts index cbca213f44..8dcc1427a1 100644 --- a/CommonServer/Services/SmsService.ts +++ b/CommonServer/Services/SmsService.ts @@ -1,16 +1,16 @@ +import { AppApiHostname } from '../EnvironmentConfig'; +import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; +import BaseService from './BaseService'; import EmptyResponseData from 'Common/Types/API/EmptyResponse'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import Protocol from 'Common/Types/API/Protocol'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; import { JSONObject } from 'Common/Types/JSON'; -import API from 'Common/Utils/API'; -import { AppApiHostname } from '../EnvironmentConfig'; -import Protocol from 'Common/Types/API/Protocol'; -import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; import ObjectID from 'Common/Types/ObjectID'; import SMS from 'Common/Types/SMS/SMS'; -import BaseService from './BaseService'; -import TwilioConfig from 'Common/Types/CallAndSMS/TwilioConfig'; +import API from 'Common/Utils/API'; export class SmsService extends BaseService { public constructor() { diff --git a/CommonServer/Services/SpanService.ts b/CommonServer/Services/SpanService.ts index 67d55c5daa..d8327a7deb 100644 --- a/CommonServer/Services/SpanService.ts +++ b/CommonServer/Services/SpanService.ts @@ -1,6 +1,6 @@ -import Span from 'Model/AnalyticsModels/Span'; -import AnalyticsDatabaseService from './AnalyticsDatabaseService'; import ClickhouseDatabase from '../Infrastructure/ClickhouseDatabase'; +import AnalyticsDatabaseService from './AnalyticsDatabaseService'; +import Span from 'Model/AnalyticsModels/Span'; export class SpanService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/CommonServer/Services/StatusPageAnnouncementService.ts b/CommonServer/Services/StatusPageAnnouncementService.ts index 9c0ac197a7..4def2d3490 100644 --- a/CommonServer/Services/StatusPageAnnouncementService.ts +++ b/CommonServer/Services/StatusPageAnnouncementService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageAnnouncement'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/StatusPageAnnouncement'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageCertificateService.ts b/CommonServer/Services/StatusPageCertificateService.ts index 15d68056ce..b7b98373e7 100644 --- a/CommonServer/Services/StatusPageCertificateService.ts +++ b/CommonServer/Services/StatusPageCertificateService.ts @@ -1,13 +1,13 @@ +import DatabaseConfig from '../DatabaseConfig'; +import { AppApiHostname } from '../EnvironmentConfig'; +import BaseService from './BaseService'; import EmptyResponseData from 'Common/Types/API/EmptyResponse'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import Protocol from 'Common/Types/API/Protocol'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; import API from 'Common/Utils/API'; -import { AppApiHostname } from '../EnvironmentConfig'; -import DatabaseConfig from '../DatabaseConfig'; -import BaseService from './BaseService'; -import Protocol from 'Common/Types/API/Protocol'; export class StatusPageCertificateService extends BaseService { public constructor() { diff --git a/CommonServer/Services/StatusPageCustomFieldService.ts b/CommonServer/Services/StatusPageCustomFieldService.ts index 6e96272b37..b713c07b55 100644 --- a/CommonServer/Services/StatusPageCustomFieldService.ts +++ b/CommonServer/Services/StatusPageCustomFieldService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageCustomField'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/StatusPageCustomField'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageDomainService.ts b/CommonServer/Services/StatusPageDomainService.ts index 09e9acfaba..8f7b9a679d 100644 --- a/CommonServer/Services/StatusPageDomainService.ts +++ b/CommonServer/Services/StatusPageDomainService.ts @@ -1,21 +1,21 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import DomainService from './DomainService'; -import Domain from 'Model/Models/Domain'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import DeleteBy from '../Types/Database/DeleteBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ObjectID from 'Common/Types/ObjectID'; -import StatusPageDomain from 'Model/Models/StatusPageDomain'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; import GreenlockUtil from '../Utils/Greenlock/Greenlock'; -import { JSONObject } from 'Common/Types/JSON'; import logger from '../Utils/Logger'; -import API from 'Common/Utils/API'; -import URL from 'Common/Types/API/URL'; +import DatabaseService from './DatabaseService'; +import DomainService from './DomainService'; import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import API from 'Common/Utils/API'; +import Domain from 'Model/Models/Domain'; +import StatusPageDomain from 'Model/Models/StatusPageDomain'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageFooterLinkService.ts b/CommonServer/Services/StatusPageFooterLinkService.ts index 7b6293ece9..d409c6f03b 100644 --- a/CommonServer/Services/StatusPageFooterLinkService.ts +++ b/CommonServer/Services/StatusPageFooterLinkService.ts @@ -1,17 +1,17 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageFooterLink'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import Query from '../Types/Database/Query'; import QueryHelper from '../Types/Database/QueryHelper'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; import UpdateBy from '../Types/Database/UpdateBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import DatabaseService from './DatabaseService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/StatusPageFooterLink'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageGroupService.ts b/CommonServer/Services/StatusPageGroupService.ts index 58a621118c..fc77caf1f5 100644 --- a/CommonServer/Services/StatusPageGroupService.ts +++ b/CommonServer/Services/StatusPageGroupService.ts @@ -1,16 +1,16 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageGroup'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; -import UpdateBy from '../Types/Database/UpdateBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import QueryHelper from '../Types/Database/QueryHelper'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/StatusPageGroup'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageHeaderLinkService.ts b/CommonServer/Services/StatusPageHeaderLinkService.ts index c18f85c8cb..1df963ef06 100644 --- a/CommonServer/Services/StatusPageHeaderLinkService.ts +++ b/CommonServer/Services/StatusPageHeaderLinkService.ts @@ -1,17 +1,17 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageHeaderLink'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import Query from '../Types/Database/Query'; import QueryHelper from '../Types/Database/QueryHelper'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; import UpdateBy from '../Types/Database/UpdateBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import DatabaseService from './DatabaseService'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/StatusPageHeaderLink'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageHistoryChartBarColorRuleService.ts b/CommonServer/Services/StatusPageHistoryChartBarColorRuleService.ts index 912a6cd9d5..6ac523659d 100644 --- a/CommonServer/Services/StatusPageHistoryChartBarColorRuleService.ts +++ b/CommonServer/Services/StatusPageHistoryChartBarColorRuleService.ts @@ -1,17 +1,17 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageHistoryChartBarColorRule'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from '../Types/Database/QueryHelper'; import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import UpdateBy from '../Types/Database/UpdateBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import Query from '../Types/Database/Query'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/StatusPageHistoryChartBarColorRule'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageOwnerTeamService.ts b/CommonServer/Services/StatusPageOwnerTeamService.ts index b623873bee..eba6fd1c1a 100644 --- a/CommonServer/Services/StatusPageOwnerTeamService.ts +++ b/CommonServer/Services/StatusPageOwnerTeamService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageOwnerTeam'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/StatusPageOwnerTeam'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageOwnerUserService.ts b/CommonServer/Services/StatusPageOwnerUserService.ts index c5bb908bd0..999965b7f0 100644 --- a/CommonServer/Services/StatusPageOwnerUserService.ts +++ b/CommonServer/Services/StatusPageOwnerUserService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageOwnerUser'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/StatusPageOwnerUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPagePrivateUserService.ts b/CommonServer/Services/StatusPagePrivateUserService.ts index 38900a24f4..717a8c2f2b 100644 --- a/CommonServer/Services/StatusPagePrivateUserService.ts +++ b/CommonServer/Services/StatusPagePrivateUserService.ts @@ -1,21 +1,21 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPagePrivateUser'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; -import StatusPage from 'Model/Models/StatusPage'; -import StatusPageService from './StatusPageService'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import OneUptimeDate from 'Common/Types/Date'; -import MailService from './MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import URL from 'Common/Types/API/URL'; -import logger from '../Utils/Logger'; -import { FileRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; +import logger from '../Utils/Logger'; +import DatabaseService from './DatabaseService'; +import MailService from './MailService'; +import StatusPageService from './StatusPageService'; +import { FileRoute } from 'Common/ServiceRoute'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import CreateBy from '../Types/Database/CreateBy'; +import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import StatusPage from 'Model/Models/StatusPage'; +import Model from 'Model/Models/StatusPagePrivateUser'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageResourceService.ts b/CommonServer/Services/StatusPageResourceService.ts index 64c92a6e47..dee2864c4c 100644 --- a/CommonServer/Services/StatusPageResourceService.ts +++ b/CommonServer/Services/StatusPageResourceService.ts @@ -1,17 +1,17 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageResource'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from '../Types/Database/QueryHelper'; import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import UpdateBy from '../Types/Database/UpdateBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import Query from '../Types/Database/Query'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Model from 'Model/Models/StatusPageResource'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageService.ts b/CommonServer/Services/StatusPageService.ts index 7d949c2b90..0babe3a586 100755 --- a/CommonServer/Services/StatusPageService.ts +++ b/CommonServer/Services/StatusPageService.ts @@ -1,36 +1,36 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnUpdate } from '../Types/Database/Hooks'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import ObjectID from 'Common/Types/ObjectID'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import StatusPage from 'Model/Models/StatusPage'; -import StatusPageDomain from 'Model/Models/StatusPageDomain'; -import StatusPageDomainService from './StatusPageDomainService'; -import URL from 'Common/Types/API/URL'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import DatabaseConfig from '../DatabaseConfig'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate, OnUpdate } from '../Types/Database/Hooks'; +import UpdateBy from '../Types/Database/UpdateBy'; +import CookieUtil from '../Utils/Cookie'; import { ExpressRequest } from '../Utils/Express'; import JSONWebToken from '../Utils/JsonWebToken'; -import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; import logger from '../Utils/Logger'; -import Typeof from 'Common/Types/Typeof'; -import StatusPageOwnerTeam from 'Model/Models/StatusPageOwnerTeam'; +import DatabaseService from './DatabaseService'; +import MonitorStatusService from './MonitorStatusService'; +import ProjectService from './ProjectService'; +import StatusPageDomainService from './StatusPageDomainService'; import StatusPageOwnerTeamService from './StatusPageOwnerTeamService'; -import StatusPageOwnerUser from 'Model/Models/StatusPageOwnerUser'; import StatusPageOwnerUserService from './StatusPageOwnerUserService'; -import User from 'Model/Models/User'; import TeamMemberService from './TeamMemberService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import CookieUtil from '../Utils/Cookie'; -import UpdateBy from '../Types/Database/UpdateBy'; -import ProjectService from './ProjectService'; -import CreateBy from '../Types/Database/CreateBy'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import MonitorStatusService from './MonitorStatusService'; +import URL from 'Common/Types/API/URL'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; import { Green } from 'Common/Types/BrandColors'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Typeof from 'Common/Types/Typeof'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import StatusPage from 'Model/Models/StatusPage'; +import StatusPageDomain from 'Model/Models/StatusPageDomain'; +import StatusPageOwnerTeam from 'Model/Models/StatusPageOwnerTeam'; +import StatusPageOwnerUser from 'Model/Models/StatusPageOwnerUser'; +import User from 'Model/Models/User'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageSsoService.ts b/CommonServer/Services/StatusPageSsoService.ts index bc4e6d02b7..fa80d80f85 100644 --- a/CommonServer/Services/StatusPageSsoService.ts +++ b/CommonServer/Services/StatusPageSsoService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageSso'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/StatusPageSso'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/StatusPageSubscriberService.ts b/CommonServer/Services/StatusPageSubscriberService.ts index dfa0e08ca6..0ee11e580d 100644 --- a/CommonServer/Services/StatusPageSubscriberService.ts +++ b/CommonServer/Services/StatusPageSubscriberService.ts @@ -1,26 +1,26 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/StatusPageSubscriber'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; -import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import StatusPageService from './StatusPageService'; -import MailService from './MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import URL from 'Common/Types/API/URL'; -import { FileRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import ProjectSMTPConfigService from '../Services/ProjectSmtpConfigService'; +import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; import logger from '../Utils/Logger'; -import StatusPage from 'Model/Models/StatusPage'; -import ObjectID from 'Common/Types/ObjectID'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import DatabaseService from './DatabaseService'; +import MailService from './MailService'; +import ProjectService from './ProjectService'; +import StatusPageService from './StatusPageService'; +import { FileRoute } from 'Common/ServiceRoute'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import ProjectService from './ProjectService'; +import URL from 'Common/Types/API/URL'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import LIMIT_MAX, { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import StatusPage from 'Model/Models/StatusPage'; import StatusPageResource from 'Model/Models/StatusPageResource'; -import QueryHelper from '../Types/Database/QueryHelper'; -import ProjectSMTPConfigService from '../Services/ProjectSmtpConfigService'; +import Model from 'Model/Models/StatusPageSubscriber'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/TeamMemberService.ts b/CommonServer/Services/TeamMemberService.ts index 1aa4beda7a..e886007552 100644 --- a/CommonServer/Services/TeamMemberService.ts +++ b/CommonServer/Services/TeamMemberService.ts @@ -1,37 +1,37 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; -import CreateBy from '../Types/Database/CreateBy'; -import AccessTokenService from './AccessTokenService'; -import Email from 'Common/Types/Email'; -import UserService from './UserService'; -import User from 'Model/Models/User'; -import UpdateBy from '../Types/Database/UpdateBy'; -import DeleteBy from '../Types/Database/DeleteBy'; -import ObjectID from 'Common/Types/ObjectID'; -import QueryHelper from '../Types/Database/QueryHelper'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import ProjectService from './ProjectService'; -import { IsBillingEnabled } from '../EnvironmentConfig'; -import { AccountsRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; +import { IsBillingEnabled } from '../EnvironmentConfig'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import QueryHelper from '../Types/Database/QueryHelper'; +import UpdateBy from '../Types/Database/UpdateBy'; +import Errors from '../Utils/Errors'; +import logger from '../Utils/Logger'; +import AccessTokenService from './AccessTokenService'; import BillingService from './BillingService'; +import DatabaseService from './DatabaseService'; +import MailService from './MailService'; +import ProjectService from './ProjectService'; +import UserNotificationRuleService from './UserNotificationRuleService'; +import UserNotificationSettingService from './UserNotificationSettingService'; +import UserService from './UserService'; +import { AccountsRoute } from 'Common/ServiceRoute'; +import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; +import URL from 'Common/Types/API/URL'; import SubscriptionPlan, { PlanSelect, } from 'Common/Types/Billing/SubscriptionPlan'; -import Project from 'Model/Models/Project'; -import MailService from './MailService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import Email from 'Common/Types/Email'; import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import URL from 'Common/Types/API/URL'; -import logger from '../Utils/Logger'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Project from 'Model/Models/Project'; import TeamMember from 'Model/Models/TeamMember'; -import UserNotificationRuleService from './UserNotificationRuleService'; -import UserNotificationSettingService from './UserNotificationSettingService'; -import Hostname from 'Common/Types/API/Hostname'; -import Protocol from 'Common/Types/API/Protocol'; -import Errors from '../Utils/Errors'; +import User from 'Model/Models/User'; export class TeamMemberService extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/TeamPermissionService.ts b/CommonServer/Services/TeamPermissionService.ts index 90bf6e55ba..f6f1652b67 100644 --- a/CommonServer/Services/TeamPermissionService.ts +++ b/CommonServer/Services/TeamPermissionService.ts @@ -1,18 +1,18 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/TeamPermission'; -import DatabaseService from './DatabaseService'; -import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import AccessTokenService from './AccessTokenService'; -import TeamMemberService from './TeamMemberService'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import TeamMember from 'Model/Models/TeamMember'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import TeamService from './TeamService'; -import UpdateBy from '../Types/Database/UpdateBy'; import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete, OnUpdate } from '../Types/Database/Hooks'; +import UpdateBy from '../Types/Database/UpdateBy'; +import AccessTokenService from './AccessTokenService'; +import DatabaseService from './DatabaseService'; +import TeamMemberService from './TeamMemberService'; +import TeamService from './TeamService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; import Team from 'Model/Models/Team'; +import TeamMember from 'Model/Models/TeamMember'; +import Model from 'Model/Models/TeamPermission'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/TeamService.ts b/CommonServer/Services/TeamService.ts index d6dde9031d..02a7f78920 100644 --- a/CommonServer/Services/TeamService.ts +++ b/CommonServer/Services/TeamService.ts @@ -1,11 +1,11 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Team'; -import DatabaseService from './DatabaseService'; +import DeleteBy from '../Types/Database/DeleteBy'; import { OnDelete, OnUpdate } from '../Types/Database/Hooks'; import UpdateBy from '../Types/Database/UpdateBy'; +import DatabaseService from './DatabaseService'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import DeleteBy from '../Types/Database/DeleteBy'; +import Model from 'Model/Models/Team'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/TelemetryServiceService.ts b/CommonServer/Services/TelemetryServiceService.ts index 6acc8fd10a..6f4eecec4f 100644 --- a/CommonServer/Services/TelemetryServiceService.ts +++ b/CommonServer/Services/TelemetryServiceService.ts @@ -1,12 +1,12 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/TelemetryService'; -import DatabaseService from './DatabaseService'; import CreateBy from '../Types/Database/CreateBy'; import { OnCreate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import { BrightColors } from 'Common/Types/BrandColors'; +import DatabaseService from './DatabaseService'; import ArrayUtil from 'Common/Types/ArrayUtil'; +import { BrightColors } from 'Common/Types/BrandColors'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Model from 'Model/Models/TelemetryService'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/TelemetryUsageBillingService.ts b/CommonServer/Services/TelemetryUsageBillingService.ts index 2d31a6eb6d..d80d9a9fd7 100644 --- a/CommonServer/Services/TelemetryUsageBillingService.ts +++ b/CommonServer/Services/TelemetryUsageBillingService.ts @@ -1,16 +1,16 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/TelemetryUsageBilling'; -import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import { MeteredPlanUtil } from '../Types/Billing/MeteredPlan/AllMeteredPlans'; +import TelemetryMeteredPlan from '../Types/Billing/MeteredPlan/TelemetryMeteredPlan'; +import QueryHelper from '../Types/Database/QueryHelper'; import DatabaseService from './DatabaseService'; -import ObjectID from 'Common/Types/ObjectID'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import OneUptimeDate from 'Common/Types/Date'; -import QueryHelper from '../Types/Database/QueryHelper'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import { MeteredPlanUtil } from '../Types/Billing/MeteredPlan/AllMeteredPlans'; import Decimal from 'Common/Types/Decimal'; -import TelemetryMeteredPlan from '../Types/Billing/MeteredPlan/TelemetryMeteredPlan'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import ObjectID from 'Common/Types/ObjectID'; +import Model from 'Model/Models/TelemetryUsageBilling'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserCallService.ts b/CommonServer/Services/UserCallService.ts index 3de9e7501d..b4de2e905f 100644 --- a/CommonServer/Services/UserCallService.ts +++ b/CommonServer/Services/UserCallService.ts @@ -1,21 +1,20 @@ +import { IsBillingEnabled } from '../EnvironmentConfig'; import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/UserCall'; -import DatabaseService from './DatabaseService'; - -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import ProjectService from './ProjectService'; -import Project from 'Model/Models/Project'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import CallService from './CallService'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; import logger from '../Utils/Logger'; +import CallService from './CallService'; +import DatabaseService from './DatabaseService'; +import ProjectService from './ProjectService'; +import UserNotificationRuleService from './UserNotificationRuleService'; +import CallRequest from 'Common/Types/Call/CallRequest'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; import Text from 'Common/Types/Text'; -import CallRequest from 'Common/Types/Call/CallRequest'; -import DeleteBy from '../Types/Database/DeleteBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import UserNotificationRuleService from './UserNotificationRuleService'; -import { IsBillingEnabled } from '../EnvironmentConfig'; +import Project from 'Model/Models/Project'; +import Model from 'Model/Models/UserCall'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserEmailService.ts b/CommonServer/Services/UserEmailService.ts index 2701a13531..ecf37a0a0c 100644 --- a/CommonServer/Services/UserEmailService.ts +++ b/CommonServer/Services/UserEmailService.ts @@ -1,18 +1,17 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/UserEmail'; -import DatabaseService from './DatabaseService'; - -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; -import MailService from './MailService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import logger from '../Utils/Logger'; -import ObjectID from 'Common/Types/ObjectID'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Text from 'Common/Types/Text'; -import DeleteBy from '../Types/Database/DeleteBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import UserNotificationRuleService from './UserNotificationRuleService'; import CreateBy from '../Types/Database/CreateBy'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; +import logger from '../Utils/Logger'; +import DatabaseService from './DatabaseService'; +import MailService from './MailService'; +import UserNotificationRuleService from './UserNotificationRuleService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import Text from 'Common/Types/Text'; +import Model from 'Model/Models/UserEmail'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserNotificationRuleService.ts b/CommonServer/Services/UserNotificationRuleService.ts index b67a3e9cbf..ec1afcf1bc 100644 --- a/CommonServer/Services/UserNotificationRuleService.ts +++ b/CommonServer/Services/UserNotificationRuleService.ts @@ -1,45 +1,45 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/UserNotificationRule'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; -import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; -import Email from 'Common/Types/Email'; -import IncidentSeverityService from './IncidentSeverityService'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import IncidentSeverity from 'Model/Models/IncidentSeverity'; -import UserEmailService from './UserEmailService'; -import UserEmail from 'Model/Models/UserEmail'; -import NotificationRuleType from 'Common/Types/NotificationRule/NotificationRuleType'; -import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; -import UserOnCallLog from 'Model/Models/UserOnCallLog'; -import UserOnCallLogService from './UserOnCallLogService'; -import UserOnCallLogTimeline from 'Model/Models/UserOnCallLogTimeline'; -import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; -import CallRequest from 'Common/Types/Call/CallRequest'; -import EmailMessage from 'Common/Types/Email/EmailMessage'; -import SMS from 'Common/Types/SMS/SMS'; -import Incident from 'Model/Models/Incident'; -import URL from 'Common/Types/API/URL'; -import { AppApiRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; -import ShortLinkService from './ShortLinkService'; -import ShortLink from 'Model/Models/ShortLink'; -import Phone from 'Common/Types/Phone'; -import Dictionary from 'Common/Types/Dictionary'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import CreateBy from '../Types/Database/CreateBy'; +import { OnCreate } from '../Types/Database/Hooks'; import Markdown, { MarkdownContentType } from '../Types/Markdown'; -import IncidentService from './IncidentService'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import UserOnCallLogTimelineService from './UserOnCallLogTimelineService'; -import MailService from './MailService'; -import SmsService from './SmsService'; import CallService from './CallService'; -import OneUptimeDate from 'Common/Types/Date'; -import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; -import Route from 'Common/Types/API/Route'; +import DatabaseService from './DatabaseService'; +import IncidentService from './IncidentService'; +import IncidentSeverityService from './IncidentSeverityService'; +import MailService from './MailService'; +import ShortLinkService from './ShortLinkService'; +import SmsService from './SmsService'; +import UserEmailService from './UserEmailService'; +import UserOnCallLogService from './UserOnCallLogService'; +import UserOnCallLogTimelineService from './UserOnCallLogTimelineService'; +import { AppApiRoute } from 'Common/ServiceRoute'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import CallRequest from 'Common/Types/Call/CallRequest'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import EmailMessage from 'Common/Types/Email/EmailMessage'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import NotificationRuleType from 'Common/Types/NotificationRule/NotificationRuleType'; +import ObjectID from 'Common/Types/ObjectID'; +import Phone from 'Common/Types/Phone'; +import SMS from 'Common/Types/SMS/SMS'; +import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; +import UserNotificationStatus from 'Common/Types/UserNotification/UserNotificationStatus'; +import Incident from 'Model/Models/Incident'; +import IncidentSeverity from 'Model/Models/IncidentSeverity'; +import ShortLink from 'Model/Models/ShortLink'; +import UserEmail from 'Model/Models/UserEmail'; +import Model from 'Model/Models/UserNotificationRule'; +import UserOnCallLog from 'Model/Models/UserOnCallLog'; +import UserOnCallLogTimeline from 'Model/Models/UserOnCallLogTimeline'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserNotificationSettingService.ts b/CommonServer/Services/UserNotificationSettingService.ts index 7c8c7c489f..18b7092121 100644 --- a/CommonServer/Services/UserNotificationSettingService.ts +++ b/CommonServer/Services/UserNotificationSettingService.ts @@ -1,27 +1,27 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import DatabaseService from './DatabaseService'; -import { OnCreate } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import ObjectID from 'Common/Types/ObjectID'; -import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; -import UserNotificationSetting from 'Model/Models/UserNotificationSetting'; -import TeamMemberService from './TeamMemberService'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import { SMSMessage } from 'Common/Types/SMS/SMS'; -import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; -import MailService from './MailService'; -import UserEmail from 'Model/Models/UserEmail'; -import UserEmailService from './UserEmailService'; -import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import { OnCreate } from '../Types/Database/Hooks'; import logger from '../Utils/Logger'; -import UserSMS from 'Model/Models/UserSMS'; -import SmsService from './SmsService'; -import UserSmsService from './UserSmsService'; -import UserCallService from './UserCallService'; import CallService from './CallService'; +import DatabaseService from './DatabaseService'; +import MailService from './MailService'; +import SmsService from './SmsService'; +import TeamMemberService from './TeamMemberService'; +import UserCallService from './UserCallService'; +import UserEmailService from './UserEmailService'; +import UserSmsService from './UserSmsService'; +import { CallRequestMessage } from 'Common/Types/Call/CallRequest'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import { EmailEnvelope } from 'Common/Types/Email/EmailMessage'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import NotificationSettingEventType from 'Common/Types/NotificationSetting/NotificationSettingEventType'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import { SMSMessage } from 'Common/Types/SMS/SMS'; import UserCall from 'Model/Models/UserCall'; +import UserEmail from 'Model/Models/UserEmail'; +import UserNotificationSetting from 'Model/Models/UserNotificationSetting'; +import UserSMS from 'Model/Models/UserSMS'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserOnCallLogService.ts b/CommonServer/Services/UserOnCallLogService.ts index 08801fd5a2..1e01e8191b 100644 --- a/CommonServer/Services/UserOnCallLogService.ts +++ b/CommonServer/Services/UserOnCallLogService.ts @@ -1,21 +1,21 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/UserOnCallLog'; -import DatabaseService from './DatabaseService'; +import CreateBy from '../Types/Database/CreateBy'; import { OnCreate, OnUpdate } from '../Types/Database/Hooks'; -import UserNotificationRule from 'Model/Models/UserNotificationRule'; +import DatabaseService from './DatabaseService'; +import IncidentService from './IncidentService'; +import OnCallDutyPolicyExecutionLogTimelineService from './OnCallDutyPolicyExecutionLogTimelineService'; import UserNotificationRuleService from './UserNotificationRuleService'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import NotificationRuleType from 'Common/Types/NotificationRule/NotificationRuleType'; -import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import CreateBy from '../Types/Database/CreateBy'; -import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; -import IncidentService from './IncidentService'; -import Incident from 'Model/Models/Incident'; -import PositiveNumber from 'Common/Types/PositiveNumber'; +import NotificationRuleType from 'Common/Types/NotificationRule/NotificationRuleType'; import ObjectID from 'Common/Types/ObjectID'; -import OnCallDutyPolicyExecutionLogTimelineService from './OnCallDutyPolicyExecutionLogTimelineService'; import OnCallDutyExecutionLogTimelineStatus from 'Common/Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import UserNotificationEventType from 'Common/Types/UserNotification/UserNotificationEventType'; +import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; +import Incident from 'Model/Models/Incident'; +import UserNotificationRule from 'Model/Models/UserNotificationRule'; +import Model from 'Model/Models/UserOnCallLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserOnCallLogTimelineService.ts b/CommonServer/Services/UserOnCallLogTimelineService.ts index 5fbdb1ffc1..8d57b326aa 100644 --- a/CommonServer/Services/UserOnCallLogTimelineService.ts +++ b/CommonServer/Services/UserOnCallLogTimelineService.ts @@ -1,19 +1,19 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/UserOnCallLogTimeline'; -import DatabaseService from './DatabaseService'; import { OnUpdate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import UserOnCallLogService from './UserOnCallLogService'; +import DatabaseService from './DatabaseService'; +import IncidentService from './IncidentService'; import OnCallDutyPolicyExecutionLogService from './OnCallDutyPolicyExecutionLogService'; import OnCallDutyPolicyExecutionLogTimelineService from './OnCallDutyPolicyExecutionLogTimelineService'; -import IncidentService from './IncidentService'; -import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; -import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; -import User from 'Model/Models/User'; +import UserOnCallLogService from './UserOnCallLogService'; import UserService from './UserService'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import OnCallDutyExecutionLogTimelineStatus from 'Common/Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus'; +import OnCallDutyPolicyStatus from 'Common/Types/OnCallDutyPolicy/OnCallDutyPolicyStatus'; +import UserNotificationExecutionStatus from 'Common/Types/UserNotification/UserNotificationExecutionStatus'; +import User from 'Model/Models/User'; +import Model from 'Model/Models/UserOnCallLogTimeline'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserService.ts b/CommonServer/Services/UserService.ts index e72489afa6..a7f1072a7c 100755 --- a/CommonServer/Services/UserService.ts +++ b/CommonServer/Services/UserService.ts @@ -1,31 +1,31 @@ -import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/User'; -import DatabaseService from './DatabaseService'; -import { OnUpdate } from '../Types/Database/Hooks'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Email from 'Common/Types/Email'; -import ObjectID from 'Common/Types/ObjectID'; -import MailService from './MailService'; -import UpdateBy from '../Types/Database/UpdateBy'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; -import { AccountsRoute } from 'Common/ServiceRoute'; import DatabaseConfig from '../DatabaseConfig'; +import { IsBillingEnabled } from '../EnvironmentConfig'; +import PostgresDatabase from '../Infrastructure/PostgresDatabase'; +import { OnUpdate } from '../Types/Database/Hooks'; +import UpdateBy from '../Types/Database/UpdateBy'; import logger from '../Utils/Logger'; -import URL from 'Common/Types/API/URL'; -import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; -import OneUptimeDate from 'Common/Types/Date'; +import DatabaseService from './DatabaseService'; import EmailVerificationTokenService from './EmailVerificationTokenService'; -import Route from 'Common/Types/API/Route'; -import TeamMember from 'Model/Models/TeamMember'; +import MailService from './MailService'; import TeamMemberService from './TeamMemberService'; import UserNotificationRuleService from './UserNotificationRuleService'; import UserNotificationSettingService from './UserNotificationSettingService'; +import { AccountsRoute } from 'Common/ServiceRoute'; import Hostname from 'Common/Types/API/Hostname'; import Protocol from 'Common/Types/API/Protocol'; -import { IsBillingEnabled } from '../EnvironmentConfig'; -import Text from 'Common/Types/Text'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Email from 'Common/Types/Email'; +import EmailTemplateType from 'Common/Types/Email/EmailTemplateType'; import HashedString from 'Common/Types/HashedString'; +import ObjectID from 'Common/Types/ObjectID'; +import Text from 'Common/Types/Text'; +import EmailVerificationToken from 'Model/Models/EmailVerificationToken'; +import TeamMember from 'Model/Models/TeamMember'; +import Model from 'Model/Models/User'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/UserSmsService.ts b/CommonServer/Services/UserSmsService.ts index f4a6a144c5..3af18be75d 100644 --- a/CommonServer/Services/UserSmsService.ts +++ b/CommonServer/Services/UserSmsService.ts @@ -1,20 +1,19 @@ +import { IsBillingEnabled } from '../EnvironmentConfig'; import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/UserSMS'; -import DatabaseService from './DatabaseService'; - -import { OnCreate, OnDelete } from '../Types/Database/Hooks'; import CreateBy from '../Types/Database/CreateBy'; -import ProjectService from './ProjectService'; -import Project from 'Model/Models/Project'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import SmsService from './SmsService'; +import DeleteBy from '../Types/Database/DeleteBy'; +import { OnCreate, OnDelete } from '../Types/Database/Hooks'; import logger from '../Utils/Logger'; +import DatabaseService from './DatabaseService'; +import ProjectService from './ProjectService'; +import SmsService from './SmsService'; +import UserNotificationRuleService from './UserNotificationRuleService'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import ObjectID from 'Common/Types/ObjectID'; import Text from 'Common/Types/Text'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import UserNotificationRuleService from './UserNotificationRuleService'; -import DeleteBy from '../Types/Database/DeleteBy'; -import { IsBillingEnabled } from '../EnvironmentConfig'; +import Project from 'Model/Models/Project'; +import Model from 'Model/Models/UserSMS'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/WorkflowLogService.ts b/CommonServer/Services/WorkflowLogService.ts index 4ec0326b58..60ba79e2ce 100644 --- a/CommonServer/Services/WorkflowLogService.ts +++ b/CommonServer/Services/WorkflowLogService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/WorkflowLog'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/WorkflowLog'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/WorkflowService.ts b/CommonServer/Services/WorkflowService.ts index 80b8c9eb9b..22b9e1e95a 100644 --- a/CommonServer/Services/WorkflowService.ts +++ b/CommonServer/Services/WorkflowService.ts @@ -1,21 +1,21 @@ +import { AppApiHostname } from '../EnvironmentConfig'; import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/Workflow'; -import DatabaseService from './DatabaseService'; +import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; import { OnUpdate } from '../Types/Database/Hooks'; -import ObjectID from 'Common/Types/ObjectID'; +import DatabaseService from './DatabaseService'; +import EmptyResponseData from 'Common/Types/API/EmptyResponse'; +import Protocol from 'Common/Types/API/Protocol'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; import { ComponentType, NodeDataProp, NodeType, } from 'Common/Types/Workflow/Component'; import API from 'Common/Utils/API'; -import EmptyResponseData from 'Common/Types/API/EmptyResponse'; -import URL from 'Common/Types/API/URL'; -import Protocol from 'Common/Types/API/Protocol'; -import { AppApiHostname } from '../EnvironmentConfig'; -import Route from 'Common/Types/API/Route'; -import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization'; +import Model from 'Model/Models/Workflow'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Services/WorkflowVariableService.ts b/CommonServer/Services/WorkflowVariableService.ts index d15c83d5e6..3d5d593558 100644 --- a/CommonServer/Services/WorkflowVariableService.ts +++ b/CommonServer/Services/WorkflowVariableService.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../Infrastructure/PostgresDatabase'; -import Model from 'Model/Models/WorkflowVariable'; import DatabaseService from './DatabaseService'; +import Model from 'Model/Models/WorkflowVariable'; export class Service extends DatabaseService { public constructor(postgresDatabase?: PostgresDatabase) { diff --git a/CommonServer/Tests/API/BaseAPI.test.ts b/CommonServer/Tests/API/BaseAPI.test.ts index df75971e5d..9f3d9f78b8 100644 --- a/CommonServer/Tests/API/BaseAPI.test.ts +++ b/CommonServer/Tests/API/BaseAPI.test.ts @@ -1,28 +1,28 @@ /* eslint-disable no-loop-func */ +import BaseAPI from '../../API/BaseAPI'; +import CommonAPI from '../../API/CommonAPI'; +import UserMiddleware from '../../Middleware/UserAuthorization'; +import DatabaseService from '../../Services/DatabaseService'; +import ProjectService from '../../Services/ProjectService'; import Express, { ExpressResponse, ExpressRouter, NextFunction, OneUptimeRequest, } from '../../Utils/Express'; -import DatabaseService from '../../Services/DatabaseService'; -import UserMiddleware from '../../Middleware/UserAuthorization'; +import Response from '../../Utils/Response'; +import { mockRouter } from './Helpers'; import { describe, expect, it } from '@jest/globals'; import BaseModel from 'Common/Models/BaseModel'; -import BaseAPI from '../../API/BaseAPI'; -import BadRequestException from 'Common/Types/Exception/BadRequestException'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import PositiveNumber from 'Common/Types/PositiveNumber'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; import { PlanSelect } from 'Common/Types/Billing/SubscriptionPlan'; -import ObjectID from 'Common/Types/ObjectID'; -import Response from '../../Utils/Response'; -import ProjectService from '../../Services/ProjectService'; -import UserType from 'Common/Types/UserType'; -import { mockRouter } from './Helpers'; -import { UserPermission } from 'Common/Types/Permission'; -import CommonAPI from '../../API/CommonAPI'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadRequestException from 'Common/Types/Exception/BadRequestException'; import GenericObject from 'Common/Types/GenericObject'; +import ObjectID from 'Common/Types/ObjectID'; +import { UserPermission } from 'Common/Types/Permission'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import UserType from 'Common/Types/UserType'; jest.mock('../../Utils/Express', () => { return { diff --git a/CommonServer/Tests/API/ProbeAPI.test.ts b/CommonServer/Tests/API/ProbeAPI.test.ts index 1f7c38e8d4..d7d5b58a43 100644 --- a/CommonServer/Tests/API/ProbeAPI.test.ts +++ b/CommonServer/Tests/API/ProbeAPI.test.ts @@ -1,16 +1,16 @@ +import Ingestor from '../../API/ProbeAPI'; import ProbeService from '../../Services/ProbeService'; -import Probe from 'Model/Models/Probe'; -import Response from '../../Utils/Response'; import { ExpressRequest, ExpressResponse, NextFunction, } from '../../Utils/Express'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import { describe, expect, it } from '@jest/globals'; +import Response from '../../Utils/Response'; import { mockRouter } from './Helpers'; -import Ingestor from '../../API/ProbeAPI'; +import { describe, expect, it } from '@jest/globals'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Probe from 'Model/Models/Probe'; jest.mock('../../Utils/Express', () => { return { diff --git a/CommonServer/Tests/API/ProjectAPI.test.ts b/CommonServer/Tests/API/ProjectAPI.test.ts index 04a8c26406..d462be3b6d 100644 --- a/CommonServer/Tests/API/ProjectAPI.test.ts +++ b/CommonServer/Tests/API/ProjectAPI.test.ts @@ -1,20 +1,20 @@ -import Project from 'Model/Models/Project'; -import TeamMember from 'Model/Models/TeamMember'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; -import ObjectID from 'Common/Types/ObjectID'; +import ProjectAPI from '../../API/ProjectAPI'; import TeamMemberService from '../../Services/TeamMemberService'; -import { mockRouter } from './Helpers'; -import { describe, expect, it } from '@jest/globals'; import { - OneUptimeResponse, - OneUptimeRequest, NextFunction, + OneUptimeRequest, + OneUptimeResponse, } from '../../Utils/Express'; import Response from '../../Utils/Response'; -import ProjectAPI from '../../API/ProjectAPI'; +import { mockRouter } from './Helpers'; +import { describe, expect, it } from '@jest/globals'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; +import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Project from 'Model/Models/Project'; +import TeamMember from 'Model/Models/TeamMember'; jest.mock('../../Utils/Express', () => { return { diff --git a/CommonServer/Tests/API/UserSmsApi.test.ts b/CommonServer/Tests/API/UserSmsApi.test.ts index f7181757e5..17d64c0bdc 100644 --- a/CommonServer/Tests/API/UserSmsApi.test.ts +++ b/CommonServer/Tests/API/UserSmsApi.test.ts @@ -1,17 +1,17 @@ +import UserSmsAPI from '../../API/UserSmsAPI'; +import UserSmsService from '../../Services/UserSmsService'; +import { + NextFunction, + OneUptimeRequest, + OneUptimeResponse, +} from '../../Utils/Express'; +import Response from '../../Utils/Response'; +import { mockRouter } from './Helpers'; +import { describe, expect, it } from '@jest/globals'; import BadDataException from 'Common/Types/Exception/BadDataException'; import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; import ObjectID from 'Common/Types/ObjectID'; import UserSMS from 'Model/Models/UserSMS'; -import UserSmsService from '../../Services/UserSmsService'; -import { mockRouter } from './Helpers'; -import { - OneUptimeResponse, - OneUptimeRequest, - NextFunction, -} from '../../Utils/Express'; -import Response from '../../Utils/Response'; -import UserSmsAPI from '../../API/UserSmsAPI'; -import { describe, expect, it } from '@jest/globals'; jest.mock('../../Utils/Express', () => { return { diff --git a/CommonServer/Tests/Middleware/BearerTokenAuthorization.test.ts b/CommonServer/Tests/Middleware/BearerTokenAuthorization.test.ts index ba33134658..c72bbbbd9e 100644 --- a/CommonServer/Tests/Middleware/BearerTokenAuthorization.test.ts +++ b/CommonServer/Tests/Middleware/BearerTokenAuthorization.test.ts @@ -1,8 +1,8 @@ import BearerTokenAuthorization from '../../Middleware/BearerTokenAuthorization'; -import { OneUptimeRequest, ExpressResponse } from '../../Utils/Express'; +import { ExpressResponse, OneUptimeRequest } from '../../Utils/Express'; import JSONWebToken from '../../Utils/JsonWebToken'; -import { JSONObject } from 'Common/Types/JSON'; import { describe, expect, it } from '@jest/globals'; +import { JSONObject } from 'Common/Types/JSON'; describe('BearerTokenAuthorization', () => { describe('isAuthorizedBearerToken', () => { diff --git a/CommonServer/Tests/Middleware/ClusterKeyAuthorization.test.ts b/CommonServer/Tests/Middleware/ClusterKeyAuthorization.test.ts index 2450940f6d..1558bd6f8b 100644 --- a/CommonServer/Tests/Middleware/ClusterKeyAuthorization.test.ts +++ b/CommonServer/Tests/Middleware/ClusterKeyAuthorization.test.ts @@ -1,5 +1,3 @@ -import Dictionary from 'Common/Types/Dictionary'; -import BadDataException from 'Common/Types/Exception/BadDataException'; import { ClusterKey as ONEUPTIME_SECRET } from '../../EnvironmentConfig'; import ClusterKeyAuthorization from '../../Middleware/ClusterKeyAuthorization'; import { @@ -8,6 +6,8 @@ import { NextFunction, } from '../../Utils/Express'; import Response from '../../Utils/Response'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; describe('ClusterKeyAuthorization', () => { describe('getClusterKeyHeaders', () => { diff --git a/CommonServer/Tests/Middleware/NotificationMiddleware.test.ts b/CommonServer/Tests/Middleware/NotificationMiddleware.test.ts index 23eb306715..8180cfd735 100644 --- a/CommonServer/Tests/Middleware/NotificationMiddleware.test.ts +++ b/CommonServer/Tests/Middleware/NotificationMiddleware.test.ts @@ -1,21 +1,18 @@ -import VoiceResponse from 'twilio/lib/twiml/VoiceResponse'; - import NotificationMiddleware from '../../Middleware/NotificationMiddleware'; - -// Helpers -import Response from '../../Utils/Response'; -import JSONWebToken from '../../Utils/JsonWebToken'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import JSONFunctions from 'Common/Types/JSONFunctions'; - // Types import { ExpressRequest, ExpressResponse, NextFunction, } from '../../Utils/Express'; +import JSONWebToken from '../../Utils/JsonWebToken'; +// Helpers +import Response from '../../Utils/Response'; import { OnCallInputRequest } from 'Common/Types/Call/CallRequest'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import VoiceResponse from 'twilio/lib/twiml/VoiceResponse'; jest.mock('twilio/lib/twiml/VoiceResponse'); jest.mock('../../Utils/Response'); diff --git a/CommonServer/Tests/Middleware/ProjectAuthorization.test.ts b/CommonServer/Tests/Middleware/ProjectAuthorization.test.ts index 4684732237..58a52023cc 100644 --- a/CommonServer/Tests/Middleware/ProjectAuthorization.test.ts +++ b/CommonServer/Tests/Middleware/ProjectAuthorization.test.ts @@ -1,20 +1,20 @@ -import '../TestingUtils/Init'; -import ObjectID from 'Common/Types/ObjectID'; import ProjectMiddleware from '../../Middleware/ProjectAuthorization'; +import AccessTokenService from '../../Services/AccessTokenService'; +import ApiKeyService from '../../Services/ApiKeyService'; +import GlobalConfigService from '../../Services/GlobalConfigService'; +import QueryHelper from '../../Types/Database/QueryHelper'; import { ExpressRequest, ExpressResponse, NextFunction, } from '../../Utils/Express'; -import ApiKeyService from '../../Services/ApiKeyService'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import OneUptimeDate from 'Common/Types/Date'; -import QueryHelper from '../../Types/Database/QueryHelper'; -import ApiKey from 'Model/Models/ApiKey'; -import AccessTokenService from '../../Services/AccessTokenService'; -import { UserTenantAccessPermission } from 'Common/Types/Permission'; import Database from '../TestingUtils/Database'; -import GlobalConfigService from '../../Services/GlobalConfigService'; +import '../TestingUtils/Init'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; +import { UserTenantAccessPermission } from 'Common/Types/Permission'; +import ApiKey from 'Model/Models/ApiKey'; jest.mock('../../Services/ApiKeyService'); jest.mock('../../Services/AccessTokenService'); diff --git a/CommonServer/Tests/Middleware/UserAuthorization.test.ts b/CommonServer/Tests/Middleware/UserAuthorization.test.ts index 49b52de616..1e720181de 100644 --- a/CommonServer/Tests/Middleware/UserAuthorization.test.ts +++ b/CommonServer/Tests/Middleware/UserAuthorization.test.ts @@ -1,5 +1,8 @@ -import Dictionary from 'Common/Types/Dictionary'; +import ProjectMiddleware from '../../Middleware/ProjectAuthorization'; import UserMiddleware from '../../Middleware/UserAuthorization'; +import AccessTokenService from '../../Services/AccessTokenService'; +import ProjectService from '../../Services/ProjectService'; +import UserService from '../../Services/UserService'; import { ExpressRequest, ExpressResponse, @@ -7,23 +10,20 @@ import { } from '../../Utils/Express'; import JSONWebToken from '../../Utils/JsonWebToken'; import logger from '../../Utils/Logger'; +import Response from '../../Utils/Response'; +import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import SsoAuthorizationException from 'Common/Types/Exception/SsoAuthorizationException'; +import HashedString from 'Common/Types/HashedString'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; import ObjectID from 'Common/Types/ObjectID'; -import ProjectMiddleware from '../../Middleware/ProjectAuthorization'; -import UserService from '../../Services/UserService'; -import Email from 'Common/Types/Email'; -import ProjectService from '../../Services/ProjectService'; -import Response from '../../Utils/Response'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Project from 'Model/Models/Project'; -import SsoAuthorizationException from 'Common/Types/Exception/SsoAuthorizationException'; -import AccessTokenService from '../../Services/AccessTokenService'; import { UserGlobalAccessPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import HashedString from 'Common/Types/HashedString'; +import Project from 'Model/Models/Project'; jest.mock('../../Utils/Logger'); jest.mock('../../Middleware/ProjectAuthorization'); diff --git a/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts b/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts index ad118888e7..00e4aeb3ec 100644 --- a/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts +++ b/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts @@ -1,12 +1,12 @@ +import AnalyticsDatabaseService from '../../Services/AnalyticsDatabaseService'; +import { SQL, Statement } from '../../Utils/AnalyticsDatabase/Statement'; +import logger from '../../Utils/Logger'; import '../TestingUtils/Init'; import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; import Route from 'Common/Types/API/Route'; import AnalyticsTableEngine from 'Common/Types/AnalyticsDatabase/AnalyticsTableEngine'; import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; -import AnalyticsDatabaseService from '../../Services/AnalyticsDatabaseService'; -import { SQL, Statement } from '../../Utils/AnalyticsDatabase/Statement'; -import logger from '../../Utils/Logger'; import GenericObject from 'Common/Types/GenericObject'; describe('AnalyticsDatabaseService', () => { diff --git a/CommonServer/Tests/Services/BillingService.test.ts b/CommonServer/Tests/Services/BillingService.test.ts index 33a56d9b0c..aff3e33454 100644 --- a/CommonServer/Tests/Services/BillingService.test.ts +++ b/CommonServer/Tests/Services/BillingService.test.ts @@ -1,30 +1,23 @@ -import MeteredPlan from 'Common/Types/Billing/MeteredPlan'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; -import { describe, expect, it } from '@jest/globals'; import { BillingService, Invoice, PaymentMethod, SubscriptionItem, } from '../../Services/BillingService'; - +import { ActiveMonitoringMeteredPlan } from '../../Types/Billing/MeteredPlan/AllMeteredPlans'; import Errors from '../../Utils/Errors'; - -import { mockStripe, Stripe } from '../TestingUtils/__mocks__/Stripe.mock'; import { - mockIsBillingEnabled, - getStripeCustomer, - getStripeSubscription, - getSubscriptionPlanData, - getCustomerData, - getSubscriptionData, - getMeteredSubscription, getChangePlanData, getCouponData, + getCustomerData, + getMeteredSubscription, + getStripeCustomer, getStripeInvoice, + getStripeSubscription, + getSubscriptionData, + getSubscriptionPlanData, + mockIsBillingEnabled, } from '../TestingUtils/Services/Helpers'; - import { ChangePlan, CouponData, @@ -33,7 +26,11 @@ import { PaymentMethodsResponse, Subscription, } from '../TestingUtils/Services/Types'; -import { ActiveMonitoringMeteredPlan } from '../../Types/Billing/MeteredPlan/AllMeteredPlans'; +import { Stripe, mockStripe } from '../TestingUtils/__mocks__/Stripe.mock'; +import { describe, expect, it } from '@jest/globals'; +import MeteredPlan from 'Common/Types/Billing/MeteredPlan'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import SubscriptionStatus from 'Common/Types/Billing/SubscriptionStatus'; describe('BillingService', () => { let billingService: BillingService; diff --git a/CommonServer/Tests/Services/ProbeService.test.ts b/CommonServer/Tests/Services/ProbeService.test.ts index 1d4e55e53d..1ef0134186 100644 --- a/CommonServer/Tests/Services/ProbeService.test.ts +++ b/CommonServer/Tests/Services/ProbeService.test.ts @@ -1,13 +1,13 @@ -import '../TestingUtils/Init'; import { Service as ProbeService } from '../../Services/ProbeService'; -import Probe from 'Model/Models/Probe'; import Database from '../TestingUtils/Database'; +import '../TestingUtils/Init'; +import UserTestService from '../TestingUtils/Services/UserServiceHelper'; import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; import Version from 'Common/Types/Version'; import Faker from 'Common/Utils/Faker'; -import PositiveNumber from 'Common/Types/PositiveNumber'; +import Probe from 'Model/Models/Probe'; import User from 'Model/Models/User'; -import UserTestService from '../TestingUtils/Services/UserServiceHelper'; import { fail } from 'assert'; describe('probeService', () => { diff --git a/CommonServer/Tests/Services/ScheduledMaintenanceService.test.ts b/CommonServer/Tests/Services/ScheduledMaintenanceService.test.ts index da24c33de5..569ff69dd5 100644 --- a/CommonServer/Tests/Services/ScheduledMaintenanceService.test.ts +++ b/CommonServer/Tests/Services/ScheduledMaintenanceService.test.ts @@ -1,15 +1,15 @@ -import '../TestingUtils/Init'; import ScheduledMaintenanceService from '../../Services/ScheduledMaintenanceService'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; import Database from '../TestingUtils/Database'; -import Project from 'Model/Models/Project'; -import User from 'Model/Models/User'; -import { describe, expect, it } from '@jest/globals'; -import UserServiceHelper from '../TestingUtils/Services/UserServiceHelper'; +import '../TestingUtils/Init'; import ProjectServiceHelper from '../TestingUtils/Services/ProjectServiceHelper'; -import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; import ScheduledMaintenanceServiceHelper from '../TestingUtils/Services/ScheduledMaintenanceServiceHelper'; import ScheduledMaintenanceStateServiceHelper from '../TestingUtils/Services/ScheduledMaintenanceStateServiceHelper'; +import UserServiceHelper from '../TestingUtils/Services/UserServiceHelper'; +import { describe, expect, it } from '@jest/globals'; +import Project from 'Model/Models/Project'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; +import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; +import User from 'Model/Models/User'; // mock PostgresDatabase const testDatabase: Database = new Database(); diff --git a/CommonServer/Tests/Services/TeamMemberService.test.ts b/CommonServer/Tests/Services/TeamMemberService.test.ts index 928448d1d1..0195bbd1af 100644 --- a/CommonServer/Tests/Services/TeamMemberService.test.ts +++ b/CommonServer/Tests/Services/TeamMemberService.test.ts @@ -1,31 +1,28 @@ -import '../TestingUtils/Init'; -import Database from '../TestingUtils/Database'; -import UserServiceHelper from '../TestingUtils/Services/UserServiceHelper'; -import ProjectServiceHelper from '../TestingUtils/Services/ProjectServiceHelper'; -import TeamServiceHelper from '../TestingUtils/Services/TeamServiceHelper'; -import TeamMemberServiceHelper from '../TestingUtils/Services/TeamMemberServiceHelper'; -import { describe, expect, it } from '@jest/globals'; -import ObjectID from 'Common/Types/ObjectID'; -import Email from 'Common/Types/Email'; -import { faker } from '@faker-js/faker'; - -import TeamMember from 'Model/Models/TeamMember'; -import User from 'Model/Models/User'; -import Project from 'Model/Models/Project'; -import Team from 'Model/Models/Team'; - -import TeamService from '../../Services/TeamService'; -import { TeamMemberService } from '../../Services/TeamMemberService'; +import { Host, HttpProtocol } from '../../EnvironmentConfig'; import AccessTokenService from '../../Services/AccessTokenService'; import BillingService from '../../Services/BillingService'; -import ProjectService from '../../Services/ProjectService'; import MailService from '../../Services/MailService'; -import UserNotificationSettingService from '../../Services/UserNotificationSettingService'; +import ProjectService from '../../Services/ProjectService'; +import { TeamMemberService } from '../../Services/TeamMemberService'; +import TeamService from '../../Services/TeamService'; import UserNotificationRuleService from '../../Services/UserNotificationRuleService'; - -import Errors from '../../Utils/Errors'; +import UserNotificationSettingService from '../../Services/UserNotificationSettingService'; import CreateBy from '../../Types/Database/CreateBy'; -import { Host, HttpProtocol } from '../../EnvironmentConfig'; +import Errors from '../../Utils/Errors'; +import Database from '../TestingUtils/Database'; +import '../TestingUtils/Init'; +import ProjectServiceHelper from '../TestingUtils/Services/ProjectServiceHelper'; +import TeamMemberServiceHelper from '../TestingUtils/Services/TeamMemberServiceHelper'; +import TeamServiceHelper from '../TestingUtils/Services/TeamServiceHelper'; +import UserServiceHelper from '../TestingUtils/Services/UserServiceHelper'; +import { faker } from '@faker-js/faker'; +import { describe, expect, it } from '@jest/globals'; +import Email from 'Common/Types/Email'; +import ObjectID from 'Common/Types/ObjectID'; +import Project from 'Model/Models/Project'; +import Team from 'Model/Models/Team'; +import TeamMember from 'Model/Models/TeamMember'; +import User from 'Model/Models/User'; jest.setTimeout(60000); // Increase test timeout to 60 seconds becuase GitHub runners are slow diff --git a/CommonServer/Tests/TestingUtils/Database.ts b/CommonServer/Tests/TestingUtils/Database.ts index 4bd4915b51..a6a7a22203 100644 --- a/CommonServer/Tests/TestingUtils/Database.ts +++ b/CommonServer/Tests/TestingUtils/Database.ts @@ -1,6 +1,6 @@ import PostgresDatabase from '../../Infrastructure/PostgresDatabase'; -import { createDatabase, dropDatabase } from 'typeorm-extension'; import { DataSource, DataSourceOptions } from 'typeorm'; +import { createDatabase, dropDatabase } from 'typeorm-extension'; export default class DatabaseConnect { private database!: PostgresDatabase; diff --git a/CommonServer/Tests/TestingUtils/Init.ts b/CommonServer/Tests/TestingUtils/Init.ts index ee39032072..8ded572f0b 100644 --- a/CommonServer/Tests/TestingUtils/Init.ts +++ b/CommonServer/Tests/TestingUtils/Init.ts @@ -1,8 +1,8 @@ -process.env['NODE_ENV'] = 'test'; import '../../Utils/Environment'; - import dotenv from 'dotenv'; +process.env['NODE_ENV'] = 'test'; + dotenv.config({ path: '../.env.test', }); diff --git a/CommonServer/Tests/TestingUtils/Services/Helpers.ts b/CommonServer/Tests/TestingUtils/Services/Helpers.ts index b753f304e6..a8bcdfc197 100644 --- a/CommonServer/Tests/TestingUtils/Services/Helpers.ts +++ b/CommonServer/Tests/TestingUtils/Services/Helpers.ts @@ -1,20 +1,17 @@ -import { Stripe } from 'stripe'; -import { faker } from '@faker-js/faker'; - -import Email from 'Common/Types/Email'; -import ObjectID from 'Common/Types/ObjectID'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; - import { BillingService } from '../../../Services/BillingService'; - import { - CustomerData, - Subscription, - MeteredSubscription, ChangePlan, CouponData, + CustomerData, + MeteredSubscription, + Subscription, } from '../../TestingUtils/Services/Types'; +import { faker } from '@faker-js/faker'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import Email from 'Common/Types/Email'; import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import ObjectID from 'Common/Types/ObjectID'; +import { Stripe } from 'stripe'; /// @dev consider modifyfing the EnvirontmentConfig to use functions instead of constants so that we can mock them diff --git a/CommonServer/Tests/TestingUtils/Services/ProjectServiceHelper.ts b/CommonServer/Tests/TestingUtils/Services/ProjectServiceHelper.ts index b5148ad5c3..cacde23722 100644 --- a/CommonServer/Tests/TestingUtils/Services/ProjectServiceHelper.ts +++ b/CommonServer/Tests/TestingUtils/Services/ProjectServiceHelper.ts @@ -1,7 +1,7 @@ -import Project from 'Model/Models/Project'; -import Faker from 'Common/Utils/Faker'; import CreateBy from '../../../Types/Database/CreateBy'; import ObjectID from 'Common/Types/ObjectID'; +import Faker from 'Common/Utils/Faker'; +import Project from 'Model/Models/Project'; export default class ProjectTestService { public static generateRandomProject(userId?: ObjectID): CreateBy { diff --git a/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts b/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts index 8da24a2df1..42038b2204 100644 --- a/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts +++ b/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts @@ -1,8 +1,8 @@ -import ObjectID from 'Common/Types/ObjectID'; import CreateBy from '../../../Types/Database/CreateBy'; -import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; -import Faker from 'Common/Utils/Faker'; import faker from '@faker-js/faker'; +import ObjectID from 'Common/Types/ObjectID'; +import Faker from 'Common/Utils/Faker'; +import ScheduledMaintenance from 'Model/Models/ScheduledMaintenance'; export default class ScheduledMaintenanceTestService { public static generateRandomScheduledMaintenance( diff --git a/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts b/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts index 53ad48bf93..7840ab98a0 100644 --- a/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts +++ b/CommonServer/Tests/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts @@ -1,7 +1,7 @@ -import ObjectID from 'Common/Types/ObjectID'; -import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; import CreateBy from '../../../Types/Database/CreateBy'; import { Black, Yellow } from 'Common/Types/BrandColors'; +import ObjectID from 'Common/Types/ObjectID'; +import ScheduledMaintenanceState from 'Model/Models/ScheduledMaintenanceState'; export default class ScheduledMaintenanceStateTestService { public static generateScheduledState( diff --git a/CommonServer/Tests/TestingUtils/Services/TeamMemberServiceHelper.ts b/CommonServer/Tests/TestingUtils/Services/TeamMemberServiceHelper.ts index 9ebda6bc43..fd5204e7b2 100644 --- a/CommonServer/Tests/TestingUtils/Services/TeamMemberServiceHelper.ts +++ b/CommonServer/Tests/TestingUtils/Services/TeamMemberServiceHelper.ts @@ -1,8 +1,8 @@ -import TeamMember from 'Model/Models/TeamMember'; +import CreateBy from '../../../Types/Database/CreateBy'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import Team from 'Model/Models/Team'; -import { JSONObject } from 'Common/Types/JSON'; -import CreateBy from '../../../Types/Database/CreateBy'; +import TeamMember from 'Model/Models/TeamMember'; export default class TeamMemberTestService { public static generateRandomTeamMember( diff --git a/CommonServer/Tests/TestingUtils/Services/TeamServiceHelper.ts b/CommonServer/Tests/TestingUtils/Services/TeamServiceHelper.ts index fedc8adc50..f0365a0dd1 100644 --- a/CommonServer/Tests/TestingUtils/Services/TeamServiceHelper.ts +++ b/CommonServer/Tests/TestingUtils/Services/TeamServiceHelper.ts @@ -1,7 +1,7 @@ -import Team from 'Model/Models/Team'; -import ObjectID from 'Common/Types/ObjectID'; -import faker from '@faker-js/faker'; import CreateBy from '../../../Types/Database/CreateBy'; +import faker from '@faker-js/faker'; +import ObjectID from 'Common/Types/ObjectID'; +import Team from 'Model/Models/Team'; export default class TeamTestService { public static generateRandomTeam( diff --git a/CommonServer/Tests/TestingUtils/Services/Types.ts b/CommonServer/Tests/TestingUtils/Services/Types.ts index 39add74014..04ad538370 100644 --- a/CommonServer/Tests/TestingUtils/Services/Types.ts +++ b/CommonServer/Tests/TestingUtils/Services/Types.ts @@ -1,9 +1,9 @@ -import Email from 'Common/Types/Email'; -import ObjectID from 'Common/Types/ObjectID'; +import { PaymentMethod } from '../../../Services/BillingService'; import ServerMeteredPlan from '../../../Types/Billing/MeteredPlan/ServerMeteredPlan'; import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import { PaymentMethod } from '../../../Services/BillingService'; import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import ObjectID from 'Common/Types/ObjectID'; export type CustomerData = { id: ObjectID; diff --git a/CommonServer/Tests/TestingUtils/Services/UserServiceHelper.ts b/CommonServer/Tests/TestingUtils/Services/UserServiceHelper.ts index 1960c06d46..d1d0aac49f 100644 --- a/CommonServer/Tests/TestingUtils/Services/UserServiceHelper.ts +++ b/CommonServer/Tests/TestingUtils/Services/UserServiceHelper.ts @@ -1,8 +1,8 @@ -import User from 'Model/Models/User'; -import Faker from 'Common/Utils/Faker'; +import CreateBy from '../../../Types/Database/CreateBy'; import CompanySize from 'Common/Types/Company/CompanySize'; import JobRole from 'Common/Types/Company/JobRole'; -import CreateBy from '../../../Types/Database/CreateBy'; +import Faker from 'Common/Utils/Faker'; +import User from 'Model/Models/User'; export default class UserTestService { public static generateRandomUser(): CreateBy { diff --git a/CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts b/CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts index 4a52eccee8..208c3690f8 100644 --- a/CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts +++ b/CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts @@ -1,4 +1,6 @@ import * as mock from 'jest-mock-extended'; +// import libraries to mock (we do it here because of hoisting) +import Stripe from 'stripe'; let mockStripe: jest.Mocked; @@ -9,8 +11,5 @@ jest.mock('stripe', () => { }); }); -// import libraries to mock (we do it here because of hoisting) -import Stripe from 'stripe'; - // return the mocked library and the library itself export { mockStripe, Stripe }; diff --git a/CommonServer/Tests/Utils/AnalyticsDatabase/Statement.test.ts b/CommonServer/Tests/Utils/AnalyticsDatabase/Statement.test.ts index 134149a052..6bfa200963 100644 --- a/CommonServer/Tests/Utils/AnalyticsDatabase/Statement.test.ts +++ b/CommonServer/Tests/Utils/AnalyticsDatabase/Statement.test.ts @@ -1,6 +1,6 @@ +import { SQL, Statement } from '../../../Utils/AnalyticsDatabase/Statement'; import '../../TestingUtils/Init'; import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; -import { SQL, Statement } from '../../../Utils/AnalyticsDatabase/Statement'; describe('Statement', () => { describe('constructor', () => { diff --git a/CommonServer/Tests/Utils/AnalyticsDatabase/StatementGenerator.test.ts b/CommonServer/Tests/Utils/AnalyticsDatabase/StatementGenerator.test.ts index 7dcaca85c7..380d7f8c51 100644 --- a/CommonServer/Tests/Utils/AnalyticsDatabase/StatementGenerator.test.ts +++ b/CommonServer/Tests/Utils/AnalyticsDatabase/StatementGenerator.test.ts @@ -1,15 +1,15 @@ +import { ClickhouseAppInstance } from '../../../Infrastructure/ClickhouseDatabase'; +import UpdateBy from '../../../Types/AnalyticsDatabase/UpdateBy'; +import { SQL, Statement } from '../../../Utils/AnalyticsDatabase/Statement'; +import StatementGenerator from '../../../Utils/AnalyticsDatabase/StatementGenerator'; +import logger from '../../../Utils/Logger'; import '../../TestingUtils/Init'; import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import NestedModel from 'Common/AnalyticsModels/NestedModel'; +import Route from 'Common/Types/API/Route'; +import AnalyticsTableEngine from 'Common/Types/AnalyticsDatabase/AnalyticsTableEngine'; import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; -import StatementGenerator from '../../../Utils/AnalyticsDatabase/StatementGenerator'; -import { ClickhouseAppInstance } from '../../../Infrastructure/ClickhouseDatabase'; -import Route from 'Common/Types/API/Route'; -import { SQL, Statement } from '../../../Utils/AnalyticsDatabase/Statement'; -import UpdateBy from '../../../Types/AnalyticsDatabase/UpdateBy'; -import logger from '../../../Utils/Logger'; -import NestedModel from 'Common/AnalyticsModels/NestedModel'; -import AnalyticsTableEngine from 'Common/Types/AnalyticsDatabase/AnalyticsTableEngine'; import OneUptimeDate from 'Common/Types/Date'; import GenericObject from 'Common/Types/GenericObject'; diff --git a/CommonServer/Tests/Utils/Cookie.test.ts b/CommonServer/Tests/Utils/Cookie.test.ts index da7779f865..0c9d3eade7 100644 --- a/CommonServer/Tests/Utils/Cookie.test.ts +++ b/CommonServer/Tests/Utils/Cookie.test.ts @@ -1,8 +1,8 @@ -import { JSONObject } from 'Common/Types/JSON'; import CookieUtil from '../../Utils/Cookie'; import { ExpressRequest, ExpressResponse } from '../../Utils/Express'; -import ObjectID from 'Common/Types/ObjectID'; import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; describe('CookieUtils', () => { let mockRequest: ExpressRequest; diff --git a/CommonServer/Tests/Utils/JsonToCsv.test.ts b/CommonServer/Tests/Utils/JsonToCsv.test.ts index be9b7cc1d0..269580b6e8 100644 --- a/CommonServer/Tests/Utils/JsonToCsv.test.ts +++ b/CommonServer/Tests/Utils/JsonToCsv.test.ts @@ -1,6 +1,6 @@ import csvConverter from '../../Utils/JsonToCsv'; -import { JSONArray } from 'Common/Types/JSON'; import { describe, expect, it } from '@jest/globals'; +import { JSONArray } from 'Common/Types/JSON'; describe('CSV Converter', () => { it('throws an error when the input JSON array is empty', () => { diff --git a/CommonServer/Types/AnalyticsDatabase/CountBy.ts b/CommonServer/Types/AnalyticsDatabase/CountBy.ts index cdf69dcd10..2390841c68 100644 --- a/CommonServer/Types/AnalyticsDatabase/CountBy.ts +++ b/CommonServer/Types/AnalyticsDatabase/CountBy.ts @@ -1,8 +1,8 @@ -import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from './Query'; import GroupBy from './GroupBy'; +import Query from './Query'; +import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import PositiveNumber from 'Common/Types/PositiveNumber'; export default interface CountBy { query: Query; diff --git a/CommonServer/Types/AnalyticsDatabase/FindBy.ts b/CommonServer/Types/AnalyticsDatabase/FindBy.ts index 67e76a629c..0214f5aebe 100644 --- a/CommonServer/Types/AnalyticsDatabase/FindBy.ts +++ b/CommonServer/Types/AnalyticsDatabase/FindBy.ts @@ -1,6 +1,6 @@ +import FindOneBy from './FindOneBy'; import BaseModel from 'Common/AnalyticsModels/BaseModel'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import FindOneBy from './FindOneBy'; export default interface FindBy extends FindOneBy { diff --git a/CommonServer/Types/AnalyticsDatabase/FindOneByID.ts b/CommonServer/Types/AnalyticsDatabase/FindOneByID.ts index 93629663dd..d0f9767396 100644 --- a/CommonServer/Types/AnalyticsDatabase/FindOneByID.ts +++ b/CommonServer/Types/AnalyticsDatabase/FindOneByID.ts @@ -1,7 +1,7 @@ -import ObjectID from 'Common/Types/ObjectID'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import BaseModel from 'Common/AnalyticsModels/BaseModel'; import Select from './Select'; +import BaseModel from 'Common/AnalyticsModels/BaseModel'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import ObjectID from 'Common/Types/ObjectID'; export default interface FindOneByID { id: ObjectID; diff --git a/CommonServer/Types/AnalyticsDatabase/Hooks.ts b/CommonServer/Types/AnalyticsDatabase/Hooks.ts index 97b2011673..779532eed8 100644 --- a/CommonServer/Types/AnalyticsDatabase/Hooks.ts +++ b/CommonServer/Types/AnalyticsDatabase/Hooks.ts @@ -1,8 +1,8 @@ -import BaseModel from 'Common/AnalyticsModels/BaseModel'; import CreateBy from './CreateBy'; import DeleteBy from './DeleteBy'; import FindBy from './FindBy'; import UpdateBy from './UpdateBy'; +import BaseModel from 'Common/AnalyticsModels/BaseModel'; export type DatabaseTriggerType = 'on-create' | 'on-update' | 'on-delete'; diff --git a/CommonServer/Types/AnalyticsDatabase/ModelPermission.ts b/CommonServer/Types/AnalyticsDatabase/ModelPermission.ts index ca04deffe8..0fa8631c4c 100644 --- a/CommonServer/Types/AnalyticsDatabase/ModelPermission.ts +++ b/CommonServer/Types/AnalyticsDatabase/ModelPermission.ts @@ -1,26 +1,26 @@ +import { IsBillingEnabled, getAllEnvVars } from '../../EnvironmentConfig'; import DatabaseRequestType from '../BaseDatabase/DatabaseRequestType'; +import Query from './Query'; +import Select from './Select'; +import BaseModel, { + AnalyticsBaseModelType, +} from 'Common/AnalyticsModels/BaseModel'; +import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; +import ColumnBillingAccessControl from 'Common/Types/BaseDatabase/ColumnBillingAccessControl'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import DatabaseCommonInteractionPropsUtil from 'Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import Columns from 'Common/Types/Database/Columns'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; +import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; +import PaymentRequiredException from 'Common/Types/Exception/PaymentRequiredException'; +import ObjectID from 'Common/Types/ObjectID'; import Permission, { PermissionHelper, UserPermission, } from 'Common/Types/Permission'; -import BaseModel, { - AnalyticsBaseModelType, -} from 'Common/AnalyticsModels/BaseModel'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; -import PaymentRequiredException from 'Common/Types/Exception/PaymentRequiredException'; -import Query from './Query'; -import Select from './Select'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Columns from 'Common/Types/Database/Columns'; -import ColumnBillingAccessControl from 'Common/Types/BaseDatabase/ColumnBillingAccessControl'; -import ObjectID from 'Common/Types/ObjectID'; -import { getAllEnvVars, IsBillingEnabled } from '../../EnvironmentConfig'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; import UserType from 'Common/Types/UserType'; -import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; -import DatabaseCommonInteractionPropsUtil from 'Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil'; export interface CheckReadPermissionType { query: Query; diff --git a/CommonServer/Types/AnalyticsDatabase/Sort.ts b/CommonServer/Types/AnalyticsDatabase/Sort.ts index 6e113917ad..05502bcfdd 100644 --- a/CommonServer/Types/AnalyticsDatabase/Sort.ts +++ b/CommonServer/Types/AnalyticsDatabase/Sort.ts @@ -1,5 +1,6 @@ import BaseModel from 'Common/AnalyticsModels/BaseModel'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; + /** * Order by find options. */ diff --git a/CommonServer/Types/AnalyticsDatabase/UpdateBy.ts b/CommonServer/Types/AnalyticsDatabase/UpdateBy.ts index 0e8d7e33ff..fdda7e761a 100644 --- a/CommonServer/Types/AnalyticsDatabase/UpdateBy.ts +++ b/CommonServer/Types/AnalyticsDatabase/UpdateBy.ts @@ -1,6 +1,6 @@ +import Query from './Query'; import BaseModel from 'Common/AnalyticsModels/BaseModel'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from './Query'; export default interface UpdateBy { query: Query; diff --git a/CommonServer/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts b/CommonServer/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts index 7de07c1857..efbd7da31f 100644 --- a/CommonServer/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts +++ b/CommonServer/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts @@ -1,13 +1,13 @@ -import ServerMeteredPlan from './ServerMeteredPlan'; -import ObjectID from 'Common/Types/ObjectID'; -import MonitorService from '../../../Services/MonitorService'; -import QueryHelper from '../../Database/QueryHelper'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import ProjectService from '../../../Services/ProjectService'; import BillingService from '../../../Services/BillingService'; -import Project from 'Model/Models/Project'; +import MonitorService from '../../../Services/MonitorService'; +import ProjectService from '../../../Services/ProjectService'; +import QueryHelper from '../../Database/QueryHelper'; +import ServerMeteredPlan from './ServerMeteredPlan'; import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; +import ObjectID from 'Common/Types/ObjectID'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Project from 'Model/Models/Project'; export default class ActiveMonitoringMeteredPlan extends ServerMeteredPlan { public override getProductType(): ProductType { diff --git a/CommonServer/Types/Billing/MeteredPlan/ServerMeteredPlan.ts b/CommonServer/Types/Billing/MeteredPlan/ServerMeteredPlan.ts index c073617445..39f798bf92 100644 --- a/CommonServer/Types/Billing/MeteredPlan/ServerMeteredPlan.ts +++ b/CommonServer/Types/Billing/MeteredPlan/ServerMeteredPlan.ts @@ -1,8 +1,8 @@ -import NotImplementedException from 'Common/Types/Exception/NotImplementedException'; -import ObjectID from 'Common/Types/ObjectID'; import BillingService from '../../../Services/BillingService'; import MeteredPlan from 'Common/Types/Billing/MeteredPlan'; +import NotImplementedException from 'Common/Types/Exception/NotImplementedException'; import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import ObjectID from 'Common/Types/ObjectID'; export default class ServerMeteredPlan { public getProductType(): ProductType { diff --git a/CommonServer/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts b/CommonServer/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts index 72e9ab6167..f2f2fce974 100644 --- a/CommonServer/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts +++ b/CommonServer/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts @@ -1,12 +1,12 @@ -import ServerMeteredPlan from './ServerMeteredPlan'; -import ObjectID from 'Common/Types/ObjectID'; -import ProjectService from '../../../Services/ProjectService'; import BillingService from '../../../Services/BillingService'; -import Project from 'Model/Models/Project'; -import TelemetryUsageBilling from 'Model/Models/TelemetryUsageBilling'; +import ProjectService from '../../../Services/ProjectService'; import TelemetryUsageBillingService from '../../../Services/TelemetryUsageBillingService'; +import ServerMeteredPlan from './ServerMeteredPlan'; import OneUptimeDate from 'Common/Types/Date'; import ProductType from 'Common/Types/MeteredPlan/ProductType'; +import ObjectID from 'Common/Types/ObjectID'; +import Project from 'Model/Models/Project'; +import TelemetryUsageBilling from 'Model/Models/TelemetryUsageBilling'; export default class TelemetryMeteredPlan extends ServerMeteredPlan { private _productType!: ProductType; diff --git a/CommonServer/Types/Database/CountBy.ts b/CommonServer/Types/Database/CountBy.ts index a9e84abf89..fafe34cbe6 100644 --- a/CommonServer/Types/Database/CountBy.ts +++ b/CommonServer/Types/Database/CountBy.ts @@ -1,8 +1,8 @@ -import BaseModel from 'Common/Models/BaseModel'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from './Query'; import GroupBy from './GroupBy'; +import Query from './Query'; +import BaseModel from 'Common/Models/BaseModel'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import PositiveNumber from 'Common/Types/PositiveNumber'; export default interface CountBy { query: Query; diff --git a/CommonServer/Types/Database/DeleteOneBy.ts b/CommonServer/Types/Database/DeleteOneBy.ts index 982fd0fa6b..482f872ef6 100644 --- a/CommonServer/Types/Database/DeleteOneBy.ts +++ b/CommonServer/Types/Database/DeleteOneBy.ts @@ -1,7 +1,7 @@ import Query from './Query'; import BaseModel from 'Common/Models/BaseModel'; -import User from 'Model/Models/User'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import User from 'Model/Models/User'; export default interface DeleteOneBy { query: Query; diff --git a/CommonServer/Types/Database/FindBy.ts b/CommonServer/Types/Database/FindBy.ts index 7f4ebea48d..6b7fdd90c6 100644 --- a/CommonServer/Types/Database/FindBy.ts +++ b/CommonServer/Types/Database/FindBy.ts @@ -1,6 +1,6 @@ +import FindOneBy from './FindOneBy'; import BaseModel from 'Common/Models/BaseModel'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import FindOneBy from './FindOneBy'; export default interface FindBy extends FindOneBy { diff --git a/CommonServer/Types/Database/FindOneByID.ts b/CommonServer/Types/Database/FindOneByID.ts index 46df39f491..86689a6a14 100644 --- a/CommonServer/Types/Database/FindOneByID.ts +++ b/CommonServer/Types/Database/FindOneByID.ts @@ -1,7 +1,7 @@ -import ObjectID from 'Common/Types/ObjectID'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import BaseModel from 'Common/Models/BaseModel'; import Select from './Select'; +import BaseModel from 'Common/Models/BaseModel'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import ObjectID from 'Common/Types/ObjectID'; export default interface FindOneByID { id: ObjectID; diff --git a/CommonServer/Types/Database/Hooks.ts b/CommonServer/Types/Database/Hooks.ts index ca4046253f..1aeb865354 100644 --- a/CommonServer/Types/Database/Hooks.ts +++ b/CommonServer/Types/Database/Hooks.ts @@ -1,8 +1,8 @@ -import BaseModel from 'Common/Models/BaseModel'; import CreateBy from './CreateBy'; import DeleteBy from './DeleteBy'; import FindBy from './FindBy'; import UpdateBy from './UpdateBy'; +import BaseModel from 'Common/Models/BaseModel'; export type DatabaseTriggerType = 'on-create' | 'on-update' | 'on-delete'; diff --git a/CommonServer/Types/Database/ModelPermission.ts b/CommonServer/Types/Database/ModelPermission.ts index 5303b68438..87f9267a37 100644 --- a/CommonServer/Types/Database/ModelPermission.ts +++ b/CommonServer/Types/Database/ModelPermission.ts @@ -1,45 +1,45 @@ +import { IsBillingEnabled, getAllEnvVars } from '../../EnvironmentConfig'; import DatabaseRequestType from '../BaseDatabase/DatabaseRequestType'; +import Query from './Query'; +import QueryHelper from './QueryHelper'; +import RelationSelect from './RelationSelect'; +import Select from './Select'; +import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; +import UserModel from 'Common/Models/UserModel'; +import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; +import ColumnBillingAccessControl from 'Common/Types/BaseDatabase/ColumnBillingAccessControl'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import DatabaseCommonInteractionPropsUtil from 'Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil'; +import EqualToOrNull from 'Common/Types/BaseDatabase/EqualToOrNull'; +import GreaterThan from 'Common/Types/BaseDatabase/GreaterThan'; +import GreaterThanOrEqual from 'Common/Types/BaseDatabase/GreaterThanOrEqual'; +import InBetween from 'Common/Types/BaseDatabase/InBetween'; +import Includes from 'Common/Types/BaseDatabase/Includes'; +import IsNull from 'Common/Types/BaseDatabase/IsNull'; +import LessThan from 'Common/Types/BaseDatabase/LessThan'; +import LessThanOrEqual from 'Common/Types/BaseDatabase/LessThanOrEqual'; +import NotEqual from 'Common/Types/BaseDatabase/NotEqual'; +import NotNull from 'Common/Types/BaseDatabase/NotNull'; +import Search from 'Common/Types/BaseDatabase/Search'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import Columns from 'Common/Types/Database/Columns'; +import { TableColumnMetadata } from 'Common/Types/Database/TableColumn'; +import TableColumnType from 'Common/Types/Database/TableColumnType'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; +import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; +import PaymentRequiredException from 'Common/Types/Exception/PaymentRequiredException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; import Permission, { PermissionHelper, UserPermission, } from 'Common/Types/Permission'; -import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import NotAuthorizedException from 'Common/Types/Exception/NotAuthorizedException'; -import PaymentRequiredException from 'Common/Types/Exception/PaymentRequiredException'; -import Query from './Query'; -import Select from './Select'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import QueryHelper from './QueryHelper'; -import Columns from 'Common/Types/Database/Columns'; -import Dictionary from 'Common/Types/Dictionary'; -import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; -import RelationSelect from './RelationSelect'; import Typeof from 'Common/Types/Typeof'; -import { TableColumnMetadata } from 'Common/Types/Database/TableColumn'; -import TableColumnType from 'Common/Types/Database/TableColumnType'; -import ObjectID from 'Common/Types/ObjectID'; -import LessThan from 'Common/Types/BaseDatabase/LessThan'; -import IsNull from 'Common/Types/BaseDatabase/IsNull'; -import GreaterThan from 'Common/Types/BaseDatabase/GreaterThan'; -import GreaterThanOrEqual from 'Common/Types/BaseDatabase/GreaterThanOrEqual'; -import LessThanOrEqual from 'Common/Types/BaseDatabase/LessThanOrEqual'; -import InBetween from 'Common/Types/BaseDatabase/InBetween'; -import EqualToOrNull from 'Common/Types/BaseDatabase/EqualToOrNull'; -import NotEqual from 'Common/Types/BaseDatabase/NotEqual'; -import NotNull from 'Common/Types/BaseDatabase/NotNull'; -import Search from 'Common/Types/BaseDatabase/Search'; -import { FindOperator } from 'typeorm'; -import { JSONObject } from 'Common/Types/JSON'; -import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity'; -import { getAllEnvVars, IsBillingEnabled } from '../../EnvironmentConfig'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import NotAuthenticatedException from 'Common/Types/Exception/NotAuthenticatedException'; import UserType from 'Common/Types/UserType'; -import ColumnBillingAccessControl from 'Common/Types/BaseDatabase/ColumnBillingAccessControl'; -import DatabaseCommonInteractionPropsUtil from 'Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil'; -import Includes from 'Common/Types/BaseDatabase/Includes'; -import UserModel from 'Common/Models/UserModel'; +import { FindOperator } from 'typeorm'; +import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity'; export interface CheckReadPermissionType { query: Query; diff --git a/CommonServer/Types/Database/QueryHelper.ts b/CommonServer/Types/Database/QueryHelper.ts index 61c97b6ea1..377858e4d1 100644 --- a/CommonServer/Types/Database/QueryHelper.ts +++ b/CommonServer/Types/Database/QueryHelper.ts @@ -1,10 +1,10 @@ +import BaseModel from 'Common/Models/BaseModel'; +import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; -import { FindOperator, Raw } from 'typeorm'; import Text from 'Common/Types/Text'; import Typeof from 'Common/Types/Typeof'; -import Dictionary from 'Common/Types/Dictionary'; -import BaseModel from 'Common/Models/BaseModel'; -import { JSONObject } from 'Common/Types/JSON'; +import { FindOperator, Raw } from 'typeorm'; export default class QueryHelper { public static findWithSameText(text: string | number): FindOperator { diff --git a/CommonServer/Types/Database/SearchBy.ts b/CommonServer/Types/Database/SearchBy.ts index a073835c76..2cfe39f3ea 100644 --- a/CommonServer/Types/Database/SearchBy.ts +++ b/CommonServer/Types/Database/SearchBy.ts @@ -1,7 +1,7 @@ import Select from './Select'; -import PositiveNumber from 'Common/Types/PositiveNumber'; import BaseModel from 'Common/Models/BaseModel'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; +import PositiveNumber from 'Common/Types/PositiveNumber'; export default interface SearchBy { text: string; diff --git a/CommonServer/Types/Database/Sort.ts b/CommonServer/Types/Database/Sort.ts index bcb97aa773..03eabfb7c8 100644 --- a/CommonServer/Types/Database/Sort.ts +++ b/CommonServer/Types/Database/Sort.ts @@ -1,7 +1,7 @@ import BaseModel from 'Common/Models/BaseModel'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; import DatabaseProperty from 'Common/Types/Database/DatabaseProperty'; import { FindOptionsOrderProperty, FindOptionsOrderValue } from 'typeorm'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; export declare type FindOrderProperty = Property extends DatabaseProperty diff --git a/CommonServer/Types/Database/UpdateBy.ts b/CommonServer/Types/Database/UpdateBy.ts index 70bb80e714..610c751bb9 100644 --- a/CommonServer/Types/Database/UpdateBy.ts +++ b/CommonServer/Types/Database/UpdateBy.ts @@ -1,6 +1,6 @@ +import UpdateOneBy from './UpdateOneBy'; import BaseModel from 'Common/Models/BaseModel'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import UpdateOneBy from './UpdateOneBy'; interface UpdateBy extends UpdateOneBy { diff --git a/CommonServer/Types/Database/UpdateByID.ts b/CommonServer/Types/Database/UpdateByID.ts index 92feda6a72..4c193b5318 100644 --- a/CommonServer/Types/Database/UpdateByID.ts +++ b/CommonServer/Types/Database/UpdateByID.ts @@ -1,7 +1,7 @@ import BaseModel from 'Common/Models/BaseModel'; +import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; import ObjectID from 'Common/Types/ObjectID'; import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity'; -import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; export default interface UpdateBy { id: ObjectID; diff --git a/CommonServer/Types/Database/UpdateByIDAndFetch.ts b/CommonServer/Types/Database/UpdateByIDAndFetch.ts index a0fb9e03cb..a76c07939d 100644 --- a/CommonServer/Types/Database/UpdateByIDAndFetch.ts +++ b/CommonServer/Types/Database/UpdateByIDAndFetch.ts @@ -1,6 +1,6 @@ -import BaseModel from 'Common/Models/BaseModel'; -import UpdateByID from './UpdateByID'; import Select from './Select'; +import UpdateByID from './UpdateByID'; +import BaseModel from 'Common/Models/BaseModel'; export default interface UpdateByIDAndFetch extends UpdateByID { diff --git a/CommonServer/Types/Database/UpdateOneBy.ts b/CommonServer/Types/Database/UpdateOneBy.ts index 5c483633ee..4d35b5068e 100644 --- a/CommonServer/Types/Database/UpdateOneBy.ts +++ b/CommonServer/Types/Database/UpdateOneBy.ts @@ -1,6 +1,6 @@ +import Query from './Query'; import BaseModel from 'Common/Models/BaseModel'; import DatabaseCommonInteractionProps from 'Common/Types/BaseDatabase/DatabaseCommonInteractionProps'; -import Query from './Query'; import PartialEntity from 'Common/Types/Database/PartialEntity'; export default interface UpdateOneBy { diff --git a/CommonServer/Types/Domain.ts b/CommonServer/Types/Domain.ts index b204047ec4..4bf8d1f5c1 100644 --- a/CommonServer/Types/Domain.ts +++ b/CommonServer/Types/Domain.ts @@ -1,7 +1,7 @@ -import DomainCommon from 'Common/Types/Domain'; -import dns from 'dns'; import logger from '../Utils/Logger'; +import DomainCommon from 'Common/Types/Domain'; import { PromiseRejectErrorFunction } from 'Common/Types/FunctionTypes'; +import dns from 'dns'; export default class Domain extends DomainCommon { public static verifyTxtRecord( diff --git a/CommonServer/Types/Markdown.ts b/CommonServer/Types/Markdown.ts index 8579b8a3e0..a2ff4aa7ff 100644 --- a/CommonServer/Types/Markdown.ts +++ b/CommonServer/Types/Markdown.ts @@ -1,4 +1,4 @@ -import { marked, Renderer } from 'marked'; +import { Renderer, marked } from 'marked'; export type MarkdownRenderer = Renderer; diff --git a/CommonServer/Types/Workflow/ComponentCode.ts b/CommonServer/Types/Workflow/ComponentCode.ts index 69b8da0004..0629549b97 100644 --- a/CommonServer/Types/Workflow/ComponentCode.ts +++ b/CommonServer/Types/Workflow/ComponentCode.ts @@ -1,6 +1,5 @@ // this class is the base class that all the component can implement // - import BadDataException from 'Common/Types/Exception/BadDataException'; import Exception from 'Common/Types/Exception/Exception'; import { JSONArray, JSONObject, JSONValue } from 'Common/Types/JSON'; diff --git a/CommonServer/Types/Workflow/Components/API/Delete.ts b/CommonServer/Types/Workflow/Components/API/Delete.ts index 1d9f253f75..f9de35c695 100644 --- a/CommonServer/Types/Workflow/Components/API/Delete.ts +++ b/CommonServer/Types/Workflow/Components/API/Delete.ts @@ -1,16 +1,16 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import { ApiComponentUtils } from './Utils'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import APIException from 'Common/Types/Exception/ApiException'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import APIComponents from 'Common/Types/Workflow/Components/API'; import API from 'Common/Utils/API'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import { ApiComponentUtils } from './Utils'; -import URL from 'Common/Types/API/URL'; -import Dictionary from 'Common/Types/Dictionary'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import APIException from 'Common/Types/Exception/ApiException'; export default class ApiDelete extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/API/Get.ts b/CommonServer/Types/Workflow/Components/API/Get.ts index d1a18ff63a..9c20ee5c9b 100644 --- a/CommonServer/Types/Workflow/Components/API/Get.ts +++ b/CommonServer/Types/Workflow/Components/API/Get.ts @@ -1,16 +1,16 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import { ApiComponentUtils } from './Utils'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import APIException from 'Common/Types/Exception/ApiException'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import APIComponents from 'Common/Types/Workflow/Components/API'; import API from 'Common/Utils/API'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import { ApiComponentUtils } from './Utils'; -import URL from 'Common/Types/API/URL'; -import Dictionary from 'Common/Types/Dictionary'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import APIException from 'Common/Types/Exception/ApiException'; export default class ApiGet extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/API/Post.ts b/CommonServer/Types/Workflow/Components/API/Post.ts index c5c0c68121..2280b8e514 100644 --- a/CommonServer/Types/Workflow/Components/API/Post.ts +++ b/CommonServer/Types/Workflow/Components/API/Post.ts @@ -1,16 +1,16 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import { ApiComponentUtils } from './Utils'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import APIException from 'Common/Types/Exception/ApiException'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import APIComponents from 'Common/Types/Workflow/Components/API'; import API from 'Common/Utils/API'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import { ApiComponentUtils } from './Utils'; -import URL from 'Common/Types/API/URL'; -import Dictionary from 'Common/Types/Dictionary'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import APIException from 'Common/Types/Exception/ApiException'; export default class ApiPost extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/API/Put.ts b/CommonServer/Types/Workflow/Components/API/Put.ts index 031ff40607..eb0b95be0a 100644 --- a/CommonServer/Types/Workflow/Components/API/Put.ts +++ b/CommonServer/Types/Workflow/Components/API/Put.ts @@ -1,16 +1,16 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import { ApiComponentUtils } from './Utils'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import APIException from 'Common/Types/Exception/ApiException'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import APIComponents from 'Common/Types/Workflow/Components/API'; import API from 'Common/Utils/API'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import { ApiComponentUtils } from './Utils'; -import URL from 'Common/Types/API/URL'; -import Dictionary from 'Common/Types/Dictionary'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import APIException from 'Common/Types/Exception/ApiException'; export default class ApiPut extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/API/Utils.ts b/CommonServer/Types/Workflow/Components/API/Utils.ts index 63076e38a8..f31fa6f92b 100644 --- a/CommonServer/Types/Workflow/Components/API/Utils.ts +++ b/CommonServer/Types/Workflow/Components/API/Utils.ts @@ -1,11 +1,11 @@ +import { RunOptions } from '../../ComponentCode'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; -import { RunOptions } from '../../ComponentCode'; -import URL from 'Common/Types/API/URL'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; export class ApiComponentUtils { public static getReturnValues( diff --git a/CommonServer/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts index aa2c7aefa3..bd9c72a175 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts @@ -1,12 +1,12 @@ -import BaseModel from 'Common/Models/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import DatabaseService from '../../../../Services/DatabaseService'; import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; +import BaseModel from 'Common/Models/BaseModel'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class CreateManyBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts index cb655e6942..85b44f6f7f 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts @@ -1,14 +1,14 @@ +import DatabaseService from '../../../../Services/DatabaseService'; +import logger from '../../../../Utils/Logger'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BaseModel from 'Common/Models/BaseModel'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; -import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; +import Exception from 'Common/Types/Exception/Exception'; import { JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import Exception from 'Common/Types/Exception/Exception'; -import logger from '../../../../Utils/Logger'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class CreateOneBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts index e574e6a03f..16796fb7d1 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts @@ -1,15 +1,15 @@ -import BaseModel from 'Common/Models/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; -import { JSONObject } from 'Common/Types/JSON'; import Query from '../../../Database/Query'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import BaseModel from 'Common/Models/BaseModel'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import PositiveNumber from 'Common/Types/PositiveNumber'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class DeleteManyBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts index bc9f529cf1..ad40cf47a7 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts @@ -1,13 +1,13 @@ +import DatabaseService from '../../../../Services/DatabaseService'; +import Query from '../../../Database/Query'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BaseModel from 'Common/Models/BaseModel'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; -import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; import { JSONObject } from 'Common/Types/JSON'; -import Query from '../../../Database/Query'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class DeleteOneBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts index 4f0266050a..e368d636cf 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts @@ -1,16 +1,16 @@ -import BaseModel from 'Common/Models/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; -import { JSONObject } from 'Common/Types/JSON'; import Query from '../../../Database/Query'; -import JSONFunctions from 'Common/Types/JSONFunctions'; import Select from '../../../Database/Select'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import BaseModel from 'Common/Models/BaseModel'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import PositiveNumber from 'Common/Types/PositiveNumber'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class FindManyBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts index 12f2d473a5..9fb4a21ea2 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts @@ -1,14 +1,14 @@ +import DatabaseService from '../../../../Services/DatabaseService'; +import Query from '../../../Database/Query'; +import Select from '../../../Database/Select'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BaseModel from 'Common/Models/BaseModel'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; -import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; import { JSONObject } from 'Common/Types/JSON'; -import Query from '../../../Database/Query'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import Select from '../../../Database/Select'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class FindOneBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts index dc85edfecf..680dcd2f55 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts @@ -1,6 +1,6 @@ -import BaseModel from 'Common/Models/BaseModel'; import DatabaseService from '../../../../Services/DatabaseService'; import OnTriggerBaseModel from './OnTriggerBaseModel'; +import BaseModel from 'Common/Models/BaseModel'; export default class OnCreateBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts index b009a895c0..5a0e3dd633 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts @@ -1,6 +1,6 @@ -import BaseModel from 'Common/Models/BaseModel'; import DatabaseService from '../../../../Services/DatabaseService'; import OnTriggerBaseModel from './OnTriggerBaseModel'; +import BaseModel from 'Common/Models/BaseModel'; export default class OnDeleteBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts index faa2423cd4..c6711b46f5 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts @@ -1,22 +1,22 @@ -import BaseModel from 'Common/Models/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; -import DatabaseService from '../../../../Services/DatabaseService'; -import { ExpressRequest, ExpressResponse } from '../../../../Utils/Express'; -import Response from '../../../../Utils/Response'; -import TriggerCode, { ExecuteWorkflowType, InitProps } from '../../TriggerCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; -import WorkflowService from '../../../../Services/WorkflowService'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import Workflow from 'Model/Models/Workflow'; import ClusterKeyAuthorization from '../../../../Middleware/ClusterKeyAuthorization'; -import { JSONObject } from 'Common/Types/JSON'; -import { RunOptions, RunReturnType } from '../../ComponentCode'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import Select from '../../../Database/Select'; +import DatabaseService from '../../../../Services/DatabaseService'; +import WorkflowService from '../../../../Services/WorkflowService'; +import { ExpressRequest, ExpressResponse } from '../../../../Utils/Express'; import logger from '../../../../Utils/Logger'; +import Response from '../../../../Utils/Response'; +import Select from '../../../Database/Select'; +import { RunOptions, RunReturnType } from '../../ComponentCode'; +import TriggerCode, { ExecuteWorkflowType, InitProps } from '../../TriggerCode'; +import BaseModel from 'Common/Models/BaseModel'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; +import Workflow from 'Model/Models/Workflow'; export default class OnTriggerBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts index 86450da5d6..ac30a4f56a 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts @@ -1,6 +1,6 @@ -import BaseModel from 'Common/Models/BaseModel'; import DatabaseService from '../../../../Services/DatabaseService'; import OnTriggerBaseModel from './OnTriggerBaseModel'; +import BaseModel from 'Common/Models/BaseModel'; export default class OnUpdateBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts index a655daecb8..0026418379 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts @@ -1,16 +1,16 @@ -import BaseModel from 'Common/Models/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; -import { JSONObject } from 'Common/Types/JSON'; import Query from '../../../Database/Query'; -import QueryDeepPartialEntity from 'Common/Types/Database/PartialEntity'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import BaseModel from 'Common/Models/BaseModel'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import PositiveNumber from 'Common/Types/PositiveNumber'; +import QueryDeepPartialEntity from 'Common/Types/Database/PartialEntity'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class UpdateManyBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts b/CommonServer/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts index 1190745104..8743505707 100644 --- a/CommonServer/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts +++ b/CommonServer/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts @@ -1,14 +1,14 @@ -import BaseModel from 'Common/Models/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import DatabaseService from '../../../../Services/DatabaseService'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; -import Text from 'Common/Types/Text'; -import { JSONObject } from 'Common/Types/JSON'; import Query from '../../../Database/Query'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import BaseModel from 'Common/Models/BaseModel'; import QueryDeepPartialEntity from 'Common/Types/Database/PartialEntity'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import Text from 'Common/Types/Text'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import BaseModelComponents from 'Common/Types/Workflow/Components/BaseModel'; export default class UpdateOneBaseModel< TBaseModel extends BaseModel diff --git a/CommonServer/Types/Workflow/Components/Conditions/IfElse.ts b/CommonServer/Types/Workflow/Components/Conditions/IfElse.ts index 844b562220..f098f67b68 100644 --- a/CommonServer/Types/Workflow/Components/Conditions/IfElse.ts +++ b/CommonServer/Types/Workflow/Components/Conditions/IfElse.ts @@ -1,11 +1,11 @@ +import VMUtil from '../../../../Utils/VM/VMAPI'; +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; import { JSONObject, JSONValue } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import Components from 'Common/Types/Workflow/Components/Condition'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import VMUtil from '../../../../Utils/VM/VMAPI'; -import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; export default class IfElse extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/Email.ts b/CommonServer/Types/Workflow/Components/Email.ts index e2ac7a44d9..467fc13758 100644 --- a/CommonServer/Types/Workflow/Components/Email.ts +++ b/CommonServer/Types/Workflow/Components/Email.ts @@ -1,9 +1,9 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import Components from 'Common/Types/Workflow/Components/Email'; -import ComponentCode, { RunOptions, RunReturnType } from '../ComponentCode'; import nodemailer, { Transporter } from 'nodemailer'; export default class Email extends ComponentCode { diff --git a/CommonServer/Types/Workflow/Components/Index.ts b/CommonServer/Types/Workflow/Components/Index.ts index d81e4bd1e2..4f99ac4ba3 100644 --- a/CommonServer/Types/Workflow/Components/Index.ts +++ b/CommonServer/Types/Workflow/Components/Index.ts @@ -1,37 +1,37 @@ -import ComponentID from 'Common/Types/Workflow/ComponentID'; -import WebhookTrigger from './Webhook'; -import Log from './Log'; -import Schedule from './Schedule'; -import Dictionary from 'Common/Types/Dictionary'; -import ComponentCode from '../ComponentCode'; -import JavaScriptCode from './JavaScript'; +import DatabaseService from '../../../Services/DatabaseService'; import Services from '../../../Services/Index'; -import BaseModel from 'Common/Models/BaseModel'; -import Text from 'Common/Types/Text'; -import OnCreateBaseModel from './BaseModel/OnCreateBaseModel'; -import CreateOneBaseModel from './BaseModel/CreateOneBaseModel'; +import ComponentCode from '../ComponentCode'; +import ApiDelete from './API/Delete'; +import ApiGet from './API/Get'; +import ApiPost from './API/Post'; +import ApiPut from './API/Put'; import CreateManyBaseModel from './BaseModel/CreateManyBaseModel'; -import FindOneBaseModel from './BaseModel/FindOneBaseModel'; -import FindManyBaseModel from './BaseModel/FindManyBaseModel'; -import OnUpdateBaseModel from './BaseModel/OnUpdateBaseModel'; -import UpdateOneBaseModel from './BaseModel/UpdateOneBaseModel'; -import UpdateManyBaseModel from './BaseModel/UpdateManyBaseModel'; -import OnDeleteBaseModel from './BaseModel/OnDeleteBaseModel'; -import DeleteOneBaseModel from './BaseModel/DeleteOneBaseModel'; +import CreateOneBaseModel from './BaseModel/CreateOneBaseModel'; import DeleteManyBaseModel from './BaseModel/DeleteManyBaseModel'; -import ManualTrigger from './Manual'; +import DeleteOneBaseModel from './BaseModel/DeleteOneBaseModel'; +import FindManyBaseModel from './BaseModel/FindManyBaseModel'; +import FindOneBaseModel from './BaseModel/FindOneBaseModel'; +import OnCreateBaseModel from './BaseModel/OnCreateBaseModel'; +import OnDeleteBaseModel from './BaseModel/OnDeleteBaseModel'; +import OnUpdateBaseModel from './BaseModel/OnUpdateBaseModel'; +import UpdateManyBaseModel from './BaseModel/UpdateManyBaseModel'; +import UpdateOneBaseModel from './BaseModel/UpdateOneBaseModel'; +import IfElse from './Conditions/IfElse'; +import Email from './Email'; import JsonToText from './JSON/JsonToText'; import MergeJSON from './JSON/MergeJson'; import TextToJSON from './JSON/TextToJson'; -import ApiGet from './API/Get'; -import ApiDelete from './API/Delete'; -import ApiPost from './API/Post'; -import ApiPut from './API/Put'; -import Email from './Email'; -import IfElse from './Conditions/IfElse'; -import SlackSendMessageToChannel from './Slack/SendMessageToChannel'; +import JavaScriptCode from './JavaScript'; +import Log from './Log'; +import ManualTrigger from './Manual'; import MicrosoftTeamsSendMessageToChannel from './MicrosoftTeams/SendMessageToChannel'; -import DatabaseService from '../../../Services/DatabaseService'; +import Schedule from './Schedule'; +import SlackSendMessageToChannel from './Slack/SendMessageToChannel'; +import WebhookTrigger from './Webhook'; +import BaseModel from 'Common/Models/BaseModel'; +import Dictionary from 'Common/Types/Dictionary'; +import Text from 'Common/Types/Text'; +import ComponentID from 'Common/Types/Workflow/ComponentID'; const Components: Dictionary = { [ComponentID.Webhook]: new WebhookTrigger(), diff --git a/CommonServer/Types/Workflow/Components/JSON/JsonToText.ts b/CommonServer/Types/Workflow/Components/JSON/JsonToText.ts index 5416444a39..eb61fff058 100644 --- a/CommonServer/Types/Workflow/Components/JSON/JsonToText.ts +++ b/CommonServer/Types/Workflow/Components/JSON/JsonToText.ts @@ -1,10 +1,10 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import JSONComponents from 'Common/Types/Workflow/Components/JSON'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import JSONFunctions from 'Common/Types/JSONFunctions'; export default class JsonToText extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/JSON/MergeJson.ts b/CommonServer/Types/Workflow/Components/JSON/MergeJson.ts index b66e2b14b2..c8eddc7f4f 100644 --- a/CommonServer/Types/Workflow/Components/JSON/MergeJson.ts +++ b/CommonServer/Types/Workflow/Components/JSON/MergeJson.ts @@ -1,10 +1,10 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import JSONComponents from 'Common/Types/Workflow/Components/JSON'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import JSONFunctions from 'Common/Types/JSONFunctions'; export default class MergeJSON extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/JSON/TextToJson.ts b/CommonServer/Types/Workflow/Components/JSON/TextToJson.ts index 2199242b7a..d7cc27260e 100644 --- a/CommonServer/Types/Workflow/Components/JSON/TextToJson.ts +++ b/CommonServer/Types/Workflow/Components/JSON/TextToJson.ts @@ -1,10 +1,10 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import JSONComponents from 'Common/Types/Workflow/Components/JSON'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import JSONFunctions from 'Common/Types/JSONFunctions'; export default class TextToJSON extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/JavaScript.ts b/CommonServer/Types/Workflow/Components/JavaScript.ts index 46f871bceb..86bc9f1448 100644 --- a/CommonServer/Types/Workflow/Components/JavaScript.ts +++ b/CommonServer/Types/Workflow/Components/JavaScript.ts @@ -1,12 +1,12 @@ +import { WorkflowScriptTimeoutInMS } from '../../../EnvironmentConfig'; +import VMUtil from '../../../Utils/VM/VMAPI'; +import ComponentCode, { RunOptions, RunReturnType } from '../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; import { JSONObject, JSONValue } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import JavaScriptComponents from 'Common/Types/Workflow/Components/JavaScript'; -import ComponentCode, { RunOptions, RunReturnType } from '../ComponentCode'; -import VMUtil from '../../../Utils/VM/VMAPI'; -import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; -import { WorkflowScriptTimeoutInMS } from '../../../EnvironmentConfig'; export default class JavaScriptCode extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/Log.ts b/CommonServer/Types/Workflow/Components/Log.ts index 2bbc91789e..32bdda66db 100644 --- a/CommonServer/Types/Workflow/Components/Log.ts +++ b/CommonServer/Types/Workflow/Components/Log.ts @@ -1,9 +1,9 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../ComponentCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import LogComponents from 'Common/Types/Workflow/Components/Log'; -import ComponentCode, { RunOptions, RunReturnType } from '../ComponentCode'; export default class Log extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/Manual.ts b/CommonServer/Types/Workflow/Components/Manual.ts index 900f202ba3..fe726ee657 100644 --- a/CommonServer/Types/Workflow/Components/Manual.ts +++ b/CommonServer/Types/Workflow/Components/Manual.ts @@ -1,8 +1,8 @@ +import TriggerCode from '../TriggerCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; import ComponentMetadata from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import ManualComponents from 'Common/Types/Workflow/Components/Manual'; -import TriggerCode from '../TriggerCode'; export default class ManualTrigger extends TriggerCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts b/CommonServer/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts index 90b05e4c49..ffb63315d5 100644 --- a/CommonServer/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts +++ b/CommonServer/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts @@ -1,14 +1,14 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import APIException from 'Common/Types/Exception/ApiException'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import MicrosoftTeamComponents from 'Common/Types/Workflow/Components/MicrosoftTeams'; import API from 'Common/Utils/API'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import URL from 'Common/Types/API/URL'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import APIException from 'Common/Types/Exception/ApiException'; export default class SendMessageToChannel extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/Schedule.ts b/CommonServer/Types/Workflow/Components/Schedule.ts index 88a2be35cc..e0819213d4 100644 --- a/CommonServer/Types/Workflow/Components/Schedule.ts +++ b/CommonServer/Types/Workflow/Components/Schedule.ts @@ -1,19 +1,19 @@ -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; -import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; -import ComponentID from 'Common/Types/Workflow/ComponentID'; -import ScheduleComponents from 'Common/Types/Workflow/Components/Schedule'; -import Workflow from 'Model/Models/Workflow'; import WorkflowService from '../../../Services/WorkflowService'; import QueryHelper from '../../Database/QueryHelper'; +import { RunOptions, RunReturnType } from '../ComponentCode'; import TriggerCode, { ExecuteWorkflowType, InitProps, UpdateProps, } from '../TriggerCode'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; -import { RunOptions, RunReturnType } from '../ComponentCode'; +import ObjectID from 'Common/Types/ObjectID'; +import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; +import ComponentID from 'Common/Types/Workflow/ComponentID'; +import ScheduleComponents from 'Common/Types/Workflow/Components/Schedule'; +import Workflow from 'Model/Models/Workflow'; export default class WebhookTrigger extends TriggerCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/Slack/SendMessageToChannel.ts b/CommonServer/Types/Workflow/Components/Slack/SendMessageToChannel.ts index 4e7c2011e8..555d0338d7 100644 --- a/CommonServer/Types/Workflow/Components/Slack/SendMessageToChannel.ts +++ b/CommonServer/Types/Workflow/Components/Slack/SendMessageToChannel.ts @@ -1,14 +1,14 @@ +import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import APIException from 'Common/Types/Exception/ApiException'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import SlackComponents from 'Common/Types/Workflow/Components/Slack'; import API from 'Common/Utils/API'; -import ComponentCode, { RunOptions, RunReturnType } from '../../ComponentCode'; -import URL from 'Common/Types/API/URL'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import APIException from 'Common/Types/Exception/ApiException'; export default class SendMessageToChannel extends ComponentCode { public constructor() { diff --git a/CommonServer/Types/Workflow/Components/Webhook.ts b/CommonServer/Types/Workflow/Components/Webhook.ts index 089a0ecc09..d3af6d59f1 100644 --- a/CommonServer/Types/Workflow/Components/Webhook.ts +++ b/CommonServer/Types/Workflow/Components/Webhook.ts @@ -1,13 +1,13 @@ +import { ExpressRequest, ExpressResponse } from '../../../Utils/Express'; +import Response from '../../../Utils/Response'; +import { RunOptions, RunReturnType } from '../ComponentCode'; +import TriggerCode, { ExecuteWorkflowType, InitProps } from '../TriggerCode'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import ComponentMetadata, { Port } from 'Common/Types/Workflow/Component'; import ComponentID from 'Common/Types/Workflow/ComponentID'; import WebhookComponents from 'Common/Types/Workflow/Components/Webhook'; -import { ExpressRequest, ExpressResponse } from '../../../Utils/Express'; -import Response from '../../../Utils/Response'; -import TriggerCode, { ExecuteWorkflowType, InitProps } from '../TriggerCode'; -import { JSONObject } from 'Common/Types/JSON'; -import { RunOptions, RunReturnType } from '../ComponentCode'; export default class WebhookTrigger extends TriggerCode { public constructor() { diff --git a/CommonServer/Types/Workflow/TriggerCode.ts b/CommonServer/Types/Workflow/TriggerCode.ts index f5cf917386..c54a516035 100644 --- a/CommonServer/Types/Workflow/TriggerCode.ts +++ b/CommonServer/Types/Workflow/TriggerCode.ts @@ -1,12 +1,11 @@ // this class is the base class that all the component can implement // - -import { JSONObject } from 'Common/Types/JSON'; -import ObjectID from 'Common/Types/ObjectID'; import { ExpressRouter } from '../../Utils/Express'; import ComponentCode, { RunOptions, RunReturnType } from './ComponentCode'; -import { Port } from 'Common/Types/Workflow/Component'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import { Port } from 'Common/Types/Workflow/Component'; export interface ExecuteWorkflowType { workflowId: ObjectID; diff --git a/CommonServer/Utils/Airtable.ts b/CommonServer/Utils/Airtable.ts index b581721135..5d1fcc6c56 100644 --- a/CommonServer/Utils/Airtable.ts +++ b/CommonServer/Utils/Airtable.ts @@ -1,7 +1,7 @@ +import { AirtableApiKey, AirtableBaseId } from '../EnvironmentConfig'; +import Dictionary from 'Common/Types/Dictionary'; import PositiveNumber from 'Common/Types/PositiveNumber'; import AirtableLib, { FieldSet, Records } from 'airtable'; -import Dictionary from 'Common/Types/Dictionary'; -import { AirtableApiKey, AirtableBaseId } from '../EnvironmentConfig'; export type AirtableRecords = Records
; diff --git a/CommonServer/Utils/AnalyticsDatabase/StatementGenerator.ts b/CommonServer/Utils/AnalyticsDatabase/StatementGenerator.ts index 4a07378816..bb2844861b 100644 --- a/CommonServer/Utils/AnalyticsDatabase/StatementGenerator.ts +++ b/CommonServer/Utils/AnalyticsDatabase/StatementGenerator.ts @@ -1,30 +1,30 @@ -import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Query from '../../Types/AnalyticsDatabase/Query'; -import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; import ClickhouseDatabase from '../../Infrastructure/ClickhouseDatabase'; -import Sort from '../../Types/AnalyticsDatabase/Sort'; +import GroupBy from '../../Types/AnalyticsDatabase/GroupBy'; +import Query from '../../Types/AnalyticsDatabase/Query'; import Select from '../../Types/AnalyticsDatabase/Select'; -import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; -import logger from '../Logger'; +import Sort from '../../Types/AnalyticsDatabase/Sort'; import UpdateBy from '../../Types/AnalyticsDatabase/UpdateBy'; -import OneUptimeDate from 'Common/Types/Date'; -import CommonModel, { - RecordValue, - Record, -} from 'Common/AnalyticsModels/CommonModel'; +import logger from '../Logger'; import { SQL, Statement } from './Statement'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import Search from 'Common/Types/BaseDatabase/Search'; -import NotEqual from 'Common/Types/BaseDatabase/NotEqual'; +import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import CommonModel, { + Record, + RecordValue, +} from 'Common/AnalyticsModels/CommonModel'; +import AnalyticsTableColumn from 'Common/Types/AnalyticsDatabase/TableColumn'; +import TableColumnType from 'Common/Types/AnalyticsDatabase/TableColumnType'; import GreaterThan from 'Common/Types/BaseDatabase/GreaterThan'; -import LessThan from 'Common/Types/BaseDatabase/LessThan'; -import LessThanOrEqual from 'Common/Types/BaseDatabase/LessThanOrEqual'; import GreaterThanOrEqual from 'Common/Types/BaseDatabase/GreaterThanOrEqual'; import InBetween from 'Common/Types/BaseDatabase/InBetween'; -import IsNull from 'Common/Types/BaseDatabase/IsNull'; import Includes from 'Common/Types/BaseDatabase/Includes'; -import GroupBy from '../../Types/AnalyticsDatabase/GroupBy'; +import IsNull from 'Common/Types/BaseDatabase/IsNull'; +import LessThan from 'Common/Types/BaseDatabase/LessThan'; +import LessThanOrEqual from 'Common/Types/BaseDatabase/LessThanOrEqual'; +import NotEqual from 'Common/Types/BaseDatabase/NotEqual'; +import Search from 'Common/Types/BaseDatabase/Search'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; diff --git a/CommonServer/Utils/BasicCron.ts b/CommonServer/Utils/BasicCron.ts index 38229c1fb4..3f27764f76 100644 --- a/CommonServer/Utils/BasicCron.ts +++ b/CommonServer/Utils/BasicCron.ts @@ -1,5 +1,5 @@ -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import logger from './Logger'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import cron from 'node-cron'; type BasicCronProps = { diff --git a/CommonServer/Utils/Cookie.ts b/CommonServer/Utils/Cookie.ts index 5f36b2ae66..c2ebb57149 100644 --- a/CommonServer/Utils/Cookie.ts +++ b/CommonServer/Utils/Cookie.ts @@ -1,7 +1,7 @@ -import { CookieOptions } from 'express'; import { ExpressRequest, ExpressResponse } from './Express'; -import ObjectID from 'Common/Types/ObjectID'; import Dictionary from 'Common/Types/Dictionary'; +import ObjectID from 'Common/Types/ObjectID'; +import { CookieOptions } from 'express'; export default class CookieUtil { // set cookie with express response diff --git a/CommonServer/Utils/Environment.ts b/CommonServer/Utils/Environment.ts index 3c207c8682..c0c4c0de2b 100644 --- a/CommonServer/Utils/Environment.ts +++ b/CommonServer/Utils/Environment.ts @@ -1,5 +1,5 @@ -import dotenv from 'dotenv'; import AppEnvironment from 'Common/Types/AppEnvironment'; +import dotenv from 'dotenv'; const Env: string = process.env['NODE_ENV'] || AppEnvironment.Development; diff --git a/CommonServer/Utils/Express.ts b/CommonServer/Utils/Express.ts index 1123cca89e..72ec0954d2 100644 --- a/CommonServer/Utils/Express.ts +++ b/CommonServer/Utils/Express.ts @@ -1,18 +1,18 @@ -import 'ejs'; -import express from 'express'; import logger from './Logger'; +import Dictionary from 'Common/Types/Dictionary'; +import GenericFunction from 'Common/Types/GenericFunction'; import { JSONObject, JSONObjectOrArray } from 'Common/Types/JSON'; -import ObjectID from 'Common/Types/ObjectID'; import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; +import ObjectID from 'Common/Types/ObjectID'; import { UserGlobalAccessPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; -import UserType from 'Common/Types/UserType'; -import Dictionary from 'Common/Types/Dictionary'; import Port from 'Common/Types/Port'; +import UserType from 'Common/Types/UserType'; +import 'ejs'; +import express from 'express'; import { Server, createServer } from 'http'; -import GenericFunction from 'Common/Types/GenericFunction'; export type RequestHandler = express.RequestHandler; export type NextFunction = express.NextFunction; diff --git a/CommonServer/Utils/Greenlock/Greenlock.ts b/CommonServer/Utils/Greenlock/Greenlock.ts index 851770ebee..730399b14c 100644 --- a/CommonServer/Utils/Greenlock/Greenlock.ts +++ b/CommonServer/Utils/Greenlock/Greenlock.ts @@ -1,22 +1,22 @@ -import acme from 'acme-client'; import { LetsEncryptAccountKey, LetsEncryptNotificationEmail, } from '../../EnvironmentConfig'; -import AcmeChallenge from 'Model/Models/AcmeChallenge'; -import AcmeChallengeService from '../../Services/AcmeChallengeService'; -import AcmeCertificate from 'Model/Models/AcmeCertificate'; import AcmeCertificateService from '../../Services/AcmeCertificateService'; -import logger from '../Logger'; -import OneUptimeDate from 'Common/Types/Date'; -import LIMIT_MAX from 'Common/Types/Database/LimitMax'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import AcmeChallengeService from '../../Services/AcmeChallengeService'; import QueryHelper from '../../Types/Database/QueryHelper'; +import logger from '../Logger'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import LIMIT_MAX from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import { Challenge } from 'acme-client/types/rfc8555'; +import Exception from 'Common/Types/Exception/Exception'; import ServerException from 'Common/Types/Exception/ServerException'; import Text from 'Common/Types/Text'; -import Exception from 'Common/Types/Exception/Exception'; +import AcmeCertificate from 'Model/Models/AcmeCertificate'; +import AcmeChallenge from 'Model/Models/AcmeChallenge'; +import acme from 'acme-client'; +import { Challenge } from 'acme-client/types/rfc8555'; export default class GreenlockUtil { public static async renewAllCertsWhichAreExpiringSoon(data: { diff --git a/CommonServer/Utils/JsonToCsv.ts b/CommonServer/Utils/JsonToCsv.ts index c8ccedc4df..770e97703a 100644 --- a/CommonServer/Utils/JsonToCsv.ts +++ b/CommonServer/Utils/JsonToCsv.ts @@ -1,5 +1,4 @@ import { JSONArray, JSONObject } from 'Common/Types/JSON'; - import Json2Csv from 'json2csv'; export default { diff --git a/CommonServer/Utils/JsonWebToken.ts b/CommonServer/Utils/JsonWebToken.ts index 7c9e78d012..9a6fef0f80 100644 --- a/CommonServer/Utils/JsonWebToken.ts +++ b/CommonServer/Utils/JsonWebToken.ts @@ -1,14 +1,14 @@ +import { EncryptionSecret } from '../EnvironmentConfig'; import Email from 'Common/Types/Email'; import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; -import ObjectID from 'Common/Types/ObjectID'; -import jwt from 'jsonwebtoken'; -import { EncryptionSecret } from '../EnvironmentConfig'; +import JSONFunctions from 'Common/Types/JSONFunctions'; import JSONWebTokenData from 'Common/Types/JsonWebTokenData'; import Name from 'Common/Types/Name'; -import User from 'Model/Models/User'; +import ObjectID from 'Common/Types/ObjectID'; import StatusPagePrivateUser from 'Model/Models/StatusPagePrivateUser'; -import JSONFunctions from 'Common/Types/JSONFunctions'; +import User from 'Model/Models/User'; +import jwt from 'jsonwebtoken'; class JSONWebToken { public static signUserLoginToken(data: { diff --git a/CommonServer/Utils/LocalFile.ts b/CommonServer/Utils/LocalFile.ts index 25ca4f126e..8c65a640fc 100644 --- a/CommonServer/Utils/LocalFile.ts +++ b/CommonServer/Utils/LocalFile.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; import { PromiseRejectErrorFunction } from 'Common/Types/FunctionTypes'; +import fs from 'fs'; export default class LocalFile { public static async makeDirectory(path: string): Promise { diff --git a/CommonServer/Utils/Logger.ts b/CommonServer/Utils/Logger.ts index 377c254f81..f3c4effa59 100644 --- a/CommonServer/Utils/Logger.ts +++ b/CommonServer/Utils/Logger.ts @@ -1,8 +1,8 @@ -import { SeverityNumber } from '@opentelemetry/api-logs'; +import { ConfigLogLevel, LogLevel } from '../EnvironmentConfig'; import OneUptimeTelemetry from './Telemetry'; +import { SeverityNumber } from '@opentelemetry/api-logs'; import Exception from 'Common/Types/Exception/Exception'; import { JSONObject } from 'Common/Types/JSON'; -import { ConfigLogLevel, LogLevel } from '../EnvironmentConfig'; export type LogBody = string | JSONObject | Exception | Error | unknown; diff --git a/CommonServer/Utils/Probe/Criteria/APIRequestCriteria.ts b/CommonServer/Utils/Probe/Criteria/APIRequestCriteria.ts index 775d3d2392..cf7cfb07d5 100644 --- a/CommonServer/Utils/Probe/Criteria/APIRequestCriteria.ts +++ b/CommonServer/Utils/Probe/Criteria/APIRequestCriteria.ts @@ -1,14 +1,14 @@ +import DataToProcess from '../DataToProcess'; +import CompareCriteria from './CompareCriteria'; +import EvaluateOverTime from './EvaluateOverTime'; +import { JSONObject } from 'Common/Types/JSON'; import { CheckOn, CriteriaFilter, FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; -import Typeof from 'Common/Types/Typeof'; -import { JSONObject } from 'Common/Types/JSON'; import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; -import CompareCriteria from './CompareCriteria'; -import EvaluateOverTime from './EvaluateOverTime'; -import DataToProcess from '../DataToProcess'; +import Typeof from 'Common/Types/Typeof'; export default class APIRequestCriteria { public static async isMonitorInstanceCriteriaFilterMet(input: { diff --git a/CommonServer/Utils/Probe/Criteria/CompareCriteria.ts b/CommonServer/Utils/Probe/Criteria/CompareCriteria.ts index 54c734986e..8ec368567f 100644 --- a/CommonServer/Utils/Probe/Criteria/CompareCriteria.ts +++ b/CommonServer/Utils/Probe/Criteria/CompareCriteria.ts @@ -1,3 +1,4 @@ +import logger from '../../../Utils/Logger'; import { CheckOn, CriteriaFilter, @@ -5,7 +6,6 @@ import { FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; import Typeof from 'Common/Types/Typeof'; -import logger from '../../../Utils/Logger'; export default class CompareCriteria { public static greaterThan(data: { diff --git a/CommonServer/Utils/Probe/Criteria/CustomCodeMonitorCriteria.ts b/CommonServer/Utils/Probe/Criteria/CustomCodeMonitorCriteria.ts index badd61b952..2fc63b8147 100644 --- a/CommonServer/Utils/Probe/Criteria/CustomCodeMonitorCriteria.ts +++ b/CommonServer/Utils/Probe/Criteria/CustomCodeMonitorCriteria.ts @@ -1,5 +1,5 @@ -import { CheckOn, CriteriaFilter } from 'Common/Types/Monitor/CriteriaFilter'; import CompareCriteria from './CompareCriteria'; +import { CheckOn, CriteriaFilter } from 'Common/Types/Monitor/CriteriaFilter'; import CustomCodeMonitorResponse from 'Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse'; export default class CustomCodeMonitoringCriteria { diff --git a/CommonServer/Utils/Probe/Criteria/EvaluateOverTime.ts b/CommonServer/Utils/Probe/Criteria/EvaluateOverTime.ts index e9ca10d9c8..38eedacc91 100644 --- a/CommonServer/Utils/Probe/Criteria/EvaluateOverTime.ts +++ b/CommonServer/Utils/Probe/Criteria/EvaluateOverTime.ts @@ -1,3 +1,5 @@ +import MonitorMetricsByMinuteService from '../../../Services/MonitorMetricsByMinuteService'; +import Query from '../../../Types/AnalyticsDatabase/Query'; import GreaterThanOrEqual from 'Common/Types/BaseDatabase/GreaterThanOrEqual'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import OneUptimeDate from 'Common/Types/Date'; @@ -8,8 +10,6 @@ import { EvaluateOverTimeType, } from 'Common/Types/Monitor/CriteriaFilter'; import ObjectID from 'Common/Types/ObjectID'; -import MonitorMetricsByMinuteService from '../../../Services/MonitorMetricsByMinuteService'; -import Query from '../../../Types/AnalyticsDatabase/Query'; import MonitorMetricsByMinute from 'Model/AnalyticsModels/MonitorMetricsByMinute'; export default class EvaluateOverTime { diff --git a/CommonServer/Utils/Probe/Criteria/IncomingRequestCriteria.ts b/CommonServer/Utils/Probe/Criteria/IncomingRequestCriteria.ts index 362f332aaa..22908619fd 100644 --- a/CommonServer/Utils/Probe/Criteria/IncomingRequestCriteria.ts +++ b/CommonServer/Utils/Probe/Criteria/IncomingRequestCriteria.ts @@ -1,14 +1,14 @@ +import logger from '../../../Utils/Logger'; +import DataToProcess from '../DataToProcess'; +import OneUptimeDate from 'Common/Types/Date'; +import { JSONObject } from 'Common/Types/JSON'; import { CheckOn, CriteriaFilter, FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; -import logger from '../../../Utils/Logger'; -import Typeof from 'Common/Types/Typeof'; import IncomingMonitorRequest from 'Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest'; -import { JSONObject } from 'Common/Types/JSON'; -import OneUptimeDate from 'Common/Types/Date'; -import DataToProcess from '../DataToProcess'; +import Typeof from 'Common/Types/Typeof'; export default class IncomingRequestCriteria { public static async isMonitorInstanceCriteriaFilterMet(input: { diff --git a/CommonServer/Utils/Probe/Criteria/SSLMonitorCriteria.ts b/CommonServer/Utils/Probe/Criteria/SSLMonitorCriteria.ts index b35ee87263..dda20771ae 100644 --- a/CommonServer/Utils/Probe/Criteria/SSLMonitorCriteria.ts +++ b/CommonServer/Utils/Probe/Criteria/SSLMonitorCriteria.ts @@ -1,13 +1,13 @@ +import DataToProcess from '../DataToProcess'; +import CompareCriteria from './CompareCriteria'; +import OneUptimeDate from 'Common/Types/Date'; import { CheckOn, CriteriaFilter, FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; -import OneUptimeDate from 'Common/Types/Date'; -import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; -import CompareCriteria from './CompareCriteria'; -import DataToProcess from '../DataToProcess'; import SslMonitorResponse from 'Common/Types/Monitor/SSLMonitor/SslMonitorResponse'; +import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; export default class ServerMonitorCriteria { public static async isMonitorInstanceCriteriaFilterMet(input: { diff --git a/CommonServer/Utils/Probe/Criteria/ServerMonitorCriteria.ts b/CommonServer/Utils/Probe/Criteria/ServerMonitorCriteria.ts index 08debceb94..a580a1a6de 100644 --- a/CommonServer/Utils/Probe/Criteria/ServerMonitorCriteria.ts +++ b/CommonServer/Utils/Probe/Criteria/ServerMonitorCriteria.ts @@ -1,18 +1,18 @@ +import DataToProcess from '../DataToProcess'; +import CompareCriteria from './CompareCriteria'; +import EvaluateOverTime from './EvaluateOverTime'; +import OneUptimeDate from 'Common/Types/Date'; +import { BasicDiskMetrics } from 'Common/Types/Infrastructure/BasicMetrics'; +import { JSONObject } from 'Common/Types/JSON'; import { CheckOn, CriteriaFilter, FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; -import { BasicDiskMetrics } from 'Common/Types/Infrastructure/BasicMetrics'; import ServerMonitorResponse, { ServerProcess, } from 'Common/Types/Monitor/ServerMonitor/ServerMonitorResponse'; -import OneUptimeDate from 'Common/Types/Date'; import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; -import EvaluateOverTime from './EvaluateOverTime'; -import { JSONObject } from 'Common/Types/JSON'; -import CompareCriteria from './CompareCriteria'; -import DataToProcess from '../DataToProcess'; export default class ServerMonitorCriteria { public static async isMonitorInstanceCriteriaFilterMet(input: { diff --git a/CommonServer/Utils/Probe/Criteria/SyntheticMonitor.ts b/CommonServer/Utils/Probe/Criteria/SyntheticMonitor.ts index 559b626b91..2dbbdd4134 100644 --- a/CommonServer/Utils/Probe/Criteria/SyntheticMonitor.ts +++ b/CommonServer/Utils/Probe/Criteria/SyntheticMonitor.ts @@ -1,7 +1,7 @@ +import CompareCriteria from './CompareCriteria'; +import CustomCodeMonitoringCriteria from './CustomCodeMonitorCriteria'; import { CheckOn, CriteriaFilter } from 'Common/Types/Monitor/CriteriaFilter'; import SyntheticMonitorResponse from 'Common/Types/Monitor/SyntheticMonitors/SyntheticMonitorResponse'; -import CustomCodeMonitoringCriteria from './CustomCodeMonitorCriteria'; -import CompareCriteria from './CompareCriteria'; export default class SyntheticMonitoringCriteria { public static async isMonitorInstanceCriteriaFilterMet(input: { diff --git a/CommonServer/Utils/Probe/ProbeMonitorResponse.ts b/CommonServer/Utils/Probe/ProbeMonitorResponse.ts index b5309eedb4..b2a9f925d7 100644 --- a/CommonServer/Utils/Probe/ProbeMonitorResponse.ts +++ b/CommonServer/Utils/Probe/ProbeMonitorResponse.ts @@ -1,55 +1,55 @@ +import IncidentService from '../../Services/IncidentService'; +import IncidentSeverityService from '../../Services/IncidentSeverityService'; +import IncidentStateTimelineService from '../../Services/IncidentStateTimelineService'; +import MonitorMetricsByMinuteService from '../../Services/MonitorMetricsByMinuteService'; +import MonitorProbeService from '../../Services/MonitorProbeService'; +import MonitorService from '../../Services/MonitorService'; +import MonitorStatusTimelineService from '../../Services/MonitorStatusTimelineService'; +import logger from '../../Utils/Logger'; +import VMUtil from '../VM/VMAPI'; +import APIRequestCriteria from './Criteria/APIRequestCriteria'; +import CustomCodeMonitoringCriteria from './Criteria/CustomCodeMonitorCriteria'; +import IncomingRequestCriteria from './Criteria/IncomingRequestCriteria'; +import SSLMonitorCriteria from './Criteria/SSLMonitorCriteria'; +import ServerMonitorCriteria from './Criteria/ServerMonitorCriteria'; +import SyntheticMonitoringCriteria from './Criteria/SyntheticMonitor'; +import DataToProcess from './DataToProcess'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import BasicInfrastructureMetrics from 'Common/Types/Infrastructure/BasicMetrics'; +import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; +import { JSONObject } from 'Common/Types/JSON'; import { CheckOn, CriteriaFilter, FilterCondition, FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; +import CustomCodeMonitorResponse from 'Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse'; +import IncomingMonitorRequest from 'Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest'; import MonitorCriteria from 'Common/Types/Monitor/MonitorCriteria'; import MonitorCriteriaInstance from 'Common/Types/Monitor/MonitorCriteriaInstance'; import MonitorStep from 'Common/Types/Monitor/MonitorStep'; import MonitorSteps from 'Common/Types/Monitor/MonitorSteps'; -import ProbeApiIngestResponse from 'Common/Types/Probe/ProbeApiIngestResponse'; -import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; -import Typeof from 'Common/Types/Typeof'; -import MonitorService from '../../Services/MonitorService'; -import MonitorStatusTimelineService from '../../Services/MonitorStatusTimelineService'; -import IncidentService from '../../Services/IncidentService'; -import logger from '../../Utils/Logger'; -import Incident from 'Model/Models/Incident'; -import Monitor from 'Model/Models/Monitor'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import ObjectID from 'Common/Types/ObjectID'; -import { JSONObject } from 'Common/Types/JSON'; -import MonitorProbeService from '../../Services/MonitorProbeService'; -import OneUptimeDate from 'Common/Types/Date'; -import MonitorProbe from 'Model/Models/MonitorProbe'; -import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; -import IncidentStateTimelineService from '../../Services/IncidentStateTimelineService'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import Dictionary from 'Common/Types/Dictionary'; -import IncidentSeverity from 'Model/Models/IncidentSeverity'; -import IncidentSeverityService from '../../Services/IncidentSeverityService'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; -import IncomingMonitorRequest from 'Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest'; import MonitorType, { MonitorTypeHelper, } from 'Common/Types/Monitor/MonitorType'; -import VMUtil from '../VM/VMAPI'; import ServerMonitorResponse from 'Common/Types/Monitor/ServerMonitor/ServerMonitorResponse'; -import BasicInfrastructureMetrics from 'Common/Types/Infrastructure/BasicMetrics'; +import ObjectID from 'Common/Types/ObjectID'; +import ProbeApiIngestResponse from 'Common/Types/Probe/ProbeApiIngestResponse'; +import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; +import Typeof from 'Common/Types/Typeof'; import MonitorMetricsByMinute from 'Model/AnalyticsModels/MonitorMetricsByMinute'; -import MonitorMetricsByMinuteService from '../../Services/MonitorMetricsByMinuteService'; -import ServerMonitorCriteria from './Criteria/ServerMonitorCriteria'; -import IncomingRequestCriteria from './Criteria/IncomingRequestCriteria'; -import APIRequestCriteria from './Criteria/APIRequestCriteria'; -import DataToProcess from './DataToProcess'; -import SSLMonitorCriteria from './Criteria/SSLMonitorCriteria'; -import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; -import CustomCodeMonitorResponse from 'Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse'; -import CustomCodeMonitoringCriteria from './Criteria/CustomCodeMonitorCriteria'; -import SyntheticMonitoringCriteria from './Criteria/SyntheticMonitor'; +import Incident from 'Model/Models/Incident'; +import IncidentSeverity from 'Model/Models/IncidentSeverity'; +import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; +import Monitor from 'Model/Models/Monitor'; +import MonitorProbe from 'Model/Models/MonitorProbe'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; export default class ProbeMonitorResponseService { public static async processProbeResponse( diff --git a/CommonServer/Utils/Realtime.ts b/CommonServer/Utils/Realtime.ts index 9699c7e5c2..23bdf2fa33 100644 --- a/CommonServer/Utils/Realtime.ts +++ b/CommonServer/Utils/Realtime.ts @@ -1,19 +1,19 @@ +import IO, { Socket, SocketServer } from '../Infrastructure/SocketIO'; +import logger from './Logger'; +import AnalyticsBaseModel, { + AnalyticsBaseModelType, +} from 'Common/AnalyticsModels/BaseModel'; +import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; +import DatabaseType from 'Common/Types/BaseDatabase/DatabaseType'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { JSONObject } from 'Common/Types/JSON'; -import IO, { SocketServer, Socket } from '../Infrastructure/SocketIO'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; import RealtimeUtil, { EventName, ListenToModelEventJSON, ModelEventType, } from 'Common/Utils/Realtime'; -import DatabaseType from 'Common/Types/BaseDatabase/DatabaseType'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; -import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; -import AnalyticsBaseModel, { - AnalyticsBaseModelType, -} from 'Common/AnalyticsModels/BaseModel'; -import logger from './Logger'; export default abstract class Realtime { private static socketServer: SocketServer | null = null; diff --git a/CommonServer/Utils/Response.ts b/CommonServer/Utils/Response.ts index ee8cda6c14..e617bb041f 100644 --- a/CommonServer/Utils/Response.ts +++ b/CommonServer/Utils/Response.ts @@ -1,25 +1,25 @@ -import JsonToCsv from './JsonToCsv'; -import logger from './Logger'; import { - OneUptimeRequest, - ExpressResponse, ExpressRequest, + ExpressResponse, + OneUptimeRequest, OneUptimeResponse, } from './Express'; -import { JSONObject, JSONArray } from 'Common/Types/JSON'; -import Exception from 'Common/Types/Exception/Exception'; -import ListData from 'Common/Types/ListData'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import URL from 'Common/Types/API/URL'; -import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; -import EmptyResponse from 'Common/Types/API/EmptyResponse'; -import FileModel from 'Common/Models/FileModel'; -import Dictionary from 'Common/Types/Dictionary'; -import StatusCode from 'Common/Types/API/StatusCode'; -import { DEFAULT_LIMIT } from 'Common/Types/Database/LimitMax'; +import JsonToCsv from './JsonToCsv'; +import logger from './Logger'; import AnalyticsDataModel, { AnalyticsBaseModelType, } from 'Common/AnalyticsModels/BaseModel'; +import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; +import FileModel from 'Common/Models/FileModel'; +import EmptyResponse from 'Common/Types/API/EmptyResponse'; +import StatusCode from 'Common/Types/API/StatusCode'; +import URL from 'Common/Types/API/URL'; +import { DEFAULT_LIMIT } from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import Exception from 'Common/Types/Exception/Exception'; +import { JSONArray, JSONObject } from 'Common/Types/JSON'; +import ListData from 'Common/Types/ListData'; +import PositiveNumber from 'Common/Types/PositiveNumber'; export default class Response { public static sendEmptySuccessResponse( diff --git a/CommonServer/Utils/StartServer.ts b/CommonServer/Utils/StartServer.ts index 46e86f8ec9..86c4d70213 100644 --- a/CommonServer/Utils/StartServer.ts +++ b/CommonServer/Utils/StartServer.ts @@ -1,35 +1,35 @@ -import './Environment'; -import './Process'; -import logger from './Logger'; -import cors from 'cors'; -import Port from 'Common/Types/Port'; -import Express, { - ExpressRequest, - ExpressResponse, - NextFunction, - ExpressJson, - ExpressUrlEncoded, - ExpressApplication, - RequestHandler, - ExpressStatic, -} from './Express'; // Connect common api's. import CommonAPI from '../API/Index'; -import NotFoundException from 'Common/Types/Exception/NotFoundException'; -import { JSONObject } from 'Common/Types/JSON'; -import LocalCache from '../Infrastructure/LocalCache'; -import Exception from 'Common/Types/Exception/Exception'; -import StatusCode from 'Common/Types/API/StatusCode'; -import Typeof from 'Common/Types/Typeof'; -import Response from './Response'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import { AppVersion } from '../EnvironmentConfig'; -import ServerException from 'Common/Types/Exception/ServerException'; -import zlib from 'zlib'; -import CookieParser from 'cookie-parser'; -import { api } from '@opentelemetry/sdk-node'; import { StatusAPIOptions } from '../API/StatusAPI'; +import { AppVersion } from '../EnvironmentConfig'; +import LocalCache from '../Infrastructure/LocalCache'; +import './Environment'; +import Express, { + ExpressApplication, + ExpressJson, + ExpressRequest, + ExpressResponse, + ExpressStatic, + ExpressUrlEncoded, + NextFunction, + RequestHandler, +} from './Express'; +import logger from './Logger'; +import './Process'; +import Response from './Response'; +import { api } from '@opentelemetry/sdk-node'; +import StatusCode from 'Common/Types/API/StatusCode'; +import Exception from 'Common/Types/Exception/Exception'; +import NotFoundException from 'Common/Types/Exception/NotFoundException'; +import ServerException from 'Common/Types/Exception/ServerException'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import Port from 'Common/Types/Port'; +import Typeof from 'Common/Types/Typeof'; +import CookieParser from 'cookie-parser'; +import cors from 'cors'; +import zlib from 'zlib'; // Make sure we have stack trace for debugging. Error.stackTraceLimit = Infinity; diff --git a/CommonServer/Utils/Telemetry.ts b/CommonServer/Utils/Telemetry.ts index 871195ff80..44c7bce525 100644 --- a/CommonServer/Utils/Telemetry.ts +++ b/CommonServer/Utils/Telemetry.ts @@ -1,21 +1,21 @@ -import * as opentelemetry from '@opentelemetry/sdk-node'; -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto'; -import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto'; -import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; -import Dictionary from 'Common/Types/Dictionary'; -import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray'; +import { Logger, logs } from '@opentelemetry/api-logs'; import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'; import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; +import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto'; +import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto'; +import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray'; +import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'; +import { Resource } from '@opentelemetry/resources'; import { BatchLogRecordProcessor, LoggerProvider, } from '@opentelemetry/sdk-logs'; -import URL from 'Common/Types/API/URL'; +import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; +import * as opentelemetry from '@opentelemetry/sdk-node'; import { SpanExporter } from '@opentelemetry/sdk-trace-node'; -import { Resource } from '@opentelemetry/resources'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; -import { Logger, logs } from '@opentelemetry/api-logs'; -import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; // Enable this line to see debug logs // diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG); diff --git a/CommonServer/Utils/VM/VMRunner.ts b/CommonServer/Utils/VM/VMRunner.ts index b7c619860c..19995525f3 100644 --- a/CommonServer/Utils/VM/VMRunner.ts +++ b/CommonServer/Utils/VM/VMRunner.ts @@ -1,11 +1,11 @@ -import { JSONObject, JSONValue } from 'Common/Types/JSON'; -import http from 'http'; -import https from 'https'; -import axios from 'axios'; -import vm, { Context } from 'node:vm'; -import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; import Dictionary from 'Common/Types/Dictionary'; import GenericObject from 'Common/Types/GenericObject'; +import ReturnResult from 'Common/Types/IsolatedVM/ReturnResult'; +import { JSONObject, JSONValue } from 'Common/Types/JSON'; +import axios from 'axios'; +import http from 'http'; +import https from 'https'; +import vm, { Context } from 'node:vm'; export default class VMRunner { public static async runCodeInSandbox(data: { diff --git a/CommonUI/src/Components/404.tsx b/CommonUI/src/Components/404.tsx index c647eeb860..7449871411 100644 --- a/CommonUI/src/Components/404.tsx +++ b/CommonUI/src/Components/404.tsx @@ -1,11 +1,10 @@ // Tailwind. - +import Navigation from '../Utils/Navigation'; +import Button, { ButtonStyleType } from './Button/Button'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import Email from 'Common/Types/Email'; import React, { FunctionComponent, ReactElement } from 'react'; -import Navigation from '../Utils/Navigation'; -import Button, { ButtonStyleType } from './Button/Button'; export interface ComponentProps { homeRoute: Route; diff --git a/CommonUI/src/Components/Accordion/Accordion.tsx b/CommonUI/src/Components/Accordion/Accordion.tsx index 167c1d81fe..1da7832886 100644 --- a/CommonUI/src/Components/Accordion/Accordion.tsx +++ b/CommonUI/src/Components/Accordion/Accordion.tsx @@ -1,12 +1,12 @@ +import Icon, { ThickProp } from '../Icon/Icon'; +import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Icon, { ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; export interface ComponentProps { title?: string | ReactElement | undefined; diff --git a/CommonUI/src/Components/ActionButton/ActionButtonSchema.ts b/CommonUI/src/Components/ActionButton/ActionButtonSchema.ts index 980b0589f1..8a2ceae1aa 100644 --- a/CommonUI/src/Components/ActionButton/ActionButtonSchema.ts +++ b/CommonUI/src/Components/ActionButton/ActionButtonSchema.ts @@ -1,7 +1,7 @@ import { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes'; import GenericObject from 'Common/Types/GenericObject'; +import IconProp from 'Common/Types/Icon/IconProp'; interface ActionButtonSchema { title: string; diff --git a/CommonUI/src/Components/Alerts/Alert.tsx b/CommonUI/src/Components/Alerts/Alert.tsx index f15c8000e5..d5de676874 100644 --- a/CommonUI/src/Components/Alerts/Alert.tsx +++ b/CommonUI/src/Components/Alerts/Alert.tsx @@ -1,7 +1,7 @@ -import Color from 'Common/Types/Color'; -import React, { FunctionComponent, ReactElement } from 'react'; import Icon from '../Icon/Icon'; +import Color from 'Common/Types/Color'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export enum AlertType { INFO, diff --git a/CommonUI/src/Components/Banner/Banner.tsx b/CommonUI/src/Components/Banner/Banner.tsx index 7928d66e6b..2e37dce9fc 100644 --- a/CommonUI/src/Components/Banner/Banner.tsx +++ b/CommonUI/src/Components/Banner/Banner.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import URL from 'Common/Types/API/URL'; import Link from '../Link/Link'; import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Breadcrumbs/Breadcrumbs.tsx b/CommonUI/src/Components/Breadcrumbs/Breadcrumbs.tsx index 5919e8f9de..ea5e2ec1e1 100644 --- a/CommonUI/src/Components/Breadcrumbs/Breadcrumbs.tsx +++ b/CommonUI/src/Components/Breadcrumbs/Breadcrumbs.tsx @@ -1,10 +1,10 @@ -import Link from 'Common/Types/Link'; -import React, { FunctionComponent, ReactElement } from 'react'; import Icon from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import UILink from '../Link/Link'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import IconProp from 'Common/Types/Icon/IconProp'; +import Link from 'Common/Types/Link'; +import React, { FunctionComponent, ReactElement } from 'react'; interface ComponentProps { links: Array; diff --git a/CommonUI/src/Components/BulkUpdate/BulkUpdateForm.tsx b/CommonUI/src/Components/BulkUpdate/BulkUpdateForm.tsx index f5e3cf486b..d7b31f83e5 100644 --- a/CommonUI/src/Components/BulkUpdate/BulkUpdateForm.tsx +++ b/CommonUI/src/Components/BulkUpdate/BulkUpdateForm.tsx @@ -1,17 +1,17 @@ -import React, { ReactElement } from 'react'; +import { GetReactElementFunction } from '../../Types/FunctionTypes'; import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; -import GenericObject from 'Common/Types/GenericObject'; import Icon, { SizeProp } from '../Icon/Icon'; -import ShortcutKey from '../ShortcutKey/ShortcutKey'; import ConfirmModal, { ComponentProps as ConfirmModalProps, } from '../Modal/ConfirmModal'; import ProgressBar, { ProgressBarSize } from '../ProgressBar/ProgressBar'; -import { Green, Red } from 'Common/Types/BrandColors'; +import ShortcutKey from '../ShortcutKey/ShortcutKey'; import SimpleLogViewer from '../SimpleLogViewer/SimpleLogViewer'; -import { GetReactElementFunction } from '../../Types/FunctionTypes'; +import { Green, Red } from 'Common/Types/BrandColors'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import GenericObject from 'Common/Types/GenericObject'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement } from 'react'; export interface BulkActionFailed { failedMessage: string | ReactElement; diff --git a/CommonUI/src/Components/Button/Button.tsx b/CommonUI/src/Components/Button/Button.tsx index 6dd33e1d96..d8028e3afa 100644 --- a/CommonUI/src/Components/Button/Button.tsx +++ b/CommonUI/src/Components/Button/Button.tsx @@ -1,9 +1,9 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import { KeyboardEventProp } from '../../Types/HtmlEvents'; +import Icon, { SizeProp } from '../Icon/Icon'; import ShortcutKey from '../ShortcutKey/ShortcutKey'; import ButtonType from './ButtonTypes'; -import Icon, { SizeProp } from '../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export enum ButtonStyleType { PRIMARY, diff --git a/CommonUI/src/Components/Calendar/Calendar.tsx b/CommonUI/src/Components/Calendar/Calendar.tsx index b2b96f1330..a140c01448 100644 --- a/CommonUI/src/Components/Calendar/Calendar.tsx +++ b/CommonUI/src/Components/Calendar/Calendar.tsx @@ -1,17 +1,17 @@ -import 'react-big-calendar/lib/css/react-big-calendar.css'; +import { Blue500 } from 'Common/Types/BrandColors'; +import CalendarEvent from 'Common/Types/Calendar/CalendarEvent'; +import Color from 'Common/Types/Color'; +import OneUptimeDate from 'Common/Types/Date'; +import StartAndEndTime from 'Common/Types/Time/StartAndEndTime'; +import moment from 'moment-timezone'; +import React, { FunctionComponent, ReactElement, useMemo } from 'react'; import { Calendar, - momentLocalizer, DateLocalizer, EventPropGetter, + momentLocalizer, } from 'react-big-calendar'; -import React, { FunctionComponent, ReactElement, useMemo } from 'react'; -import moment from 'moment-timezone'; -import OneUptimeDate from 'Common/Types/Date'; -import CalendarEvent from 'Common/Types/Calendar/CalendarEvent'; -import StartAndEndTime from 'Common/Types/Time/StartAndEndTime'; -import Color from 'Common/Types/Color'; -import { Blue500 } from 'Common/Types/BrandColors'; +import 'react-big-calendar/lib/css/react-big-calendar.css'; const localizer: DateLocalizer = momentLocalizer(moment); diff --git a/CommonUI/src/Components/Card/Card.tsx b/CommonUI/src/Components/Card/Card.tsx index 852b38e3c0..d957833b12 100644 --- a/CommonUI/src/Components/Card/Card.tsx +++ b/CommonUI/src/Components/Card/Card.tsx @@ -1,8 +1,7 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Button, { ButtonStyleType } from '../Button/Button'; - -import IconProp from 'Common/Types/Icon/IconProp'; import ShortcutKey from '../ShortcutKey/ShortcutKey'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface CardButtonSchema { title: string; diff --git a/CommonUI/src/Components/Card/CardButtons/Refresh.ts b/CommonUI/src/Components/Card/CardButtons/Refresh.ts index 8d2387c115..5bf3f1afd6 100644 --- a/CommonUI/src/Components/Card/CardButtons/Refresh.ts +++ b/CommonUI/src/Components/Card/CardButtons/Refresh.ts @@ -1,6 +1,6 @@ -import IconProp from 'Common/Types/Icon/IconProp'; import { ButtonStyleType } from '../../Button/Button'; import { CardButtonSchema } from '../Card'; +import IconProp from 'Common/Types/Icon/IconProp'; type GetButtonFunctionType = () => CardButtonSchema; diff --git a/CommonUI/src/Components/CategoryCheckbox/Category.tsx b/CommonUI/src/Components/CategoryCheckbox/Category.tsx index 4e14cc1421..7360b49410 100644 --- a/CommonUI/src/Components/CategoryCheckbox/Category.tsx +++ b/CommonUI/src/Components/CategoryCheckbox/Category.tsx @@ -1,10 +1,10 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; +import CheckboxElement from '../Checkbox/Checkbox'; import { CategoryCheckboxOption, CheckboxCategory, } from './CategoryCheckboxTypes'; -import CheckboxElement from '../Checkbox/Checkbox'; import CheckBoxList from './CheckboxList'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export type CategoryCheckboxValue = string | number | boolean; diff --git a/CommonUI/src/Components/CategoryCheckbox/CheckboxList.tsx b/CommonUI/src/Components/CategoryCheckbox/CheckboxList.tsx index f5f3dfb07d..07ea0a074e 100644 --- a/CommonUI/src/Components/CategoryCheckbox/CheckboxList.tsx +++ b/CommonUI/src/Components/CategoryCheckbox/CheckboxList.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; -import { CategoryCheckboxOption } from './CategoryCheckboxTypes'; import CheckboxElement from '../Checkbox/Checkbox'; +import { CategoryCheckboxOption } from './CategoryCheckboxTypes'; import GenericObject from 'Common/Types/GenericObject'; import { JSONObject } from 'Common/Types/JSON'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export type CategoryCheckboxValue = string | number | boolean; diff --git a/CommonUI/src/Components/CategoryCheckbox/Index.tsx b/CommonUI/src/Components/CategoryCheckbox/Index.tsx index dcb4d00052..b3b82f4da2 100644 --- a/CommonUI/src/Components/CategoryCheckbox/Index.tsx +++ b/CommonUI/src/Components/CategoryCheckbox/Index.tsx @@ -1,12 +1,12 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import Category from './Category'; import { CategoryCheckboxOption, - CheckboxCategory, CategoryCheckboxValue, + CheckboxCategory, } from './CategoryCheckboxTypes'; -import Category from './Category'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; import BaseModel from 'Common/Models/BaseModel'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface CategoryCheckboxOptionsAndCategories { categories: Array; diff --git a/CommonUI/src/Components/Charts/ChartGroup/ChartGroup.tsx b/CommonUI/src/Components/Charts/ChartGroup/ChartGroup.tsx index a89d074070..141aec0f57 100644 --- a/CommonUI/src/Components/Charts/ChartGroup/ChartGroup.tsx +++ b/CommonUI/src/Components/Charts/ChartGroup/ChartGroup.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; import LineChart, { ComponentProps as LineChartProps } from '../Line/LineChart'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export enum ChartGroupInterval { ONE_HOUR = '1 hour', diff --git a/CommonUI/src/Components/Charts/Line/LineChart.tsx b/CommonUI/src/Components/Charts/Line/LineChart.tsx index ff9fec9541..1d03bf1e47 100644 --- a/CommonUI/src/Components/Charts/Line/LineChart.tsx +++ b/CommonUI/src/Components/Charts/Line/LineChart.tsx @@ -1,10 +1,10 @@ -import React, { FunctionComponent, ReactElement } from 'react'; +import { Box, CartesianMarkerProps } from '@nivo/core'; +import { LegendProps } from '@nivo/legends'; import { Point, ResponsiveLine } from '@nivo/line'; import { BrightColors } from 'Common/Types/BrandColors'; -import { Box, CartesianMarkerProps } from '@nivo/core'; -import OneUptimeDate from 'Common/Types/Date'; import Color from 'Common/Types/Color'; -import { LegendProps } from '@nivo/legends'; +import OneUptimeDate from 'Common/Types/Date'; +import React, { FunctionComponent, ReactElement } from 'react'; export type XValue = string | number | Date; export type YValue = number; diff --git a/CommonUI/src/Components/Checkbox/Checkbox.tsx b/CommonUI/src/Components/Checkbox/Checkbox.tsx index f3ebcfdd90..d9311466c3 100644 --- a/CommonUI/src/Components/Checkbox/Checkbox.tsx +++ b/CommonUI/src/Components/Checkbox/Checkbox.tsx @@ -1,4 +1,5 @@ import React, { FunctionComponent, ReactElement } from 'react'; + export type CategoryCheckboxValue = string | number | boolean; export interface CategoryProps { diff --git a/CommonUI/src/Components/Checkbox/CheckboxViewer.tsx b/CommonUI/src/Components/Checkbox/CheckboxViewer.tsx index 016f4eb0ea..6e8fbc1dbc 100644 --- a/CommonUI/src/Components/Checkbox/CheckboxViewer.tsx +++ b/CommonUI/src/Components/Checkbox/CheckboxViewer.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement } from 'react'; +import Icon from '../Icon/Icon'; import { Green, Red } from 'Common/Types/BrandColors'; import IconProp from 'Common/Types/Icon/IconProp'; -import Icon from '../Icon/Icon'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { text: string; diff --git a/CommonUI/src/Components/CodeBlock/CodeBlock.tsx b/CommonUI/src/Components/CodeBlock/CodeBlock.tsx index 8dc057bbb5..2290cb49f1 100644 --- a/CommonUI/src/Components/CodeBlock/CodeBlock.tsx +++ b/CommonUI/src/Components/CodeBlock/CodeBlock.tsx @@ -1,6 +1,6 @@ +import 'highlight.js/styles/a11y-dark.css'; import React, { FunctionComponent, ReactElement } from 'react'; import Highlight from 'react-highlight'; -import 'highlight.js/styles/a11y-dark.css'; export interface ComponentProps { code: string | ReactElement; diff --git a/CommonUI/src/Components/CodeEditor/CodeEditor.tsx b/CommonUI/src/Components/CodeEditor/CodeEditor.tsx index 7e1a064655..1f5d4b312e 100644 --- a/CommonUI/src/Components/CodeEditor/CodeEditor.tsx +++ b/CommonUI/src/Components/CodeEditor/CodeEditor.tsx @@ -1,5 +1,5 @@ +import Editor from '@monaco-editor/react'; import CodeType from 'Common/Types/Code/CodeType'; - import React, { FunctionComponent, ReactElement, @@ -7,8 +7,6 @@ import React, { useState, } from 'react'; -import Editor from '@monaco-editor/react'; - export interface ComponentProps { initialValue?: undefined | string; onClick?: undefined | (() => void); diff --git a/CommonUI/src/Components/ColorCircle/ColorCircle.tsx b/CommonUI/src/Components/ColorCircle/ColorCircle.tsx index e0135c4d9e..6add578fb9 100644 --- a/CommonUI/src/Components/ColorCircle/ColorCircle.tsx +++ b/CommonUI/src/Components/ColorCircle/ColorCircle.tsx @@ -1,6 +1,6 @@ +import Tooltip from '../Tooltip/Tooltip'; import Color from 'Common/Types/Color'; import React, { FunctionComponent, ReactElement } from 'react'; -import Tooltip from '../Tooltip/Tooltip'; export interface ComponentProps { color: Color; diff --git a/CommonUI/src/Components/ColorSquareCube/ColorSquareCube.tsx b/CommonUI/src/Components/ColorSquareCube/ColorSquareCube.tsx index 2da26d8264..d066b1f897 100644 --- a/CommonUI/src/Components/ColorSquareCube/ColorSquareCube.tsx +++ b/CommonUI/src/Components/ColorSquareCube/ColorSquareCube.tsx @@ -1,6 +1,6 @@ +import Tooltip from '../Tooltip/Tooltip'; import Color from 'Common/Types/Color'; import React, { FunctionComponent, ReactElement } from 'react'; -import Tooltip from '../Tooltip/Tooltip'; export interface ComponentProps { color: Color; diff --git a/CommonUI/src/Components/ComingSoon/ComingSoon.tsx b/CommonUI/src/Components/ComingSoon/ComingSoon.tsx index 059e02718a..0eb8614545 100644 --- a/CommonUI/src/Components/ComingSoon/ComingSoon.tsx +++ b/CommonUI/src/Components/ComingSoon/ComingSoon.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import EmptyState from '../EmptyState/EmptyState'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; const ComingSoon: FunctionComponent = (): ReactElement => { return ( diff --git a/CommonUI/src/Components/ComponentLoader/CompactLoader.tsx b/CommonUI/src/Components/ComponentLoader/CompactLoader.tsx index ed12c9e185..b1bc908204 100644 --- a/CommonUI/src/Components/ComponentLoader/CompactLoader.tsx +++ b/CommonUI/src/Components/ComponentLoader/CompactLoader.tsx @@ -1,6 +1,6 @@ +import Loader, { LoaderType } from '../Loader/Loader'; import { VeryLightGray } from 'Common/Types/BrandColors'; import React, { ReactElement } from 'react'; -import Loader, { LoaderType } from '../Loader/Loader'; const CompactLoader: () => JSX.Element = (): ReactElement => { return ( diff --git a/CommonUI/src/Components/ComponentLoader/ComponentLoader.tsx b/CommonUI/src/Components/ComponentLoader/ComponentLoader.tsx index 79221ce778..4a96a54aef 100644 --- a/CommonUI/src/Components/ComponentLoader/ComponentLoader.tsx +++ b/CommonUI/src/Components/ComponentLoader/ComponentLoader.tsx @@ -1,5 +1,5 @@ -import React, { ReactElement } from 'react'; import CompactLoader from './CompactLoader'; +import React, { ReactElement } from 'react'; const ComponentLoader: () => JSX.Element = (): ReactElement => { return ( diff --git a/CommonUI/src/Components/CopyTextButton/CopyTextButton.tsx b/CommonUI/src/Components/CopyTextButton/CopyTextButton.tsx index 05360bd329..bdf9752c31 100644 --- a/CommonUI/src/Components/CopyTextButton/CopyTextButton.tsx +++ b/CommonUI/src/Components/CopyTextButton/CopyTextButton.tsx @@ -1,9 +1,9 @@ +import Clipboard from '../../Utils/Clipboard'; import React, { FunctionComponent, MouseEventHandler, ReactElement, } from 'react'; -import Clipboard from '../../Utils/Clipboard'; export interface ComponentProps { textToBeCopied: string; diff --git a/CommonUI/src/Components/CopyableButton/CopyableButton.tsx b/CommonUI/src/Components/CopyableButton/CopyableButton.tsx index 96ec998147..c540b66f30 100644 --- a/CommonUI/src/Components/CopyableButton/CopyableButton.tsx +++ b/CommonUI/src/Components/CopyableButton/CopyableButton.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; import Icon, { SizeProp, ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Tooltip from '../Tooltip/Tooltip'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface ComponentProps { textToBeCopied: string; diff --git a/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx b/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx index 6eb948b7ff..f0b79a3454 100644 --- a/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx +++ b/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx @@ -1,19 +1,19 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; -import ObjectID from 'Common/Types/ObjectID'; -import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; -import Card from '../Card/Card'; -import ModelAPI, { ListResult } from '../../Utils/ModelAPI/ModelAPI'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import Detail from '../Detail/Detail'; -import BasicFormModal from '../FormModal/BasicFormModal'; -import { JSONObject } from 'Common/Types/JSON'; -import { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; import API from '../../Utils/API/API'; -import useAsyncEffect from 'use-async-effect'; +import ModelAPI, { ListResult } from '../../Utils/ModelAPI/ModelAPI'; +import { ButtonStyleType } from '../Button/Button'; +import Card from '../Card/Card'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import Detail from '../Detail/Detail'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import BasicFormModal from '../FormModal/BasicFormModal'; +import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; +import useAsyncEffect from 'use-async-effect'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Detail/Detail.tsx b/CommonUI/src/Components/Detail/Detail.tsx index d4ee86530f..14c56a94bb 100644 --- a/CommonUI/src/Components/Detail/Detail.tsx +++ b/CommonUI/src/Components/Detail/Detail.tsx @@ -1,26 +1,26 @@ -import React, { ReactElement } from 'react'; -import Field from './Field'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import OneUptimeDate from 'Common/Types/Date'; -import FieldType from '../Types/FieldType'; -import HiddenText from '../HiddenText/HiddenText'; -import get from 'lodash/get'; -import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; -import CodeEditor from '../CodeEditor/CodeEditor'; -import CodeType from 'Common/Types/Code/CodeType'; -import FileModel from 'Common/Models/FileModel'; -import ColorViewer from '../ColorViewer/ColorViewer'; -import Color from 'Common/Types/Color'; import AlignItem from '../../Types/AlignItem'; -import PlaceholderText from './PlaceholderText'; +import { Logger } from '../../Utils/Logger'; +import CodeEditor from '../CodeEditor/CodeEditor'; +import ColorViewer from '../ColorViewer/ColorViewer'; +import CopyableButton from '../CopyableButton/CopyableButton'; import DictionaryOfStringsViewer from '../Dictionary/DictionaryOfStingsViewer'; import { DropdownOption } from '../Dropdown/Dropdown'; +import HiddenText from '../HiddenText/HiddenText'; +import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; +import FieldType from '../Types/FieldType'; +import Field from './Field'; import FieldLabelElement from './FieldLabel'; +import PlaceholderText from './PlaceholderText'; +import FileModel from 'Common/Models/FileModel'; +import CodeType from 'Common/Types/Code/CodeType'; +import Color from 'Common/Types/Color'; import DatabaseProperty from 'Common/Types/Database/DatabaseProperty'; +import OneUptimeDate from 'Common/Types/Date'; import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import GenericObject from 'Common/Types/GenericObject'; -import CopyableButton from '../CopyableButton/CopyableButton'; -import { Logger } from '../../Utils/Logger'; +import get from 'lodash/get'; +import React, { ReactElement } from 'react'; export interface ComponentProps { item: T; diff --git a/CommonUI/src/Components/Detail/Field.ts b/CommonUI/src/Components/Detail/Field.ts index ce03e00a9e..4a1b9b370a 100644 --- a/CommonUI/src/Components/Detail/Field.ts +++ b/CommonUI/src/Components/Detail/Field.ts @@ -1,11 +1,11 @@ +import AlignItem from '../../Types/AlignItem'; +import { DropdownOption } from '../Dropdown/Dropdown'; +import FieldType from '../Types/FieldType'; +import { Size } from './FieldLabel'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; -import { ReactElement } from 'react'; -import AlignItem from '../../Types/AlignItem'; -import FieldType from '../Types/FieldType'; -import { DropdownOption } from '../Dropdown/Dropdown'; -import { Size } from './FieldLabel'; import { JSONObject } from 'Common/Types/JSON'; +import { ReactElement } from 'react'; export interface DetailSideLink { text: string; diff --git a/CommonUI/src/Components/Detail/FieldLabel.tsx b/CommonUI/src/Components/Detail/FieldLabel.tsx index 557f785862..09c2c928d4 100644 --- a/CommonUI/src/Components/Detail/FieldLabel.tsx +++ b/CommonUI/src/Components/Detail/FieldLabel.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import { DetailSideLink } from './Field'; import Link from '../Link/Link'; +import { DetailSideLink } from './Field'; +import React, { FunctionComponent, ReactElement } from 'react'; export enum Size { Normal = 'text-sm', diff --git a/CommonUI/src/Components/Dictionary/Dictionary.tsx b/CommonUI/src/Components/Dictionary/Dictionary.tsx index f4225f0f02..92e280018c 100644 --- a/CommonUI/src/Components/Dictionary/Dictionary.tsx +++ b/CommonUI/src/Components/Dictionary/Dictionary.tsx @@ -1,15 +1,15 @@ +import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; +import Dropdown, { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; +import Icon, { SizeProp } from '../Icon/Icon'; +import Input, { InputType } from '../Input/Input'; import Dictionary from 'Common/Types/Dictionary'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; -import Input, { InputType } from '../Input/Input'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Dropdown, { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; -import Icon, { SizeProp } from '../Icon/Icon'; export enum ValueType { Text = 'Text', diff --git a/CommonUI/src/Components/Dictionary/DictionaryOfStrings.tsx b/CommonUI/src/Components/Dictionary/DictionaryOfStrings.tsx index 602ed87398..d74ed1f3c9 100644 --- a/CommonUI/src/Components/Dictionary/DictionaryOfStrings.tsx +++ b/CommonUI/src/Components/Dictionary/DictionaryOfStrings.tsx @@ -1,6 +1,6 @@ +import DictionaryForm, { ValueType } from './Dictionary'; import Dictionary from 'Common/Types/Dictionary'; import React, { FunctionComponent, ReactElement } from 'react'; -import DictionaryForm, { ValueType } from './Dictionary'; export interface ComponentProps { onChange?: undefined | ((value: Dictionary) => void); diff --git a/CommonUI/src/Components/Dropdown/Dropdown.tsx b/CommonUI/src/Components/Dropdown/Dropdown.tsx index 0fddd61f48..f75798da49 100644 --- a/CommonUI/src/Components/Dropdown/Dropdown.tsx +++ b/CommonUI/src/Components/Dropdown/Dropdown.tsx @@ -1,4 +1,4 @@ -import Select, { ControlProps, GroupBase, OptionProps } from 'react-select'; +import ObjectID from 'Common/Types/ObjectID'; import React, { FunctionComponent, ReactElement, @@ -6,7 +6,7 @@ import React, { useRef, useState, } from 'react'; -import ObjectID from 'Common/Types/ObjectID'; +import Select, { ControlProps, GroupBase, OptionProps } from 'react-select'; export type DropdownValue = string | number | boolean; diff --git a/CommonUI/src/Components/DuplicateModel/DuplicateModel.tsx b/CommonUI/src/Components/DuplicateModel/DuplicateModel.tsx index 5aaa94eb93..fcc032c64d 100644 --- a/CommonUI/src/Components/DuplicateModel/DuplicateModel.tsx +++ b/CommonUI/src/Components/DuplicateModel/DuplicateModel.tsx @@ -1,18 +1,18 @@ -import BaseModel from 'Common/Models/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import React, { ReactElement, useState } from 'react'; +import API from '../../Utils/API/API'; +import Select from '../../Utils/BaseDatabase/Select'; import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; +import Navigation from '../../Utils/Navigation'; import { ButtonStyleType } from '../Button/Button'; import Card from '../Card/Card'; -import API from '../../Utils/API/API'; -import IconProp from 'Common/Types/Icon/IconProp'; -import ConfirmModal from '../Modal/ConfirmModal'; -import Select from '../../Utils/BaseDatabase/Select'; +import BasicFormModal from '../FormModal/BasicFormModal'; import { ModelField } from '../Forms/ModelForm'; +import ConfirmModal from '../Modal/ConfirmModal'; +import BaseModel from 'Common/Models/BaseModel'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; import Route from 'Common/Types/API/Route'; -import Navigation from '../../Utils/Navigation'; -import BasicFormModal from '../FormModal/BasicFormModal'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement, useState } from 'react'; export interface ComponentProps { modelType: { new (): TBaseModel }; diff --git a/CommonUI/src/Components/EmptyState/EmptyState.tsx b/CommonUI/src/Components/EmptyState/EmptyState.tsx index f62ad98c31..709b52ad59 100644 --- a/CommonUI/src/Components/EmptyState/EmptyState.tsx +++ b/CommonUI/src/Components/EmptyState/EmptyState.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Icon from '../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string | ReactElement; diff --git a/CommonUI/src/Components/Error/PageError.tsx b/CommonUI/src/Components/Error/PageError.tsx index 11d6f81f56..9d2dc684f6 100644 --- a/CommonUI/src/Components/Error/PageError.tsx +++ b/CommonUI/src/Components/Error/PageError.tsx @@ -1,9 +1,9 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Navigation from '../../Utils/Navigation'; import { ButtonStyleType } from '../Button/Button'; import { IconType } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Modal from '../Modal/Modal'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title?: string; diff --git a/CommonUI/src/Components/EventHistoryList/EventHistoryDayList.tsx b/CommonUI/src/Components/EventHistoryList/EventHistoryDayList.tsx index 369b936e43..6edb599d5b 100644 --- a/CommonUI/src/Components/EventHistoryList/EventHistoryDayList.tsx +++ b/CommonUI/src/Components/EventHistoryList/EventHistoryDayList.tsx @@ -1,8 +1,8 @@ -import OneUptimeDate from 'Common/Types/Date'; -import React, { FunctionComponent, ReactElement } from 'react'; import EventHistoryItem, { ComponentProps as ItemComponentProps, } from '../EventItem/EventItem'; +import OneUptimeDate from 'Common/Types/Date'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { date: Date; diff --git a/CommonUI/src/Components/EventHistoryList/EventHistoryList.tsx b/CommonUI/src/Components/EventHistoryList/EventHistoryList.tsx index 7e116aa48f..a598d3d3e7 100644 --- a/CommonUI/src/Components/EventHistoryList/EventHistoryList.tsx +++ b/CommonUI/src/Components/EventHistoryList/EventHistoryList.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import EventHistoryDayList, { ComponentProps as EventHistoryDayListComponentProps, } from './EventHistoryDayList'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { items: Array; diff --git a/CommonUI/src/Components/EventItem/EventItem.tsx b/CommonUI/src/Components/EventItem/EventItem.tsx index 7b5eb00e62..c76eccae26 100644 --- a/CommonUI/src/Components/EventItem/EventItem.tsx +++ b/CommonUI/src/Components/EventItem/EventItem.tsx @@ -1,15 +1,15 @@ -import Route from 'Common/Types/API/Route'; -import { VeryLightGray } from 'Common/Types/BrandColors'; -import OneUptimeDate from 'Common/Types/Date'; -import React, { FunctionComponent, ReactElement } from 'react'; +import Icon from '../Icon/Icon'; import Link from '../Link/Link'; -import URL from 'Common/Types/API/URL'; -import Color from 'Common/Types/Color'; +import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; import Pill from '../Pill/Pill'; import BaseModel from 'Common/Models/BaseModel'; -import Icon from '../Icon/Icon'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import { VeryLightGray } from 'Common/Types/BrandColors'; +import Color from 'Common/Types/Color'; +import OneUptimeDate from 'Common/Types/Date'; import IconProp from 'Common/Types/Icon/IconProp'; -import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; +import React, { FunctionComponent, ReactElement } from 'react'; export enum TimelineItemType { StateChange = 'StateChange', diff --git a/CommonUI/src/Components/Events/RecurringFieldElement.tsx b/CommonUI/src/Components/Events/RecurringFieldElement.tsx index 0da77355d5..5563f455fd 100644 --- a/CommonUI/src/Components/Events/RecurringFieldElement.tsx +++ b/CommonUI/src/Components/Events/RecurringFieldElement.tsx @@ -1,11 +1,11 @@ -import Recurring from 'Common/Types/Events/Recurring'; -import React, { FunctionComponent, ReactElement, useState } from 'react'; -import Input, { InputType } from '../Input/Input'; -import Typeof from 'Common/Types/Typeof'; -import PositiveNumber from 'Common/Types/PositiveNumber'; -import Dropdown, { DropdownValue } from '../Dropdown/Dropdown'; import DropdownUtil from '../../Utils/Dropdown'; +import Dropdown, { DropdownValue } from '../Dropdown/Dropdown'; +import Input, { InputType } from '../Input/Input'; import EventInterval from 'Common/Types/Events/EventInterval'; +import Recurring from 'Common/Types/Events/Recurring'; +import PositiveNumber from 'Common/Types/PositiveNumber'; +import Typeof from 'Common/Types/Typeof'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface ComponentProps { error?: string | undefined; diff --git a/CommonUI/src/Components/FilePicker/FilePicker.tsx b/CommonUI/src/Components/FilePicker/FilePicker.tsx index 63de8293e1..fd72f7365e 100644 --- a/CommonUI/src/Components/FilePicker/FilePicker.tsx +++ b/CommonUI/src/Components/FilePicker/FilePicker.tsx @@ -1,3 +1,14 @@ +import { FILE_URL } from '../../Config'; +import API from '../../Utils/API/API'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import Icon, { SizeProp } from '../Icon/Icon'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import CommonURL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import MimeType from 'Common/Types/File/MimeType'; +import IconProp from 'Common/Types/Icon/IconProp'; +import FileModel from 'Model/Models/File'; import React, { FunctionComponent, ReactElement, @@ -5,17 +16,6 @@ import React, { useState, } from 'react'; import { useDropzone } from 'react-dropzone'; -import MimeType from 'Common/Types/File/MimeType'; -import FileModel from 'Model/Models/File'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; -import CommonURL from 'Common/Types/API/URL'; -import { FILE_URL } from '../../Config'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; -import Icon, { SizeProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import Dictionary from 'Common/Types/Dictionary'; -import API from '../../Utils/API/API'; export interface ComponentProps { initialValue?: undefined | Array | FileModel; diff --git a/CommonUI/src/Components/Filters/BooleanFilter.tsx b/CommonUI/src/Components/Filters/BooleanFilter.tsx index 76839fb747..0d3cba1486 100644 --- a/CommonUI/src/Components/Filters/BooleanFilter.tsx +++ b/CommonUI/src/Components/Filters/BooleanFilter.tsx @@ -1,9 +1,9 @@ -import React, { ReactElement } from 'react'; import Dropdown, { DropdownValue } from '../Dropdown/Dropdown'; -import Filter from './Types/Filter'; -import GenericObject from 'Common/Types/GenericObject'; import FieldType from '../Types/FieldType'; +import Filter from './Types/Filter'; import FilterData from './Types/FilterData'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { filter: Filter; diff --git a/CommonUI/src/Components/Filters/DropdownFilter.tsx b/CommonUI/src/Components/Filters/DropdownFilter.tsx index 41e3726340..2e7a1e66ec 100644 --- a/CommonUI/src/Components/Filters/DropdownFilter.tsx +++ b/CommonUI/src/Components/Filters/DropdownFilter.tsx @@ -1,9 +1,9 @@ -import React, { ReactElement } from 'react'; import Dropdown, { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; -import Filter from './Types/Filter'; -import GenericObject from 'Common/Types/GenericObject'; import FieldType from '../Types/FieldType'; +import Filter from './Types/Filter'; import FilterData from './Types/FilterData'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { filter: Filter; diff --git a/CommonUI/src/Components/Filters/EntityFilter.tsx b/CommonUI/src/Components/Filters/EntityFilter.tsx index f7965e1857..4ad18f55a5 100644 --- a/CommonUI/src/Components/Filters/EntityFilter.tsx +++ b/CommonUI/src/Components/Filters/EntityFilter.tsx @@ -1,9 +1,9 @@ -import React, { ReactElement } from 'react'; import Dropdown, { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; -import Filter from './Types/Filter'; -import GenericObject from 'Common/Types/GenericObject'; import FieldType from '../Types/FieldType'; +import Filter from './Types/Filter'; import FilterData from './Types/FilterData'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { filter: Filter; diff --git a/CommonUI/src/Components/Filters/FilterViewer.tsx b/CommonUI/src/Components/Filters/FilterViewer.tsx index 3c4434e23a..ee5766a97a 100644 --- a/CommonUI/src/Components/Filters/FilterViewer.tsx +++ b/CommonUI/src/Components/Filters/FilterViewer.tsx @@ -1,20 +1,20 @@ -import React, { ReactElement, useEffect, useState } from 'react'; -import Filter from './Types/Filter'; -import GenericObject from 'Common/Types/GenericObject'; -import FilterData from './Types/FilterData'; -import FilterViewerItem from './FilterViewerItem'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; import Button, { ButtonStyleType } from '../Button/Button'; -import Modal, { ModalWidth } from '../Modal/Modal'; -import FiltersForm from './FiltersForm'; -import IconProp from 'Common/Types/Icon/IconProp'; +import { DropdownOption } from '../Dropdown/Dropdown'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; import { SizeProp } from '../Icon/Icon'; +import Modal, { ModalWidth } from '../Modal/Modal'; +import FieldType from '../Types/FieldType'; +import FilterViewerItem from './FilterViewerItem'; +import FiltersForm from './FiltersForm'; +import Filter from './Types/Filter'; +import FilterData from './Types/FilterData'; +import InBetween from 'Common/Types/BaseDatabase/InBetween'; import Search from 'Common/Types/BaseDatabase/Search'; import OneUptimeDate from 'Common/Types/Date'; -import InBetween from 'Common/Types/BaseDatabase/InBetween'; -import FieldType from '../Types/FieldType'; -import { DropdownOption } from '../Dropdown/Dropdown'; import Dictionary from 'Common/Types/Dictionary'; +import GenericObject from 'Common/Types/GenericObject'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement, useEffect, useState } from 'react'; export interface ComponentProps { filters: Array>; diff --git a/CommonUI/src/Components/Filters/FiltersForm.tsx b/CommonUI/src/Components/Filters/FiltersForm.tsx index ecdd3e5aa7..7636a6edb8 100644 --- a/CommonUI/src/Components/Filters/FiltersForm.tsx +++ b/CommonUI/src/Components/Filters/FiltersForm.tsx @@ -1,14 +1,14 @@ -import React, { ReactElement } from 'react'; -import Filter from './Types/Filter'; import ComponentLoader from '../ComponentLoader/ComponentLoader'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import GenericObject from 'Common/Types/GenericObject'; -import FilterData from './Types/FilterData'; -import EntityFilter from './EntityFilter'; import BooleanFilter from './BooleanFilter'; -import TextFilter from './TextFilter'; import DropdownFilter from './DropdownFilter'; +import EntityFilter from './EntityFilter'; import JSONFilter from './JSONFilter'; +import TextFilter from './TextFilter'; +import Filter from './Types/Filter'; +import FilterData from './Types/FilterData'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { filters: Array>; diff --git a/CommonUI/src/Components/Filters/JSONFilter.tsx b/CommonUI/src/Components/Filters/JSONFilter.tsx index a96f764c08..f59c44c1f7 100644 --- a/CommonUI/src/Components/Filters/JSONFilter.tsx +++ b/CommonUI/src/Components/Filters/JSONFilter.tsx @@ -1,10 +1,10 @@ -import React, { ReactElement } from 'react'; -import Filter from './Types/Filter'; -import GenericObject from 'Common/Types/GenericObject'; +import DictionaryForm, { ValueType } from '../Dictionary/Dictionary'; import FieldType from '../Types/FieldType'; +import Filter from './Types/Filter'; import FilterData from './Types/FilterData'; import Dictionary from 'Common/Types/Dictionary'; -import DictionaryForm, { ValueType } from '../Dictionary/Dictionary'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { filter: Filter; diff --git a/CommonUI/src/Components/Filters/TextFilter.tsx b/CommonUI/src/Components/Filters/TextFilter.tsx index 9fa097f8b6..79253eb815 100644 --- a/CommonUI/src/Components/Filters/TextFilter.tsx +++ b/CommonUI/src/Components/Filters/TextFilter.tsx @@ -1,12 +1,12 @@ -import React, { ReactElement } from 'react'; -import Filter from './Types/Filter'; -import GenericObject from 'Common/Types/GenericObject'; -import FieldType from '../Types/FieldType'; -import FilterData from './Types/FilterData'; import Input, { InputType } from '../Input/Input'; -import OneUptimeDate from 'Common/Types/Date'; +import FieldType from '../Types/FieldType'; +import Filter from './Types/Filter'; +import FilterData from './Types/FilterData'; import Search from 'Common/Types/BaseDatabase/Search'; import DatabaseDate from 'Common/Types/Database/Date'; +import OneUptimeDate from 'Common/Types/Date'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { filter: Filter; diff --git a/CommonUI/src/Components/Filters/Types/Filter.ts b/CommonUI/src/Components/Filters/Types/Filter.ts index 59d2689b93..27aedd9c5a 100644 --- a/CommonUI/src/Components/Filters/Types/Filter.ts +++ b/CommonUI/src/Components/Filters/Types/Filter.ts @@ -1,6 +1,6 @@ -import GenericObject from 'Common/Types/GenericObject'; import { DropdownOption } from '../../Dropdown/Dropdown'; import FieldType from '../../Types/FieldType'; +import GenericObject from 'Common/Types/GenericObject'; export default interface Filter { title: string; diff --git a/CommonUI/src/Components/Filters/Types/FilterData.ts b/CommonUI/src/Components/Filters/Types/FilterData.ts index 7aa352d269..4785476a40 100644 --- a/CommonUI/src/Components/Filters/Types/FilterData.ts +++ b/CommonUI/src/Components/Filters/Types/FilterData.ts @@ -1,5 +1,5 @@ -import GenericObject from 'Common/Types/GenericObject'; import Query from '../../../Utils/BaseDatabase/Query'; +import GenericObject from 'Common/Types/GenericObject'; type FillterData = Query; // this is bascially a Query object diff --git a/CommonUI/src/Components/Footer/Footer.tsx b/CommonUI/src/Components/Footer/Footer.tsx index aef0749c6c..feb456434c 100644 --- a/CommonUI/src/Components/Footer/Footer.tsx +++ b/CommonUI/src/Components/Footer/Footer.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import UILink from '../Link/Link'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface FooterLink { onClick?: (() => void) | undefined; diff --git a/CommonUI/src/Components/FormModal/BasicFormModal.tsx b/CommonUI/src/Components/FormModal/BasicFormModal.tsx index 40b4af91d5..15b1d8f703 100644 --- a/CommonUI/src/Components/FormModal/BasicFormModal.tsx +++ b/CommonUI/src/Components/FormModal/BasicFormModal.tsx @@ -1,12 +1,12 @@ -import React, { ReactElement, useEffect, useRef, useState } from 'react'; import { ButtonStyleType } from '../Button/Button'; -import Modal from '../Modal/Modal'; +import ButtonType from '../Button/ButtonTypes'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; import BasicForm, { BaseComponentProps as BasicFormComponentProps, } from '../Forms/BasicForm'; -import ButtonType from '../Button/ButtonTypes'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import Modal from '../Modal/Modal'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement, useEffect, useRef, useState } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Forms/BasicForm.tsx b/CommonUI/src/Components/Forms/BasicForm.tsx index bd4335bfb5..ecf05af169 100644 --- a/CommonUI/src/Components/Forms/BasicForm.tsx +++ b/CommonUI/src/Components/Forms/BasicForm.tsx @@ -1,39 +1,39 @@ +import API from '../../Utils/API/API'; +import UiAnalytics from '../../Utils/Analytics'; +import Alert, { AlertType } from '../Alerts/Alert'; +import Button, { ButtonStyleType } from '../Button/Button'; +import ButtonTypes from '../Button/ButtonTypes'; +import { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import FormField from './Fields/FormField'; +import Steps from './Steps/Steps'; +import Field from './Types/Field'; +import Fields from './Types/Fields'; +import FormFieldSchemaType from './Types/FormFieldSchemaType'; +import { FormStep } from './Types/FormStep'; +import FormValues from './Types/FormValues'; +import Validation from './Validation'; +import OneUptimeDate from 'Common/Types/Date'; +import Dictionary from 'Common/Types/Dictionary'; +import { VoidFunction } from 'Common/Types/FunctionTypes'; +import GenericObject from 'Common/Types/GenericObject'; +import HashedString from 'Common/Types/HashedString'; +import { JSONObject, JSONValue } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import Typeof from 'Common/Types/Typeof'; +import { FormikErrors, FormikProps } from 'formik'; import React, { - forwardRef, ForwardRefExoticComponent, MutableRefObject, ReactElement, Ref, + forwardRef, useEffect, useImperativeHandle, useRef, useState, } from 'react'; -import Button, { ButtonStyleType } from '../Button/Button'; -import FormValues from './Types/FormValues'; -import Fields from './Types/Fields'; -import ButtonTypes from '../Button/ButtonTypes'; -import { JSONObject, JSONValue } from 'Common/Types/JSON'; -import FormFieldSchemaType from './Types/FormFieldSchemaType'; -import Alert, { AlertType } from '../Alerts/Alert'; -import { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; -import OneUptimeDate from 'Common/Types/Date'; -import HashedString from 'Common/Types/HashedString'; -import Typeof from 'Common/Types/Typeof'; -import UiAnalytics from '../../Utils/Analytics'; -import Dictionary from 'Common/Types/Dictionary'; -import Field from './Types/Field'; -import { FormStep } from './Types/FormStep'; -import Steps from './Steps/Steps'; -import FormField from './Fields/FormField'; -import Validation from './Validation'; import useAsyncEffect from 'use-async-effect'; -import API from '../../Utils/API/API'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import { FormikErrors, FormikProps } from 'formik'; -import { VoidFunction } from 'Common/Types/FunctionTypes'; -import GenericObject from 'Common/Types/GenericObject'; -import ObjectID from 'Common/Types/ObjectID'; export type FormProps = FormikProps; export type FormErrors = FormikErrors; diff --git a/CommonUI/src/Components/Forms/BasicModelForm.tsx b/CommonUI/src/Components/Forms/BasicModelForm.tsx index 2977d9a6ff..a86fc6947e 100644 --- a/CommonUI/src/Components/Forms/BasicModelForm.tsx +++ b/CommonUI/src/Components/Forms/BasicModelForm.tsx @@ -1,19 +1,19 @@ +import { ButtonStyleType } from '../Button/Button'; +import BasicForm, { + DefaultValidateFunction, + FormErrors, + FormProps, +} from './BasicForm'; +import Fields from './Types/Fields'; +import { FormStep } from './Types/FormStep'; +import FormValues from './Types/FormValues'; +import BaseModel from 'Common/Models/BaseModel'; import React, { MutableRefObject, ReactElement, useEffect, useState, } from 'react'; -import BaseModel from 'Common/Models/BaseModel'; -import FormValues from './Types/FormValues'; -import Fields from './Types/Fields'; -import BasicForm, { - DefaultValidateFunction, - FormErrors, - FormProps, -} from './BasicForm'; -import { ButtonStyleType } from '../Button/Button'; -import { FormStep } from './Types/FormStep'; export interface ComponentProps { model: TBaseModel; diff --git a/CommonUI/src/Components/Forms/Fields/ColorPicker.tsx b/CommonUI/src/Components/Forms/Fields/ColorPicker.tsx index ca0d470ca1..78be41d8e2 100644 --- a/CommonUI/src/Components/Forms/Fields/ColorPicker.tsx +++ b/CommonUI/src/Components/Forms/Fields/ColorPicker.tsx @@ -1,4 +1,8 @@ +import useComponentOutsideClick from '../../../Types/UseComponentOutsideClick'; +import Icon from '../../Icon/Icon'; +import Input, { InputType } from '../../Input/Input'; import Color from 'Common/Types/Color'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, @@ -6,10 +10,6 @@ import React, { useState, } from 'react'; import { ChromePicker, ColorResult } from 'react-color'; -import useComponentOutsideClick from '../../../Types/UseComponentOutsideClick'; -import Input, { InputType } from '../../Input/Input'; -import Icon from '../../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; export interface ComponentProps { onChange: (value: Color | null) => void; diff --git a/CommonUI/src/Components/Forms/Fields/FieldLabel.tsx b/CommonUI/src/Components/Forms/Fields/FieldLabel.tsx index 2889abd31e..dcb6787858 100644 --- a/CommonUI/src/Components/Forms/Fields/FieldLabel.tsx +++ b/CommonUI/src/Components/Forms/Fields/FieldLabel.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Link from '../../Link/Link'; import { FormFieldSideLink } from '../Types/Field'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Forms/Fields/FormField.tsx b/CommonUI/src/Components/Forms/Fields/FormField.tsx index 71054f56af..8d266d7837 100644 --- a/CommonUI/src/Components/Forms/Fields/FormField.tsx +++ b/CommonUI/src/Components/Forms/Fields/FormField.tsx @@ -1,35 +1,34 @@ -import React, { ReactElement, useEffect } from 'react'; - -import BadDataException from 'Common/Types/Exception/BadDataException'; -import FormFieldSchemaType from '../Types/FormFieldSchemaType'; -import ColorPicker from '../Fields/ColorPicker'; -import Color from 'Common/Types/Color'; -import TextArea from '../../TextArea/TextArea'; -import Dropdown, { DropdownValue } from '../../Dropdown/Dropdown'; -import Toggle from '../../Toggle/Toggle'; -import Input, { InputType } from '../../Input/Input'; -import CodeEditor from '../../CodeEditor/CodeEditor'; -import CodeType from 'Common/Types/Code/CodeType'; -import FilePicker from '../../FilePicker/FilePicker'; -import MimeType from 'Common/Types/File/MimeType'; -import FileModel from 'Common/Models/FileModel'; -import RadioButtons from '../../RadioButtons/GroupRadioButtons'; -import Field, { FormFieldStyleType } from '../Types/Field'; -import FieldLabelElement from '../Fields/FieldLabel'; -import FormValues from '../Types/FormValues'; -import { JSONValue } from 'Common/Types/JSON'; -import IDGenerator from '../../ObjectID/IDGenerator'; -import ObjectID from 'Common/Types/ObjectID'; -import OneUptimeDate from 'Common/Types/Date'; +import { GetReactElementFunction } from '../../../Types/FunctionTypes'; +import CategoryCheckbox from '../../CategoryCheckbox/Index'; import CheckboxElement, { CategoryCheckboxValue, } from '../../Checkbox/Checkbox'; -import CategoryCheckbox from '../../CategoryCheckbox/Index'; -import Typeof from 'Common/Types/Typeof'; -import Modal from '../../Modal/Modal'; +import CodeEditor from '../../CodeEditor/CodeEditor'; +import Dropdown, { DropdownValue } from '../../Dropdown/Dropdown'; +import FilePicker from '../../FilePicker/FilePicker'; +import Input, { InputType } from '../../Input/Input'; import Link from '../../Link/Link'; -import { GetReactElementFunction } from '../../../Types/FunctionTypes'; +import Modal from '../../Modal/Modal'; +import IDGenerator from '../../ObjectID/IDGenerator'; +import RadioButtons from '../../RadioButtons/GroupRadioButtons'; +import TextArea from '../../TextArea/TextArea'; +import Toggle from '../../Toggle/Toggle'; +import ColorPicker from '../Fields/ColorPicker'; +import FieldLabelElement from '../Fields/FieldLabel'; +import Field, { FormFieldStyleType } from '../Types/Field'; +import FormFieldSchemaType from '../Types/FormFieldSchemaType'; +import FormValues from '../Types/FormValues'; +import FileModel from 'Common/Models/FileModel'; +import CodeType from 'Common/Types/Code/CodeType'; +import Color from 'Common/Types/Color'; +import OneUptimeDate from 'Common/Types/Date'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import MimeType from 'Common/Types/File/MimeType'; import GenericObject from 'Common/Types/GenericObject'; +import { JSONValue } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import Typeof from 'Common/Types/Typeof'; +import React, { ReactElement, useEffect } from 'react'; export interface ComponentProps { field: Field; diff --git a/CommonUI/src/Components/Forms/ModelForm.tsx b/CommonUI/src/Components/Forms/ModelForm.tsx index c20a09703b..c1ad71e54c 100644 --- a/CommonUI/src/Components/Forms/ModelForm.tsx +++ b/CommonUI/src/Components/Forms/ModelForm.tsx @@ -1,51 +1,51 @@ -import React, { MutableRefObject, ReactElement, useState } from 'react'; -import BaseModel from 'Common/Models/BaseModel'; -import FormValues from './Types/FormValues'; -import Fields from './Types/Fields'; -import BasicModelForm from './BasicModelForm'; -import { JSONObject } from 'Common/Types/JSON'; -import URL from 'Common/Types/API/URL'; +import SelectFormFields from '../../Types/SelectEntityField'; +import API from '../../Utils/API/API'; +import Select from '../../Utils/BaseDatabase/Select'; import ModelAPI, { ListResult, ModelAPIHttpResponse, RequestOptions, } from '../../Utils/ModelAPI/ModelAPI'; -import Select from '../../Utils/BaseDatabase/Select'; -import Dictionary from 'Common/Types/Dictionary'; -import useAsyncEffect from 'use-async-effect'; -import ObjectID from 'Common/Types/ObjectID'; -import Loader, { LoaderType } from '../Loader/Loader'; -import { Black, VeryLightGray } from 'Common/Types/BrandColors'; -import Permission, { - PermissionHelper, - UserPermission, -} from 'Common/Types/Permission'; import PermissionUtil from '../../Utils/Permission'; -import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import FileModel from 'Common/Models/FileModel'; -import TableColumnType from 'Common/Types/Database/TableColumnType'; -import Typeof from 'Common/Types/Typeof'; -import { TableColumnMetadata } from 'Common/Types/Database/TableColumn'; -import { ButtonStyleType } from '../Button/Button'; -import API from '../../Utils/API/API'; -import { FormStep } from './Types/FormStep'; -import Field from './Types/Field'; -import { getMaxLengthFromTableColumnType } from 'Common/Types/Database/ColumnLength'; -import SelectFormFields from '../../Types/SelectEntityField'; import User from '../../Utils/User'; +import { ButtonStyleType } from '../Button/Button'; import { CategoryCheckboxOption, CheckboxCategory, } from '../CategoryCheckbox/CategoryCheckboxTypes'; -import AccessControlModel from 'Common/Models/AccessControlModel'; +import Loader, { LoaderType } from '../Loader/Loader'; import Pill, { PillSize } from '../Pill/Pill'; -import Color from 'Common/Types/Color'; -import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; import { FormErrors, FormProps } from './BasicForm'; +import BasicModelForm from './BasicModelForm'; +import Field from './Types/Field'; +import Fields from './Types/Fields'; +import { FormStep } from './Types/FormStep'; +import FormValues from './Types/FormValues'; +import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import AccessControlModel from 'Common/Models/AccessControlModel'; +import BaseModel from 'Common/Models/BaseModel'; +import FileModel from 'Common/Models/FileModel'; +import URL from 'Common/Types/API/URL'; +import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; +import { Black, VeryLightGray } from 'Common/Types/BrandColors'; +import Color from 'Common/Types/Color'; +import { getMaxLengthFromTableColumnType } from 'Common/Types/Database/ColumnLength'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import { TableColumnMetadata } from 'Common/Types/Database/TableColumn'; +import TableColumnType from 'Common/Types/Database/TableColumnType'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import GenericObject from 'Common/Types/GenericObject'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import Permission, { + PermissionHelper, + UserPermission, +} from 'Common/Types/Permission'; +import Typeof from 'Common/Types/Typeof'; +import React, { MutableRefObject, ReactElement, useState } from 'react'; +import useAsyncEffect from 'use-async-effect'; export enum FormType { Create, diff --git a/CommonUI/src/Components/Forms/Steps/Step.tsx b/CommonUI/src/Components/Forms/Steps/Step.tsx index c7760a98f8..3aec5d9cc6 100644 --- a/CommonUI/src/Components/Forms/Steps/Step.tsx +++ b/CommonUI/src/Components/Forms/Steps/Step.tsx @@ -1,6 +1,6 @@ -import React, { ReactElement } from 'react'; import { FormStep, FormStepState } from '../Types/FormStep'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { step: FormStep; diff --git a/CommonUI/src/Components/Forms/Steps/Steps.tsx b/CommonUI/src/Components/Forms/Steps/Steps.tsx index 4d1d6291a6..7f51f84581 100644 --- a/CommonUI/src/Components/Forms/Steps/Steps.tsx +++ b/CommonUI/src/Components/Forms/Steps/Steps.tsx @@ -1,8 +1,8 @@ -import React, { ReactElement } from 'react'; import { FormStep, FormStepState } from '../Types/FormStep'; -import Step from './Step'; import FormValues from '../Types/FormValues'; +import Step from './Step'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { steps: Array>; diff --git a/CommonUI/src/Components/Forms/Types/Field.ts b/CommonUI/src/Components/Forms/Types/Field.ts index ec62b2d94d..a6fd396c09 100644 --- a/CommonUI/src/Components/Forms/Types/Field.ts +++ b/CommonUI/src/Components/Forms/Types/Field.ts @@ -1,17 +1,17 @@ -import Route from 'Common/Types/API/Route'; -import URL from 'Common/Types/API/URL'; -import FormFieldSchemaType from './FormFieldSchemaType'; import SelectFormFields from '../../../Types/SelectEntityField'; -import { DropdownOption } from '../../Dropdown/Dropdown'; -import { BaseModelType } from 'Common/Models/BaseModel'; -import MimeType from 'Common/Types/File/MimeType'; -import FormValues from './FormValues'; -import { RadioButton } from '../../RadioButtons/GroupRadioButtons'; -import { ReactElement } from 'react'; import { CategoryCheckboxOption, CheckboxCategory, } from '../../CategoryCheckbox/CategoryCheckboxTypes'; +import { DropdownOption } from '../../Dropdown/Dropdown'; +import { RadioButton } from '../../RadioButtons/GroupRadioButtons'; +import FormFieldSchemaType from './FormFieldSchemaType'; +import FormValues from './FormValues'; +import { BaseModelType } from 'Common/Models/BaseModel'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import MimeType from 'Common/Types/File/MimeType'; +import { ReactElement } from 'react'; export enum FormFieldStyleType { Default = 'Default', diff --git a/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts b/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts index a295fac859..0dd88fd08c 100644 --- a/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts +++ b/CommonUI/src/Components/Forms/Types/FormFieldsSchema.ts @@ -1,6 +1,6 @@ +import FormType from './FormFieldSchemaType'; import Hostname from 'Common/Types/API/Hostname'; import ObjectID from 'Common/Types/ObjectID'; -import FormType from './FormFieldSchemaType'; type FormField = Property extends ObjectID ? FormType.ObjectID diff --git a/CommonUI/src/Components/Forms/Validation.ts b/CommonUI/src/Components/Forms/Validation.ts index 81466bbdbe..f9fa2ee859 100644 --- a/CommonUI/src/Components/Forms/Validation.ts +++ b/CommonUI/src/Components/Forms/Validation.ts @@ -1,27 +1,21 @@ -import FormValues from './Types/FormValues'; - -import { JSONObject } from 'Common/Types/JSON'; +import Field from './Types/Field'; import FormFieldSchemaType from './Types/FormFieldSchemaType'; -import Email from 'Common/Types/Email'; - -import Color from 'Common/Types/Color'; - -import OneUptimeDate from 'Common/Types/Date'; -import Port from 'Common/Types/Port'; +import FormValues from './Types/FormValues'; import Hostname from 'Common/Types/API/Hostname'; import Route from 'Common/Types/API/Route'; -import Exception from 'Common/Types/Exception/Exception'; - -import Phone from 'Common/Types/Phone'; -import Domain from 'Common/Types/Domain'; - import URL from 'Common/Types/API/URL'; - +import Color from 'Common/Types/Color'; +import OneUptimeDate from 'Common/Types/Date'; import Dictionary from 'Common/Types/Dictionary'; -import Field from './Types/Field'; +import Domain from 'Common/Types/Domain'; +import Email from 'Common/Types/Email'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import Typeof from 'Common/Types/Typeof'; +import Exception from 'Common/Types/Exception/Exception'; import GenericObject from 'Common/Types/GenericObject'; +import { JSONObject } from 'Common/Types/JSON'; +import Phone from 'Common/Types/Phone'; +import Port from 'Common/Types/Port'; +import Typeof from 'Common/Types/Typeof'; export default class Validation { public static validateLength( diff --git a/CommonUI/src/Components/FullPageModal/FullPageModal.tsx b/CommonUI/src/Components/FullPageModal/FullPageModal.tsx index 5e3ce6b89c..064ed8e42c 100644 --- a/CommonUI/src/Components/FullPageModal/FullPageModal.tsx +++ b/CommonUI/src/Components/FullPageModal/FullPageModal.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Icon, { SizeProp, ThickProp } from '../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onClose: () => void; diff --git a/CommonUI/src/Components/GanttChart/Bar/Index.tsx b/CommonUI/src/Components/GanttChart/Bar/Index.tsx index 733961fcf0..82bbe21014 100644 --- a/CommonUI/src/Components/GanttChart/Bar/Index.tsx +++ b/CommonUI/src/Components/GanttChart/Bar/Index.tsx @@ -1,11 +1,11 @@ +import BarLabel from './BarLabel'; +import Color from 'Common/Types/Color'; import React, { FunctionComponent, MouseEventHandler, ReactElement, useState, } from 'react'; -import Color from 'Common/Types/Color'; -import BarLabel from './BarLabel'; export interface GanttChartBar { id: string; diff --git a/CommonUI/src/Components/GanttChart/Index.tsx b/CommonUI/src/Components/GanttChart/Index.tsx index c2ef70a1e7..410d9b88f3 100644 --- a/CommonUI/src/Components/GanttChart/Index.tsx +++ b/CommonUI/src/Components/GanttChart/Index.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; -import Timeline, { GanttChartTimeline } from './Timeline/Index'; import ChartContainer from './ChartContainer'; -import Rows from './Rows'; import { GanttChartRow } from './Row/Row'; +import Rows from './Rows'; +import Timeline, { GanttChartTimeline } from './Timeline/Index'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface GanttChartProps { id: string; diff --git a/CommonUI/src/Components/GanttChart/Row/Index.tsx b/CommonUI/src/Components/GanttChart/Row/Index.tsx index 2da09c61da..1c0d2935e1 100644 --- a/CommonUI/src/Components/GanttChart/Row/Index.tsx +++ b/CommonUI/src/Components/GanttChart/Row/Index.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Row, { GanttChartRow } from './Row'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { row: GanttChartRow; diff --git a/CommonUI/src/Components/GanttChart/Row/Row.tsx b/CommonUI/src/Components/GanttChart/Row/Row.tsx index b3b0825258..4746df0812 100644 --- a/CommonUI/src/Components/GanttChart/Row/Row.tsx +++ b/CommonUI/src/Components/GanttChart/Row/Row.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; -import RowLabel from './RowLabel'; -import Bar, { GanttChartBar } from '../Bar/Index'; import Icon from '../../Icon/Icon'; +import Bar, { GanttChartBar } from '../Bar/Index'; +import RowLabel from './RowLabel'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface GanttChartRow { rowInfo: { diff --git a/CommonUI/src/Components/GanttChart/Rows.tsx b/CommonUI/src/Components/GanttChart/Rows.tsx index 60c3130a24..a0a963e02d 100644 --- a/CommonUI/src/Components/GanttChart/Rows.tsx +++ b/CommonUI/src/Components/GanttChart/Rows.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Row from './Row/Index'; import { GanttChartRow } from './Row/Row'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { rows: Array; diff --git a/CommonUI/src/Components/GanttChart/Timeline/Index.tsx b/CommonUI/src/Components/GanttChart/Timeline/Index.tsx index eddee55f25..e74000febe 100644 --- a/CommonUI/src/Components/GanttChart/Timeline/Index.tsx +++ b/CommonUI/src/Components/GanttChart/Timeline/Index.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import TimelineInterval from './TimelineInterval'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface GanttChartTimeline { start: number; diff --git a/CommonUI/src/Components/Graphs/DayUptimeGraph.tsx b/CommonUI/src/Components/Graphs/DayUptimeGraph.tsx index 1f13a06a42..6987da6e24 100644 --- a/CommonUI/src/Components/Graphs/DayUptimeGraph.tsx +++ b/CommonUI/src/Components/Graphs/DayUptimeGraph.tsx @@ -1,15 +1,15 @@ +import Tooltip from '../Tooltip/Tooltip'; import { Green } from 'Common/Types/BrandColors'; import Color from 'Common/Types/Color'; import OneUptimeDate from 'Common/Types/Date'; import Dictionary from 'Common/Types/Dictionary'; +import ObjectID from 'Common/Types/ObjectID'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Tooltip from '../Tooltip/Tooltip'; -import ObjectID from 'Common/Types/ObjectID'; export interface Event { startDate: Date; diff --git a/CommonUI/src/Components/Header/HeaderIconDropdownButton.tsx b/CommonUI/src/Components/Header/HeaderIconDropdownButton.tsx index 745293fc8d..41deddc2d4 100644 --- a/CommonUI/src/Components/Header/HeaderIconDropdownButton.tsx +++ b/CommonUI/src/Components/Header/HeaderIconDropdownButton.tsx @@ -1,14 +1,14 @@ +import useComponentOutsideClick from '../../Types/UseComponentOutsideClick'; +import Icon, { SizeProp } from '../Icon/Icon'; +import Image from '../Image/Image'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Icon, { SizeProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import useComponentOutsideClick from '../../Types/UseComponentOutsideClick'; -import Image from '../Image/Image'; -import Route from 'Common/Types/API/Route'; export interface ComponentProps { icon?: IconProp; diff --git a/CommonUI/src/Components/Header/IconDropdown/IconDropdownItem.tsx b/CommonUI/src/Components/Header/IconDropdown/IconDropdownItem.tsx index e9d924cd90..97bf752d81 100644 --- a/CommonUI/src/Components/Header/IconDropdown/IconDropdownItem.tsx +++ b/CommonUI/src/Components/Header/IconDropdown/IconDropdownItem.tsx @@ -1,9 +1,9 @@ +import Icon from '../../Icon/Icon'; +import Link from '../../Link/Link'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; -import React, { FunctionComponent, ReactElement } from 'react'; -import Icon from '../../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; -import Link from '../../Link/Link'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { url?: URL | Route; diff --git a/CommonUI/src/Components/Header/Notifications/NotificationItem.tsx b/CommonUI/src/Components/Header/Notifications/NotificationItem.tsx index 703357e067..c617537cd4 100644 --- a/CommonUI/src/Components/Header/Notifications/NotificationItem.tsx +++ b/CommonUI/src/Components/Header/Notifications/NotificationItem.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import CircularIconImage from '../../Icon/CircularIconImage'; import Icon from '../../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import OneUptimeDate from 'Common/Types/Date'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { icon: IconProp; diff --git a/CommonUI/src/Components/Header/Notifications/Notifications.tsx b/CommonUI/src/Components/Header/Notifications/Notifications.tsx index 558f61668c..a567933760 100644 --- a/CommonUI/src/Components/Header/Notifications/Notifications.tsx +++ b/CommonUI/src/Components/Header/Notifications/Notifications.tsx @@ -1,8 +1,8 @@ -import Route from 'Common/Types/API/Route'; -import React, { FunctionComponent, ReactElement } from 'react'; import Icon from '../../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Link from '../../Link/Link'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { children: ReactElement | Array; diff --git a/CommonUI/src/Components/Header/ProjectPicker/CreateNewProjectButton.tsx b/CommonUI/src/Components/Header/ProjectPicker/CreateNewProjectButton.tsx index b6b5c9442e..9c84d17ae8 100644 --- a/CommonUI/src/Components/Header/ProjectPicker/CreateNewProjectButton.tsx +++ b/CommonUI/src/Components/Header/ProjectPicker/CreateNewProjectButton.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Icon from '../../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onCreateButtonClicked: () => void; diff --git a/CommonUI/src/Components/Header/ProjectPicker/ProjectPicker.tsx b/CommonUI/src/Components/Header/ProjectPicker/ProjectPicker.tsx index 3c64aee688..508117690b 100644 --- a/CommonUI/src/Components/Header/ProjectPicker/ProjectPicker.tsx +++ b/CommonUI/src/Components/Header/ProjectPicker/ProjectPicker.tsx @@ -1,16 +1,16 @@ +import useComponentOutsideClick from '../../../Types/UseComponentOutsideClick'; +import Icon from '../../Icon/Icon'; +import CreateNewProjectButton from './CreateNewProjectButton'; +import ProjectPickerMenu from './ProjectPickerMenu'; +import ProjectPickerMenuItem from './ProjectPickerMenuItem'; +import IconProp from 'Common/Types/Icon/IconProp'; +import Project from 'Model/Models/Project'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import useComponentOutsideClick from '../../../Types/UseComponentOutsideClick'; -import Icon from '../../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Project from 'Model/Models/Project'; -import ProjectPickerMenu from './ProjectPickerMenu'; -import ProjectPickerMenuItem from './ProjectPickerMenuItem'; -import CreateNewProjectButton from './CreateNewProjectButton'; export interface ComponentProps { projects: Array; diff --git a/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerFilterBox.tsx b/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerFilterBox.tsx index 0b1b7ce9fc..ab6744ee45 100644 --- a/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerFilterBox.tsx +++ b/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerFilterBox.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Input from '../../Input/Input'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onChange: (search: string) => void; diff --git a/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenu.tsx b/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenu.tsx index 4ffb70e945..0a8d7146b5 100644 --- a/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenu.tsx +++ b/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenu.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import ProjectPickerFilterBox from './ProjectPickerFilterBox'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { children: ReactElement | Array; diff --git a/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx b/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx index 6fa6e83c04..1406e1a2f1 100644 --- a/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx +++ b/CommonUI/src/Components/Header/ProjectPicker/ProjectPickerMenuItem.tsx @@ -1,9 +1,9 @@ -import Project from 'Model/Models/Project'; -import Route from 'Common/Types/API/Route'; -import React, { FunctionComponent, ReactElement } from 'react'; -import Icon from '../../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Navigation from '../../../Utils/Navigation'; +import Icon from '../../Icon/Icon'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; +import Project from 'Model/Models/Project'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { icon: IconProp; diff --git a/CommonUI/src/Components/Header/SearchBox.tsx b/CommonUI/src/Components/Header/SearchBox.tsx index 37baed3f8d..32f95e8e5b 100644 --- a/CommonUI/src/Components/Header/SearchBox.tsx +++ b/CommonUI/src/Components/Header/SearchBox.tsx @@ -1,7 +1,6 @@ // Tailwind - -import React, { FunctionComponent, ReactElement } from 'react'; import Input from '../Input/Input'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onChange: (search: string) => void; diff --git a/CommonUI/src/Components/Header/UserProfile/UserProfile.tsx b/CommonUI/src/Components/Header/UserProfile/UserProfile.tsx index 31738d15e5..67449fd97f 100644 --- a/CommonUI/src/Components/Header/UserProfile/UserProfile.tsx +++ b/CommonUI/src/Components/Header/UserProfile/UserProfile.tsx @@ -1,10 +1,10 @@ +import Icon from '../../Icon/Icon'; +import Image from '../../Image/Image'; +import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import IconProp from 'Common/Types/Icon/IconProp'; import Name from 'Common/Types/Name'; import React, { FunctionComponent, ReactElement } from 'react'; -import Icon from '../../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Route from 'Common/Types/API/Route'; -import Image from '../../Image/Image'; export interface ComponentProps { userFullName: Name; diff --git a/CommonUI/src/Components/Header/UserProfile/UserProfileMenuItem.tsx b/CommonUI/src/Components/Header/UserProfile/UserProfileMenuItem.tsx index b07ede47f2..e74987c10d 100644 --- a/CommonUI/src/Components/Header/UserProfile/UserProfileMenuItem.tsx +++ b/CommonUI/src/Components/Header/UserProfile/UserProfileMenuItem.tsx @@ -1,9 +1,9 @@ +import Icon from '../../Icon/Icon'; +import Link from '../../Link/Link'; import Route from 'Common/Types/API/Route'; import Color from 'Common/Types/Color'; -import React, { FunctionComponent, ReactElement } from 'react'; -import Icon from '../../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; -import Link from '../../Link/Link'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/HeaderAlert/HeaderAlert.tsx b/CommonUI/src/Components/HeaderAlert/HeaderAlert.tsx index de51b6c4bb..d6138a38aa 100644 --- a/CommonUI/src/Components/HeaderAlert/HeaderAlert.tsx +++ b/CommonUI/src/Components/HeaderAlert/HeaderAlert.tsx @@ -1,6 +1,6 @@ -import React, { ReactElement } from 'react'; import Icon from '../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement } from 'react'; export interface ComponentProps { icon: IconProp; diff --git a/CommonUI/src/Components/HeaderAlert/HeaderModelAlert.tsx b/CommonUI/src/Components/HeaderAlert/HeaderModelAlert.tsx index bfceed48ba..70e9a33e71 100644 --- a/CommonUI/src/Components/HeaderAlert/HeaderModelAlert.tsx +++ b/CommonUI/src/Components/HeaderAlert/HeaderModelAlert.tsx @@ -1,11 +1,11 @@ -import React, { ReactElement, useEffect, useState } from 'react'; -import BaseModel from 'Common/Models/BaseModel'; +import API from '../../Utils/API/API'; import Query from '../../Utils/BaseDatabase/Query'; import ModelAPI, { RequestOptions } from '../../Utils/ModelAPI/ModelAPI'; -import API from '../../Utils/API/API'; -import IconProp from 'Common/Types/Icon/IconProp'; import HeaderAlert from './HeaderAlert'; +import BaseModel from 'Common/Models/BaseModel'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement, useEffect, useState } from 'react'; export interface ComponentProps { icon: IconProp; diff --git a/CommonUI/src/Components/HiddenText/HiddenText.tsx b/CommonUI/src/Components/HiddenText/HiddenText.tsx index edc1f542ce..d087d4f9df 100644 --- a/CommonUI/src/Components/HiddenText/HiddenText.tsx +++ b/CommonUI/src/Components/HiddenText/HiddenText.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; +import CopyableButton from '../CopyableButton/CopyableButton'; import Icon from '../Icon/Icon'; import IconProp from 'Common/Types/Icon/IconProp'; -import CopyableButton from '../CopyableButton/CopyableButton'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface ComponentProps { text: string; diff --git a/CommonUI/src/Components/Icon/CircularIconImage.tsx b/CommonUI/src/Components/Icon/CircularIconImage.tsx index c463af92c4..a09af645d7 100644 --- a/CommonUI/src/Components/Icon/CircularIconImage.tsx +++ b/CommonUI/src/Components/Icon/CircularIconImage.tsx @@ -1,7 +1,7 @@ -import Color from 'Common/Types/Color'; -import React, { FunctionComponent, ReactElement } from 'react'; import Icon, { SizeProp } from './Icon'; +import Color from 'Common/Types/Color'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { backgroundColor?: undefined | Color; diff --git a/CommonUI/src/Components/Icon/Icon.tsx b/CommonUI/src/Components/Icon/Icon.tsx index 59e211ff9d..bb55615160 100644 --- a/CommonUI/src/Components/Icon/Icon.tsx +++ b/CommonUI/src/Components/Icon/Icon.tsx @@ -1,6 +1,6 @@ import Color from 'Common/Types/Color'; -import React, { FunctionComponent, ReactElement } from 'react'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export enum SizeProp { ExtraSmall, diff --git a/CommonUI/src/Components/Image/Image.tsx b/CommonUI/src/Components/Image/Image.tsx index 09a45a77c0..3bfce16e2c 100644 --- a/CommonUI/src/Components/Image/Image.tsx +++ b/CommonUI/src/Components/Image/Image.tsx @@ -1,10 +1,9 @@ // Taiwind - import Route from 'Common/Types/API/Route'; +import URLFromProject from 'Common/Types/API/URL'; import BadDataException from 'Common/Types/Exception/BadDataException'; import File from 'Model/Models/File'; import React, { FunctionComponent, ReactElement } from 'react'; -import URLFromProject from 'Common/Types/API/URL'; export interface ComponentProps { onClick?: () => void | undefined; diff --git a/CommonUI/src/Components/ImageTiles/ImageTiles.tsx b/CommonUI/src/Components/ImageTiles/ImageTiles.tsx index ed178f4d66..2fbebea1f5 100644 --- a/CommonUI/src/Components/ImageTiles/ImageTiles.tsx +++ b/CommonUI/src/Components/ImageTiles/ImageTiles.tsx @@ -1,9 +1,9 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import URL from 'Common/Types/API/URL'; import Navigation from '../../Utils/Navigation'; -import Image from '../Image/Image'; import FieldLabelElement from '../Detail/FieldLabel'; +import Image from '../Image/Image'; import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ImageTile { image: ReactElement; diff --git a/CommonUI/src/Components/InfoCard/InfoCard.tsx b/CommonUI/src/Components/InfoCard/InfoCard.tsx index 059f91457c..b6b93ac578 100644 --- a/CommonUI/src/Components/InfoCard/InfoCard.tsx +++ b/CommonUI/src/Components/InfoCard/InfoCard.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import FieldLabelElement from '../Detail/FieldLabel'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Input/Input.tsx b/CommonUI/src/Components/Input/Input.tsx index e6df134ca2..939cf14d5e 100644 --- a/CommonUI/src/Components/Input/Input.tsx +++ b/CommonUI/src/Components/Input/Input.tsx @@ -1,6 +1,8 @@ // Tailwind - +import { Logger } from '../../Utils/Logger'; +import Icon from '../Icon/Icon'; import OneUptimeDate from 'Common/Types/Date'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, @@ -8,9 +10,6 @@ import React, { useRef, useState, } from 'react'; -import Icon from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import { Logger } from '../../Utils/Logger'; export enum InputType { TEXT = 'text', diff --git a/CommonUI/src/Components/Link/Link.tsx b/CommonUI/src/Components/Link/Link.tsx index 26b600d247..bbaaa396d9 100644 --- a/CommonUI/src/Components/Link/Link.tsx +++ b/CommonUI/src/Components/Link/Link.tsx @@ -1,10 +1,9 @@ /* eslint-disable jsx-a11y/anchor-is-valid */ - +import Navigation from '../../Utils/Navigation'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; import { JSONObject } from 'Common/Types/JSON'; import React, { FunctionComponent, ReactElement } from 'react'; -import Navigation from '../../Utils/Navigation'; export interface ComponentProps { children: ReactElement | Array | string; diff --git a/CommonUI/src/Components/List/List.tsx b/CommonUI/src/Components/List/List.tsx index efee78cee9..efa0d5b1f8 100644 --- a/CommonUI/src/Components/List/List.tsx +++ b/CommonUI/src/Components/List/List.tsx @@ -1,17 +1,17 @@ -import React, { ReactElement } from 'react'; -import Pagination from '../Pagination/Pagination'; -import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; -import ListBody from './ListBody'; -import Field from '../Detail/Field'; -import { DragDropContext, DropResult } from 'react-beautiful-dnd'; -import { ListDetailProps } from './ListRow'; import { GetReactElementFunction } from '../../Types/FunctionTypes'; +import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import Field from '../Detail/Field'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import FilterViewer from '../Filters/FilterViewer'; import FilterType from '../Filters/Types/Filter'; import FilterData from '../Filters/Types/FilterData'; +import Pagination from '../Pagination/Pagination'; +import ListBody from './ListBody'; +import { ListDetailProps } from './ListRow'; import GenericObject from 'Common/Types/GenericObject'; -import FilterViewer from '../Filters/FilterViewer'; +import React, { ReactElement } from 'react'; +import { DragDropContext, DropResult } from 'react-beautiful-dnd'; export interface ComponentProps { data: Array; diff --git a/CommonUI/src/Components/List/ListBody.tsx b/CommonUI/src/Components/List/ListBody.tsx index 3bcaa162a1..65e8191b89 100644 --- a/CommonUI/src/Components/List/ListBody.tsx +++ b/CommonUI/src/Components/List/ListBody.tsx @@ -1,9 +1,9 @@ -import React, { ReactElement } from 'react'; -import ListRow, { ListDetailProps } from './ListRow'; import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; import Field from '../Detail/Field'; -import { Droppable, DroppableProvided } from 'react-beautiful-dnd'; +import ListRow, { ListDetailProps } from './ListRow'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; +import { Droppable, DroppableProvided } from 'react-beautiful-dnd'; export interface ComponentProps { data: Array; diff --git a/CommonUI/src/Components/List/ListRow.tsx b/CommonUI/src/Components/List/ListRow.tsx index f45b680006..be9556cbb4 100644 --- a/CommonUI/src/Components/List/ListRow.tsx +++ b/CommonUI/src/Components/List/ListRow.tsx @@ -1,13 +1,13 @@ -import React, { ReactElement, useState } from 'react'; +import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; import Button, { ButtonSize } from '../Button/Button'; import Detail from '../Detail/Detail'; import Field from '../Detail/Field'; -import ConfirmModal from '../Modal/ConfirmModal'; -import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; -import { Draggable, DraggableProvided } from 'react-beautiful-dnd'; import Icon, { ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; +import ConfirmModal from '../Modal/ConfirmModal'; import GenericObject from 'Common/Types/GenericObject'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement, useState } from 'react'; +import { Draggable, DraggableProvided } from 'react-beautiful-dnd'; export interface ListDetailProps { showDetailsInNumberOfColumns?: number | undefined; diff --git a/CommonUI/src/Components/Loader/Loader.tsx b/CommonUI/src/Components/Loader/Loader.tsx index 818e109f7c..81c509bf91 100644 --- a/CommonUI/src/Components/Loader/Loader.tsx +++ b/CommonUI/src/Components/Loader/Loader.tsx @@ -1,8 +1,8 @@ +import { VeryLightGray } from 'Common/Types/BrandColors'; +import Color from 'Common/Types/Color'; +import React, { FunctionComponent } from 'react'; import BarLoader from 'react-spinners/BarLoader'; import BeatLoader from 'react-spinners/BeatLoader'; -import React, { FunctionComponent } from 'react'; -import Color from 'Common/Types/Color'; -import { VeryLightGray } from 'Common/Types/BrandColors'; export enum LoaderType { Bar, diff --git a/CommonUI/src/Components/Loader/PageLoader.tsx b/CommonUI/src/Components/Loader/PageLoader.tsx index 2fd911c3f7..01b6a1ab13 100644 --- a/CommonUI/src/Components/Loader/PageLoader.tsx +++ b/CommonUI/src/Components/Loader/PageLoader.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Loader, { LoaderType } from './Loader'; import { VeryLightGray } from 'Common/Types/BrandColors'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { isVisible: boolean; diff --git a/CommonUI/src/Components/LogsViewer/LogItem.tsx b/CommonUI/src/Components/LogsViewer/LogItem.tsx index 5aeed8d608..ef34422c6d 100644 --- a/CommonUI/src/Components/LogsViewer/LogItem.tsx +++ b/CommonUI/src/Components/LogsViewer/LogItem.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; -import Log, { LogSeverity } from 'Model/AnalyticsModels/Log'; -import OneUptimeDate from 'Common/Types/Date'; import CopyTextButton from '../CopyTextButton/CopyTextButton'; +import OneUptimeDate from 'Common/Types/Date'; +import Log, { LogSeverity } from 'Model/AnalyticsModels/Log'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface ComponentProps { log: Log; diff --git a/CommonUI/src/Components/LogsViewer/LogsFilters.tsx b/CommonUI/src/Components/LogsViewer/LogsFilters.tsx index 7754c50a75..6feec76c70 100644 --- a/CommonUI/src/Components/LogsViewer/LogsFilters.tsx +++ b/CommonUI/src/Components/LogsViewer/LogsFilters.tsx @@ -1,16 +1,16 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import Input, { InputType } from '../Input/Input'; +import DropdownUtil from '../../Utils/Dropdown'; import Button, { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Dropdown, { DropdownValue } from '../Dropdown/Dropdown'; -import FieldLabelElement from '../Forms/Fields/FieldLabel'; // import TelemetryService from 'Model/Models/TelemetryService'; import CodeEditor from '../CodeEditor/CodeEditor'; -import CodeType from 'Common/Types/Code/CodeType'; -import DropdownUtil from '../../Utils/Dropdown'; -import { LogSeverity } from 'Model/AnalyticsModels/Log'; -import OneUptimeDate from 'Common/Types/Date'; +import Dropdown, { DropdownValue } from '../Dropdown/Dropdown'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import FieldLabelElement from '../Forms/Fields/FieldLabel'; +import Input, { InputType } from '../Input/Input'; +import CodeType from 'Common/Types/Code/CodeType'; +import OneUptimeDate from 'Common/Types/Date'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { LogSeverity } from 'Model/AnalyticsModels/Log'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface FilterOption { searchText?: string | undefined; diff --git a/CommonUI/src/Components/LogsViewer/LogsViewer.tsx b/CommonUI/src/Components/LogsViewer/LogsViewer.tsx index 91d196d81e..c257d2e8aa 100644 --- a/CommonUI/src/Components/LogsViewer/LogsViewer.tsx +++ b/CommonUI/src/Components/LogsViewer/LogsViewer.tsx @@ -1,9 +1,9 @@ -import Log from 'Model/AnalyticsModels/Log'; -import React, { FunctionComponent, ReactElement, Ref } from 'react'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; import LogItem from './LogItem'; import LogsFilters, { FilterOption } from './LogsFilters'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; import { VoidFunction } from 'Common/Types/FunctionTypes'; +import Log from 'Model/AnalyticsModels/Log'; +import React, { FunctionComponent, ReactElement, Ref } from 'react'; export interface ComponentProps { logs: Array; diff --git a/CommonUI/src/Components/Markdown.tsx/LazyMarkdownViewer.tsx b/CommonUI/src/Components/Markdown.tsx/LazyMarkdownViewer.tsx index 3918e1bdf2..0b3b78fabd 100644 --- a/CommonUI/src/Components/Markdown.tsx/LazyMarkdownViewer.tsx +++ b/CommonUI/src/Components/Markdown.tsx/LazyMarkdownViewer.tsx @@ -1,10 +1,10 @@ +import { ComponentProps } from './MarkdownViewer'; import React, { FunctionComponent, LazyExoticComponent, Suspense, lazy, } from 'react'; -import { ComponentProps } from './MarkdownViewer'; const MarkdownViewer: LazyExoticComponent> = lazy(() => { diff --git a/CommonUI/src/Components/Markdown.tsx/MarkdownEditor.tsx b/CommonUI/src/Components/Markdown.tsx/MarkdownEditor.tsx index 62f47e18dd..4531bbf80d 100644 --- a/CommonUI/src/Components/Markdown.tsx/MarkdownEditor.tsx +++ b/CommonUI/src/Components/Markdown.tsx/MarkdownEditor.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import TextArea from '../TextArea/TextArea'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { initialValue?: undefined | string; diff --git a/CommonUI/src/Components/Markdown.tsx/MarkdownViewer.tsx b/CommonUI/src/Components/Markdown.tsx/MarkdownViewer.tsx index 515cf752be..086c389687 100644 --- a/CommonUI/src/Components/Markdown.tsx/MarkdownViewer.tsx +++ b/CommonUI/src/Components/Markdown.tsx/MarkdownViewer.tsx @@ -1,8 +1,6 @@ import React, { FunctionComponent, ReactElement } from 'react'; - // https://github.com/remarkjs/react-markdown import ReactMarkdown from 'react-markdown'; - // https://github.com/remarkjs/remark-gfm import remarkGfm from 'remark-gfm'; diff --git a/CommonUI/src/Components/MasterPage/MasterPage.tsx b/CommonUI/src/Components/MasterPage/MasterPage.tsx index f464dc883d..b23f78da4a 100644 --- a/CommonUI/src/Components/MasterPage/MasterPage.tsx +++ b/CommonUI/src/Components/MasterPage/MasterPage.tsx @@ -1,7 +1,7 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import PageError from '../Error/PageError'; import PageLoader from '../Loader/PageLoader'; import TopSection from '../TopSection/TopSection'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { header?: undefined | ReactElement; diff --git a/CommonUI/src/Components/Modal/ConfirmModal.tsx b/CommonUI/src/Components/Modal/ConfirmModal.tsx index 524c631602..6d59757c34 100644 --- a/CommonUI/src/Components/Modal/ConfirmModal.tsx +++ b/CommonUI/src/Components/Modal/ConfirmModal.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import { ButtonStyleType } from '../Button/Button'; import Modal from './Modal'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Modal/Modal.tsx b/CommonUI/src/Components/Modal/Modal.tsx index 8710def616..9f5863972c 100644 --- a/CommonUI/src/Components/Modal/Modal.tsx +++ b/CommonUI/src/Components/Modal/Modal.tsx @@ -1,12 +1,12 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Button, { ButtonStyleType } from '../Button/Button'; -import ModalFooter from './ModalFooter'; -import ModalBody from './ModalBody'; import ButtonType from '../Button/ButtonTypes'; -import Loader, { LoaderType } from '../Loader/Loader'; import Icon, { IconType, SizeProp, ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; +import Loader, { LoaderType } from '../Loader/Loader'; +import ModalBody from './ModalBody'; +import ModalFooter from './ModalFooter'; import { VeryLightGray } from 'Common/Types/BrandColors'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export enum ModalWidth { Normal, diff --git a/CommonUI/src/Components/Modal/ModalBody.tsx b/CommonUI/src/Components/Modal/ModalBody.tsx index b23f8edf47..a9cf9a173e 100644 --- a/CommonUI/src/Components/Modal/ModalBody.tsx +++ b/CommonUI/src/Components/Modal/ModalBody.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Alert, { AlertType } from '../Alerts/Alert'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { children: Array | ReactElement; diff --git a/CommonUI/src/Components/Modal/ModalFooter.tsx b/CommonUI/src/Components/Modal/ModalFooter.tsx index b39d2a1533..c08a12e96b 100644 --- a/CommonUI/src/Components/Modal/ModalFooter.tsx +++ b/CommonUI/src/Components/Modal/ModalFooter.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Button, { ButtonStyleType } from '../Button/Button'; import ButtonType from '../Button/ButtonTypes'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onClose?: undefined | (() => void) | undefined; diff --git a/CommonUI/src/Components/ModelDelete/ModelDelete.tsx b/CommonUI/src/Components/ModelDelete/ModelDelete.tsx index ab50ff5dcd..ec1a76bc24 100644 --- a/CommonUI/src/Components/ModelDelete/ModelDelete.tsx +++ b/CommonUI/src/Components/ModelDelete/ModelDelete.tsx @@ -1,13 +1,13 @@ -import BaseModel from 'Common/Models/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import React, { ReactElement, useState } from 'react'; +import API from '../../Utils/API/API'; import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; import { ButtonStyleType } from '../Button/Button'; import Card from '../Card/Card'; -import API from '../../Utils/API/API'; -import IconProp from 'Common/Types/Icon/IconProp'; -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import ConfirmModal from '../Modal/ConfirmModal'; +import BaseModel from 'Common/Models/BaseModel'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement, useState } from 'react'; export interface ComponentProps { modelType: { new (): TBaseModel }; diff --git a/CommonUI/src/Components/ModelDetail/CardModelDetail.tsx b/CommonUI/src/Components/ModelDetail/CardModelDetail.tsx index a86a4f9709..2bd65bb82d 100644 --- a/CommonUI/src/Components/ModelDetail/CardModelDetail.tsx +++ b/CommonUI/src/Components/ModelDetail/CardModelDetail.tsx @@ -1,24 +1,24 @@ +import PermissionUtil from '../../Utils/Permission'; +import User from '../../Utils/User'; +import { ButtonStyleType } from '../Button/Button'; +import Card, { + CardButtonSchema, + ComponentProps as CardProps, +} from '../Card/Card'; +import { FormType } from '../Forms/ModelForm'; +import Fields from '../Forms/Types/Fields'; +import { FormStep } from '../Forms/Types/FormStep'; +import { ModalWidth } from '../Modal/Modal'; +import ModelFormModal from '../ModelFormModal/ModelFormModal'; +import ModelDetail, { ComponentProps as ModeDetailProps } from './ModelDetail'; +import BaseModel from 'Common/Models/BaseModel'; +import IconProp from 'Common/Types/Icon/IconProp'; import { PermissionHelper, UserPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; import React, { ReactElement, useEffect, useState } from 'react'; -import PermissionUtil from '../../Utils/Permission'; -import Card, { - CardButtonSchema, - ComponentProps as CardProps, -} from '../Card/Card'; -import ModelDetail, { ComponentProps as ModeDetailProps } from './ModelDetail'; -import BaseModel from 'Common/Models/BaseModel'; -import { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; -import ModelFormModal from '../ModelFormModal/ModelFormModal'; -import { FormType } from '../Forms/ModelForm'; -import Fields from '../Forms/Types/Fields'; -import { FormStep } from '../Forms/Types/FormStep'; -import { ModalWidth } from '../Modal/Modal'; -import User from '../../Utils/User'; export interface ComponentProps { cardProps: CardProps; diff --git a/CommonUI/src/Components/ModelDetail/Field.ts b/CommonUI/src/Components/ModelDetail/Field.ts index 2088cb9e0d..36b7270b1c 100644 --- a/CommonUI/src/Components/ModelDetail/Field.ts +++ b/CommonUI/src/Components/ModelDetail/Field.ts @@ -1,6 +1,6 @@ -import BaseModel from 'Common/Models/BaseModel'; import Select from '../../Utils/BaseDatabase/Select'; import { FieldBase } from '../Detail/Field'; +import BaseModel from 'Common/Models/BaseModel'; export default interface Field extends FieldBase { diff --git a/CommonUI/src/Components/ModelDetail/ModelDetail.tsx b/CommonUI/src/Components/ModelDetail/ModelDetail.tsx index 8e0e520b2e..45ae3ecb1c 100644 --- a/CommonUI/src/Components/ModelDetail/ModelDetail.tsx +++ b/CommonUI/src/Components/ModelDetail/ModelDetail.tsx @@ -1,23 +1,23 @@ -import React, { ReactElement, useEffect, useState } from 'react'; -import BaseModel from 'Common/Models/BaseModel'; -import { JSONObject } from 'Common/Types/JSON'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; -import Select from '../../Utils/BaseDatabase/Select'; -import Dictionary from 'Common/Types/Dictionary'; -import ObjectID from 'Common/Types/ObjectID'; -import Loader, { LoaderType } from '../Loader/Loader'; -import { VeryLightGray } from 'Common/Types/BrandColors'; -import Permission, { PermissionHelper } from 'Common/Types/Permission'; -import PermissionUtil from '../../Utils/Permission'; -import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; -import Field from './Field'; -import DetailField from '../Detail/Field'; -import Detail from '../Detail/Detail'; import API from '../../Utils/API/API'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import { useAsyncEffect } from 'use-async-effect'; +import Select from '../../Utils/BaseDatabase/Select'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; +import PermissionUtil from '../../Utils/Permission'; import User from '../../Utils/User'; -import { VoidFunction, PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import Detail from '../Detail/Detail'; +import DetailField from '../Detail/Field'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import Loader, { LoaderType } from '../Loader/Loader'; +import Field from './Field'; +import BaseModel from 'Common/Models/BaseModel'; +import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; +import { VeryLightGray } from 'Common/Types/BrandColors'; +import Dictionary from 'Common/Types/Dictionary'; +import { PromiseVoidFunction, VoidFunction } from 'Common/Types/FunctionTypes'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import Permission, { PermissionHelper } from 'Common/Types/Permission'; +import React, { ReactElement, useEffect, useState } from 'react'; +import { useAsyncEffect } from 'use-async-effect'; export interface ComponentProps { modelType: { new (): TBaseModel }; diff --git a/CommonUI/src/Components/ModelFilter/Filter.ts b/CommonUI/src/Components/ModelFilter/Filter.ts index 76d440526d..f2f6466071 100644 --- a/CommonUI/src/Components/ModelFilter/Filter.ts +++ b/CommonUI/src/Components/ModelFilter/Filter.ts @@ -1,11 +1,11 @@ +import SelectEntityField from '../../Types/SelectEntityField'; +import Query from '../../Utils/BaseDatabase/Query'; +import { DropdownOption } from '../Dropdown/Dropdown'; +import FieldType from '../Types/FieldType'; import AnalyticsBaseModel, { AnalyticsBaseModelType, } from 'Common/AnalyticsModels/BaseModel'; import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; -import Query from '../../Utils/BaseDatabase/Query'; -import { DropdownOption } from '../Dropdown/Dropdown'; -import SelectEntityField from '../../Types/SelectEntityField'; -import FieldType from '../Types/FieldType'; export default interface Filter< TEntity extends BaseModel | AnalyticsBaseModel diff --git a/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx b/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx index ddfcf28d43..830f42e784 100644 --- a/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx +++ b/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx @@ -1,17 +1,17 @@ -import React, { MutableRefObject, ReactElement, useRef, useState } from 'react'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; +import Alert, { AlertType } from '../Alerts/Alert'; import { ButtonStyleType } from '../Button/Button'; -import Modal, { ModalWidth } from '../Modal/Modal'; +import ButtonType from '../Button/ButtonTypes'; +import { FormProps } from '../Forms/BasicForm'; import ModelForm, { ComponentProps as ModelFormComponentProps, } from '../Forms/ModelForm'; +import FormValues from '../Forms/Types/FormValues'; +import Modal, { ModalWidth } from '../Modal/Modal'; import BaseModel from 'Common/Models/BaseModel'; -import ButtonType from '../Button/ButtonTypes'; import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; -import Alert, { AlertType } from '../Alerts/Alert'; -import FormValues from '../Forms/Types/FormValues'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; -import { FormProps } from '../Forms/BasicForm'; +import React, { MutableRefObject, ReactElement, useRef, useState } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/ModelList/ModelList.tsx b/CommonUI/src/Components/ModelList/ModelList.tsx index ecc7f2d25b..f54a75f49b 100644 --- a/CommonUI/src/Components/ModelList/ModelList.tsx +++ b/CommonUI/src/Components/ModelList/ModelList.tsx @@ -1,24 +1,24 @@ -import React, { ReactElement, useEffect, useState } from 'react'; +import API from '../../Utils/API/API'; import Query from '../../Utils/BaseDatabase/Query'; -import BaseModel from 'Common/Models/BaseModel'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import Select from '../../Utils/BaseDatabase/Select'; import ModelAPI, { ListResult, RequestOptions, } from '../../Utils/ModelAPI/ModelAPI'; -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import Select from '../../Utils/BaseDatabase/Select'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; import Input from '../Input/Input'; import StaticModelList from '../ModelList/StaticModelList'; -import API from '../../Utils/API/API'; -import URL from 'Common/Types/API/URL'; -import { JSONArray } from 'Common/Types/JSON'; +import BaseModel from 'Common/Models/BaseModel'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ObjectID from 'Common/Types/ObjectID'; +import URL from 'Common/Types/API/URL'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { JSONArray } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement, useEffect, useState } from 'react'; export interface ComponentProps { id: string; diff --git a/CommonUI/src/Components/ModelList/StaticModelList.tsx b/CommonUI/src/Components/ModelList/StaticModelList.tsx index cc82ef7fbb..d2ccb23f89 100644 --- a/CommonUI/src/Components/ModelList/StaticModelList.tsx +++ b/CommonUI/src/Components/ModelList/StaticModelList.tsx @@ -1,8 +1,10 @@ +import { GetReactElementFunction } from '../../Types/FunctionTypes'; +import Button, { ButtonStyleType } from '../Button/Button'; +import Icon from '../Icon/Icon'; import BaseModel from 'Common/Models/BaseModel'; +import IconProp from 'Common/Types/Icon/IconProp'; import Typeof from 'Common/Types/Typeof'; import React, { ReactElement } from 'react'; -import Button, { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; import { DragDropContext, Draggable, @@ -11,8 +13,6 @@ import { Droppable, DroppableProvided, } from 'react-beautiful-dnd'; -import Icon from '../Icon/Icon'; -import { GetReactElementFunction } from '../../Types/FunctionTypes'; export interface ComponentProps { list: Array; diff --git a/CommonUI/src/Components/ModelListModal/ModelListModal.tsx b/CommonUI/src/Components/ModelListModal/ModelListModal.tsx index f267dee226..cd59c02508 100644 --- a/CommonUI/src/Components/ModelListModal/ModelListModal.tsx +++ b/CommonUI/src/Components/ModelListModal/ModelListModal.tsx @@ -1,9 +1,9 @@ -import React, { ReactElement, useState } from 'react'; -import Modal from '../Modal/Modal'; import Query from '../../Utils/BaseDatabase/Query'; -import BaseModel from 'Common/Models/BaseModel'; import Select from '../../Utils/BaseDatabase/Select'; +import Modal from '../Modal/Modal'; import ModelList from '../ModelList/ModelList'; +import BaseModel from 'Common/Models/BaseModel'; +import React, { ReactElement, useState } from 'react'; export interface ComponentProps { query?: Query; diff --git a/CommonUI/src/Components/ModelProgress/ModelProgress.tsx b/CommonUI/src/Components/ModelProgress/ModelProgress.tsx index 6129576063..000fe614f6 100644 --- a/CommonUI/src/Components/ModelProgress/ModelProgress.tsx +++ b/CommonUI/src/Components/ModelProgress/ModelProgress.tsx @@ -1,13 +1,13 @@ -import BaseModel from 'Common/Models/BaseModel'; -import React, { ReactElement, useEffect, useState } from 'react'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; +import API from '../../Utils/API/API'; import Query from '../../Utils/BaseDatabase/Query'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; import Card from '../Card/Card'; import ComponentLoader from '../ComponentLoader/ComponentLoader'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; import ProgressBar from '../ProgressBar/ProgressBar'; -import API from '../../Utils/API/API'; +import BaseModel from 'Common/Models/BaseModel'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import React, { ReactElement, useEffect, useState } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx b/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx index f597e81805..54c3965f83 100644 --- a/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx +++ b/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx @@ -1,18 +1,18 @@ +import ModelAPI from '../../Utils/AnalyticsModelAPI/AnalyticsModelAPI'; +import GroupBy from '../../Utils/BaseDatabase/GroupBy'; +import Query from '../../Utils/BaseDatabase/Query'; +import RequestOptions from '../../Utils/BaseDatabase/RequestOptions'; +import Select from '../../Utils/BaseDatabase/Select'; +import Sort from '../../Utils/BaseDatabase/Sort'; +import BaseModelTable, { BaseTableProps, ModalType } from './BaseModelTable'; import AnalyticsBaseModel, { AnalyticsBaseModelType, } from 'Common/AnalyticsModels/BaseModel'; -import BaseModelTable, { BaseTableProps, ModalType } from './BaseModelTable'; -import ModelAPI from '../../Utils/AnalyticsModelAPI/AnalyticsModelAPI'; -import React, { ReactElement } from 'react'; -import ObjectID from 'Common/Types/ObjectID'; -import { JSONObject } from 'Common/Types/JSON'; -import Select from '../../Utils/BaseDatabase/Select'; -import Query from '../../Utils/BaseDatabase/Query'; -import Sort from '../../Utils/BaseDatabase/Sort'; -import RequestOptions from '../../Utils/BaseDatabase/RequestOptions'; -import NotImplementedException from 'Common/Types/Exception/NotImplementedException'; import { BaseModelType } from 'Common/Models/BaseModel'; -import GroupBy from '../../Utils/BaseDatabase/GroupBy'; +import NotImplementedException from 'Common/Types/Exception/NotImplementedException'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement } from 'react'; export interface ComponentProps extends BaseTableProps { diff --git a/CommonUI/src/Components/ModelTable/BaseModelTable.tsx b/CommonUI/src/Components/ModelTable/BaseModelTable.tsx index 19ab453abf..522a3d1288 100644 --- a/CommonUI/src/Components/ModelTable/BaseModelTable.tsx +++ b/CommonUI/src/Components/ModelTable/BaseModelTable.tsx @@ -1,88 +1,86 @@ +import { API_DOCS_URL, BILLING_ENABLED, getAllEnvVars } from '../../Config'; +import { GetReactElementFunction } from '../../Types/FunctionTypes'; +import SelectEntityField from '../../Types/SelectEntityField'; +import API from '../../Utils/API/API'; +import GroupBy from '../../Utils/BaseDatabase/GroupBy'; +import ListResult from '../../Utils/BaseDatabase/ListResult'; +import Query from '../../Utils/BaseDatabase/Query'; +import RequestOptions from '../../Utils/BaseDatabase/RequestOptions'; +import Select from '../../Utils/BaseDatabase/Select'; +import Sort from '../../Utils/BaseDatabase/Sort'; +import { Logger } from '../../Utils/Logger'; +import Navigation from '../../Utils/Navigation'; +import PermissionUtil from '../../Utils/Permission'; +import ProjectUtil from '../../Utils/Project'; +import User from '../../Utils/User'; +import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; +import { + BulkActionButtonSchema, + BulkActionFailed, + BulkActionOnClickProps, +} from '../BulkUpdate/BulkUpdateForm'; +import { ButtonStyleType } from '../Button/Button'; +import Card, { + CardButtonSchema, + ComponentProps as CardComponentProps, +} from '../Card/Card'; +import { getRefreshButton } from '../Card/CardButtons/Refresh'; +import Field from '../Detail/Field'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import ClassicFilterType from '../Filters/Types/Filter'; +import FilterData from '../Filters/Types/FilterData'; +import { FormProps } from '../Forms/BasicForm'; +import { ModelField } from '../Forms/ModelForm'; +import { FormStep } from '../Forms/Types/FormStep'; +import FormValues from '../Forms/Types/FormValues'; +import List from '../List/List'; +import { ListDetailProps } from '../List/ListRow'; +import ConfirmModal from '../Modal/ConfirmModal'; +import { ModalWidth } from '../Modal/Modal'; +import Filter from '../ModelFilter/Filter'; +import OrderedStatesList from '../OrderedStatesList/OrderedStatesList'; +import Pill from '../Pill/Pill'; +import Table from '../Table/Table'; +import TableColumn from '../Table/Types/Column'; +import FieldType from '../Types/FieldType'; +import ModelTableColumn from './Column'; +import Columns from './Columns'; +import AnalyticsBaseModel, { + AnalyticsBaseModelType, +} from 'Common/AnalyticsModels/BaseModel'; import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; +import InBetween from 'Common/Types/BaseDatabase/InBetween'; +import Search from 'Common/Types/BaseDatabase/Search'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import SubscriptionPlan, { + PlanSelect, +} from 'Common/Types/Billing/SubscriptionPlan'; +import { Yellow } from 'Common/Types/BrandColors'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { + ErrorFunction, + PromiseVoidFunction, + VoidFunction, +} from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import Permission, { + PermissionHelper, + UserPermission, +} from 'Common/Types/Permission'; +import Typeof from 'Common/Types/Typeof'; import React, { MutableRefObject, ReactElement, useEffect, useState, } from 'react'; -import Columns from './Columns'; -import Table from '../Table/Table'; -import TableColumn from '../Table/Types/Column'; -import { JSONObject } from 'Common/Types/JSON'; -import Card, { - CardButtonSchema, - ComponentProps as CardComponentProps, -} from '../Card/Card'; - -import RequestOptions from '../../Utils/BaseDatabase/RequestOptions'; -import ListResult from '../../Utils/BaseDatabase/ListResult'; -import Select from '../../Utils/BaseDatabase/Select'; -import { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; -import { ModelField } from '../Forms/ModelForm'; - -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import FieldType from '../Types/FieldType'; -import Dictionary from 'Common/Types/Dictionary'; -import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; -import ObjectID from 'Common/Types/ObjectID'; -import ConfirmModal from '../Modal/ConfirmModal'; -import Permission, { - PermissionHelper, - UserPermission, -} from 'Common/Types/Permission'; -import PermissionUtil from '../../Utils/Permission'; -import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl'; -import Query from '../../Utils/BaseDatabase/Query'; -import Search from 'Common/Types/BaseDatabase/Search'; -import Typeof from 'Common/Types/Typeof'; -import Navigation from '../../Utils/Navigation'; -import Route from 'Common/Types/API/Route'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import List from '../List/List'; -import OrderedStatesList from '../OrderedStatesList/OrderedStatesList'; -import Field from '../Detail/Field'; -import FormValues from '../Forms/Types/FormValues'; -import Filter from '../ModelFilter/Filter'; -import ModelTableColumn from './Column'; -import { Logger } from '../../Utils/Logger'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import InBetween from 'Common/Types/BaseDatabase/InBetween'; -import { API_DOCS_URL, BILLING_ENABLED, getAllEnvVars } from '../../Config'; -import SubscriptionPlan, { - PlanSelect, -} from 'Common/Types/Billing/SubscriptionPlan'; -import Pill from '../Pill/Pill'; -import { Yellow } from 'Common/Types/BrandColors'; -import { ModalWidth } from '../Modal/Modal'; -import ProjectUtil from '../../Utils/Project'; -import API from '../../Utils/API/API'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import { FormStep } from '../Forms/Types/FormStep'; -import URL from 'Common/Types/API/URL'; -import { ListDetailProps } from '../List/ListRow'; -import User from '../../Utils/User'; -import AnalyticsBaseModel, { - AnalyticsBaseModelType, -} from 'Common/AnalyticsModels/BaseModel'; -import Sort from '../../Utils/BaseDatabase/Sort'; -import { FormProps } from '../Forms/BasicForm'; -import { - PromiseVoidFunction, - ErrorFunction, - VoidFunction, -} from 'Common/Types/FunctionTypes'; -import { GetReactElementFunction } from '../../Types/FunctionTypes'; -import SelectEntityField from '../../Types/SelectEntityField'; -import ClassicFilterType from '../Filters/Types/Filter'; -import { getRefreshButton } from '../Card/CardButtons/Refresh'; -import GroupBy from '../../Utils/BaseDatabase/GroupBy'; -import FilterData from '../Filters/Types/FilterData'; -import { - BulkActionButtonSchema, - BulkActionFailed, - BulkActionOnClickProps, -} from '../BulkUpdate/BulkUpdateForm'; export enum ShowAs { Table, diff --git a/CommonUI/src/Components/ModelTable/Column.ts b/CommonUI/src/Components/ModelTable/Column.ts index b91b29d774..bffc8179f8 100644 --- a/CommonUI/src/Components/ModelTable/Column.ts +++ b/CommonUI/src/Components/ModelTable/Column.ts @@ -1,11 +1,11 @@ -import BaseModel from 'Common/Models/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import { ReactElement } from 'react'; import AlignItem from '../../Types/AlignItem'; import SelectEntityField from '../../Types/SelectEntityField'; -import IconProp from 'Common/Types/Icon/IconProp'; import FieldType from '../Types/FieldType'; import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import BaseModel from 'Common/Models/BaseModel'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; +import { ReactElement } from 'react'; export interface ActionButton { buttonText: string; diff --git a/CommonUI/src/Components/ModelTable/Columns.ts b/CommonUI/src/Components/ModelTable/Columns.ts index 1bcdd0ec37..2ea8a7fe2e 100644 --- a/CommonUI/src/Components/ModelTable/Columns.ts +++ b/CommonUI/src/Components/ModelTable/Columns.ts @@ -1,6 +1,6 @@ -import BaseModel from 'Common/Models/BaseModel'; import Column from './Column'; import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import BaseModel from 'Common/Models/BaseModel'; type Columns = Array>; diff --git a/CommonUI/src/Components/ModelTable/ModelTable.tsx b/CommonUI/src/Components/ModelTable/ModelTable.tsx index 3c461585a2..863e28e74d 100644 --- a/CommonUI/src/Components/ModelTable/ModelTable.tsx +++ b/CommonUI/src/Components/ModelTable/ModelTable.tsx @@ -1,17 +1,17 @@ -import React, { ReactElement } from 'react'; -import BaseModelTable, { BaseTableProps, ModalType } from './BaseModelTable'; -import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; -import ModelAPI, { RequestOptions } from '../../Utils/ModelAPI/ModelAPI'; -import ObjectID from 'Common/Types/ObjectID'; -import { JSONObject } from 'Common/Types/JSON'; -import Dictionary from 'Common/Types/Dictionary'; -import Select from '../../Utils/BaseDatabase/Select'; -import Query from '../../Utils/BaseDatabase/Query'; -import Sort from '../../Utils/BaseDatabase/Sort'; -import ModelFormModal from '../ModelFormModal/ModelFormModal'; -import { FormType } from '../Forms/ModelForm'; -import { AnalyticsBaseModelType } from 'Common/AnalyticsModels/BaseModel'; import GroupBy from '../../Utils/BaseDatabase/GroupBy'; +import Query from '../../Utils/BaseDatabase/Query'; +import Select from '../../Utils/BaseDatabase/Select'; +import Sort from '../../Utils/BaseDatabase/Sort'; +import ModelAPI, { RequestOptions } from '../../Utils/ModelAPI/ModelAPI'; +import { FormType } from '../Forms/ModelForm'; +import ModelFormModal from '../ModelFormModal/ModelFormModal'; +import BaseModelTable, { BaseTableProps, ModalType } from './BaseModelTable'; +import { AnalyticsBaseModelType } from 'Common/AnalyticsModels/BaseModel'; +import BaseModel, { BaseModelType } from 'Common/Models/BaseModel'; +import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement } from 'react'; export interface ComponentProps extends BaseTableProps { diff --git a/CommonUI/src/Components/MonitorGraphs/Uptime.tsx b/CommonUI/src/Components/MonitorGraphs/Uptime.tsx index d540165da0..daa648a9e7 100644 --- a/CommonUI/src/Components/MonitorGraphs/Uptime.tsx +++ b/CommonUI/src/Components/MonitorGraphs/Uptime.tsx @@ -1,3 +1,12 @@ +import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import DayUptimeGraph, { BarChartRule, Event } from '../Graphs/DayUptimeGraph'; +import UptimeUtil from './UptimeUtil'; +import Color from 'Common/Types/Color'; +import ObjectID from 'Common/Types/ObjectID'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; +import StatusPageHistoryChartBarColorRule from 'Model/Models/StatusPageHistoryChartBarColorRule'; import React, { FunctionComponent, ReactElement, @@ -5,16 +14,6 @@ import React, { useState, } from 'react'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; -import DayUptimeGraph, { BarChartRule, Event } from '../Graphs/DayUptimeGraph'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import ObjectID from 'Common/Types/ObjectID'; -import UptimeUtil from './UptimeUtil'; -import StatusPageHistoryChartBarColorRule from 'Model/Models/StatusPageHistoryChartBarColorRule'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import Color from 'Common/Types/Color'; - export interface MonitorEvent extends Event { monitorId: ObjectID; } diff --git a/CommonUI/src/Components/MonitorGraphs/UptimeUtil.ts b/CommonUI/src/Components/MonitorGraphs/UptimeUtil.ts index 1afa64076b..3ad472d817 100644 --- a/CommonUI/src/Components/MonitorGraphs/UptimeUtil.ts +++ b/CommonUI/src/Components/MonitorGraphs/UptimeUtil.ts @@ -1,10 +1,10 @@ -import ObjectID from 'Common/Types/ObjectID'; -import { MonitorEvent } from './Uptime'; -import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; -import OneUptimeDate from 'Common/Types/Date'; -import { Green } from 'Common/Types/BrandColors'; import { Event } from '../Graphs/DayUptimeGraph'; +import { MonitorEvent } from './Uptime'; +import { Green } from 'Common/Types/BrandColors'; +import OneUptimeDate from 'Common/Types/Date'; +import ObjectID from 'Common/Types/ObjectID'; import MonitorStatus from 'Model/Models/MonitorStatus'; +import MonitorStatusTimeline from 'Model/Models/MonitorStatusTimeline'; import { UptimePrecision } from 'Model/Models/StatusPageResource'; export default class UptimeUtil { diff --git a/CommonUI/src/Components/Navbar/NavBarItem.tsx b/CommonUI/src/Components/Navbar/NavBarItem.tsx index bc9b742a76..1520a289a0 100644 --- a/CommonUI/src/Components/Navbar/NavBarItem.tsx +++ b/CommonUI/src/Components/Navbar/NavBarItem.tsx @@ -1,11 +1,10 @@ // Tailwind - -import Route from 'Common/Types/API/Route'; -import React, { FunctionComponent, ReactElement } from 'react'; import Navigation from '../../Utils/Navigation'; import Icon, { ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Link from '../Link/Link'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Navbar/NavBarMenu.tsx b/CommonUI/src/Components/Navbar/NavBarMenu.tsx index e292e49c4c..46707d7b03 100644 --- a/CommonUI/src/Components/Navbar/NavBarMenu.tsx +++ b/CommonUI/src/Components/Navbar/NavBarMenu.tsx @@ -1,6 +1,6 @@ +import Link from '../Link/Link'; import URL from 'Common/Types/API/URL'; import React, { FunctionComponent, ReactElement } from 'react'; -import Link from '../Link/Link'; export interface ComponentProps { children: ReactElement | Array; diff --git a/CommonUI/src/Components/Navbar/NavBarMenuItem.tsx b/CommonUI/src/Components/Navbar/NavBarMenuItem.tsx index 75f3b7ebe0..3ac0fc2f28 100644 --- a/CommonUI/src/Components/Navbar/NavBarMenuItem.tsx +++ b/CommonUI/src/Components/Navbar/NavBarMenuItem.tsx @@ -1,8 +1,8 @@ -import Route from 'Common/Types/API/Route'; -import React, { FunctionComponent, ReactElement } from 'react'; import Icon from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Link from '../Link/Link'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Navbar/NavBarMenuSubItem.tsx b/CommonUI/src/Components/Navbar/NavBarMenuSubItem.tsx index ffb67bad5d..bdb83c1cca 100644 --- a/CommonUI/src/Components/Navbar/NavBarMenuSubItem.tsx +++ b/CommonUI/src/Components/Navbar/NavBarMenuSubItem.tsx @@ -1,6 +1,6 @@ +import Link from '../Link/Link'; import Route from 'Common/Types/API/Route'; import React, { FunctionComponent, ReactElement } from 'react'; -import Link from '../Link/Link'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/ObjectID/IDGenerator.tsx b/CommonUI/src/Components/ObjectID/IDGenerator.tsx index 71c19b4bc7..72799da878 100644 --- a/CommonUI/src/Components/ObjectID/IDGenerator.tsx +++ b/CommonUI/src/Components/ObjectID/IDGenerator.tsx @@ -1,13 +1,13 @@ +import Button, { ButtonStyleType } from '../Button/Button'; +import Input from '../Input/Input'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Input from '../Input/Input'; -import Button, { ButtonStyleType } from '../Button/Button'; -import ObjectID from 'Common/Types/ObjectID'; -import IconProp from 'Common/Types/Icon/IconProp'; export interface ComponentProps { readonly?: boolean | undefined; diff --git a/CommonUI/src/Components/OrderedStatesList/Item.tsx b/CommonUI/src/Components/OrderedStatesList/Item.tsx index c63f2f0a73..d9e24b05fd 100644 --- a/CommonUI/src/Components/OrderedStatesList/Item.tsx +++ b/CommonUI/src/Components/OrderedStatesList/Item.tsx @@ -1,8 +1,8 @@ -import React, { ReactElement, useState } from 'react'; import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; import Button, { ButtonSize } from '../Button/Button'; import ConfirmModal from '../Modal/ConfirmModal'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement, useState } from 'react'; export interface ComponentProps { item: T; diff --git a/CommonUI/src/Components/OrderedStatesList/OrderedStatesList.tsx b/CommonUI/src/Components/OrderedStatesList/OrderedStatesList.tsx index 12b78934ba..21e2413d48 100644 --- a/CommonUI/src/Components/OrderedStatesList/OrderedStatesList.tsx +++ b/CommonUI/src/Components/OrderedStatesList/OrderedStatesList.tsx @@ -1,11 +1,11 @@ -import React, { ReactElement } from 'react'; import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; import ComponentLoader from '../ComponentLoader/ComponentLoader'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; import Icon, { SizeProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import Item from './Item'; import GenericObject from 'Common/Types/GenericObject'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement } from 'react'; export interface ComponentProps { data: Array; diff --git a/CommonUI/src/Components/Page/ModelPage.tsx b/CommonUI/src/Components/Page/ModelPage.tsx index 07b81d62f1..e8009a28b1 100644 --- a/CommonUI/src/Components/Page/ModelPage.tsx +++ b/CommonUI/src/Components/Page/ModelPage.tsx @@ -1,12 +1,12 @@ -import Link from 'Common/Types/Link'; -import React, { ReactElement, useState } from 'react'; -import ObjectID from 'Common/Types/ObjectID'; -import BaseModel from 'Common/Models/BaseModel'; -import Page from './Page'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; import API from '../../Utils/API/API'; -import useAsyncEffect from 'use-async-effect'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; +import Page from './Page'; +import BaseModel from 'Common/Models/BaseModel'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import Link from 'Common/Types/Link'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement, useState } from 'react'; +import useAsyncEffect from 'use-async-effect'; export interface ComponentProps { title?: string | undefined; diff --git a/CommonUI/src/Components/Page/Page.tsx b/CommonUI/src/Components/Page/Page.tsx index c91a11c6e2..a80b6669c6 100644 --- a/CommonUI/src/Components/Page/Page.tsx +++ b/CommonUI/src/Components/Page/Page.tsx @@ -1,9 +1,9 @@ -import Link from 'Common/Types/Link'; -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import Analytics from '../../Utils/Analytics'; import Breadcrumbs from '../Breadcrumbs/Breadcrumbs'; -import PageLoader from '../Loader/PageLoader'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import PageLoader from '../Loader/PageLoader'; +import Link from 'Common/Types/Link'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface ComponentProps { title?: string | undefined; diff --git a/CommonUI/src/Components/Pagination/Pagination.tsx b/CommonUI/src/Components/Pagination/Pagination.tsx index 52c943276a..79ac0981f5 100644 --- a/CommonUI/src/Components/Pagination/Pagination.tsx +++ b/CommonUI/src/Components/Pagination/Pagination.tsx @@ -1,13 +1,13 @@ +import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; +import BasicFormModal from '../FormModal/BasicFormModal'; +import FormFieldSchemaType from '../Forms/Types/FormFieldSchemaType'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import BasicFormModal from '../FormModal/BasicFormModal'; -import FormFieldSchemaType from '../Forms/Types/FormFieldSchemaType'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; export interface PaginationNavigationItem { pageNumber: number; diff --git a/CommonUI/src/Components/Pill/Pill.tsx b/CommonUI/src/Components/Pill/Pill.tsx index f812353e9a..de01422c85 100644 --- a/CommonUI/src/Components/Pill/Pill.tsx +++ b/CommonUI/src/Components/Pill/Pill.tsx @@ -1,6 +1,6 @@ +import { Black } from 'Common/Types/BrandColors'; import Color from 'Common/Types/Color'; import React, { CSSProperties, FunctionComponent, ReactElement } from 'react'; -import { Black } from 'Common/Types/BrandColors'; export enum PillSize { Small = '10px', diff --git a/CommonUI/src/Components/Probe/Probe.tsx b/CommonUI/src/Components/Probe/Probe.tsx index 8454e76315..4265a5f5d6 100644 --- a/CommonUI/src/Components/Probe/Probe.tsx +++ b/CommonUI/src/Components/Probe/Probe.tsx @@ -1,12 +1,12 @@ -import { JSONObject } from 'Common/Types/JSON'; -import React, { FunctionComponent, ReactElement } from 'react'; -import Image from '../Image/Image'; -import URL from 'Common/Types/API/URL'; import { FILE_URL } from '../../Config'; -import Probe from 'Model/Models/Probe'; import Icon from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; +import Image from '../Image/Image'; import BaseModel from 'Common/Models/BaseModel'; +import URL from 'Common/Types/API/URL'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; +import Probe from 'Model/Models/Probe'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { probe?: Probe | JSONObject | undefined | null; diff --git a/CommonUI/src/Components/Radio/Radio.tsx b/CommonUI/src/Components/Radio/Radio.tsx index 3be272ac3b..e522c8e225 100644 --- a/CommonUI/src/Components/Radio/Radio.tsx +++ b/CommonUI/src/Components/Radio/Radio.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; import { DropdownOption, DropdownValue } from '../Dropdown/Dropdown'; import Text from 'Common/Types/Text'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface RadioOption extends DropdownOption {} diff --git a/CommonUI/src/Components/ResetObjectID/ResetObjectID.tsx b/CommonUI/src/Components/ResetObjectID/ResetObjectID.tsx index 0af0aebd80..4b7b7b0ac5 100644 --- a/CommonUI/src/Components/ResetObjectID/ResetObjectID.tsx +++ b/CommonUI/src/Components/ResetObjectID/ResetObjectID.tsx @@ -1,14 +1,14 @@ -import React, { ReactElement, useState } from 'react'; -import BaseModel from 'Common/Models/BaseModel'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; -import ObjectID from 'Common/Types/ObjectID'; import API from '../../Utils/API/API'; -import Card from '../Card/Card'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; import { ButtonStyleType } from '../Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; +import Card from '../Card/Card'; import ConfirmModal from '../Modal/ConfirmModal'; +import BaseModel from 'Common/Models/BaseModel'; import { TableColumnMetadata } from 'Common/Types/Database/TableColumn'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { ReactElement, useState } from 'react'; export interface ComponentProps { modelType: { new (): TBaseModel }; diff --git a/CommonUI/src/Components/ShortcutKey/Shortcut.tsx b/CommonUI/src/Components/ShortcutKey/Shortcut.tsx index ecd907cd00..188f1ce8e2 100644 --- a/CommonUI/src/Components/ShortcutKey/Shortcut.tsx +++ b/CommonUI/src/Components/ShortcutKey/Shortcut.tsx @@ -1,5 +1,5 @@ -import React, { ReactElement, FunctionComponent } from 'react'; import Char from 'Common/Types/Char'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { shortcuts: Array; diff --git a/CommonUI/src/Components/SideMenu/CountModelSideMenuItem.tsx b/CommonUI/src/Components/SideMenu/CountModelSideMenuItem.tsx index ee4be7eac5..3947a85582 100644 --- a/CommonUI/src/Components/SideMenu/CountModelSideMenuItem.tsx +++ b/CommonUI/src/Components/SideMenu/CountModelSideMenuItem.tsx @@ -1,13 +1,13 @@ -import Link from 'Common/Types/Link'; -import React, { ReactElement, useEffect, useState } from 'react'; -import ModelAPI, { RequestOptions } from '../../Utils/ModelAPI/ModelAPI'; -import BaseModel from 'Common/Models/BaseModel'; +import API from '../../Utils/API/API'; import Query from '../../Utils/BaseDatabase/Query'; +import ModelAPI, { RequestOptions } from '../../Utils/ModelAPI/ModelAPI'; import { BadgeType } from '../Badge/Badge'; import SideMenuItem from './SideMenuItem'; -import API from '../../Utils/API/API'; -import IconProp from 'Common/Types/Icon/IconProp'; +import BaseModel from 'Common/Models/BaseModel'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import Link from 'Common/Types/Link'; +import React, { ReactElement, useEffect, useState } from 'react'; export interface ComponentProps { link: Link; diff --git a/CommonUI/src/Components/SideMenu/SideMenuItem.tsx b/CommonUI/src/Components/SideMenu/SideMenuItem.tsx index 499555d095..194a421a5a 100644 --- a/CommonUI/src/Components/SideMenu/SideMenuItem.tsx +++ b/CommonUI/src/Components/SideMenu/SideMenuItem.tsx @@ -1,10 +1,10 @@ +import Navigation from '../../Utils/Navigation'; +import Badge, { BadgeType } from '../Badge/Badge'; +import Icon from '../Icon/Icon'; +import UILink from '../Link/Link'; +import IconProp from 'Common/Types/Icon/IconProp'; import Link from 'Common/Types/Link'; import React, { FunctionComponent } from 'react'; -import Navigation from '../../Utils/Navigation'; -import Icon from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import UILink from '../Link/Link'; -import Badge, { BadgeType } from '../Badge/Badge'; export interface ComponentProps { link: Link; diff --git a/CommonUI/src/Components/SideOver/SideOver.tsx b/CommonUI/src/Components/SideOver/SideOver.tsx index d1ea61a01d..5d6efd0fc5 100644 --- a/CommonUI/src/Components/SideOver/SideOver.tsx +++ b/CommonUI/src/Components/SideOver/SideOver.tsx @@ -1,7 +1,7 @@ -import IconProp from 'Common/Types/Icon/IconProp'; -import React, { FunctionComponent, ReactElement } from 'react'; import Button, { ButtonStyleType } from '../Button/Button'; import Icon from '../Icon/Icon'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { FunctionComponent, ReactElement } from 'react'; export enum SideOverSize { Small = 'Small', diff --git a/CommonUI/src/Components/Table/Table.tsx b/CommonUI/src/Components/Table/Table.tsx index 72856102e5..aedfec434d 100644 --- a/CommonUI/src/Components/Table/Table.tsx +++ b/CommonUI/src/Components/Table/Table.tsx @@ -1,21 +1,21 @@ -import React, { ReactElement, useEffect, useState } from 'react'; -import TableBody from './TableBody'; -import TableHeader from './TableHeader'; -import Columns from './Types/Columns'; -import Pagination from '../Pagination/Pagination'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import ComponentLoader from '../ComponentLoader/ComponentLoader'; -import { DragDropContext, DropResult } from 'react-beautiful-dnd'; -import FilterData from '../Filters/Types/FilterData'; -import Filter from '../Filters/Types/Filter'; import { GetReactElementFunction } from '../../Types/FunctionTypes'; -import GenericObject from 'Common/Types/GenericObject'; -import FilterViewer from '../Filters/FilterViewer'; +import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; import BulkUpdateForm, { BulkActionButtonSchema, } from '../BulkUpdate/BulkUpdateForm'; +import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import FilterViewer from '../Filters/FilterViewer'; +import Filter from '../Filters/Types/Filter'; +import FilterData from '../Filters/Types/FilterData'; +import Pagination from '../Pagination/Pagination'; +import TableBody from './TableBody'; +import TableHeader from './TableHeader'; +import Columns from './Types/Columns'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement, useEffect, useState } from 'react'; +import { DragDropContext, DropResult } from 'react-beautiful-dnd'; export interface BulkActionProps { buttons: Array>; diff --git a/CommonUI/src/Components/Table/TableBody.tsx b/CommonUI/src/Components/Table/TableBody.tsx index 9b486e81ed..41b79c7cfe 100644 --- a/CommonUI/src/Components/Table/TableBody.tsx +++ b/CommonUI/src/Components/Table/TableBody.tsx @@ -1,9 +1,9 @@ -import React, { ReactElement } from 'react'; -import TableRow from './TableRow'; import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; +import TableRow from './TableRow'; import Columns from './Types/Columns'; -import { Droppable, DroppableProvided } from 'react-beautiful-dnd'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; +import { Droppable, DroppableProvided } from 'react-beautiful-dnd'; export interface ComponentProps { data: Array; diff --git a/CommonUI/src/Components/Table/TableCard.tsx b/CommonUI/src/Components/Table/TableCard.tsx index d61ad9b742..0c8ae4f537 100644 --- a/CommonUI/src/Components/Table/TableCard.tsx +++ b/CommonUI/src/Components/Table/TableCard.tsx @@ -1,7 +1,7 @@ -import React, { ReactElement } from 'react'; import Card, { CardButtonSchema } from '../Card/Card'; import Table, { ComponentProps as TableComponentProps } from './Table'; import GenericObject from 'Common/Types/GenericObject'; +import React, { ReactElement } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Table/TableHeader.tsx b/CommonUI/src/Components/Table/TableHeader.tsx index 17ac3063f4..504e91c9af 100644 --- a/CommonUI/src/Components/Table/TableHeader.tsx +++ b/CommonUI/src/Components/Table/TableHeader.tsx @@ -1,12 +1,12 @@ -import React, { ReactElement, useState } from 'react'; +import CheckboxElement from '../Checkbox/Checkbox'; +import Icon, { ThickProp } from '../Icon/Icon'; +import FieldType from '../Types/FieldType'; import Column from './Types/Column'; import Columns from './Types/Columns'; -import Icon, { ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; -import FieldType from '../Types/FieldType'; import GenericObject from 'Common/Types/GenericObject'; -import CheckboxElement from '../Checkbox/Checkbox'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement, useState } from 'react'; export interface ComponentProps { columns: Columns; diff --git a/CommonUI/src/Components/Table/TableRow.tsx b/CommonUI/src/Components/Table/TableRow.tsx index d3ea4ef790..ed947f3fb0 100644 --- a/CommonUI/src/Components/Table/TableRow.tsx +++ b/CommonUI/src/Components/Table/TableRow.tsx @@ -1,19 +1,19 @@ -import OneUptimeDate from 'Common/Types/Date'; -import React, { ReactElement, useState } from 'react'; -import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; -import Icon, { ThickProp } from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; import ActionButtonSchema from '../ActionButton/ActionButtonSchema'; +import Button, { ButtonSize, ButtonStyleType } from '../Button/Button'; +import CheckboxElement from '../Checkbox/Checkbox'; +import ColorInput from '../ColorViewer/ColorViewer'; +import Icon, { ThickProp } from '../Icon/Icon'; +import ConfirmModal from '../Modal/ConfirmModal'; +import FieldType from '../Types/FieldType'; import Column from './Types/Column'; import Columns from './Types/Columns'; -import FieldType from '../Types/FieldType'; -import get from 'lodash/get'; -import ConfirmModal from '../Modal/ConfirmModal'; -import { Draggable, DraggableProvided } from 'react-beautiful-dnd'; -import ColorInput from '../ColorViewer/ColorViewer'; import Color from 'Common/Types/Color'; +import OneUptimeDate from 'Common/Types/Date'; import GenericObject from 'Common/Types/GenericObject'; -import CheckboxElement from '../Checkbox/Checkbox'; +import IconProp from 'Common/Types/Icon/IconProp'; +import get from 'lodash/get'; +import React, { ReactElement, useState } from 'react'; +import { Draggable, DraggableProvided } from 'react-beautiful-dnd'; export interface ComponentProps { item: T; diff --git a/CommonUI/src/Components/Table/Types/Column.ts b/CommonUI/src/Components/Table/Types/Column.ts index 5327bec1aa..eca2814ba0 100644 --- a/CommonUI/src/Components/Table/Types/Column.ts +++ b/CommonUI/src/Components/Table/Types/Column.ts @@ -1,7 +1,7 @@ -import { ReactElement } from 'react'; import AlignItem from '../../../Types/AlignItem'; import FieldType from '../../Types/FieldType'; import GenericObject from 'Common/Types/GenericObject'; +import { ReactElement } from 'react'; export default interface Column { title: string; diff --git a/CommonUI/src/Components/Table/Types/Columns.ts b/CommonUI/src/Components/Table/Types/Columns.ts index 9d1e67d54b..955fe8c44a 100644 --- a/CommonUI/src/Components/Table/Types/Columns.ts +++ b/CommonUI/src/Components/Table/Types/Columns.ts @@ -1,5 +1,5 @@ -import GenericObject from 'Common/Types/GenericObject'; import Column from './Column'; +import GenericObject from 'Common/Types/GenericObject'; type Columns = Array>; diff --git a/CommonUI/src/Components/Tabs/Tabs.tsx b/CommonUI/src/Components/Tabs/Tabs.tsx index 71223db06b..c9db95d661 100644 --- a/CommonUI/src/Components/Tabs/Tabs.tsx +++ b/CommonUI/src/Components/Tabs/Tabs.tsx @@ -1,10 +1,10 @@ +import TabElement, { Tab } from './Tab'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import TabElement, { Tab } from './Tab'; export interface ComponentProps { tabs: Array; diff --git a/CommonUI/src/Components/TextArea/TextArea.tsx b/CommonUI/src/Components/TextArea/TextArea.tsx index d1465f32f1..d98588ca60 100644 --- a/CommonUI/src/Components/TextArea/TextArea.tsx +++ b/CommonUI/src/Components/TextArea/TextArea.tsx @@ -1,11 +1,11 @@ +import Icon from '../Icon/Icon'; +import IconProp from 'Common/Types/Icon/IconProp'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Icon from '../Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; export interface ComponentProps { onChange?: undefined | ((value: string) => void); diff --git a/CommonUI/src/Components/Toast/Toast.tsx b/CommonUI/src/Components/Toast/Toast.tsx index 1a2096c067..ab599a36cc 100644 --- a/CommonUI/src/Components/Toast/Toast.tsx +++ b/CommonUI/src/Components/Toast/Toast.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; import OneUptimeDate from 'Common/Types/Date'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export enum ToastType { DANGER, diff --git a/CommonUI/src/Components/Tooltip/Tooltip.tsx b/CommonUI/src/Components/Tooltip/Tooltip.tsx index f46e75fc84..6592eaac76 100644 --- a/CommonUI/src/Components/Tooltip/Tooltip.tsx +++ b/CommonUI/src/Components/Tooltip/Tooltip.tsx @@ -1,5 +1,5 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import Tippy from '@tippyjs/react'; +import React, { FunctionComponent, ReactElement } from 'react'; import 'tippy.js/dist/tippy.css'; export interface ComponentProps { diff --git a/CommonUI/src/Components/Workflow/ArgumentsForm.tsx b/CommonUI/src/Components/Workflow/ArgumentsForm.tsx index f965fe9875..870bbb96b8 100644 --- a/CommonUI/src/Components/Workflow/ArgumentsForm.tsx +++ b/CommonUI/src/Components/Workflow/ArgumentsForm.tsx @@ -1,3 +1,13 @@ +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import BasicForm, { FormProps } from '../Forms/BasicForm'; +import FormValues from '../Forms/Types/FormValues'; +import ComponentValuePickerModal from './ComponentValuePickerModal'; +import { componentInputTypeToFormFieldType } from './Utils'; +import VariableModal from './VariableModal'; +import Dictionary from 'Common/Types/Dictionary'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import { Argument, NodeDataProp } from 'Common/Types/Workflow/Component'; import React, { FunctionComponent, ReactElement, @@ -5,16 +15,6 @@ import React, { useRef, useState, } from 'react'; -import { Argument, NodeDataProp } from 'Common/Types/Workflow/Component'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import BasicForm, { FormProps } from '../Forms/BasicForm'; -import FormValues from '../Forms/Types/FormValues'; -import { JSONObject } from 'Common/Types/JSON'; -import Dictionary from 'Common/Types/Dictionary'; -import { componentInputTypeToFormFieldType } from './Utils'; -import VariableModal from './VariableModal'; -import ObjectID from 'Common/Types/ObjectID'; -import ComponentValuePickerModal from './ComponentValuePickerModal'; export interface ComponentProps { component: NodeDataProp; diff --git a/CommonUI/src/Components/Workflow/Component.tsx b/CommonUI/src/Components/Workflow/Component.tsx index 5f9c3ffdd8..e48a22a038 100644 --- a/CommonUI/src/Components/Workflow/Component.tsx +++ b/CommonUI/src/Components/Workflow/Component.tsx @@ -1,6 +1,7 @@ -import React, { FunctionComponent, useState } from 'react'; -import { Handle, Position, Connection } from 'reactflow'; import Icon, { ThickProp } from '../Icon/Icon'; +import Pill from '../Pill/Pill'; +import Tooltip from '../Tooltip/Tooltip'; +import { Green } from 'Common/Types/BrandColors'; import IconProp from 'Common/Types/Icon/IconProp'; import { ComponentType, @@ -8,9 +9,8 @@ import { NodeType, Port, } from 'Common/Types/Workflow/Component'; -import Tooltip from '../Tooltip/Tooltip'; -import Pill from '../Pill/Pill'; -import { Green } from 'Common/Types/BrandColors'; +import React, { FunctionComponent, useState } from 'react'; +import { Connection, Handle, Position } from 'reactflow'; export interface ComponentProps { data: NodeDataProp; diff --git a/CommonUI/src/Components/Workflow/ComponentArgumentsViewer.tsx b/CommonUI/src/Components/Workflow/ComponentArgumentsViewer.tsx index 9da3c91a8a..0c958a3a35 100644 --- a/CommonUI/src/Components/Workflow/ComponentArgumentsViewer.tsx +++ b/CommonUI/src/Components/Workflow/ComponentArgumentsViewer.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import { Argument } from 'Common/Types/Workflow/Component'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; import Pill from '../Pill/Pill'; import { Black } from 'Common/Types/BrandColors'; +import { Argument } from 'Common/Types/Workflow/Component'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { arguments: Array; diff --git a/CommonUI/src/Components/Workflow/ComponentPortViewer.tsx b/CommonUI/src/Components/Workflow/ComponentPortViewer.tsx index 60a8a9af9e..8b6f570e62 100644 --- a/CommonUI/src/Components/Workflow/ComponentPortViewer.tsx +++ b/CommonUI/src/Components/Workflow/ComponentPortViewer.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import { Port } from 'Common/Types/Workflow/Component'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import { Port } from 'Common/Types/Workflow/Component'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { ports: Array; diff --git a/CommonUI/src/Components/Workflow/ComponentReturnValueViewer.tsx b/CommonUI/src/Components/Workflow/ComponentReturnValueViewer.tsx index d96d24c2f5..5d0a2d8318 100644 --- a/CommonUI/src/Components/Workflow/ComponentReturnValueViewer.tsx +++ b/CommonUI/src/Components/Workflow/ComponentReturnValueViewer.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import { ReturnValue } from 'Common/Types/Workflow/Component'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; import Pill from '../Pill/Pill'; import { Black } from 'Common/Types/BrandColors'; +import { ReturnValue } from 'Common/Types/Workflow/Component'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { returnValues: Array; diff --git a/CommonUI/src/Components/Workflow/ComponentSettingsModal.tsx b/CommonUI/src/Components/Workflow/ComponentSettingsModal.tsx index 3cdfa0d950..02b74fbc5f 100644 --- a/CommonUI/src/Components/Workflow/ComponentSettingsModal.tsx +++ b/CommonUI/src/Components/Workflow/ComponentSettingsModal.tsx @@ -1,7 +1,3 @@ -import IconProp from 'Common/Types/Icon/IconProp'; -import { JSONObject } from 'Common/Types/JSON'; -import Dictionary from 'Common/Types/Dictionary'; -import React, { FunctionComponent, ReactElement, useState } from 'react'; import Button, { ButtonStyleType } from '../Button/Button'; import Divider from '../Divider/Divider'; import BasicForm from '../Forms/BasicForm'; @@ -9,12 +5,16 @@ import FormFieldSchemaType from '../Forms/Types/FormFieldSchemaType'; import FormValues from '../Forms/Types/FormValues'; import ConfirmModal from '../Modal/ConfirmModal'; import SideOver from '../SideOver/SideOver'; +import ArgumentsForm from './ArgumentsForm'; import ComponentPortViewer from './ComponentPortViewer'; import ComponentReturnValueViewer from './ComponentReturnValueViewer'; -import ArgumentsForm from './ArgumentsForm'; +import DocumentationViewer from './DocumentationViewer'; +import Dictionary from 'Common/Types/Dictionary'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import { NodeDataProp } from 'Common/Types/Workflow/Component'; -import DocumentationViewer from './DocumentationViewer'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface ComponentProps { title: string; diff --git a/CommonUI/src/Components/Workflow/ComponentValuePickerModal.tsx b/CommonUI/src/Components/Workflow/ComponentValuePickerModal.tsx index e94fc2479b..b08c7db07c 100644 --- a/CommonUI/src/Components/Workflow/ComponentValuePickerModal.tsx +++ b/CommonUI/src/Components/Workflow/ComponentValuePickerModal.tsx @@ -1,15 +1,15 @@ +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import Input from '../Input/Input'; +import Modal, { ModalWidth } from '../Modal/Modal'; +import Pill from '../Pill/Pill'; import { Black } from 'Common/Types/BrandColors'; import { NodeDataProp, ReturnValue } from 'Common/Types/Workflow/Component'; import React, { - useState, FunctionComponent, ReactElement, useEffect, + useState, } from 'react'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import Modal, { ModalWidth } from '../Modal/Modal'; -import Pill from '../Pill/Pill'; -import Input from '../Input/Input'; export interface ComponentProps { onClose: () => void; diff --git a/CommonUI/src/Components/Workflow/ComponentsModal.tsx b/CommonUI/src/Components/Workflow/ComponentsModal.tsx index 2e24d8a923..a1064cd6de 100644 --- a/CommonUI/src/Components/Workflow/ComponentsModal.tsx +++ b/CommonUI/src/Components/Workflow/ComponentsModal.tsx @@ -1,21 +1,20 @@ // Show a large modal full of components. - +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import Icon from '../Icon/Icon'; +import Input from '../Input/Input'; +import SideOver from '../SideOver/SideOver'; +import ComponentElement from './Component'; +import ComponentMetadata, { + ComponentCategory, + ComponentType, + NodeType, +} from 'Common/Types/Workflow/Component'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import ComponentMetadata, { - ComponentType, - ComponentCategory, - NodeType, -} from 'Common/Types/Workflow/Component'; -import ComponentElement from './Component'; -import Input from '../Input/Input'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import Icon from '../Icon/Icon'; -import SideOver from '../SideOver/SideOver'; export interface ComponentProps { componentsType: ComponentType; diff --git a/CommonUI/src/Components/Workflow/DocumentationViewer.tsx b/CommonUI/src/Components/Workflow/DocumentationViewer.tsx index 8aede2f158..172a680804 100644 --- a/CommonUI/src/Components/Workflow/DocumentationViewer.tsx +++ b/CommonUI/src/Components/Workflow/DocumentationViewer.tsx @@ -1,15 +1,15 @@ -import React, { FunctionComponent, ReactElement, useState } from 'react'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import { HOME_URL, HOST, HTTP_PROTOCOL } from '../../Config'; import API from '../../Utils/API/API'; import ComponentLoader from '../ComponentLoader/ComponentLoader'; +import ErrorMessage from '../ErrorMessage/ErrorMessage'; import MarkdownViewer from '../Markdown.tsx/LazyMarkdownViewer'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; -import { HOST, HOME_URL, HTTP_PROTOCOL } from '../../Config'; -import ObjectID from 'Common/Types/ObjectID'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import useAsyncEffect from 'use-async-effect'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import ObjectID from 'Common/Types/ObjectID'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; +import useAsyncEffect from 'use-async-effect'; export interface ComponentProps { documentationLink: Route; diff --git a/CommonUI/src/Components/Workflow/RunForm.tsx b/CommonUI/src/Components/Workflow/RunForm.tsx index 9c86f7ed9d..210e987a95 100644 --- a/CommonUI/src/Components/Workflow/RunForm.tsx +++ b/CommonUI/src/Components/Workflow/RunForm.tsx @@ -1,3 +1,9 @@ +import ErrorMessage from '../ErrorMessage/ErrorMessage'; +import BasicForm, { FormProps } from '../Forms/BasicForm'; +import FormValues from '../Forms/Types/FormValues'; +import { componentInputTypeToFormFieldType } from './Utils'; +import { JSONObject } from 'Common/Types/JSON'; +import { NodeDataProp, ReturnValue } from 'Common/Types/Workflow/Component'; import React, { FunctionComponent, ReactElement, @@ -5,12 +11,6 @@ import React, { useRef, useState, } from 'react'; -import { NodeDataProp, ReturnValue } from 'Common/Types/Workflow/Component'; -import ErrorMessage from '../ErrorMessage/ErrorMessage'; -import BasicForm, { FormProps } from '../Forms/BasicForm'; -import FormValues from '../Forms/Types/FormValues'; -import { JSONObject } from 'Common/Types/JSON'; -import { componentInputTypeToFormFieldType } from './Utils'; export interface ComponentProps { component: NodeDataProp; diff --git a/CommonUI/src/Components/Workflow/RunModal.tsx b/CommonUI/src/Components/Workflow/RunModal.tsx index 16c4ee4d40..f16b4ac46f 100644 --- a/CommonUI/src/Components/Workflow/RunModal.tsx +++ b/CommonUI/src/Components/Workflow/RunModal.tsx @@ -1,15 +1,15 @@ -import { - ComponentInputType, - NodeDataProp, - NodeType, -} from 'Common/Types/Workflow/Component'; -import React, { FunctionComponent, ReactElement, useState } from 'react'; import { ButtonStyleType } from '../Button/Button'; import ErrorMessage from '../ErrorMessage/ErrorMessage'; import ConfirmModal from '../Modal/ConfirmModal'; import SideOver from '../SideOver/SideOver'; import RunForm from './RunForm'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import { + ComponentInputType, + NodeDataProp, + NodeType, +} from 'Common/Types/Workflow/Component'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface ComponentProps { onClose: () => void; diff --git a/CommonUI/src/Components/Workflow/Utils.ts b/CommonUI/src/Components/Workflow/Utils.ts index 8efd6a5d8e..e0a0db40e9 100644 --- a/CommonUI/src/Components/Workflow/Utils.ts +++ b/CommonUI/src/Components/Workflow/Utils.ts @@ -1,14 +1,14 @@ +import { DropdownOption } from '../Dropdown/Dropdown'; +import FormFieldSchemaType from '../Forms/Types/FormFieldSchemaType'; +import IconProp from 'Common/Types/Icon/IconProp'; +import Typeof from 'Common/Types/Typeof'; import ComponentMetadata, { ComponentCategory, ComponentInputType, } from 'Common/Types/Workflow/Component'; -import FormFieldSchemaType from '../Forms/Types/FormFieldSchemaType'; -import { DropdownOption } from '../Dropdown/Dropdown'; -import Entities from 'Model/Models/Index'; -import BaseModelComponentFactory from 'Common/Types/Workflow/Components/BaseModel'; -import IconProp from 'Common/Types/Icon/IconProp'; import Components, { Categories } from 'Common/Types/Workflow/Components'; -import Typeof from 'Common/Types/Typeof'; +import BaseModelComponentFactory from 'Common/Types/Workflow/Components/BaseModel'; +import Entities from 'Model/Models/Index'; type LoadComponentsAndCategoriesFunction = () => { components: Array; diff --git a/CommonUI/src/Components/Workflow/VariableModal.tsx b/CommonUI/src/Components/Workflow/VariableModal.tsx index 1d2c0017f3..696a24f6da 100644 --- a/CommonUI/src/Components/Workflow/VariableModal.tsx +++ b/CommonUI/src/Components/Workflow/VariableModal.tsx @@ -1,8 +1,8 @@ +import ModelListModal from '../ModelListModal/ModelListModal'; import EqualToOrNull from 'Common/Types/BaseDatabase/EqualToOrNull'; import ObjectID from 'Common/Types/ObjectID'; import WorkflowVariable from 'Model/Models/WorkflowVariable'; import React, { FunctionComponent, ReactElement } from 'react'; -import ModelListModal from '../ModelListModal/ModelListModal'; export interface ComponentProps { workflowId: ObjectID; diff --git a/CommonUI/src/Components/Workflow/Workflow.tsx b/CommonUI/src/Components/Workflow/Workflow.tsx index 23889d5b4d..37b1dee051 100644 --- a/CommonUI/src/Components/Workflow/Workflow.tsx +++ b/CommonUI/src/Components/Workflow/Workflow.tsx @@ -1,44 +1,44 @@ -import React, { - FunctionComponent, - useCallback, - useRef, - useEffect, - useState, -} from 'react'; -import { VoidFunction } from 'Common/Types/FunctionTypes'; -import ReactFlow, { - MiniMap, - Controls, - Background, - useNodesState, - useEdgesState, - addEdge, - MarkerType, - Edge, - Connection, - updateEdge, - Node, - ProOptions, - NodeTypes, - OnConnect, - getConnectedEdges, -} from 'reactflow'; -// 👇 you need to import the reactflow styles -import 'reactflow/dist/style.css'; import WorkflowComponent from './Component'; -import ObjectID from 'Common/Types/ObjectID'; +import ComponentSettingsModal from './ComponentSettingsModal'; +import ComponentsModal from './ComponentsModal'; +import RunModal from './RunModal'; +import { loadComponentsAndCategories } from './Utils'; +import { VoidFunction } from 'Common/Types/FunctionTypes'; import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; import ComponentMetadata, { ComponentCategory, ComponentType, NodeDataProp, NodeType, } from 'Common/Types/Workflow/Component'; -import ComponentsModal from './ComponentsModal'; -import { JSONObject } from 'Common/Types/JSON'; -import ComponentSettingsModal from './ComponentSettingsModal'; -import { loadComponentsAndCategories } from './Utils'; -import RunModal from './RunModal'; +import React, { + FunctionComponent, + useCallback, + useEffect, + useRef, + useState, +} from 'react'; +import ReactFlow, { + Background, + Connection, + Controls, + Edge, + MarkerType, + MiniMap, + Node, + NodeTypes, + OnConnect, + ProOptions, + addEdge, + getConnectedEdges, + updateEdge, + useEdgesState, + useNodesState, +} from 'reactflow'; +// 👇 you need to import the reactflow styles +import 'reactflow/dist/style.css'; type GetPlaceholderTriggerNodeFunction = () => Node; diff --git a/CommonUI/src/Components/Workflow/WorkflowStatus.tsx b/CommonUI/src/Components/Workflow/WorkflowStatus.tsx index 82d79a1917..e7cf3a400d 100644 --- a/CommonUI/src/Components/Workflow/WorkflowStatus.tsx +++ b/CommonUI/src/Components/Workflow/WorkflowStatus.tsx @@ -1,7 +1,7 @@ -import { Green, Red, Yellow } from 'Common/Types/BrandColors'; -import React, { FunctionComponent, ReactElement } from 'react'; -import WorkflowStatus from 'Common/Types/Workflow/WorkflowStatus'; import Pill from '../Pill/Pill'; +import { Green, Red, Yellow } from 'Common/Types/BrandColors'; +import WorkflowStatus from 'Common/Types/Workflow/WorkflowStatus'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { status: WorkflowStatus; diff --git a/CommonUI/src/Container.tsx b/CommonUI/src/Container.tsx index 565a07620f..7a61ae92de 100644 --- a/CommonUI/src/Container.tsx +++ b/CommonUI/src/Container.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement, useEffect, FunctionComponent } from 'react'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; type Props = { children: Array; diff --git a/CommonUI/src/Tests/Components/404.test.tsx b/CommonUI/src/Tests/Components/404.test.tsx index 75a886d05e..f93b842fef 100644 --- a/CommonUI/src/Tests/Components/404.test.tsx +++ b/CommonUI/src/Tests/Components/404.test.tsx @@ -1,10 +1,10 @@ -import * as React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import NotFound, { ComponentProps } from '../../Components/404'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; import Route from 'Common/Types/API/Route'; -import Email from 'Common/Types/Email'; import URL from 'Common/Types/API/URL'; +import Email from 'Common/Types/Email'; +import * as React from 'react'; // Mock the Navigation module to avoid real navigation jest.mock('../../Utils/Navigation', () => { diff --git a/CommonUI/src/Tests/Components/Alert.test.tsx b/CommonUI/src/Tests/Components/Alert.test.tsx index ac6b111d51..38c662d783 100644 --- a/CommonUI/src/Tests/Components/Alert.test.tsx +++ b/CommonUI/src/Tests/Components/Alert.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import Alert, { AlertType } from '../../Components/Alerts/Alert'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; +import React from 'react'; describe('alert tests', () => { test('it should render all props passed', () => { diff --git a/CommonUI/src/Tests/Components/Badge.test.tsx b/CommonUI/src/Tests/Components/Badge.test.tsx index ab73849a10..0d2c3d2868 100644 --- a/CommonUI/src/Tests/Components/Badge.test.tsx +++ b/CommonUI/src/Tests/Components/Badge.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import Badge, { BadgeType } from '../../Components/Badge/Badge'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; describe('Badge', () => { test('it should render all props', () => { diff --git a/CommonUI/src/Tests/Components/BasicForm.test.tsx b/CommonUI/src/Tests/Components/BasicForm.test.tsx index db599f3a12..a00bda9547 100644 --- a/CommonUI/src/Tests/Components/BasicForm.test.tsx +++ b/CommonUI/src/Tests/Components/BasicForm.test.tsx @@ -1,14 +1,13 @@ -import * as React from 'react'; - +import BasicForm from '../../Components/Forms/BasicForm'; +import Fields from '../../Components/Forms/Types/Fields'; +import FormFieldSchemaType from '../../Components/Forms/Types/FormFieldSchemaType'; +import FormValues from '../../Components/Forms/Types/FormValues'; +import '@testing-library/jest-dom/extend-expect'; import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import BasicForm from '../../Components/Forms/BasicForm'; -import FormFieldSchemaType from '../../Components/Forms/Types/FormFieldSchemaType'; -import Route from 'Common/Types/API/Route'; -import FormValues from '../../Components/Forms/Types/FormValues'; -import Fields from '../../Components/Forms/Types/Fields'; import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup'; -import '@testing-library/jest-dom/extend-expect'; +import Route from 'Common/Types/API/Route'; +import * as React from 'react'; describe('BasicForm test', () => { const fields: Fields> = [ diff --git a/CommonUI/src/Tests/Components/Breadcrumbs.test.tsx b/CommonUI/src/Tests/Components/Breadcrumbs.test.tsx index d58fe069fa..246356af4e 100644 --- a/CommonUI/src/Tests/Components/Breadcrumbs.test.tsx +++ b/CommonUI/src/Tests/Components/Breadcrumbs.test.tsx @@ -1,13 +1,14 @@ -import * as React from 'react'; -import { describe, test, expect } from '@jest/globals'; +import Breadcrumbs from '../../Components/Breadcrumbs/Breadcrumbs'; +import Navigation from '../../Utils/Navigation'; +import { describe, expect, test } from '@jest/globals'; import Route from 'Common/Types/API/Route'; +import Link from 'Common/Types/Link'; +import * as React from 'react'; import renderer, { ReactTestInstance, ReactTestRenderer, } from 'react-test-renderer'; -import Breadcrumbs from '../../Components/Breadcrumbs/Breadcrumbs'; -import Link from 'Common/Types/Link'; -import Navigation from '../../Utils/Navigation'; + describe('Breadcrumbs', () => { test('Should render correctly and also contain "Home" and "Projects" string', () => { const links: Array = [ diff --git a/CommonUI/src/Tests/Components/Button.test.tsx b/CommonUI/src/Tests/Components/Button.test.tsx index 5c840bebeb..17fa6be0c1 100644 --- a/CommonUI/src/Tests/Components/Button.test.tsx +++ b/CommonUI/src/Tests/Components/Button.test.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import Button, { ButtonSize, ButtonStyleType, } from '../../Components/Button/Button'; import ButtonType from '../../Components/Button/ButtonTypes'; import ShortcutKey from '../../Components/ShortcutKey/ShortcutKey'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; import IconProp from 'Common/Types/Icon/IconProp'; +import React from 'react'; describe('Button', () => { test('it should render correctly with title and icon', () => { diff --git a/CommonUI/src/Tests/Components/Card.test.tsx b/CommonUI/src/Tests/Components/Card.test.tsx index 052cbd8d81..d069022445 100644 --- a/CommonUI/src/Tests/Components/Card.test.tsx +++ b/CommonUI/src/Tests/Components/Card.test.tsx @@ -1,12 +1,12 @@ -import React, { ReactElement } from 'react'; -import { fireEvent, render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; +import { ButtonStyleType } from '../../Components/Button/Button'; import Card, { CardButtonSchema, ComponentProps, } from '../../Components/Card/Card'; -import { ButtonStyleType } from '../../Components/Button/Button'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; import IconProp from 'Common/Types/Icon/IconProp'; +import React, { ReactElement } from 'react'; describe('Card', () => { const props: ComponentProps = { diff --git a/CommonUI/src/Tests/Components/ColorViewer.test.tsx b/CommonUI/src/Tests/Components/ColorViewer.test.tsx index 767e3667ff..e13ccbfd1d 100644 --- a/CommonUI/src/Tests/Components/ColorViewer.test.tsx +++ b/CommonUI/src/Tests/Components/ColorViewer.test.tsx @@ -1,8 +1,8 @@ -import * as React from 'react'; -import { fireEvent, render } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import ColorViewer from '../../Components/ColorViewer/ColorViewer'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render } from '@testing-library/react'; import Color from 'Common/Types/Color'; +import * as React from 'react'; describe('Color Viewer', () => { test('Render the component', () => { diff --git a/CommonUI/src/Tests/Components/ComponentsModal.test.tsx b/CommonUI/src/Tests/Components/ComponentsModal.test.tsx index e65379742d..a5343192dd 100644 --- a/CommonUI/src/Tests/Components/ComponentsModal.test.tsx +++ b/CommonUI/src/Tests/Components/ComponentsModal.test.tsx @@ -1,15 +1,14 @@ -import React from 'react'; +import ComponentsModal from '../../Components/Workflow/ComponentsModal'; import { faker } from '@faker-js/faker'; -import { render, fireEvent, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; +import IconProp from 'Common/Types/Icon/IconProp'; import ComponentMetadata, { ComponentCategory, ComponentType, } from 'Common/Types/Workflow/Component'; -import IconProp from 'Common/Types/Icon/IconProp'; - -import ComponentsModal from '../../Components/Workflow/ComponentsModal'; +import React from 'react'; /// @dev we use different UUID for (id & title), description, and category to ensure that the component is unique diff --git a/CommonUI/src/Tests/Components/ConfirmModal.test.tsx b/CommonUI/src/Tests/Components/ConfirmModal.test.tsx index ed28d1bad9..e089033a91 100644 --- a/CommonUI/src/Tests/Components/ConfirmModal.test.tsx +++ b/CommonUI/src/Tests/Components/ConfirmModal.test.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import { fireEvent, render, screen } from '@testing-library/react'; +import { ButtonStyleType } from '../../Components/Button/Button'; import ConfirmModal, { ComponentProps, } from '../../Components/Modal/ConfirmModal'; import { describe, expect, it } from '@jest/globals'; -import { ButtonStyleType } from '../../Components/Button/Button'; +import { fireEvent, render, screen } from '@testing-library/react'; +import React from 'react'; describe('ConfirmModal', () => { const mockProps: ComponentProps = { diff --git a/CommonUI/src/Tests/Components/DictionaryOfStrings.test.tsx b/CommonUI/src/Tests/Components/DictionaryOfStrings.test.tsx index 320cd5f034..ed7e1f9cc5 100644 --- a/CommonUI/src/Tests/Components/DictionaryOfStrings.test.tsx +++ b/CommonUI/src/Tests/Components/DictionaryOfStrings.test.tsx @@ -1,14 +1,13 @@ // Libraries -import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; -import Dictionary from 'Common/Types/Dictionary'; -import { describe, expect, it } from '@jest/globals'; - // Custom components import DictionaryOfStrings, { ComponentProps, } from '../../Components/Dictionary/DictionaryOfStrings'; +import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; +import Dictionary from 'Common/Types/Dictionary'; +import React from 'react'; jest.mock('Common/Types/Date', () => { return { diff --git a/CommonUI/src/Tests/Components/Dropdown.test.tsx b/CommonUI/src/Tests/Components/Dropdown.test.tsx index d8de3f51a4..d29ecac2ec 100644 --- a/CommonUI/src/Tests/Components/Dropdown.test.tsx +++ b/CommonUI/src/Tests/Components/Dropdown.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; import Dropdown, { DropdownOption } from '../../Components/Dropdown/Dropdown'; -import { fireEvent, render, screen } from '@testing-library/react'; import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; +import React from 'react'; describe('Dropdown', () => { const options: DropdownOption[] = [ diff --git a/CommonUI/src/Tests/Components/DuplicateModel.test.tsx b/CommonUI/src/Tests/Components/DuplicateModel.test.tsx index 83544dc562..0cc0dc4c27 100644 --- a/CommonUI/src/Tests/Components/DuplicateModel.test.tsx +++ b/CommonUI/src/Tests/Components/DuplicateModel.test.tsx @@ -1,22 +1,22 @@ -import React from 'react'; -import BaseModel from 'Common/Models/BaseModel'; -import Select from '../../Utils/BaseDatabase/Select'; +import DuplicateModel from '../../Components/DuplicateModel/DuplicateModel'; import { ModelField } from '../../Components/Forms/ModelForm'; -import TableMetaData from 'Common/Types/Database/TableMetadata'; -import IconProp from 'Common/Types/Icon/IconProp'; +import Select from '../../Utils/BaseDatabase/Select'; import { describe, expect, it } from '@jest/globals'; import { + fireEvent, render, screen, - within, - fireEvent, waitFor, + within, } from '@testing-library/react'; -import DuplicateModel from '../../Components/DuplicateModel/DuplicateModel'; -import ObjectID from 'Common/Types/ObjectID'; -import CrudApiEndpoint from 'Common/Types/Database/CrudApiEndpoint'; -import { act } from 'react-test-renderer'; +import BaseModel from 'Common/Models/BaseModel'; import Route from 'Common/Types/API/Route'; +import CrudApiEndpoint from 'Common/Types/Database/CrudApiEndpoint'; +import TableMetaData from 'Common/Types/Database/TableMetadata'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; +import React from 'react'; +import { act } from 'react-test-renderer'; @TableMetaData({ tableName: 'Foo', diff --git a/CommonUI/src/Tests/Components/EmptyState/EmptyState.test.tsx b/CommonUI/src/Tests/Components/EmptyState/EmptyState.test.tsx index f0d1b42466..7f19e906ec 100644 --- a/CommonUI/src/Tests/Components/EmptyState/EmptyState.test.tsx +++ b/CommonUI/src/Tests/Components/EmptyState/EmptyState.test.tsx @@ -1,8 +1,8 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom'; import EmptyState from '../../../Components/EmptyState/EmptyState'; +import '@testing-library/jest-dom'; +import { render, screen } from '@testing-library/react'; import IconProp from 'Common/Types/Icon/IconProp'; +import React from 'react'; describe('EmptyState', () => { test('renders correctly with all props', () => { diff --git a/CommonUI/src/Tests/Components/ErrorBoundary.test.tsx b/CommonUI/src/Tests/Components/ErrorBoundary.test.tsx index 1a701f96b8..cf56255163 100644 --- a/CommonUI/src/Tests/Components/ErrorBoundary.test.tsx +++ b/CommonUI/src/Tests/Components/ErrorBoundary.test.tsx @@ -1,7 +1,7 @@ -import '@testing-library/jest-dom/extend-expect'; -import React, { useEffect, FunctionComponent } from 'react'; -import { render, screen } from '@testing-library/react'; import ErrorBoundary from '../../Components/ErrorBoundary'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import React, { FunctionComponent, useEffect } from 'react'; describe('ErrorBoundary', () => { const spy: jest.SpyInstance = jest.spyOn(console, 'error'); diff --git a/CommonUI/src/Tests/Components/FilePicker.test.tsx b/CommonUI/src/Tests/Components/FilePicker.test.tsx index 36d41d895d..2ed4eac9d5 100644 --- a/CommonUI/src/Tests/Components/FilePicker.test.tsx +++ b/CommonUI/src/Tests/Components/FilePicker.test.tsx @@ -1,25 +1,23 @@ -import React from 'react'; -import { act } from 'react-test-renderer'; -import { describe, expect, it } from '@jest/globals'; +import FilePicker from '../../Components/FilePicker/FilePicker'; +import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; import { faker } from '@faker-js/faker'; +import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; import { - render, fireEvent, + queryAllByAttribute, + queryByAttribute, + queryByTestId, + render, screen, waitFor, - queryByAttribute, - queryAllByAttribute, - queryByTestId, } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; - -import MimeType from 'Common/Types/File/MimeType'; -import FileModel from 'Model/Models/File'; -import ModelAPI from '../../Utils/ModelAPI/ModelAPI'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import MimeType from 'Common/Types/File/MimeType'; import ObjectID from 'Common/Types/ObjectID'; - -import FilePicker from '../../Components/FilePicker/FilePicker'; +import FileModel from 'Model/Models/File'; +import React from 'react'; +import { act } from 'react-test-renderer'; const mockOnChange: jest.Mock = jest.fn(); const mockOnBlur: jest.Mock = jest.fn(); diff --git a/CommonUI/src/Tests/Components/HiddenText.test.tsx b/CommonUI/src/Tests/Components/HiddenText.test.tsx index a996e036b3..4ecdeadad4 100644 --- a/CommonUI/src/Tests/Components/HiddenText.test.tsx +++ b/CommonUI/src/Tests/Components/HiddenText.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { fireEvent, render, screen, waitFor } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import HiddenText from '../../Components/HiddenText/HiddenText'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import React from 'react'; describe('tests for HiddenText component', () => { test('it should click hidden-text and reveal text in document', async () => { diff --git a/CommonUI/src/Tests/Components/Input.test.tsx b/CommonUI/src/Tests/Components/Input.test.tsx index 2efa51a854..3aff20640d 100644 --- a/CommonUI/src/Tests/Components/Input.test.tsx +++ b/CommonUI/src/Tests/Components/Input.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { render, fireEvent, screen, cleanup } from '@testing-library/react'; import Input, { ComponentProps, InputType } from '../../Components/Input/Input'; import '@testing-library/jest-dom/extend-expect'; +import { cleanup, fireEvent, render, screen } from '@testing-library/react'; +import React from 'react'; describe('Input', () => { afterEach(() => { diff --git a/CommonUI/src/Tests/Components/Item.test.tsx b/CommonUI/src/Tests/Components/Item.test.tsx index bab8d5f6bf..242644447f 100644 --- a/CommonUI/src/Tests/Components/Item.test.tsx +++ b/CommonUI/src/Tests/Components/Item.test.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import '@testing-library/jest-dom'; -import Item, { ComponentProps } from '../../Components/OrderedStatesList/Item'; import { ButtonStyleType } from '../../Components/Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; +import Item, { ComponentProps } from '../../Components/OrderedStatesList/Item'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom'; +import { render } from '@testing-library/react'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React from 'react'; describe('Item component', () => { interface ItemData { diff --git a/CommonUI/src/Tests/Components/List.test.tsx b/CommonUI/src/Tests/Components/List.test.tsx index 439824d896..13211680a0 100644 --- a/CommonUI/src/Tests/Components/List.test.tsx +++ b/CommonUI/src/Tests/Components/List.test.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom'; -import FieldType from '../../Components/Types/FieldType'; import List, { ComponentProps } from '../../Components/List/List'; +import FieldType from '../../Components/Types/FieldType'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom'; +import { fireEvent, render, screen } from '@testing-library/react'; +import React from 'react'; describe('List', () => { interface ListData { diff --git a/CommonUI/src/Tests/Components/Loader.test.tsx b/CommonUI/src/Tests/Components/Loader.test.tsx index da88b006d5..509f4e3cc8 100644 --- a/CommonUI/src/Tests/Components/Loader.test.tsx +++ b/CommonUI/src/Tests/Components/Loader.test.tsx @@ -1,8 +1,8 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import Loader, { LoaderType } from '../../Components/Loader/Loader'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; import Color from 'Common/Types/Color'; +import React from 'react'; describe('Loader tests', () => { test('it should render if bar loader show up', () => { diff --git a/CommonUI/src/Tests/Components/MasterPage.test.tsx b/CommonUI/src/Tests/Components/MasterPage.test.tsx index 07062206d4..bee4e99f22 100644 --- a/CommonUI/src/Tests/Components/MasterPage.test.tsx +++ b/CommonUI/src/Tests/Components/MasterPage.test.tsx @@ -1,10 +1,10 @@ -import '@testing-library/jest-dom/extend-expect'; -import React from 'react'; -import { render, screen } from '@testing-library/react'; import MasterPage, { ComponentProps, } from '../../Components/MasterPage/MasterPage'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; describe('MasterPage', () => { const defaultProps: ComponentProps = { diff --git a/CommonUI/src/Tests/Components/Modal.test.tsx b/CommonUI/src/Tests/Components/Modal.test.tsx index 64887f526c..cda1a0232a 100644 --- a/CommonUI/src/Tests/Components/Modal.test.tsx +++ b/CommonUI/src/Tests/Components/Modal.test.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; -import Modal, { ModalWidth } from '../../Components/Modal/Modal'; import { ButtonStyleType } from '../../Components/Button/Button'; import ButtonType from '../../Components/Button/ButtonTypes'; -import IconProp from 'Common/Types/Icon/IconProp'; +import Modal, { ModalWidth } from '../../Components/Modal/Modal'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render } from '@testing-library/react'; +import IconProp from 'Common/Types/Icon/IconProp'; +import React from 'react'; describe('Modal', () => { test('renders the modal with the title and description', () => { diff --git a/CommonUI/src/Tests/Components/NavBar.test.tsx b/CommonUI/src/Tests/Components/NavBar.test.tsx index 988a57ad15..251d9d97bf 100644 --- a/CommonUI/src/Tests/Components/NavBar.test.tsx +++ b/CommonUI/src/Tests/Components/NavBar.test.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; import Navbar, { ComponentProps } from '../../Components/Navbar/NavBar'; -import '@testing-library/jest-dom/extend-expect'; -import { ReactElement } from 'react-markdown/lib/react-markdown'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; +import { ReactElement } from 'react-markdown/lib/react-markdown'; describe('Navbar', () => { const defaultProps: ComponentProps = { diff --git a/CommonUI/src/Tests/Components/OrderedStatesList.test.tsx b/CommonUI/src/Tests/Components/OrderedStatesList.test.tsx index af7f867cce..34dd6e8fcd 100644 --- a/CommonUI/src/Tests/Components/OrderedStatesList.test.tsx +++ b/CommonUI/src/Tests/Components/OrderedStatesList.test.tsx @@ -1,10 +1,11 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom'; import OrderedStatesList, { ComponentProps, } from '../../Components/OrderedStatesList/OrderedStatesList'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; + describe('OrderedSateList', () => { interface ItemData { title: string; diff --git a/CommonUI/src/Tests/Components/Pagination.test.tsx b/CommonUI/src/Tests/Components/Pagination.test.tsx index 3adfe7d16a..72c9c44b64 100644 --- a/CommonUI/src/Tests/Components/Pagination.test.tsx +++ b/CommonUI/src/Tests/Components/Pagination.test.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import Pagination, { ComponentProps, } from '../../Components/Pagination/Pagination'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import React from 'react'; describe('Pagination', () => { it('renders Component', () => { diff --git a/CommonUI/src/Tests/Components/Pill.test.tsx b/CommonUI/src/Tests/Components/Pill.test.tsx index 692fcf8b9e..c81194cc74 100644 --- a/CommonUI/src/Tests/Components/Pill.test.tsx +++ b/CommonUI/src/Tests/Components/Pill.test.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; - -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import Pill, { PillSize } from '../../Components/Pill/Pill'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; import Color from 'Common/Types/Color'; +import * as React from 'react'; describe('', () => { test('Checking text', () => { diff --git a/CommonUI/src/Tests/Components/Probe.test.tsx b/CommonUI/src/Tests/Components/Probe.test.tsx index 675fe81966..8b4799a516 100644 --- a/CommonUI/src/Tests/Components/Probe.test.tsx +++ b/CommonUI/src/Tests/Components/Probe.test.tsx @@ -1,9 +1,9 @@ -import * as React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import ProbeElement from '../../Components/Probe/Probe'; -import Probe from 'Model/Models/Probe'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; import ObjectID from 'Common/Types/ObjectID'; +import Probe from 'Model/Models/Probe'; +import * as React from 'react'; describe('ProbeElement Component', () => { const mockProbe: Probe = new Probe(); diff --git a/CommonUI/src/Tests/Components/ProgressBar.test.tsx b/CommonUI/src/Tests/Components/ProgressBar.test.tsx index 8353dc83a8..030e693a33 100644 --- a/CommonUI/src/Tests/Components/ProgressBar.test.tsx +++ b/CommonUI/src/Tests/Components/ProgressBar.test.tsx @@ -1,7 +1,7 @@ -import * as React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; import ProgressBar from '../../Components/ProgressBar/ProgressBar'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import * as React from 'react'; describe('ProgressBar Component', () => { function getProgressBar(): HTMLElement { diff --git a/CommonUI/src/Tests/Components/RadioButtons.test.tsx b/CommonUI/src/Tests/Components/RadioButtons.test.tsx index bb175d74a3..a1de78f570 100644 --- a/CommonUI/src/Tests/Components/RadioButtons.test.tsx +++ b/CommonUI/src/Tests/Components/RadioButtons.test.tsx @@ -1,9 +1,9 @@ -import React from 'react'; import RadioButtons, { RadioButton, } from '../../Components/RadioButtons/GroupRadioButtons'; -import { fireEvent, render } from '@testing-library/react'; import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render } from '@testing-library/react'; +import React from 'react'; describe('RadioButtons', () => { const options: RadioButton[] = [ diff --git a/CommonUI/src/Tests/Components/SideMenuItem.test.tsx b/CommonUI/src/Tests/Components/SideMenuItem.test.tsx index 88cf8b8b1c..002bee583b 100644 --- a/CommonUI/src/Tests/Components/SideMenuItem.test.tsx +++ b/CommonUI/src/Tests/Components/SideMenuItem.test.tsx @@ -1,19 +1,17 @@ // Libraries -import React from 'react'; -import { fireEvent, render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; - +import { BadgeType } from '../../Components/Badge/Badge'; // Components import SideMenuItem, { ComponentProps, } from '../../Components/SideMenu/SideMenuItem'; import * as Navigation from '../../Utils/Navigation'; - +import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; // Types import Route from 'Common/Types/API/Route'; import IconProp from 'Common/Types/Icon/IconProp'; -import { BadgeType } from '../../Components/Badge/Badge'; -import { describe, expect, it } from '@jest/globals'; +import React from 'react'; const highlightClassList: string = 'bg-gray-100 text-indigo-600 hover:bg-white group rounded-md px-3 py-2 flex items-center text-sm font-medium'; diff --git a/CommonUI/src/Tests/Components/SideOver.test.tsx b/CommonUI/src/Tests/Components/SideOver.test.tsx index 654a8f7b87..3f3b94445e 100644 --- a/CommonUI/src/Tests/Components/SideOver.test.tsx +++ b/CommonUI/src/Tests/Components/SideOver.test.tsx @@ -1,7 +1,7 @@ -import React, { ReactElement } from 'react'; import SideOver, { ComponentProps } from '../../Components/SideOver/SideOver'; -import { fireEvent, render, screen } from '@testing-library/react'; import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render, screen } from '@testing-library/react'; +import React, { ReactElement } from 'react'; describe('SideOver', () => { const childElementText: string = 'child element'; diff --git a/CommonUI/src/Tests/Components/Tabs.test.tsx b/CommonUI/src/Tests/Components/Tabs.test.tsx index 2568b33c8b..d497096be3 100644 --- a/CommonUI/src/Tests/Components/Tabs.test.tsx +++ b/CommonUI/src/Tests/Components/Tabs.test.tsx @@ -1,8 +1,8 @@ -import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; -import Tabs from '../../Components/Tabs/Tabs'; import { Tab } from '../../Components/Tabs/Tab'; +import Tabs from '../../Components/Tabs/Tabs'; +import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render } from '@testing-library/react'; +import React from 'react'; describe('Tabs', () => { const activeClass: string = 'bg-gray-100 text-gray-700'; diff --git a/CommonUI/src/Tests/Components/Template/Template.test.tsx b/CommonUI/src/Tests/Components/Template/Template.test.tsx index a9dccdb0b9..e7726b6f06 100644 --- a/CommonUI/src/Tests/Components/Template/Template.test.tsx +++ b/CommonUI/src/Tests/Components/Template/Template.test.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import '@testing-library/jest-dom'; -import { screen, render } from '@testing-library/react'; import Component, { ComponentProps, } from '../../../Components/Template/Template'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; describe('Template Component', () => { const props: ComponentProps = { diff --git a/CommonUI/src/Tests/Components/TextArea.test.tsx b/CommonUI/src/Tests/Components/TextArea.test.tsx index 8283ca8373..67ffd4c9ab 100644 --- a/CommonUI/src/Tests/Components/TextArea.test.tsx +++ b/CommonUI/src/Tests/Components/TextArea.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { fireEvent, render } from '@testing-library/react'; import TextArea from '../../Components/TextArea/TextArea'; import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render } from '@testing-library/react'; +import React from 'react'; describe('TextArea', () => { test('renders textarea element with initialValue only', () => { diff --git a/CommonUI/src/Tests/Components/Toast.test.tsx b/CommonUI/src/Tests/Components/Toast.test.tsx index dd2ef46433..89ca414d8b 100644 --- a/CommonUI/src/Tests/Components/Toast.test.tsx +++ b/CommonUI/src/Tests/Components/Toast.test.tsx @@ -1,10 +1,10 @@ -import * as React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom/extend-expect'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup'; -import userEvent from '@testing-library/user-event'; import Toast, { ToastType } from '../../Components/Toast/Toast'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup'; import OneUptimeDate from 'Common/Types/Date'; +import * as React from 'react'; describe('Test for Toast.tsx', () => { test('should render the component', () => { diff --git a/CommonUI/src/Tests/Components/Toggle.test.tsx b/CommonUI/src/Tests/Components/Toggle.test.tsx index 715e0af351..ca073274e8 100644 --- a/CommonUI/src/Tests/Components/Toggle.test.tsx +++ b/CommonUI/src/Tests/Components/Toggle.test.tsx @@ -1,7 +1,7 @@ -import React from 'react'; import Toggle from '../../Components/Toggle/Toggle'; -import { fireEvent, render } from '@testing-library/react'; import '@testing-library/jest-dom/extend-expect'; +import { fireEvent, render } from '@testing-library/react'; +import React from 'react'; describe('Toggle', () => { test('renders toggle element with required props only', () => { diff --git a/CommonUI/src/Tests/Components/TopSection.test.tsx b/CommonUI/src/Tests/Components/TopSection.test.tsx index 80ddcc62fc..af3f8af39e 100644 --- a/CommonUI/src/Tests/Components/TopSection.test.tsx +++ b/CommonUI/src/Tests/Components/TopSection.test.tsx @@ -1,10 +1,10 @@ -import '@testing-library/jest-dom/extend-expect'; -import React from 'react'; -import { render, screen } from '@testing-library/react'; import TopSection, { ComponentProps, } from '../../Components/TopSection/TopSection'; import { describe, expect, it } from '@jest/globals'; +import '@testing-library/jest-dom/extend-expect'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; describe('TopSection', () => { const defaultProps: ComponentProps = { diff --git a/CommonUI/src/Types/UseComponentOutsideClick.ts b/CommonUI/src/Types/UseComponentOutsideClick.ts index d8d1652171..38fbc854ab 100644 --- a/CommonUI/src/Types/UseComponentOutsideClick.ts +++ b/CommonUI/src/Types/UseComponentOutsideClick.ts @@ -1,9 +1,9 @@ import React, { - useState, + MouseEvent, + MouseEventHandler, useEffect, useRef, - MouseEventHandler, - MouseEvent, + useState, } from 'react'; type UseComponentOutsideClickFunction = (isVisible: boolean) => { diff --git a/CommonUI/src/Utils/API/API.ts b/CommonUI/src/Utils/API/API.ts index dbf6cd185d..92f045f2a0 100644 --- a/CommonUI/src/Utils/API/API.ts +++ b/CommonUI/src/Utils/API/API.ts @@ -1,23 +1,23 @@ +import LocalStorage from '../LocalStorage'; +import Navigation from '../Navigation'; +import PermissionUtil from '../Permission'; import User from '../User'; -import Headers from 'Common/Types/API/Headers'; -import API from 'Common/Utils/API'; -import APIException from 'Common/Types/Exception/ApiException'; import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import Cookies from 'universal-cookie'; -import Protocol from 'Common/Types/API/Protocol'; +import Headers from 'Common/Types/API/Headers'; import Hostname from 'Common/Types/API/Hostname'; +import Protocol from 'Common/Types/API/Protocol'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; -import Navigation from '../Navigation'; import Dictionary from 'Common/Types/Dictionary'; -import PermissionUtil from '../Permission'; +import APIException from 'Common/Types/Exception/ApiException'; +import Exception from 'Common/Types/Exception/Exception'; import JSONFunctions from 'Common/Types/JSONFunctions'; import { UserGlobalAccessPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; -import LocalStorage from '../LocalStorage'; -import Exception from 'Common/Types/Exception/Exception'; +import API from 'Common/Utils/API'; +import Cookies from 'universal-cookie'; class BaseAPI extends API { public constructor(protocol: Protocol, hostname: Hostname, route?: Route) { diff --git a/CommonUI/src/Utils/API/ApiDocsAPI.ts b/CommonUI/src/Utils/API/ApiDocsAPI.ts index cc160f97b7..08084ca806 100644 --- a/CommonUI/src/Utils/API/ApiDocsAPI.ts +++ b/CommonUI/src/Utils/API/ApiDocsAPI.ts @@ -1,6 +1,6 @@ import { API_DOCS_HOSTNAME, HTTP_PROTOCOL } from '../../Config'; -import API from 'Common/Utils/API'; import { ApiReferenceRoute } from 'Common/ServiceRoute'; +import API from 'Common/Utils/API'; class ApiDocsRoute extends API { public constructor() { diff --git a/CommonUI/src/Utils/API/DashboardAPI.ts b/CommonUI/src/Utils/API/DashboardAPI.ts index 6f0c2d25cc..b812680128 100755 --- a/CommonUI/src/Utils/API/DashboardAPI.ts +++ b/CommonUI/src/Utils/API/DashboardAPI.ts @@ -1,6 +1,6 @@ import { APP_HOSTNAME, HTTP_PROTOCOL } from '../../Config'; -import { AppApiRoute } from 'Common/ServiceRoute'; import BaseAPI from './API'; +import { AppApiRoute } from 'Common/ServiceRoute'; class BackendAPI extends BaseAPI { public constructor() { diff --git a/CommonUI/src/Utils/API/IdentityAPI.ts b/CommonUI/src/Utils/API/IdentityAPI.ts index 422dba616e..588471702d 100755 --- a/CommonUI/src/Utils/API/IdentityAPI.ts +++ b/CommonUI/src/Utils/API/IdentityAPI.ts @@ -1,6 +1,6 @@ -import { IDENTITY_HOSTNAME, HTTP_PROTOCOL } from '../../Config'; -import { IdentityRoute } from 'Common/ServiceRoute'; +import { HTTP_PROTOCOL, IDENTITY_HOSTNAME } from '../../Config'; import BaseAPI from './API'; +import { IdentityRoute } from 'Common/ServiceRoute'; class IdentityAPI extends BaseAPI { public constructor() { diff --git a/CommonUI/src/Utils/API/IntegrationAPI.ts b/CommonUI/src/Utils/API/IntegrationAPI.ts index f7e8be853d..7714e29735 100644 --- a/CommonUI/src/Utils/API/IntegrationAPI.ts +++ b/CommonUI/src/Utils/API/IntegrationAPI.ts @@ -1,4 +1,4 @@ -import { INTEGRATION_HOSTNAME, HTTP_PROTOCOL } from '../../Config'; +import { HTTP_PROTOCOL, INTEGRATION_HOSTNAME } from '../../Config'; import BaseAPI from './API'; class BackendAPI extends BaseAPI { diff --git a/CommonUI/src/Utils/Analytics.ts b/CommonUI/src/Utils/Analytics.ts index 4e79271fe7..1dde2d12bf 100644 --- a/CommonUI/src/Utils/Analytics.ts +++ b/CommonUI/src/Utils/Analytics.ts @@ -1,5 +1,5 @@ -import Analytics from 'Common/Utils/Analytics'; import { AnalyticsHost, AnalyticsKey } from '../Config'; +import Analytics from 'Common/Utils/Analytics'; const UiAnalytics: Analytics = new Analytics(AnalyticsHost, AnalyticsKey); diff --git a/CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts b/CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts index f58228bdaf..25f7b910dd 100644 --- a/CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts +++ b/CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts @@ -1,26 +1,26 @@ -import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import Query from '../BaseDatabase/Query'; -import Select from '../BaseDatabase/Select'; +import { FormType } from '../../Components/Forms/ModelForm'; +import { APP_API_URL } from '../../Config'; import API from '../API/API'; +import GroupBy from '../BaseDatabase/GroupBy'; +import BaseListResult from '../BaseDatabase/ListResult'; +import Query from '../BaseDatabase/Query'; +import RequestOptions from '../BaseDatabase/RequestOptions'; +import Select from '../BaseDatabase/Select'; +import Sort from '../BaseDatabase/Sort'; +import Navigation from '../Navigation'; +import ProjectUtil from '../Project'; +import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPMethod from 'Common/Types/API/HTTPMethod'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import { APP_API_URL } from '../../Config'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPMethod from 'Common/Types/API/HTTPMethod'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; import { JSONArray, JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import { FormType } from '../../Components/Forms/ModelForm'; -import Dictionary from 'Common/Types/Dictionary'; -import ProjectUtil from '../Project'; -import Sort from '../BaseDatabase/Sort'; +import ObjectID from 'Common/Types/ObjectID'; import Project from 'Model/Models/Project'; -import Navigation from '../Navigation'; -import BaseListResult from '../BaseDatabase/ListResult'; -import RequestOptions from '../BaseDatabase/RequestOptions'; -import GroupBy from '../BaseDatabase/GroupBy'; export interface ListResult extends BaseListResult {} diff --git a/CommonUI/src/Utils/BaseDatabase/Query.ts b/CommonUI/src/Utils/BaseDatabase/Query.ts index 3043f85dd2..988385f1fc 100644 --- a/CommonUI/src/Utils/BaseDatabase/Query.ts +++ b/CommonUI/src/Utils/BaseDatabase/Query.ts @@ -1,11 +1,11 @@ +import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; import BaseModel from 'Common/Models/BaseModel'; -import CompareBase from 'Common/Types/Database/CompareBase'; import InBetween from 'Common/Types/BaseDatabase/InBetween'; import NotNull from 'Common/Types/BaseDatabase/NotNull'; import Search from 'Common/Types/BaseDatabase/Search'; -import { JSONObject, JSONValue } from 'Common/Types/JSON'; -import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; +import CompareBase from 'Common/Types/Database/CompareBase'; import GenericObject from 'Common/Types/GenericObject'; +import { JSONObject, JSONValue } from 'Common/Types/JSON'; type Query< TBaseModel extends diff --git a/CommonUI/src/Utils/BaseDatabase/RequestOptions.ts b/CommonUI/src/Utils/BaseDatabase/RequestOptions.ts index 0e35db32cd..7efcfdaabf 100644 --- a/CommonUI/src/Utils/BaseDatabase/RequestOptions.ts +++ b/CommonUI/src/Utils/BaseDatabase/RequestOptions.ts @@ -1,5 +1,5 @@ -import Dictionary from 'Common/Types/Dictionary'; import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; export default interface RequestOptions { requestHeaders?: Dictionary | undefined; diff --git a/CommonUI/src/Utils/Cookie.ts b/CommonUI/src/Utils/Cookie.ts index c960414fd0..3f23e393ba 100644 --- a/CommonUI/src/Utils/Cookie.ts +++ b/CommonUI/src/Utils/Cookie.ts @@ -1,11 +1,11 @@ +import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import OneUptimeDate from 'Common/Types/Date'; import Email from 'Common/Types/Email'; import { JSONObject, JSONValue } from 'Common/Types/JSON'; -import Typeof from 'Common/Types/Typeof'; import JSONFunctions from 'Common/Types/JSONFunctions'; +import Typeof from 'Common/Types/Typeof'; import UniversalCookies, { CookieSetOptions } from 'universal-cookie'; -import Route from 'Common/Types/API/Route'; -import OneUptimeDate from 'Common/Types/Date'; export default class Cookie { public static setItem( diff --git a/CommonUI/src/Utils/Dropdown.ts b/CommonUI/src/Utils/Dropdown.ts index 262293388b..9a43d16fba 100644 --- a/CommonUI/src/Utils/Dropdown.ts +++ b/CommonUI/src/Utils/Dropdown.ts @@ -1,5 +1,5 @@ -import BaseModel from 'Common/Models/BaseModel'; import { DropdownOption } from '../Components/Dropdown/Dropdown'; +import BaseModel from 'Common/Models/BaseModel'; type Enum = Record & { [k: number]: string }; diff --git a/CommonUI/src/Utils/File.ts b/CommonUI/src/Utils/File.ts index 2ba1606d5d..52cbb5afbd 100644 --- a/CommonUI/src/Utils/File.ts +++ b/CommonUI/src/Utils/File.ts @@ -1,6 +1,6 @@ +import { FILE_URL } from '../Config'; import URL from 'Common/Types/API/URL'; import ObjectID from 'Common/Types/ObjectID'; -import { FILE_URL } from '../Config'; export default class FileUtil { public static getFileURL(fileId: ObjectID): URL { diff --git a/CommonUI/src/Utils/History.ts b/CommonUI/src/Utils/History.ts index 13e940c1d9..9937105a69 100644 --- a/CommonUI/src/Utils/History.ts +++ b/CommonUI/src/Utils/History.ts @@ -1,2 +1,3 @@ import { createBrowserHistory } from 'history'; + export default createBrowserHistory(); diff --git a/CommonUI/src/Utils/LocalStorage.ts b/CommonUI/src/Utils/LocalStorage.ts index eaaa8a90a5..b7cd3eaeeb 100644 --- a/CommonUI/src/Utils/LocalStorage.ts +++ b/CommonUI/src/Utils/LocalStorage.ts @@ -1,9 +1,9 @@ import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; import Email from 'Common/Types/Email'; import { JSONObject, JSONValue } from 'Common/Types/JSON'; -import Typeof from 'Common/Types/Typeof'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import Dictionary from 'Common/Types/Dictionary'; +import Typeof from 'Common/Types/Typeof'; export default class LocalStorage { public static setItem(key: string, value: JSONValue | Email | URL): void { diff --git a/CommonUI/src/Utils/Login.ts b/CommonUI/src/Utils/Login.ts index ef8ff50f45..95b3105cb1 100644 --- a/CommonUI/src/Utils/Login.ts +++ b/CommonUI/src/Utils/Login.ts @@ -1,13 +1,13 @@ -import UserUtil from '../Utils/User'; -import Navigation from '../Utils/Navigation'; -import Email from 'Common/Types/Email'; -import ObjectID from 'Common/Types/ObjectID'; -import Name from 'Common/Types/Name'; import { DASHBOARD_URL } from '../Config'; -import { JSONObject } from 'Common/Types/JSON'; -import User from 'Model/Models/User'; import Analytics from '../Utils/Analytics'; +import Navigation from '../Utils/Navigation'; +import UserUtil from '../Utils/User'; import BaseModel from 'Common/Models/BaseModel'; +import Email from 'Common/Types/Email'; +import { JSONObject } from 'Common/Types/JSON'; +import Name from 'Common/Types/Name'; +import ObjectID from 'Common/Types/ObjectID'; +import User from 'Model/Models/User'; export default abstract class LoginUtil { public static login(value: JSONObject): void { diff --git a/CommonUI/src/Utils/ModelAPI/ModelAPI.ts b/CommonUI/src/Utils/ModelAPI/ModelAPI.ts index 4a4e2e570b..898c049d91 100644 --- a/CommonUI/src/Utils/ModelAPI/ModelAPI.ts +++ b/CommonUI/src/Utils/ModelAPI/ModelAPI.ts @@ -1,26 +1,26 @@ -import BaseModel from 'Common/Models/BaseModel'; -import ObjectID from 'Common/Types/ObjectID'; -import Query from '../BaseDatabase/Query'; -import Select from '../BaseDatabase/Select'; +import { FormType } from '../../Components/Forms/ModelForm'; +import { APP_API_URL } from '../../Config'; import API from '../../Utils/API/API'; +import GroupBy from '../BaseDatabase/GroupBy'; +import BaseListResult from '../BaseDatabase/ListResult'; +import Query from '../BaseDatabase/Query'; +import BaseRequestOptions from '../BaseDatabase/RequestOptions'; +import Select from '../BaseDatabase/Select'; +import Sort from '../BaseDatabase/Sort'; +import Navigation from '../Navigation'; +import ProjectUtil from '../Project'; +import BaseModel from 'Common/Models/BaseModel'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPMethod from 'Common/Types/API/HTTPMethod'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; import Route from 'Common/Types/API/Route'; import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; import BadDataException from 'Common/Types/Exception/BadDataException'; -import { APP_API_URL } from '../../Config'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import HTTPMethod from 'Common/Types/API/HTTPMethod'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; import { JSONArray, JSONObject } from 'Common/Types/JSON'; import JSONFunctions from 'Common/Types/JSONFunctions'; -import { FormType } from '../../Components/Forms/ModelForm'; -import Dictionary from 'Common/Types/Dictionary'; -import ProjectUtil from '../Project'; -import Sort from '../BaseDatabase/Sort'; +import ObjectID from 'Common/Types/ObjectID'; import Project from 'Model/Models/Project'; -import Navigation from '../Navigation'; -import BaseListResult from '../BaseDatabase/ListResult'; -import BaseRequestOptions from '../BaseDatabase/RequestOptions'; -import GroupBy from '../BaseDatabase/GroupBy'; export class ModelAPIHttpResponse< TBaseModel extends BaseModel diff --git a/CommonUI/src/Utils/Navigation.ts b/CommonUI/src/Utils/Navigation.ts index 452f010c9f..3ec9779178 100644 --- a/CommonUI/src/Utils/Navigation.ts +++ b/CommonUI/src/Utils/Navigation.ts @@ -1,16 +1,16 @@ +import { AgnosticRouteMatch } from '@remix-run/router'; +import Hostname from 'Common/Types/API/Hostname'; import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import ObjectID from 'Common/Types/ObjectID'; import { - NavigateFunction, Location, + NavigateFunction, Params, matchRoutes, } from 'react-router-dom'; -import URL from 'Common/Types/API/URL'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Hostname from 'Common/Types/API/Hostname'; -import ObjectID from 'Common/Types/ObjectID'; -import Dictionary from 'Common/Types/Dictionary'; -import { AgnosticRouteMatch } from '@remix-run/router'; abstract class Navigation { private static navigateHook: NavigateFunction; diff --git a/CommonUI/src/Utils/Permission.ts b/CommonUI/src/Utils/Permission.ts index 6ab917e13f..d9fcce1147 100644 --- a/CommonUI/src/Utils/Permission.ts +++ b/CommonUI/src/Utils/Permission.ts @@ -1,3 +1,4 @@ +import { DropdownOption } from '../Components/Dropdown/Dropdown'; import LocalStorage from './LocalStorage'; import { JSONObject } from 'Common/Types/JSON'; import Permission, { @@ -7,7 +8,6 @@ import Permission, { UserPermission, UserTenantAccessPermission, } from 'Common/Types/Permission'; -import { DropdownOption } from '../Components/Dropdown/Dropdown'; export default class PermissionUtil { public static getGlobalPermissions(): UserGlobalAccessPermission | null { diff --git a/CommonUI/src/Utils/PricingPlan.ts b/CommonUI/src/Utils/PricingPlan.ts index 586cb7cc4a..06663713f9 100644 --- a/CommonUI/src/Utils/PricingPlan.ts +++ b/CommonUI/src/Utils/PricingPlan.ts @@ -1,6 +1,6 @@ import { env } from '../Config'; -import PricingPlanType from 'Common/Types/PricingPlan'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import PricingPlanType from 'Common/Types/PricingPlan'; export default class PricingPlan { public static getPlans(): Array { diff --git a/CommonUI/src/Utils/Project.ts b/CommonUI/src/Utils/Project.ts index e8d6a2e81b..c859ad7fa0 100644 --- a/CommonUI/src/Utils/Project.ts +++ b/CommonUI/src/Utils/Project.ts @@ -1,12 +1,12 @@ +import { BILLING_ENABLED, getAllEnvVars } from '../Config'; import LocalStorage from './LocalStorage'; -import { JSONObject } from 'Common/Types/JSON'; -import Project from 'Model/Models/Project'; +import BaseModel from 'Common/Models/BaseModel'; import SubscriptionPlan, { PlanSelect, } from 'Common/Types/Billing/SubscriptionPlan'; -import { BILLING_ENABLED, getAllEnvVars } from '../Config'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; -import BaseModel from 'Common/Models/BaseModel'; +import Project from 'Model/Models/Project'; export default class ProjectUtil { public static getCurrentProject(): Project | null { diff --git a/CommonUI/src/Utils/Realtime.ts b/CommonUI/src/Utils/Realtime.ts index a3d83b18f2..8c0a4d7968 100644 --- a/CommonUI/src/Utils/Realtime.ts +++ b/CommonUI/src/Utils/Realtime.ts @@ -1,20 +1,20 @@ +import { HOST, HTTP_PROTOCOL } from '../Config'; +import Query from './BaseDatabase/Query'; +import Select from './BaseDatabase/Select'; import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel'; import BaseModel from 'Common/Models/BaseModel'; -import Query from './BaseDatabase/Query'; +import { RealtimeRoute } from 'Common/ServiceRoute'; +import URL from 'Common/Types/API/URL'; +import DatabaseType from 'Common/Types/BaseDatabase/DatabaseType'; +import { JSONObject } from 'Common/Types/JSON'; +import JSONFunctions from 'Common/Types/JSONFunctions'; +import ObjectID from 'Common/Types/ObjectID'; import RealtimeUtil, { EventName, ListenToModelEventJSON, ModelEventType, } from 'Common/Utils/Realtime'; -import ObjectID from 'Common/Types/ObjectID'; import SocketIO, { Socket } from 'socket.io-client'; -import { HOST, HTTP_PROTOCOL } from '../Config'; -import URL from 'Common/Types/API/URL'; -import JSONFunctions from 'Common/Types/JSONFunctions'; -import DatabaseType from 'Common/Types/BaseDatabase/DatabaseType'; -import Select from './BaseDatabase/Select'; -import { JSONObject } from 'Common/Types/JSON'; -import { RealtimeRoute } from 'Common/ServiceRoute'; export interface ListenToModelEvent< Model extends AnalyticsBaseModel | BaseModel diff --git a/CommonUI/src/Utils/StatusPage.ts b/CommonUI/src/Utils/StatusPage.ts index 8e93aec75a..7d9380a0cf 100644 --- a/CommonUI/src/Utils/StatusPage.ts +++ b/CommonUI/src/Utils/StatusPage.ts @@ -1,14 +1,14 @@ -import ObjectID from 'Common/Types/ObjectID'; import { CategoryCheckboxOption, CheckboxCategory, } from '../Components/CategoryCheckbox/CategoryCheckboxTypes'; -import StatusPageResource from 'Model/Models/StatusPageResource'; -import ModelAPI, { ListResult } from '../Utils/ModelAPI/ModelAPI'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import URL from 'Common/Types/API/URL'; -import StatusPageGroup from 'Model/Models/StatusPageGroup'; import { CategoryCheckboxOptionsAndCategories } from '../Components/CategoryCheckbox/Index'; +import ModelAPI, { ListResult } from '../Utils/ModelAPI/ModelAPI'; +import URL from 'Common/Types/API/URL'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import ObjectID from 'Common/Types/ObjectID'; +import StatusPageGroup from 'Model/Models/StatusPageGroup'; +import StatusPageResource from 'Model/Models/StatusPageResource'; export default class StatusPageUtil { public static async getCategoryCheckboxPropsBasedOnResources( diff --git a/CommonUI/src/Utils/Telemetry.ts b/CommonUI/src/Utils/Telemetry.ts index 1f91c2f412..454c956a2f 100644 --- a/CommonUI/src/Utils/Telemetry.ts +++ b/CommonUI/src/Utils/Telemetry.ts @@ -1,19 +1,19 @@ +import { + OpenTelemetryExporterOtlpEndpoint, + OpenTelemetryExporterOtlpHeaders, +} from '../Config'; +import { ZoneContextManager } from '@opentelemetry/context-zone'; +import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'; +import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; +import { Resource } from '@opentelemetry/resources'; import { BatchSpanProcessor, TracerConfig, WebTracerProvider, } from '@opentelemetry/sdk-trace-web'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; -import { Resource } from '@opentelemetry/resources'; -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; -import { - OpenTelemetryExporterOtlpEndpoint, - OpenTelemetryExporterOtlpHeaders, -} from '../Config'; -import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; export default class Telemetry { public static init(data: { serviceName: string }): void { diff --git a/CommonUI/src/Utils/User.ts b/CommonUI/src/Utils/User.ts index 23b00ca201..dc3fd4db16 100644 --- a/CommonUI/src/Utils/User.ts +++ b/CommonUI/src/Utils/User.ts @@ -1,13 +1,13 @@ -import LocalStorage from './LocalStorage'; -import Email from 'Common/Types/Email'; -import URL from 'Common/Types/API/URL'; -import { JSONObject } from 'Common/Types/JSON'; -import ObjectID from 'Common/Types/ObjectID'; -import Name from 'Common/Types/Name'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import Dictionary from 'Common/Types/Dictionary'; -import API from 'Common/Utils/API'; import { IDENTITY_URL } from '../Config'; +import LocalStorage from './LocalStorage'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import Email from 'Common/Types/Email'; +import BadDataException from 'Common/Types/Exception/BadDataException'; +import { JSONObject } from 'Common/Types/JSON'; +import Name from 'Common/Types/Name'; +import ObjectID from 'Common/Types/ObjectID'; +import API from 'Common/Utils/API'; export default class User { public static setProfilePicId(id: ObjectID | null): void { diff --git a/Dashboard/Serve.ts b/Dashboard/Serve.ts index 139eda5644..7893b70d4a 100755 --- a/Dashboard/Serve.ts +++ b/Dashboard/Serve.ts @@ -1,7 +1,7 @@ -import App from 'CommonServer/Utils/StartServer'; +import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; import Express, { ExpressApplication } from 'CommonServer/Utils/Express'; import logger from 'CommonServer/Utils/Logger'; -import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import App from 'CommonServer/Utils/StartServer'; export const APP_NAME: string = 'dashboard'; diff --git a/Dashboard/src/App.tsx b/Dashboard/src/App.tsx index 848c463ceb..ef589bf195 100644 --- a/Dashboard/src/App.tsx +++ b/Dashboard/src/App.tsx @@ -1,64 +1,54 @@ -import React, { useState, useEffect } from 'react'; -import Route from 'Common/Types/API/Route'; -import { - Routes, - Route as PageRoute, - useNavigate, - useLocation, - useParams, -} from 'react-router-dom'; import MasterPage from './Components/MasterPage/MasterPage'; +import ActiveIncidents from './Pages/Global/NewIncidents'; +import ProjectInvitations from './Pages/Global/ProjectInvitations'; +// User Profile +import UserProfileOverview from './Pages/Global/UserProfile/Index'; +import UserProfilePassword from './Pages/Global/UserProfile/Password'; +import UserProfilePicture from './Pages/Global/UserProfile/Picture'; // Pages import Home from './Pages/Home/Home'; import NotOperationalMonitors from './Pages/Home/NotOperationalMonitors'; import OngoingScheduledEvents from './Pages/Home/OngoingScheduledMaintenance'; - -import useAsyncEffect from 'use-async-effect'; - -import Navigation from 'CommonUI/src/Utils/Navigation'; -import RouteMap from './Utils/RouteMap'; -import PageMap from './Utils/PageMap'; - -import { BILLING_ENABLED, APP_API_URL } from 'CommonUI/src/Config'; - -import ActiveIncidents from './Pages/Global/NewIncidents'; -import ProjectInvitations from './Pages/Global/ProjectInvitations'; - -import SettingsDangerZone from './Pages/Settings/DangerZone'; - -// User Profile -import UserProfileOverview from './Pages/Global/UserProfile/Index'; -import UserProfilePicture from './Pages/Global/UserProfile/Picture'; -import UserProfilePassword from './Pages/Global/UserProfile/Password'; - import Logout from './Pages/Logout/Logout'; -import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; -import Project from 'Model/Models/Project'; -import PageNotFound from './Pages/PageNotFound/PageNotFound'; -import Welcome from './Pages/Onboarding/Welcome'; -import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; -import EventName from './Utils/EventName'; - import Sso from './Pages/Onboarding/SSO'; -import API from 'CommonUI/src/Utils/API/API'; -import BillingPaymentMethod from 'Model/Models/BillingPaymentMethod'; +import Welcome from './Pages/Onboarding/Welcome'; import PageComponentProps from './Pages/PageComponentProps'; - -import URL from 'Common/Types/API/URL'; - +import PageNotFound from './Pages/PageNotFound/PageNotFound'; +import SettingsDangerZone from './Pages/Settings/DangerZone'; +import IncidentsRoutes from './Routes/IncidentsRoutes'; //Routes import InitRoutes from './Routes/InitRoutes'; -import TelemetryRoutes from './Routes/TelemetryRoutes'; +import MonitorGroupRoutes from './Routes/MonitorGroupRoutes'; import MonitorsRoutes from './Routes/MonitorsRoutes'; -import WorkflowRoutes from './Routes/WorkflowRoutes'; -import StatusPagesRoutes from './Routes/StatusPagesRoutes'; -import IncidentsRoutes from './Routes/IncidentsRoutes'; +import OnCallDutyRoutes from './Routes/OnCallDutyRoutes'; import ScheduledMaintenanceEventsRoutes from './Routes/ScheduleMaintenaceEventsRoutes'; import SettingsRoutes from './Routes/SettingsRoutes'; -import OnCallDutyRoutes from './Routes/OnCallDutyRoutes'; -import MonitorGroupRoutes from './Routes/MonitorGroupRoutes'; +import StatusPagesRoutes from './Routes/StatusPagesRoutes'; +import TelemetryRoutes from './Routes/TelemetryRoutes'; import UserSettingsRoutes from './Routes/UserSettingsRoutes'; +import WorkflowRoutes from './Routes/WorkflowRoutes'; +import EventName from './Utils/EventName'; +import PageMap from './Utils/PageMap'; +import RouteMap from './Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; +import URL from 'Common/Types/API/URL'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { APP_API_URL, BILLING_ENABLED } from 'CommonUI/src/Config'; +import API from 'CommonUI/src/Utils/API/API'; +import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; +import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import BillingPaymentMethod from 'Model/Models/BillingPaymentMethod'; +import Project from 'Model/Models/Project'; +import React, { useEffect, useState } from 'react'; +import { + Route as PageRoute, + Routes, + useLocation, + useNavigate, + useParams, +} from 'react-router-dom'; +import useAsyncEffect from 'use-async-effect'; const App: () => JSX.Element = () => { Navigation.setNavigateHook(useNavigate()); diff --git a/Dashboard/src/Components/CallSMS/CallSMSConfigTable.tsx b/Dashboard/src/Components/CallSMS/CallSMSConfigTable.tsx index 5f60107934..571cf6a40b 100644 --- a/Dashboard/src/Components/CallSMS/CallSMSConfigTable.tsx +++ b/Dashboard/src/Components/CallSMS/CallSMSConfigTable.tsx @@ -1,27 +1,27 @@ +import EmptyResponseData from 'Common/Types/API/EmptyResponse'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; +import BasicFormModal from 'CommonUI/src/Components/FormModal/BasicFormModal'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; +import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import { NOTIFICATION_URL } from 'CommonUI/src/Config'; +import API from 'CommonUI/src/Utils/API/API'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import ProjectCallSMSConfig from 'Model/Models/ProjectCallSMSConfig'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; -import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes'; -import ProjectCallSMSConfig from 'Model/Models/ProjectCallSMSConfig'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import { JSONObject } from 'Common/Types/JSON'; -import BasicFormModal from 'CommonUI/src/Components/FormModal/BasicFormModal'; -import API from 'CommonUI/src/Utils/API/API'; -import { NOTIFICATION_URL } from 'CommonUI/src/Config'; -import URL from 'Common/Types/API/URL'; -import ObjectID from 'Common/Types/ObjectID'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import EmptyResponseData from 'Common/Types/API/EmptyResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; const CustomCallSMSTable: FunctionComponent = (): ReactElement => { const [showCallTestModal, setShowCallTestModal] = useState(false); diff --git a/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx b/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx index 33b16eff06..f76e356ad9 100644 --- a/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx +++ b/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx @@ -1,27 +1,27 @@ +import EmptyResponseData from 'Common/Types/API/EmptyResponse'; +import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; +import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; +import ObjectID from 'Common/Types/ObjectID'; +import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; +import BasicFormModal from 'CommonUI/src/Components/FormModal/BasicFormModal'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; +import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import { NOTIFICATION_URL } from 'CommonUI/src/Config'; +import API from 'CommonUI/src/Utils/API/API'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import ProjectSmtpConfig from 'Model/Models/ProjectSmtpConfig'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; -import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes'; -import ProjectSmtpConfig from 'Model/Models/ProjectSmtpConfig'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import { JSONObject } from 'Common/Types/JSON'; -import BasicFormModal from 'CommonUI/src/Components/FormModal/BasicFormModal'; -import API from 'CommonUI/src/Utils/API/API'; -import { NOTIFICATION_URL } from 'CommonUI/src/Config'; -import URL from 'Common/Types/API/URL'; -import ObjectID from 'Common/Types/ObjectID'; -import HTTPResponse from 'Common/Types/API/HTTPResponse'; -import EmptyResponseData from 'Common/Types/API/EmptyResponse'; -import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; -import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; const CustomSMTPTable: FunctionComponent = (): ReactElement => { const [showSMTPTestModal, setShowSMTPTestModal] = useState(false); diff --git a/Dashboard/src/Components/CustomSMTP/CustomSMTPView.tsx b/Dashboard/src/Components/CustomSMTP/CustomSMTPView.tsx index 2d0d47651d..b3cb430351 100644 --- a/Dashboard/src/Components/CustomSMTP/CustomSMTPView.tsx +++ b/Dashboard/src/Components/CustomSMTP/CustomSMTPView.tsx @@ -1,9 +1,9 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import Link from 'CommonUI/src/Components/Link/Link'; -import Route from 'Common/Types/API/Route'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; +import Link from 'CommonUI/src/Components/Link/Link'; import ProjectSmtpConfig from 'Model/Models/ProjectSmtpConfig'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { smtp?: ProjectSmtpConfig | undefined; diff --git a/Dashboard/src/Components/Footer/Footer.tsx b/Dashboard/src/Components/Footer/Footer.tsx index 4b147d7557..bb1218635e 100644 --- a/Dashboard/src/Components/Footer/Footer.tsx +++ b/Dashboard/src/Components/Footer/Footer.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import Footer from 'CommonUI/src/Components/Footer/Footer'; -import URL from 'Common/Types/API/URL'; -import API from 'Common/Utils/API'; -import { HOST, HTTP_PROTOCOL } from 'CommonUI/src/Config'; -import { JSONObject } from 'Common/Types/JSON'; -import BadDataException from 'Common/Types/Exception/BadDataException'; -import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import Dictionary from 'Common/Types/Dictionary'; import HTTPResponse from 'Common/Types/API/HTTPResponse'; +import URL from 'Common/Types/API/URL'; +import Dictionary from 'Common/Types/Dictionary'; +import BadDataException from 'Common/Types/Exception/BadDataException'; import { PromiseVoidFunction } from 'Common/Types/FunctionTypes'; +import { JSONObject } from 'Common/Types/JSON'; +import API from 'Common/Utils/API'; +import Footer from 'CommonUI/src/Components/Footer/Footer'; +import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; +import { HOST, HTTP_PROTOCOL } from 'CommonUI/src/Config'; +import React from 'react'; const DashboardFooter: () => JSX.Element = () => { const [showAboutModal, setShowAboutModal] = React.useState(false); diff --git a/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx b/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx index e5468660a3..e6b071fc84 100644 --- a/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx +++ b/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx @@ -1,3 +1,5 @@ +import CriteriaFilterUiUtil from '../../../Utils/Form/Monitor/CriteriaFilter'; +import Route from 'Common/Types/API/Route'; import IconProp from 'Common/Types/Icon/IconProp'; import { CheckOn, @@ -12,6 +14,8 @@ import Button, { ButtonSize, ButtonStyleType, } from 'CommonUI/src/Components/Button/Button'; +import CheckboxElement from 'CommonUI/src/Components/Checkbox/Checkbox'; +import FieldLabelElement from 'CommonUI/src/Components/Detail/FieldLabel'; import Dropdown, { DropdownOption, DropdownValue, @@ -20,10 +24,6 @@ import Input from 'CommonUI/src/Components/Input/Input'; import Link from 'CommonUI/src/Components/Link/Link'; import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; import React, { FunctionComponent, ReactElement, useEffect } from 'react'; -import FieldLabelElement from 'CommonUI/src/Components/Detail/FieldLabel'; -import Route from 'Common/Types/API/Route'; -import CheckboxElement from 'CommonUI/src/Components/Checkbox/Checkbox'; -import CriteriaFilterUiUtil from '../../../Utils/Form/Monitor/CriteriaFilter'; export interface ComponentProps { initialValue: CriteriaFilter | undefined; diff --git a/Dashboard/src/Components/Form/Monitor/CriteriaFilters.tsx b/Dashboard/src/Components/Form/Monitor/CriteriaFilters.tsx index 12de9df17a..9546ba204a 100644 --- a/Dashboard/src/Components/Form/Monitor/CriteriaFilters.tsx +++ b/Dashboard/src/Components/Form/Monitor/CriteriaFilters.tsx @@ -1,17 +1,17 @@ +import CriteriaFilterElement from './CriteriaFilter'; +import IconProp from 'Common/Types/Icon/IconProp'; import { CheckOn, CriteriaFilter, FilterType, } from 'Common/Types/Monitor/CriteriaFilter'; -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; -import CriteriaFilterElement from './CriteriaFilter'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; import Button, { ButtonSize, ButtonStyleType, } from 'CommonUI/src/Components/Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface ComponentProps { initialValue: Array | undefined; diff --git a/Dashboard/src/Components/Form/Monitor/MonitorCriteria.tsx b/Dashboard/src/Components/Form/Monitor/MonitorCriteria.tsx index 41563d22a6..7373fd4731 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorCriteria.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorCriteria.tsx @@ -1,15 +1,15 @@ -import MonitorCriteria from 'Common/Types/Monitor/MonitorCriteria'; -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import MonitorCriteriaInstanceElement from './MonitorCriteriaInstance'; +import IconProp from 'Common/Types/Icon/IconProp'; +import MonitorCriteria from 'Common/Types/Monitor/MonitorCriteria'; +import MonitorCriteriaInstance from 'Common/Types/Monitor/MonitorCriteriaInstance'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; import Button, { ButtonSize, ButtonStyleType, } from 'CommonUI/src/Components/Button/Button'; -import MonitorCriteriaInstance from 'Common/Types/Monitor/MonitorCriteriaInstance'; import { DropdownOption } from 'CommonUI/src/Components/Dropdown/Dropdown'; -import IconProp from 'Common/Types/Icon/IconProp'; import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface ComponentProps { initialValue: MonitorCriteria | undefined; diff --git a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx index 99267e0f67..9961356ea4 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentForm.tsx @@ -1,11 +1,10 @@ -import React, { FunctionComponent, ReactElement } from 'react'; - import { CriteriaIncident } from 'Common/Types/Monitor/CriteriaIncident'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import Incident from 'Model/Models/Incident'; -import BasicForm from 'CommonUI/src/Components/Forms/BasicForm'; 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'; export interface ComponentProps { initialValue?: undefined | CriteriaIncident; diff --git a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentsForm.tsx b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentsForm.tsx index cc7293acdc..60e17ebf6e 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentsForm.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaIncidentsForm.tsx @@ -1,8 +1,8 @@ -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import MonitorCriteriaIncidentForm from './MonitorCriteriaIncidentForm'; import { CriteriaIncident } from 'Common/Types/Monitor/CriteriaIncident'; -import { DropdownOption } from 'CommonUI/src/Components/Dropdown/Dropdown'; import ObjectID from 'Common/Types/ObjectID'; +import { DropdownOption } from 'CommonUI/src/Components/Dropdown/Dropdown'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; export interface ComponentProps { initialValue: Array | undefined; diff --git a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaInstance.tsx b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaInstance.tsx index 87d1133f56..c7a3bb7a6b 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorCriteriaInstance.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorCriteriaInstance.tsx @@ -1,36 +1,36 @@ +import CriteriaFilters from './CriteriaFilters'; +import MonitorCriteriaIncidentsForm from './MonitorCriteriaIncidentsForm'; +import Dictionary from 'Common/Types/Dictionary'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { + CriteriaFilter, + FilterCondition, +} from 'Common/Types/Monitor/CriteriaFilter'; +import { CriteriaIncident } from 'Common/Types/Monitor/CriteriaIncident'; +import MonitorCriteriaInstance from 'Common/Types/Monitor/MonitorCriteriaInstance'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; +import ObjectID from 'Common/Types/ObjectID'; +import Button, { + ButtonSize, + ButtonStyleType, +} from 'CommonUI/src/Components/Button/Button'; +import Dropdown, { + DropdownOption, + DropdownValue, +} from 'CommonUI/src/Components/Dropdown/Dropdown'; +import FieldLabelElement from 'CommonUI/src/Components/Forms/Fields/FieldLabel'; +import HorizontalRule from 'CommonUI/src/Components/HorizontalRule/HorizontalRule'; +import Input from 'CommonUI/src/Components/Input/Input'; +import Radio from 'CommonUI/src/Components/Radio/Radio'; +import TextArea from 'CommonUI/src/Components/TextArea/TextArea'; +import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; +import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import Dropdown, { - DropdownOption, - DropdownValue, -} from 'CommonUI/src/Components/Dropdown/Dropdown'; -import MonitorCriteriaInstance from 'Common/Types/Monitor/MonitorCriteriaInstance'; -import FieldLabelElement from 'CommonUI/src/Components/Forms/Fields/FieldLabel'; -import ObjectID from 'Common/Types/ObjectID'; -import { - CriteriaFilter, - FilterCondition, -} from 'Common/Types/Monitor/CriteriaFilter'; -import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; -import CriteriaFilters from './CriteriaFilters'; -import Button, { - ButtonSize, - ButtonStyleType, -} from 'CommonUI/src/Components/Button/Button'; -import MonitorCriteriaIncidentsForm from './MonitorCriteriaIncidentsForm'; -import { CriteriaIncident } from 'Common/Types/Monitor/CriteriaIncident'; -import Radio from 'CommonUI/src/Components/Radio/Radio'; -import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Input from 'CommonUI/src/Components/Input/Input'; -import TextArea from 'CommonUI/src/Components/TextArea/TextArea'; -import HorizontalRule from 'CommonUI/src/Components/HorizontalRule/HorizontalRule'; -import Dictionary from 'Common/Types/Dictionary'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; export interface ComponentProps { monitorStatusDropdownOptions: Array; diff --git a/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx b/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx index 9343982318..83e71ec9ab 100644 --- a/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx +++ b/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx @@ -1,24 +1,24 @@ -import MonitorSteps from 'Common/Types/Monitor/MonitorSteps'; -import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import MonitorStepElement from './MonitorStep'; +import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; +import MonitorStep from 'Common/Types/Monitor/MonitorStep'; +import MonitorSteps from 'Common/Types/Monitor/MonitorSteps'; +import MonitorType from 'Common/Types/Monitor/MonitorType'; +import ObjectID from 'Common/Types/ObjectID'; +import ComponentLoader from 'CommonUI/src/Components/ComponentLoader/ComponentLoader'; import Dropdown, { DropdownOption, DropdownValue, } from 'CommonUI/src/Components/Dropdown/Dropdown'; -import MonitorStep from 'Common/Types/Monitor/MonitorStep'; -import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import API from 'CommonUI/src/Utils/API/API'; -import ComponentLoader from 'CommonUI/src/Components/ComponentLoader/ComponentLoader'; -import { CustomElementProps } from 'CommonUI/src/Components/Forms/Types/Field'; -import MonitorType from 'Common/Types/Monitor/MonitorType'; -import IncidentSeverity from 'Model/Models/IncidentSeverity'; -import HorizontalRule from 'CommonUI/src/Components/HorizontalRule/HorizontalRule'; import FieldLabelElement from 'CommonUI/src/Components/Forms/Fields/FieldLabel'; -import ObjectID from 'Common/Types/ObjectID'; -import SortOrder from 'Common/Types/BaseDatabase/SortOrder'; +import { CustomElementProps } from 'CommonUI/src/Components/Forms/Types/Field'; +import HorizontalRule from 'CommonUI/src/Components/HorizontalRule/HorizontalRule'; +import API from 'CommonUI/src/Utils/API/API'; +import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import IncidentSeverity from 'Model/Models/IncidentSeverity'; +import MonitorStatus from 'Model/Models/MonitorStatus'; import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; +import React, { FunctionComponent, ReactElement, useEffect } from 'react'; import useAsyncEffect from 'use-async-effect'; export interface ComponentProps extends CustomElementProps { diff --git a/Dashboard/src/Components/Header/Header.tsx b/Dashboard/src/Components/Header/Header.tsx index 28c6795b16..2ac09dc9ca 100644 --- a/Dashboard/src/Components/Header/Header.tsx +++ b/Dashboard/src/Components/Header/Header.tsx @@ -1,36 +1,36 @@ +import EventName from '../../Utils/EventName'; +import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +// import SearchBox from './SearchBox'; +// import Notifications from './Notifications'; +import Help from './Help'; +import Logo from './Logo'; +import ProjectPicker from './ProjectPicker'; +import Upgrade from './Upgrade'; +import UserProfile from './UserProfile'; +import Route from 'Common/Types/API/Route'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import OneUptimeDate from 'Common/Types/Date'; +import { VoidFunction } from 'Common/Types/FunctionTypes'; +import IconProp from 'Common/Types/Icon/IconProp'; +import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; +import Header from 'CommonUI/src/Components/Header/Header'; +import HeaderAlert from 'CommonUI/src/Components/HeaderAlert/HeaderAlert'; +import HeaderModelAlert from 'CommonUI/src/Components/HeaderAlert/HeaderModelAlert'; +import { SizeProp } from 'CommonUI/src/Components/Icon/Icon'; +import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; +import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import User from 'CommonUI/src/Utils/User'; +import Incident from 'Model/Models/Incident'; +import Project from 'Model/Models/Project'; +import TeamMember from 'Model/Models/TeamMember'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -// import SearchBox from './SearchBox'; -// import Notifications from './Notifications'; -import Help from './Help'; -import UserProfile from './UserProfile'; -import ProjectPicker from './ProjectPicker'; -import Header from 'CommonUI/src/Components/Header/Header'; -import Project from 'Model/Models/Project'; -import Logo from './Logo'; -import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; -import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; -import EventName from '../../Utils/EventName'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; -import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; -import PageMap from '../../Utils/PageMap'; -import Upgrade from './Upgrade'; -import { SizeProp } from 'CommonUI/src/Components/Icon/Icon'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Route from 'Common/Types/API/Route'; -import TeamMember from 'Model/Models/TeamMember'; -import User from 'CommonUI/src/Utils/User'; -import Incident from 'Model/Models/Incident'; -import OneUptimeDate from 'Common/Types/Date'; -import HeaderModelAlert from 'CommonUI/src/Components/HeaderAlert/HeaderModelAlert'; -import HeaderAlert from 'CommonUI/src/Components/HeaderAlert/HeaderAlert'; -import { VoidFunction } from 'Common/Types/FunctionTypes'; export interface ComponentProps { projects: Array; diff --git a/Dashboard/src/Components/Header/Help.tsx b/Dashboard/src/Components/Header/Help.tsx index 7d86f62502..9e4ae94178 100644 --- a/Dashboard/src/Components/Header/Help.tsx +++ b/Dashboard/src/Components/Header/Help.tsx @@ -1,10 +1,10 @@ -import React, { ReactElement, useState } from 'react'; +import URL from 'Common/Types/API/URL'; +import IconProp from 'Common/Types/Icon/IconProp'; import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem'; import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu'; import IconDropdownRow from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownRow'; -import IconProp from 'Common/Types/Icon/IconProp'; -import URL from 'Common/Types/API/URL'; +import React, { ReactElement, useState } from 'react'; const Help: () => JSX.Element = (): ReactElement => { const [isDropdownVisible, setIsDropdownVisible] = useState(false); diff --git a/Dashboard/src/Components/Header/Logo.tsx b/Dashboard/src/Components/Header/Logo.tsx index 72677e21f3..bcccffa878 100644 --- a/Dashboard/src/Components/Header/Logo.tsx +++ b/Dashboard/src/Components/Header/Logo.tsx @@ -1,9 +1,8 @@ // Tailwind - -import React, { FunctionComponent, ReactElement } from 'react'; +import Route from 'Common/Types/API/Route'; import Image from 'CommonUI/src/Components/Image/Image'; import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg'; -import Route from 'Common/Types/API/Route'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onClick: () => void; diff --git a/Dashboard/src/Components/Header/Notifications.tsx b/Dashboard/src/Components/Header/Notifications.tsx index e89a24937a..4d45d04ae6 100644 --- a/Dashboard/src/Components/Header/Notifications.tsx +++ b/Dashboard/src/Components/Header/Notifications.tsx @@ -1,8 +1,8 @@ -import React, { ReactElement, useState } from 'react'; -import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; -import Notifications from 'CommonUI/src/Components/Header/Notifications/Notifications'; -import NotificationItem from 'CommonUI/src/Components/Header/Notifications/NotificationItem'; import IconProp from 'Common/Types/Icon/IconProp'; +import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; +import NotificationItem from 'CommonUI/src/Components/Header/Notifications/NotificationItem'; +import Notifications from 'CommonUI/src/Components/Header/Notifications/Notifications'; +import React, { ReactElement, useState } from 'react'; const DashboardHeader: () => JSX.Element = (): ReactElement => { const [isDropdownVisible, setIsDropdownVisible] = useState(false); diff --git a/Dashboard/src/Components/Header/ProjectPicker.tsx b/Dashboard/src/Components/Header/ProjectPicker.tsx index d977fb07a6..f60550e0d9 100644 --- a/Dashboard/src/Components/Header/ProjectPicker.tsx +++ b/Dashboard/src/Components/Header/ProjectPicker.tsx @@ -28,15 +28,13 @@ export interface ComponentProps { onProjectSelected: (project: Project) => void; showProjectModal: boolean; onProjectModalClose: () => void; + selectedProject: Project | null; } const DashboardProjectPicker: FunctionComponent = ( props: ComponentProps ): ReactElement => { const [showModal, setShowModal] = useState(false); - const [selectedProject, setSelectedProject] = useState( - null - ); const [initialValues, setInitialValues] = useState({}); @@ -118,44 +116,35 @@ const DashboardProjectPicker: FunctionComponent = ( useEffect(() => { const currentProject: Project | null = getCurrentProject(); - setSelectedProject(currentProject); + if (currentProject && props.onProjectSelected) { props.onProjectSelected(currentProject); } }, []); - useEffect(() => { - if (selectedProject) { - ProjectUtil.setCurrentProject(selectedProject); - if (props.onProjectSelected) { - props.onProjectSelected(selectedProject); - } - } - }, [selectedProject]); - useEffect(() => { if ( props.projects && props.projects.length > 0 && - !selectedProject && + !props.selectedProject && props.projects[0] ) { const currentProject: Project | null = getCurrentProject(); if (!currentProject) { - setSelectedProject(props.projects[0]); + props.onProjectSelected(props.projects[0]); } else if ( props.projects.filter((project: Project) => { return project._id === currentProject._id; }).length > 0 ) { - setSelectedProject( + props.onProjectSelected( props.projects.filter((project: Project) => { return project._id === currentProject._id; })[0] as Project ); } else { - setSelectedProject(props.projects[0]); + props.onProjectSelected(props.projects[0]); } } }, [props.projects]); @@ -200,15 +189,13 @@ const DashboardProjectPicker: FunctionComponent = ( ).map((plan: SubscriptionPlan): RadioButton => { let description: string = plan.isCustomPricing() ? `Our sales team will contact you soon.` - : `Billed ${ - isSubscriptionPlanYearly - ? 'yearly' - : 'monthly' - }. ${ - plan.getTrialPeriod() > 0 - ? `Free ${plan.getTrialPeriod()} days trial.` - : '' - }`; + : `Billed ${isSubscriptionPlanYearly + ? 'yearly' + : 'monthly' + }. ${plan.getTrialPeriod() > 0 + ? `Free ${plan.getTrialPeriod()} days trial.` + : '' + }`; if ( isSubscriptionPlanYearly && @@ -233,23 +220,22 @@ const DashboardProjectPicker: FunctionComponent = ( sideTitle: plan.isCustomPricing() ? 'Custom Price' : isSubscriptionPlanYearly - ? '$' + - plan - .getYearlySubscriptionAmountInUSD() - .toString() + - '/mo billed yearly' - : '$' + - plan - .getMonthlySubscriptionAmountInUSD() - .toString(), + ? '$' + + plan + .getYearlySubscriptionAmountInUSD() + .toString() + + '/mo billed yearly' + : '$' + + plan + .getMonthlySubscriptionAmountInUSD() + .toString(), sideDescription: plan.isCustomPricing() ? '' : isSubscriptionPlanYearly - ? `~ $${ - plan.getYearlySubscriptionAmountInUSD() * - 12 - } per user / year` - : `/month per user`, + ? `~ $${plan.getYearlySubscriptionAmountInUSD() * + 12 + } per user / year` + : `/month per user`, }; }), title: 'Please select a plan.', @@ -277,7 +263,7 @@ const DashboardProjectPicker: FunctionComponent = ( <> {props.projects.length !== 0 && ( { @@ -285,7 +271,7 @@ const DashboardProjectPicker: FunctionComponent = ( props.onProjectModalClose(); }} onProjectSelected={(project: Project) => { - setSelectedProject(project); + props.onProjectSelected(project); }} /> )} @@ -303,7 +289,9 @@ const DashboardProjectPicker: FunctionComponent = ( submitButtonText="Create Project" onSuccess={(project: Project | null) => { LocalStorage.removeItem('promoCode'); - setSelectedProject(project); + if (project && props.onProjectSelected) { + props.onProjectSelected(project); + } if (project && props.onProjectSelected) { props.onProjectSelected(project); } @@ -314,15 +302,15 @@ const DashboardProjectPicker: FunctionComponent = ( name: 'Create New Project', steps: BILLING_ENABLED ? [ - { - title: 'Basic', - id: 'basic', - }, - { - title: 'Select Plan', - id: 'plan', - }, - ] + { + title: 'Basic', + id: 'basic', + }, + { + title: 'Select Plan', + id: 'plan', + }, + ] : undefined, saveRequestOptions: { isMultiTenantRequest: true, // because this is a tenant request, we do not have to include the header in the request diff --git a/Dashboard/src/Components/Header/SearchBox.tsx b/Dashboard/src/Components/Header/SearchBox.tsx index d90880fcd7..eb2148856e 100644 --- a/Dashboard/src/Components/Header/SearchBox.tsx +++ b/Dashboard/src/Components/Header/SearchBox.tsx @@ -1,6 +1,6 @@ -import React, { FunctionComponent, ReactElement } from 'react'; import SearchBox from 'CommonUI/src/Components/Header/SearchBox'; import Project from 'Model/Models/Project'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { onChange: (search: string) => void; diff --git a/Dashboard/src/Components/Header/Upgrade.tsx b/Dashboard/src/Components/Header/Upgrade.tsx index 590372739a..4be84f5dfb 100644 --- a/Dashboard/src/Components/Header/Upgrade.tsx +++ b/Dashboard/src/Components/Header/Upgrade.tsx @@ -1,17 +1,17 @@ -import React, { ReactElement, useState } from 'react'; +import DashboardNavigation from '../../Utils/Navigation'; +import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; import IconProp from 'Common/Types/Icon/IconProp'; -import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal'; -import Project from 'Model/Models/Project'; -import Navigation from 'CommonUI/src/Utils/Navigation'; +import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan'; +import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal'; import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons'; -import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; -import DashboardNavigation from '../../Utils/Navigation'; import Toggle from 'CommonUI/src/Components/Toggle/Toggle'; +import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config'; import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import Project from 'Model/Models/Project'; +import React, { ReactElement, useState } from 'react'; const Upgrade: () => JSX.Element = (): ReactElement => { const [showModal, setShowModal] = useState(false); diff --git a/Dashboard/src/Components/Header/UserProfile.tsx b/Dashboard/src/Components/Header/UserProfile.tsx index 4d05d9fcb9..042021e559 100644 --- a/Dashboard/src/Components/Header/UserProfile.tsx +++ b/Dashboard/src/Components/Header/UserProfile.tsx @@ -1,24 +1,24 @@ +import EventName from '../../Utils/EventName'; +import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; +import IconProp from 'Common/Types/Icon/IconProp'; +import ObjectID from 'Common/Types/ObjectID'; +import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; +import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem'; +import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu'; +import { ADMIN_DASHBOARD_URL } from 'CommonUI/src/Config'; +import BlankProfilePic from 'CommonUI/src/Images/users/blank-profile.svg'; +import FileUtil from 'CommonUI/src/Utils/File'; +import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; +import Navigation from 'CommonUI/src/Utils/Navigation'; +import User from 'CommonUI/src/Utils/User'; import React, { FunctionComponent, ReactElement, useEffect, useState, } from 'react'; -import IconProp from 'Common/Types/Icon/IconProp'; -import Route from 'Common/Types/API/Route'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; -import PageMap from '../../Utils/PageMap'; -import BlankProfilePic from 'CommonUI/src/Images/users/blank-profile.svg'; -import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton'; -import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem'; -import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu'; -import Navigation from 'CommonUI/src/Utils/Navigation'; -import { ADMIN_DASHBOARD_URL } from 'CommonUI/src/Config'; -import User from 'CommonUI/src/Utils/User'; -import ObjectID from 'Common/Types/ObjectID'; -import FileUtil from 'CommonUI/src/Utils/File'; -import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; -import EventName from '../../Utils/EventName'; export interface ComponentProps { onClickUserProfile: () => void; diff --git a/Dashboard/src/Components/Incident/ChangeState.tsx b/Dashboard/src/Components/Incident/ChangeState.tsx index 968264b7fd..f6368692b6 100644 --- a/Dashboard/src/Components/Incident/ChangeState.tsx +++ b/Dashboard/src/Components/Incident/ChangeState.tsx @@ -1,25 +1,25 @@ +import UserElement from '../User/User'; import OneUptimeDate from 'Common/Types/Date'; import BadDataException from 'Common/Types/Exception/BadDataException'; +import IconProp from 'Common/Types/Icon/IconProp'; import ObjectID from 'Common/Types/ObjectID'; import Button, { ButtonSize, ButtonStyleType, } from 'CommonUI/src/Components/Button/Button'; -import IconProp from 'Common/Types/Icon/IconProp'; +import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; +import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal'; import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; import ProjectUtil from 'CommonUI/src/Utils/Project'; import IncidentState from 'Model/Models/IncidentState'; import IncidentStateTimeline from 'Model/Models/IncidentStateTimeline'; import React, { - useState, - useEffect, FunctionComponent, ReactElement, + useEffect, + useState, } from 'react'; -import UserElement from '../User/User'; -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import { FormType } from 'CommonUI/src/Components/Forms/ModelForm'; -import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal'; export enum IncidentType { Ack, diff --git a/Dashboard/src/Components/Incident/Incident.tsx b/Dashboard/src/Components/Incident/Incident.tsx index 3f2e35ac58..f4850f64de 100644 --- a/Dashboard/src/Components/Incident/Incident.tsx +++ b/Dashboard/src/Components/Incident/Incident.tsx @@ -1,10 +1,10 @@ -import React, { FunctionComponent, ReactElement } from 'react'; -import Link from 'CommonUI/src/Components/Link/Link'; -import Route from 'Common/Types/API/Route'; -import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; import PageMap from '../../Utils/PageMap'; +import RouteMap, { RouteUtil } from '../../Utils/RouteMap'; +import Route from 'Common/Types/API/Route'; import ObjectID from 'Common/Types/ObjectID'; +import Link from 'CommonUI/src/Components/Link/Link'; import Incident from 'Model/Models/Incident'; +import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { incident: Incident; diff --git a/Dashboard/src/Components/Incident/IncidentsTable.tsx b/Dashboard/src/Components/Incident/IncidentsTable.tsx index 67d2f7af47..f6e9c0102c 100644 --- a/Dashboard/src/Components/Incident/IncidentsTable.tsx +++ b/Dashboard/src/Components/Incident/IncidentsTable.tsx @@ -1,41 +1,41 @@ -import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; -import FieldType from 'CommonUI/src/Components/Types/FieldType'; -import React, { FunctionComponent, ReactElement, useState } from 'react'; -import Incident from 'Model/Models/Incident'; -import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; -import MonitorStatus from 'Model/Models/MonitorStatus'; -import { JSONObject } from 'Common/Types/JSON'; -import Pill from 'CommonUI/src/Components/Pill/Pill'; -import Monitor from 'Model/Models/Monitor'; -import MonitorsElement from '../../Components/Monitor/Monitors'; -import IncidentState from 'Model/Models/IncidentState'; -import Label from 'Model/Models/Label'; import LabelsElement from '../../Components/Label/Labels'; -import IncidentSeverity from 'Model/Models/IncidentSeverity'; -import Query from 'CommonUI/src/Utils/BaseDatabase/Query'; -import Route from 'Common/Types/API/Route'; -import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; +import MonitorsElement from '../../Components/Monitor/Monitors'; import EventName from '../../Utils/EventName'; import DashboardNavigation from '../../Utils/Navigation'; -import Team from 'Model/Models/Team'; import ProjectUser from '../../Utils/ProjectUser'; -import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; -import IncidentTemplate from 'Model/Models/IncidentTemplate'; -import IconProp from 'Common/Types/Icon/IconProp'; -import BasicFormModal from 'CommonUI/src/Components/FormModal/BasicFormModal'; -import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import BaseModel from 'Common/Models/BaseModel'; +import Route from 'Common/Types/API/Route'; +import { Black } from 'Common/Types/BrandColors'; import { LIMIT_PER_PROJECT } from 'Common/Types/Database/LimitMax'; -import API from 'CommonUI/src/Utils/API/API'; -import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; -import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; -import IncidentTemplateOwnerUser from 'Model/Models/IncidentTemplateOwnerUser'; -import IncidentTemplateOwnerTeam from 'Model/Models/IncidentTemplateOwnerTeam'; +import IconProp from 'Common/Types/Icon/IconProp'; +import { JSONObject } from 'Common/Types/JSON'; import ObjectID from 'Common/Types/ObjectID'; import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button'; -import BaseModel from 'Common/Models/BaseModel'; +import BasicFormModal from 'CommonUI/src/Components/FormModal/BasicFormModal'; +import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType'; import FormValues from 'CommonUI/src/Components/Forms/Types/FormValues'; -import { Black } from 'Common/Types/BrandColors'; +import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal'; import { ModalTableBulkDefaultActions } from 'CommonUI/src/Components/ModelTable/BaseModelTable'; +import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable'; +import Pill from 'CommonUI/src/Components/Pill/Pill'; +import FieldType from 'CommonUI/src/Components/Types/FieldType'; +import API from 'CommonUI/src/Utils/API/API'; +import Query from 'CommonUI/src/Utils/BaseDatabase/Query'; +import DropdownUtil from 'CommonUI/src/Utils/Dropdown'; +import GlobalEvents from 'CommonUI/src/Utils/GlobalEvents'; +import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI'; +import Incident from 'Model/Models/Incident'; +import IncidentSeverity from 'Model/Models/IncidentSeverity'; +import IncidentState from 'Model/Models/IncidentState'; +import IncidentTemplate from 'Model/Models/IncidentTemplate'; +import IncidentTemplateOwnerTeam from 'Model/Models/IncidentTemplateOwnerTeam'; +import IncidentTemplateOwnerUser from 'Model/Models/IncidentTemplateOwnerUser'; +import Label from 'Model/Models/Label'; +import Monitor from 'Model/Models/Monitor'; +import MonitorStatus from 'Model/Models/MonitorStatus'; +import OnCallDutyPolicy from 'Model/Models/OnCallDutyPolicy'; +import Team from 'Model/Models/Team'; +import React, { FunctionComponent, ReactElement, useState } from 'react'; export interface ComponentProps { query?: Query | undefined; diff --git a/Dashboard/src/Components/Label/Label.tsx b/Dashboard/src/Components/Label/Label.tsx index 937862d543..5f8f29cb92 100644 --- a/Dashboard/src/Components/Label/Label.tsx +++ b/Dashboard/src/Components/Label/Label.tsx @@ -1,6 +1,6 @@ -import Label from 'Model/Models/Label'; -import Pill from 'CommonUI/src/Components/Pill/Pill'; import { Black } from 'Common/Types/BrandColors'; +import Pill from 'CommonUI/src/Components/Pill/Pill'; +import Label from 'Model/Models/Label'; import React, { FunctionComponent, ReactElement } from 'react'; export interface ComponentProps { diff --git a/Dashboard/src/Components/Label/Labels.tsx b/Dashboard/src/Components/Label/Labels.tsx index 0897cc4dfe..533cefce04 100644 --- a/Dashboard/src/Components/Label/Labels.tsx +++ b/Dashboard/src/Components/Label/Labels.tsx @@ -1,6 +1,6 @@ +import LabelElement from './Label'; import Label from 'Model/Models/Label'; import React, { FunctionComponent, ReactElement } from 'react'; -import LabelElement from './Label'; export interface ComponentProps { labels: Array