refactor: Update import statements for CommonUI to use Common/UI

2026-01-11 19:56:44 +00:00 · 2024-08-07 16:14:31 -06:00 · 2024-08-07 16:14:31 -06:00 · 86e5a33bd9
commit 86e5a33bd9
parent 3eb6f4da5f
40 changed files with 47 additions and 85 deletions
--- a/.github/workflows/test.common-server.yaml
+++ b/.github/workflows/test.common-server.yaml
@ -1,22 +0,0 @@
-name: Common Server Test
-
-on:
-  pull_request: 
-  push:
-    branches-ignore:
-      - 'hotfix-*'   # excludes hotfix branches
-      - 'release'
-
-jobs:
-  test:
-    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 CommonServer && bash test-setup.sh
-      - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && rm -rf build && npm run test
--- a/.github/workflows/test.common.yaml
+++ b/.github/workflows/test.common.yaml
@ -17,5 +17,6 @@ jobs:
      - uses: actions/setup-node@v2
        with:
          node-version: 18.3.0 
+      - run: cd Common/Tests && bash test-setup.sh
      - run: cd Common && npm install && npm run test
  
--- a/.prettierignore
+++ b/.prettierignore
@ -51,6 +51,3 @@ licenses/*
 certifications/*
 ApiReference/public/assets/*
 JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/*
-
-
-CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -218,12 +218,12 @@
            "autoAttachChildProcesses": true
        },
        {
-            "name": "CommonServer: Debug Tests",
+            "name": "Common: Debug Tests",
            "type": "node",
            "restart": true,
            "autoAttachChildProcesses": true,
            "request": "launch",
-            "cwd": "${workspaceRoot}/CommonServer",
+            "cwd": "${workspaceRoot}/Common",
            "runtimeExecutable": "npm",
            "runtimeArgs": [
                "run-script",
--- a/Accounts/package-lock.json
+++ b/Accounts/package-lock.json
@ -9,7 +9,7 @@
            "version": "0.1.0",
            "dependencies": {
                "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
+            
                "css-loader": "^6.11.0",
                "dotenv": "^16.4.5",
                "express": "^4.19.2",
--- a/Accounts/package.json
+++ b/Accounts/package.json
@ -27,7 +27,6 @@
    },
    "dependencies": {
        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
        "css-loader": "^6.11.0",
        "dotenv": "^16.4.5",
        "express": "^4.19.2",
--- a/AdminDashboard/package-lock.json
+++ b/AdminDashboard/package-lock.json
@ -9,7 +9,7 @@
            "version": "0.1.0",
            "dependencies": {
                "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
+            
                "dotenv": "^16.4.5",
                "file-loader": "^6.2.0",
                "react": "^18.3.1",
--- a/AdminDashboard/package.json
+++ b/AdminDashboard/package.json
@ -5,7 +5,6 @@
    "dependencies": {
        "Common": "file:../Common",
    
-        "CommonServer": "file:../CommonServer",
        "dotenv": "^16.4.5",
        "file-loader": "^6.2.0",
        "react": "^18.3.1",
--- a/App/nodemon.json
+++ b/App/nodemon.json
@ -1,5 +1,5 @@
 {
-    "watch": ["./","../Common", "../CommonServer", "../Model"],
+    "watch": ["./","../Common"],
    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "ignore": [
        "greenlock.d/*"
--- a/App/package-lock.json
+++ b/App/package-lock.json
@ -11,7 +11,6 @@
      "dependencies": {
        "@sendgrid/mail": "^8.1.0",
        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
        "ejs": "^3.1.9",
        "handlebars": "^4.7.8",
        "nodemailer": "^6.9.7",
--- a/App/package.json
+++ b/App/package.json
@ -19,7 +19,7 @@
    "@sendgrid/mail": "^8.1.0",
    "Common": "file:../Common",
    
-    "CommonServer": "file:../CommonServer",
+
    "ejs": "^3.1.9",
    "handlebars": "^4.7.8",
    "nodemailer": "^6.9.7",
--- a/Common/Server/Utils/Environment.ts
+++ b/Common/Server/Utils/Environment.ts
@ -12,7 +12,7 @@ if (Env === AppEnvironment.Development || Env === AppEnvironment.Test) {
    path: "../Common/.env",
  });
  dotenv.config({
-    path: "../CommonServer/.env",
+    path: "../Common/Server/.env",
  });
  dotenv.config({
    path: "./.env",
--- a/Common/Tests/Server/TestingUtils/Init.ts
+++ b/Common/Tests/Server/TestingUtils/Init.ts
@ -1,5 +1,5 @@
 import "../../../Server/Utils/Environment";

-// Env vars are actually changed in CommonServer/test-setup.sh
+// Env vars are actually changed in Common/Server/test-setup.sh

 process.env["NODE_ENV"] = "test";
--- a/Common/Server/test-setup.sh
+++ b/Common/Server/test-setup.sh
--- a/Copilot/nodemon.json
+++ b/Copilot/nodemon.json
@ -1,9 +1,7 @@
 {
    "watch": [
        "./",
-        "../Common",
-        "../CommonServer",
-        "../Model"
+        "../Common"
    ],
    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
--- a/Copilot/package-lock.json
+++ b/Copilot/package-lock.json
@ -11,7 +11,7 @@
            "dependencies": {
                "Common": "file:../Common",
    
-                "CommonServer": "file:../CommonServer",
+            
                "dotenv": "^16.4.5",
                "Model": "file:../Model",
                "openai": "^4.52.5",
--- a/Copilot/package.json
+++ b/Copilot/package.json
@ -17,7 +17,6 @@
    "dependencies": {
        "Common": "file:../Common",
    
-        "CommonServer": "file:../CommonServer",
        "dotenv": "^16.4.5",
        "openai": "^4.52.5",
        "ts-node": "^10.9.1"
--- a/Dashboard/package-lock.json
+++ b/Dashboard/package-lock.json
@ -11,7 +11,7 @@
                "@stripe/react-stripe-js": "^1.15.0",
                "@stripe/stripe-js": "^1.44.1",
                "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
+            
                "dotenv": "^16.4.5",
                "file-loader": "^6.2.0",
                "react": "^18.3.1",
--- a/Dashboard/package.json
+++ b/Dashboard/package.json
@ -32,7 +32,6 @@
        "@stripe/stripe-js": "^1.44.1",
        "Common": "file:../Common",
    
-        "CommonServer": "file:../CommonServer",
        "dotenv": "^16.4.5",
        "file-loader": "^6.2.0",
        "react": "^18.3.1",
--- a/Ingestor/nodemon.json
+++ b/Ingestor/nodemon.json
@ -1,5 +1,5 @@
 {
-    "watch": ["./","../Common", "../CommonServer", "../Model"],
+    "watch": ["./","../Common"],
        "ext": "ts,json,tsx,env,js,jsx,hbs",
        "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
    }
--- a/Ingestor/package-lock.json
+++ b/Ingestor/package-lock.json
@ -10,7 +10,7 @@
            "license": "Apache-2.0",
            "dependencies": {
                "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
+            
                "ejs": "^3.1.10",
                "Model": "file:../Model",
                "protobufjs": "^7.3.2",
--- a/Ingestor/package.json
+++ b/Ingestor/package.json
@ -17,7 +17,6 @@
    "dependencies": {
        "Common": "file:../Common",
    
-        "CommonServer": "file:../CommonServer",
        "ejs": "^3.1.10",
        "protobufjs": "^7.3.2",
        "ts-node": "^10.9.1"
--- a/IsolatedVM/nodemon.json
+++ b/IsolatedVM/nodemon.json
@ -1,5 +1,5 @@
 {
-    "watch": ["./","../Common", "../CommonServer", "../Model"],
+    "watch": ["./","../Common"],
        "ext": "ts,json,tsx,env,js,jsx,hbs",
        "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
    }
--- a/IsolatedVM/package-lock.json
+++ b/IsolatedVM/package-lock.json
@ -11,7 +11,7 @@
            "dependencies": {
                "Common": "file:../Common",
    
-                "CommonServer": "file:../CommonServer",
+            
                "ts-node": "^10.9.1"
            },
            "devDependencies": {
--- a/IsolatedVM/package.json
+++ b/IsolatedVM/package.json
@ -17,7 +17,6 @@
    "dependencies": {
        "Common": "file:../Common",
    
-        "CommonServer": "file:../CommonServer",
        "ts-node": "^10.9.1"
    },
    "devDependencies": {
--- a/Nginx/package-lock.json
+++ b/Nginx/package-lock.json
@ -10,7 +10,6 @@
      "license": "Apache-2.0",
      "dependencies": {
        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
        "ts-node": "^10.9.1"
      },
      "devDependencies": {
--- a/Nginx/package.json
+++ b/Nginx/package.json
@ -14,7 +14,7 @@
  "dependencies": {
    "Common": "file:../Common",
    
-    "CommonServer": "file:../CommonServer",
+
    "ts-node": "^10.9.1"
  },
  "devDependencies": {
--- a/Probe/nodemon.json
+++ b/Probe/nodemon.json
@ -1,5 +1,5 @@
 {
-"watch": ["./","../Common", "../CommonServer", "../Model"],
+"watch": ["./","../Common"],
    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
 }
--- a/Probe/package-lock.json
+++ b/Probe/package-lock.json
@ -12,7 +12,6 @@
        "@types/ping": "^0.4.4",
        "axios": "^1.7.2",
        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
        "ejs": "^3.1.10",
        "ping": "^0.4.4",
        "playwright": "^1.45.1",
--- a/Probe/package.json
+++ b/Probe/package.json
@ -21,7 +21,7 @@
    "axios": "^1.7.2",
    "Common": "file:../Common",
    
-    "CommonServer": "file:../CommonServer",
+
    "ejs": "^3.1.10",
    "ping": "^0.4.4",
    "playwright": "1.45.1",
--- a/Scripts/package-lock.json
+++ b/Scripts/package-lock.json
@ -11,7 +11,6 @@
      "dependencies": {
        "Common": "file:../Common",
    
-        "CommonServer": "file:../CommonServer",
        "ejs": "^3.1.10",
        "ts-node": "^10.9.2"
      },
--- a/Scripts/package.json
+++ b/Scripts/package.json
@ -8,7 +8,7 @@
  "dependencies": {
    "Common": "file:../Common",
    
-    "CommonServer": "file:../CommonServer",
+
    "ejs": "^3.1.10",
    "ts-node": "^10.9.2"
  },
--- a/StatusPage/package-lock.json
+++ b/StatusPage/package-lock.json
@ -9,7 +9,6 @@
      "version": "0.1.0",
      "dependencies": {
        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
        "css-loader": "^6.11.0",
        "dotenv": "^16.4.5",
        "express": "^4.19.2",
--- a/StatusPage/package.json
+++ b/StatusPage/package.json
@ -29,7 +29,7 @@
  "dependencies": {
    "Common": "file:../Common",
    
-    "CommonServer": "file:../CommonServer",
+
    "css-loader": "^6.11.0",
    "dotenv": "^16.4.5",
    "express": "^4.19.2",
--- a/TestServer/nodemon.json
+++ b/TestServer/nodemon.json
@ -1,5 +1,5 @@
 {
-    "watch": ["./","../Common", "../CommonServer", "../Model"],
+    "watch": ["./","../Common"],
        "ext": "ts,json,tsx,env,js,jsx,hbs",
        "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
    }
--- a/TestServer/package-lock.json
+++ b/TestServer/package-lock.json
@ -10,7 +10,7 @@
            "license": "Apache-2.0",
            "dependencies": {
                "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
+            
                "ejs": "^3.1.10",
                "ts-node": "^10.9.1"
            },
--- a/TestServer/package.json
+++ b/TestServer/package.json
@ -17,7 +17,6 @@
    "license": "Apache-2.0",
    "dependencies": {
        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
        "ejs": "^3.1.10",
        "ts-node": "^10.9.1"
    },
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -57,9 +57,9 @@ services:
            - /usr/src/app/dev-env
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        build:
            network: host
@ -80,9 +80,9 @@ services:
            - /usr/src/app/dev-env
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        build:
            network: host
@ -104,9 +104,9 @@ services:
            - /usr/src/app/dev-env
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        build:
            network: host
@ -127,9 +127,9 @@ services:
            - /usr/src/app/dev-env
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        build:
            network: host
@ -144,9 +144,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        extends:
            file: ./docker-compose.base.yml
@ -167,9 +167,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        extends:
            file: ./docker-compose.base.yml
@ -189,9 +189,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
              
        extends:
            file: ./docker-compose.base.yml
@ -210,9 +210,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
              
        extends:
            file: ./docker-compose.base.yml
@ -231,9 +231,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        ports:
          - '9974:9229' # Debugging port.
@ -252,9 +252,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        ports:
          - '9932:9229' # Debugging port.
@ -314,9 +314,9 @@ services:
            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
            - /usr/src/app/node_modules/
            - ./Common:/usr/src/Common
-            - ./CommonServer:/usr/src/CommonServer
+
            - /usr/src/Common/node_modules/
-            - /usr/src/CommonServer/node_modules/
+
            
        ports:
            - '9985:9229' # Debugging port.
--- a/migration-run.sh
+++ b/migration-run.sh
@ -5,4 +5,4 @@ export DATABASE_HOST=$DATABASE_MIGRATIONS_HOST
 export DATABASE_PORT=$DATABASE_MIGRATIONS_PORT

 sudo npm i -g ts-node 
-npx typeorm-ts-node-esm migration:run --dataSource=./CommonServer/Infrastructure/PostgresConfig.ts
+npx typeorm-ts-node-esm migration:run --dataSource=./Common/Server/Infrastructure/PostgresConfig.ts
--- a/package.json
+++ b/package.json
@ -70,7 +70,7 @@
        "deploy-test": "kubectl config use-context oneuptime-test && helm upgrade oneuptime ./HelmChart/Public/oneuptime -f ./HelmChart/Public/oneuptime/values.yaml  -f ./HelmChart/Values/test.values.yaml",
        "template-deploy-test": "kubectl config use-context oneuptime-test && helm template  oneuptime ./HelmChart/Public/oneuptime -f ./HelmChart/Public/oneuptime/values.yaml  -f ./HelmChart/Values/test.values.yaml --debug",
        "deploy-prod": "kubectl config use-context oneuptime-prod && helm upgrade oneuptime ./HelmChart/Public/oneuptime -f ./HelmChart/Public/oneuptime/values.yaml  -f ./HelmChart/Values/prod.values.yaml",
-        "generate-postgres-migration": "export $(grep -v '^#' config.env | xargs) && node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate ./CommonServer/Infrastructure/Postgres/SchemaMigrations/MigrationName -d ./CommonServer/Infrastructure/Postgres/LocalMigrationGenerationDataSource.ts"
+        "generate-postgres-migration": "export $(grep -v '^#' config.env | xargs) && node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate ./Common/Server/Infrastructure/Postgres/SchemaMigrations/MigrationName -d ./Common/Server/Infrastructure/Postgres/LocalMigrationGenerationDataSource.ts"
    },
    "repository": {
        "type": "git",