Merge pull request OneUptime#1626 from OneUptime/merge-dir

refactor: Update import statements for ProbeMonitor and ServerMonitor…
yonasBSD · Aug 5, 2024 · ea0d1a4 · ea0d1a4
2 parents 7b99467 + ea3c357
commit ea0d1a4
Show file tree

Hide file tree

Showing 912 changed files with 4,335 additions and 17,412 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -20,8 +20,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd Accounts && npm install && npm run compile && npm run dep-check
@@ -36,7 +34,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
       - run: cd CommonServer && npm install
       - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
 
@@ -50,23 +47,8 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install && npm run compile && npm run dep-check
 
-  compile-common-project:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonProject && npm install && npm run compile && npm run dep-check
-
   compile-common-ui:
     runs-on: ubuntu-latest
     env:
@@ -77,8 +59,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonUI && npm install --force && npm run compile && npm run dep-check
 
   compile-common:
@@ -90,9 +70,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install && npm run compile && npm run dep-check
+      - run: cd Common && npm install && npm run compile && npm run dep-check
 
   compile-app:
     runs-on: ubuntu-latest
@@ -104,8 +82,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd App && npm install && npm run compile && npm run dep-check
@@ -120,8 +96,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd Copilot && npm install && npm run compile && npm run dep-check
 
@@ -135,8 +109,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd Nginx && npm install && npm run compile && npm run dep-check
@@ -162,8 +134,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check
@@ -178,27 +148,11 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd Dashboard && npm install && npm run compile && npm run dep-check
 
 
-  compile-model:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd Model && npm install && npm run compile && npm run dep-check
-
   compile-e2e:
     runs-on: ubuntu-latest
     env:
@@ -209,7 +163,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
       - run: cd E2E && npm install && npm run compile && npm run dep-check
 
   compile-probe:
@@ -222,8 +175,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd Probe && npm install && npm run compile && npm run dep-check
 
@@ -237,8 +188,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd Ingestor && npm install && npm run compile && npm run dep-check
 
@@ -253,8 +202,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd StatusPage && npm install && npm run compile && npm run dep-check
@@ -269,7 +216,5 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd TestServer && npm install && npm run compile && npm run dep-check
diff --git a/.github/workflows/test.common-server.yaml b/.github/workflows/test.common-server.yaml
@@ -18,7 +18,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonServer && bash test-setup.sh
       - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && rm -rf build && npm run test
diff --git a/.github/workflows/test.common.yaml b/.github/workflows/test.common.yaml
@@ -16,7 +16,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18.3.0
-      - run: cd Model && npm install 
+          node-version: 18.3.0 
       - run: cd Common && npm install && npm run test
 
diff --git a/.github/workflows/test.commonui.yaml b/.github/workflows/test.commonui.yaml
@@ -18,6 +18,5 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd Model && npm install
       - run: cd CommonUI && npm install --force && npm run test
 
diff --git a/.github/workflows/test.model.yaml b/.github/workflows/test.model.yaml
@@ -17,7 +17,5 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd Model && npm install && npm run test
+      - run: cd Common && npm install && npm run test
 
diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl
@@ -36,19 +36,8 @@ COPY ./Common /usr/src/Common
 
 
 
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-# Set version in ./Model/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
-RUN npm install
-COPY ./Model /usr/src/Model
 
-WORKDIR /usr/src/CommonProject
-COPY ./CommonProject/package*.json /usr/src/CommonProject/
-# Set version in ./CommonProject/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
-RUN npm install
-COPY ./CommonProject /usr/src/CommonProject
+
 
 
 

diff --git a/Accounts/package.json b/Accounts/package.json
@@ -27,14 +27,12 @@
     },
     "dependencies": {
         "Common": "file:../Common",
-
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
         "css-loader": "^6.11.0",
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
         "file-loader": "^6.2.0",
-        "Model": "file:../Model",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",

diff --git a/Accounts/src/Pages/ForgotPassword.tsx b/Accounts/src/Pages/ForgotPassword.tsx
@@ -5,7 +5,7 @@ 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 User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 
 const ForgotPassword: () => JSX.Element = () => {

diff --git a/Accounts/src/Pages/Login.tsx b/Accounts/src/Pages/Login.tsx
@@ -12,10 +12,10 @@ 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 UserTwoFactorAuth from "Model/Models/UserTwoFactorAuth";
+import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
 import Navigation from "CommonUI/src/Utils/Navigation";
 import UserUtil from "CommonUI/src/Utils/User";
-import User from "Model/Models/User";
+import User from "Common/Models/DatabaseModels/User";
 import React from "react";
 import useAsyncEffect from "use-async-effect";
 import StaticModelList from "CommonUI/src/Components/ModelList/StaticModelList";

diff --git a/Accounts/src/Pages/LoginWithSSO.tsx b/Accounts/src/Pages/LoginWithSSO.tsx
@@ -8,9 +8,9 @@ import { DASHBOARD_URL, IDENTITY_URL } from "CommonUI/src/Config";
 import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
 import Navigation from "CommonUI/src/Utils/Navigation";
 import UserUtil from "CommonUI/src/Utils/User";
-import User from "Model/Models/User";
+import User from "Common/Models/DatabaseModels/User";
 import React, { ReactElement, useState } from "react";
-import ProjectSSO from "Model/Models/ProjectSso";
+import ProjectSSO from "Common/Models/DatabaseModels/ProjectSso";
 import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
 import API from "CommonUI/src/Utils/API/API";
 import BasicForm from "CommonUI/src/Components/Forms/BasicForm";

diff --git a/Accounts/src/Pages/Register.tsx b/Accounts/src/Pages/Register.tsx
@@ -18,8 +18,8 @@ import LoginUtil from "CommonUI/src/Utils/Login";
 import ModelAPI, { ListResult } from "CommonUI/src/Utils/ModelAPI/ModelAPI";
 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 Reseller from "Common/Models/DatabaseModels/Reseller";
+import User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 import useAsyncEffect from "use-async-effect";
 

diff --git a/Accounts/src/Pages/ResetPassword.tsx b/Accounts/src/Pages/ResetPassword.tsx
@@ -6,7 +6,7 @@ import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSc
 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 User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 
 const RegisterPage: () => JSX.Element = () => {

diff --git a/Accounts/src/Pages/VerifyEmail.tsx b/Accounts/src/Pages/VerifyEmail.tsx
@@ -10,7 +10,7 @@ import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.
 import API from "CommonUI/src/Utils/API/API";
 import ModelAPI from "CommonUI/src/Utils/ModelAPI/ModelAPI";
 import Navigation from "CommonUI/src/Utils/Navigation";
-import EmailVerificationToken from "Model/Models/EmailVerificationToken";
+import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
 import React, { useEffect, useState } from "react";
 
 const VerifyEmail: () => JSX.Element = () => {

diff --git a/AdminDashboard/Dockerfile.tpl b/AdminDashboard/Dockerfile.tpl
@@ -35,19 +35,8 @@ RUN npm install
 COPY ./Common /usr/src/Common
 
 
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-# Set version in ./Model/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
-RUN npm install
-COPY ./Model /usr/src/Model
 
-WORKDIR /usr/src/CommonProject
-COPY ./CommonProject/package*.json /usr/src/CommonProject/
-# Set version in ./CommonProject/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
-RUN npm install
-COPY ./CommonProject /usr/src/CommonProject
+
 
 
 

diff --git a/AdminDashboard/package.json b/AdminDashboard/package.json
@@ -9,7 +9,6 @@
         "CommonUI": "file:../CommonUI",
         "dotenv": "^16.4.5",
         "file-loader": "^6.2.0",
-        "Model": "file:../Model",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",

diff --git a/AdminDashboard/src/Components/Header/ProjectPicker.tsx b/AdminDashboard/src/Components/Header/ProjectPicker.tsx
@@ -10,7 +10,7 @@ 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 Project from "Common/Models/DatabaseModels/Project";
 import React, {
   FunctionComponent,
   ReactElement,

diff --git a/AdminDashboard/src/Components/Header/SearchBox.tsx b/AdminDashboard/src/Components/Header/SearchBox.tsx
@@ -1,5 +1,5 @@
 import SearchBox from "CommonUI/src/Components/Header/SearchBox";
-import Project from "Model/Models/Project";
+import Project from "Common/Models/DatabaseModels/Project";
 import React, { FunctionComponent, ReactElement } from "react";
 
 export interface ComponentProps {

diff --git a/AdminDashboard/src/Pages/Projects/Index.tsx b/AdminDashboard/src/Pages/Projects/Index.tsx
@@ -13,8 +13,8 @@ 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 Project from "Common/Models/DatabaseModels/Project";
+import User from "Common/Models/DatabaseModels/User";
 import React, {
   FunctionComponent,
   ReactElement,

diff --git a/AdminDashboard/src/Pages/Projects/View/Delete.tsx b/AdminDashboard/src/Pages/Projects/View/Delete.tsx
@@ -6,7 +6,7 @@ import ModelDelete from "CommonUI/src/Components/ModelDelete/ModelDelete";
 import Navigation from "CommonUI/src/Utils/Navigation";
 import React, { FunctionComponent, ReactElement } from "react";
 import SideMenuComponent from "./SideMenu";
-import Project from "Model/Models/Project";
+import Project from "Common/Models/DatabaseModels/Project";
 import ModelPage from "CommonUI/src/Components/Page/ModelPage";
 
 const DeletePage: FunctionComponent = (): ReactElement => {

diff --git a/AdminDashboard/src/Pages/Projects/View/Index.tsx b/AdminDashboard/src/Pages/Projects/View/Index.tsx
@@ -3,7 +3,7 @@ import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import Navigation from "CommonUI/src/Utils/Navigation";
-import Project from "Model/Models/Project";
+import Project from "Common/Models/DatabaseModels/Project";
 import React, { FunctionComponent, ReactElement } from "react";
 import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
 import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";

diff --git a/AdminDashboard/src/Pages/Settings/APIKey/Index.tsx b/AdminDashboard/src/Pages/Settings/APIKey/Index.tsx
@@ -7,7 +7,7 @@ import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSc
 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 GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {

diff --git a/AdminDashboard/src/Pages/Settings/Authentication/Index.tsx b/AdminDashboard/src/Pages/Settings/Authentication/Index.tsx
@@ -7,7 +7,7 @@ import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSc
 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 GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {