Fix error handling in StatusPageDomainService.ts

[Snyk] Security upgrade ejs from 3.1.9 to 3.1.10

.eslintrc.json

@@ -82,15 +82,20 @@
         "@typescript-eslint/no-empty-interface": [
             "error",
             {
-              "allowSingleExtends": true
+                "allowSingleExtends": true
             }
-          ],
+        ],
         // https://www.npmjs.com/package/eslint-plugin-unused-imports
         "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_"}],
+        "@typescript-eslint/no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_"
+            }
+        ],
         "@typescript-eslint/no-extra-non-null-assertion": "error",
-        "@typescript-eslint/no-floating-promises":"error",
-        "@typescript-eslint/await-thenable":"error",
+        "@typescript-eslint/no-floating-promises": "error",
+        "@typescript-eslint/await-thenable": "error",
         "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
         "unused-imports/no-unused-imports": "error",
         "unused-imports/no-unused-vars": [
@@ -180,8 +185,27 @@
             }
         ],
         "no-var": "error",
-        "object-curly-spacing": ["error", "always"],
-        "no-unneeded-ternary": "error"
+        "object-curly-spacing": [
+            "error",
+            "always"
+        ],
+        "no-unneeded-ternary": "error",
+        "@typescript-eslint/ban-types": [
+            "error",
+            {
+                "types": {
+                    "String": true,
+                    "Boolean": true,
+                    "Number": true,
+                    "Symbol": false,
+                    "{}": true,
+                    "Object": true,
+                    "object": true,
+                    "Function": true
+                },
+                "extendDefaults": true
+            }
+        ]
     },
     "settings": {
         "react": {

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,5 +34,8 @@ If applicable, add screenshots to help explain your problem.
  - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
+**Deployment Type**
+Is this issue on SaaS (at https://oneuptime.com) or self hosted (the version that you deployed on your server)? 
+
 **Additional context**
 Add any other context about the problem here.

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name:  Docker Build
+name: Build
 
 on:
   pull_request:
@@ -25,7 +25,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Accounts/Dockerfile .
 
-  docker-build-link-shortener:
+  docker-build-isolated-vm:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -38,7 +38,8 @@ jobs:
       
       # build image for accounts service
       - name: build docker image
-        run: sudo docker build -f ./LinkShortener/Dockerfile .
+        run: sudo docker build -f ./IsolatedVM/Dockerfile .
+
 
   docker-build-otel-collector:
     runs-on: ubuntu-latest
@@ -55,22 +56,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./OTelCollector/Dockerfile .
 
-  docker-build-api-reference:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build image for home
-      - name: build docker image
-        run: sudo docker build -f ./ApiReference/Dockerfile .
-
-  docker-build-dashboard-api:
+  docker-build-app:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -84,7 +70,23 @@ jobs:
         
       # build image for accounts service
       - name: build docker image
-        run: sudo docker build -f ./DashboardAPI/Dockerfile .
+        run: sudo docker build -f ./App/Dockerfile .
+
+  docker-build-e2e:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Preinstall 
+        run: npm run prerun
+
+        
+      # build image for accounts service
+      - name: build docker image
+        run: sudo docker build -f ./E2E/Dockerfile .
 
   docker-build-admin-dashboard:
     runs-on: ubuntu-latest
@@ -116,21 +118,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Dashboard/Dockerfile .
 
-  docker-build-file:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for file
-      - name: build docker image
-        run: sudo docker build -f ./File/Dockerfile .
-
   docker-build-haraka:
     runs-on: ubuntu-latest
     env:
@@ -147,68 +134,6 @@ jobs:
         run: sudo docker build -f ./Haraka/Dockerfile .
 
 
-  docker-build-home:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build image for home
-      - name: build docker image
-        run: sudo docker build -f ./Home/Dockerfile .
-
-  docker-build-identity:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-      
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build image for identity
-      - name: build docker image
-        run: sudo docker build -f ./Identity/Dockerfile .
-
-  docker-build-integrations:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build image for integrations
-      - name: build docker image
-        run: sudo docker build -f ./Integration/Dockerfile .
-
-
-  docker-build-notification:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for mail service
-      - name: build docker image
-        run: sudo docker build -f ./Notification/Dockerfile .
-
-
   docker-build-probe:
     runs-on: ubuntu-latest
     env:
@@ -239,21 +164,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Ingestor/Dockerfile .
 
-  docker-build-realtime:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for home
-      - name: build docker image
-        run: sudo docker build -f ./Realtime/Dockerfile .
-
   docker-build-status-page:
     runs-on: ubuntu-latest
     env:
@@ -269,23 +179,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./StatusPage/Dockerfile .
 
-  docker-build-workers:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-      
-      - name: Preinstall 
-        run: npm run prerun
-
-        
-      # build image for home
-      - name: build docker image
-        run: sudo docker build -f ./Workers/Dockerfile .
-
-  docker-build-workflow:
+  docker-build-infrastructure-agent:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -298,8 +192,7 @@ jobs:
 
       # build image for mail service
       - name: build docker image
-        run: sudo docker build -f ./Workflow/Dockerfile .
-
+        run: sudo docker build -f ./InfrastructureAgent/Dockerfile .
 
   docker-build-test-server:
     runs-on: ubuntu-latest
@@ -314,4 +207,4 @@ jobs:
 
       # build image for mail service
       - name: build docker image
-        run: sudo docker build -f ./TestServer/Dockerfile .
+        run: sudo docker build -f ./TestServer/Dockerfile .

.github/workflows/compile.yml

@@ -23,9 +23,9 @@ jobs:
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
-      - run: cd Accounts && npm install && npm run compile
+      - run: cd Accounts && npm install && npm run compile && npm run dep-check
 
-  compile-api-reference:
+  compile-isolated-vm:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -35,23 +35,8 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd ApiReference && npm install && npm run compile
-
-  compile-link-shortener:
-    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 CommonServer && npm install
-      - run: cd LinkShortener && npm install && npm run compile
+      - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
 
   compile-common-server:
     runs-on: ubuntu-latest
@@ -64,7 +49,7 @@ jobs:
           node-version: 18.3.0
       - run: cd Common && npm install
       - run: cd Model && npm install
-      - run: cd CommonServer && npm install && npm run compile
+      - run: cd CommonServer && npm install && npm run compile && npm run dep-check
 
   compile-common-ui:
     runs-on: ubuntu-latest
@@ -77,7 +62,7 @@ jobs:
           node-version: 18.3.0
       - run: cd Common && npm install
       - run: cd Model && npm install
-      - run: cd CommonUI && npm install --force && npm run compile
+      - run: cd CommonUI && npm install --force && npm run compile && npm run dep-check
 
   compile-common:
     runs-on: ubuntu-latest
@@ -89,9 +74,9 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd Model && npm install && npm run compile
+      - run: cd Model && npm install && npm run compile && npm run dep-check
 
-  compile-dashboard-api:
+  compile-app:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -104,7 +89,36 @@ jobs:
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
-      - run: cd DashboardAPI && npm install && npm run compile
+      - run: cd App && npm install && npm run compile && npm run dep-check
+
+  compile-nginx:
+    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 CommonServer && npm install
+      - run: cd CommonUI && npm install --force
+      - run: cd Nginx && npm install && npm run compile && npm run dep-check
+
+  compile-infrastructure-agent:
+    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 CommonServer && npm install
+      - run: cd InfrastructureAgent && npm install && npm run compile && npm run dep-check
   
 
   compile-admin-dashboard:
@@ -120,7 +134,7 @@ jobs:
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
-      - run: cd AdminDashboard && npm install && npm run compile
+      - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check
 
   compile-dashboard:
     runs-on: ubuntu-latest
@@ -135,77 +149,8 @@ jobs:
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
-      - run: cd Dashboard && npm install && npm run compile
+      - run: cd Dashboard && npm install && npm run compile && npm run dep-check
 
-  compile-file:
-    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 CommonServer && npm install
-      - run: cd File && npm install && npm run compile
-
-  compile-home:
-    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 CommonServer && npm install
-      - run: cd Home && npm install && npm run compile
-
-  compile-identity:
-    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 CommonServer && npm install
-      - run: cd Identity && npm install && npm run compile
-
-  compile-integrations:
-    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 CommonServer && npm install
-      - run: cd Integration && npm install && npm run compile
-
-  compile-notification:
-    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 CommonServer && npm install
-      - run: cd Notification && npm install && npm run compile
 
   compile-model:
     runs-on: ubuntu-latest
@@ -218,7 +163,19 @@ jobs:
           node-version: 18.3.0
       - run: cd Common && npm install
       - run: cd Model && npm install
-      - run: cd Model && npm install && npm run compile
+      - run: cd Model && npm install && npm run compile && npm run dep-check
+
+  compile-e2e:
+    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 E2E && npm install && npm run compile && npm run dep-check
 
   compile-probe:
     runs-on: ubuntu-latest
@@ -232,7 +189,7 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd Probe && npm install && npm run compile
+      - run: cd Probe && npm install && npm run compile && npm run dep-check
 
   compile-ingestor:
     runs-on: ubuntu-latest
@@ -246,23 +203,9 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd Ingestor && npm install && npm run compile
+      - run: cd Ingestor && npm install && npm run compile && npm run dep-check
   
 
-  compile-realtime:
-    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 CommonServer && npm install
-      - run: cd Realtime && npm install && npm run compile
-
   compile-status-page:
     runs-on: ubuntu-latest
     env:
@@ -276,36 +219,7 @@ jobs:
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
-      - run: cd StatusPage && npm install && npm run compile
-
-  compile-workers:
-    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 CommonServer && npm install
-      - run: cd CommonUI && npm install --force
-      - run: cd Workers && npm install && npm run compile
-
-  compile-workflow:
-    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 CommonServer && npm install
-      - run: cd Workflow && npm install && npm run compile
+      - run: cd StatusPage && npm install && npm run compile && npm run dep-check
 
   compile-test-server:
     runs-on: ubuntu-latest
@@ -319,4 +233,4 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd TestServer && npm install && npm run compile
+      - run: cd TestServer && npm install && npm run compile && npm run dep-check

.github/workflows/release.yml

@@ -31,7 +31,11 @@ jobs:
       - run: echo "${{needs.generate-build-number.outputs.build_number}}"
       - name: "Build Changelog"
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v3.7.1
+        uses: mikepenz/release-changelog-builder-action@v4.2.0
+        with:
+          configuration: "./Scripts/Release/ChangelogConfig.json"
+      - run: echo "Changelog:"    
+      - run: echo "${{steps.build_changelog.outputs.changelog}}"
       - uses: ncipollo/release-action@v1
         with:
           tag: "7.0.${{needs.generate-build-number.outputs.build_number}}"
@@ -147,6 +151,126 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+  e2e-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/e2e
+            ghcr.io/oneuptime/e2e
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy e2e.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./E2E/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  isolated-vm-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/isolated-vm
+            ghcr.io/oneuptime/isolated-vm
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy isolated-vm.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IsolatedVM/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   test-server-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -269,186 +393,6 @@ jobs:
 
 
 
-  workflow-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/workflow
-            ghcr.io/oneuptime/workflow
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy workflow.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Workflow/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  link-shortener-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/link-shortener
-            ghcr.io/oneuptime/link-shortener
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy link-shortener.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./LinkShortener/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  workers-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/workers
-            ghcr.io/oneuptime/workers
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy workers.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Workers/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   status-page-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -569,66 +513,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  realtime-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/realtime
-            ghcr.io/oneuptime/realtime
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy realtime.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Realtime/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   ingestor-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -689,126 +573,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  notification-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/notification
-            ghcr.io/oneuptime/notification
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy notification.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Notification/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  integrations-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/integrations
-            ghcr.io/oneuptime/integrations
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy integrations.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Integration/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   probe-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -869,126 +633,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  identity-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/identity
-            ghcr.io/oneuptime/identity
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy identity.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Identity/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  home-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/home
-            ghcr.io/oneuptime/home
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy home.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Home/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
 
   haraka-docker-image-deploy:
     needs: generate-build-number
@@ -1050,67 +694,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  file-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/file
-            ghcr.io/oneuptime/file
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy file.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./File/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-
   admin-dashboard-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -1232,7 +815,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  dashboard-api-docker-image-deploy:
+  app-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -1241,8 +824,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/dashboard-api
-            ghcr.io/oneuptime/dashboard-api
+            oneuptime/app
+            ghcr.io/oneuptime/app
           tags: |
             type=raw,value=release,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
@@ -1264,7 +847,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy dashboard-api.
+      # Build and deploy app.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -1282,67 +865,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./DashboardAPI/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  api-reference-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/api-reference
-            ghcr.io/oneuptime/api-reference
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy api-reference.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./ApiReference/Dockerfile
+          file: ./App/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -1411,3 +934,136 @@ jobs:
           build-args: |
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+    # We dont need any of this because we are using the npm package  
+  # infrastructure-agent-macos-binary-release:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 21.6.2
+  #     - run: cd InfrastructureAgent && bash Scripts/Build/Mac.sh
+
+  # We dont need any of this because we are using the npm package    
+  # infrastructure-agent-windows-binary-release:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 21.6.2
+  #     - run: cd InfrastructureAgent && ./Scripts/Build/Windows.ps1
+
+  # We dont need any of this because we are using the npm package  
+  # infrastructure-agent-linux-binary-release:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 21.6.2
+  #     - run: cd InfrastructureAgent && bash ./Scripts/Build/Linux.sh
+
+  publish-npm-packages:
+    runs-on: ubuntu-latest
+    needs: generate-build-number
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+      NPM_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
+      PACKAGE_VERSION: 7.0.${{needs.generate-build-number.outputs.build_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+      - name: Preinstall 
+        run: npm run prerun
+      - name: Publish Infrastructure Agent
+        run: bash ./Scripts/NPM/PublishAllPackages.sh
+        
+  infrastructure-agent-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/infrastructure-agent
+            ghcr.io/oneuptime/infrastructure-agent
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy infrastructure-agent.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./InfrastructureAgent/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  test-e2e:
+    runs-on: ubuntu-latest
+    # Needs all the jobs to be done before this job
+    needs: [e2e-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, ingestor-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, admin-dashboard-docker-image-deploy, dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, infrastructure-agent-docker-image-deploy, publish-npm-packages]
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      # Docker compose needs a lot of space to build images, so we need to free up some space first in the GitHub Actions runner
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: npm run start
+      - run: cd E2E && npm install && npm run test
+            

.github/workflows/test-app.yaml

@@ -1,4 +1,4 @@
-name: Home Test
+name: App Test
 
 on:
   pull_request: 
@@ -17,5 +17,4 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd Home && npm install && npm run test
-  
+      - run: cd App && npm install && npm run test

.github/workflows/test-release.yaml

@@ -80,6 +80,68 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+
+  e2e-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/e2e
+            ghcr.io/oneuptime/e2e
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy e2e.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./E2E/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   test-server-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -141,69 +203,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  workflow-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/workflow
-            ghcr.io/oneuptime/workflow
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy workflow.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Workflow/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-
-          
   otel-collector-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -265,7 +264,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  link-shortener-docker-image-deploy:
+  isolated-vm-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -274,8 +273,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/link-shortener
-            ghcr.io/oneuptime/link-shortener
+            oneuptime/isolated-vm
+            ghcr.io/oneuptime/isolated-vm
           tags: |
             type=raw,value=test,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
@@ -298,7 +297,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy link-shortener.
+      # Build and deploy isolated-vm.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -316,68 +315,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./LinkShortener/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  workers-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/workers
-            ghcr.io/oneuptime/workers
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy workers.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Workers/Dockerfile
+          file: ./IsolatedVM/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -511,67 +449,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  realtime-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/realtime
-            ghcr.io/oneuptime/realtime
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy realtime.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Realtime/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   ingestor-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -633,128 +510,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  notification-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/notification
-            ghcr.io/oneuptime/notification
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy notification.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Notification/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  integrations-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/integrations
-            ghcr.io/oneuptime/integrations
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy integrations.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Integration/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   probe-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -816,129 +571,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  identity-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/identity
-            ghcr.io/oneuptime/identity
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy identity.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Identity/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  home-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/home
-            ghcr.io/oneuptime/home
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy home.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Home/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-
   haraka-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -1000,67 +632,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  file-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/file
-            ghcr.io/oneuptime/file
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy file.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./File/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   dashboard-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -1183,7 +754,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  dashboard-api-docker-image-deploy:
+  app-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -1192,8 +763,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/dashboard-api
-            ghcr.io/oneuptime/dashboard-api
+            oneuptime/app
+            ghcr.io/oneuptime/app
           tags: |
             type=raw,value=test,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
@@ -1216,7 +787,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy dashboard-api.
+      # Build and deploy app.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -1234,68 +805,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./DashboardAPI/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
-  api-reference-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/api-reference
-            ghcr.io/oneuptime/api-reference
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy api-reference.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./ApiReference/Dockerfile
+          file: ./App/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -1365,3 +875,79 @@ jobs:
           build-args: |
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+          
+  infrastructure-agent-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/infrastructure
+            ghcr.io/oneuptime/infrastructure
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy infrastructure.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./InfrastructureAgent/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  
+
+  test-helm-chart:
+    runs-on: ubuntu-latest
+    needs: [ infrastructure-agent-docker-image-deploy, isolated-vm-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, ingestor-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy]
+    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 HelmChart && cd Tests && bash index.sh

.github/workflows/test.common-server.yaml

@@ -19,5 +19,6 @@ jobs:
           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 && npm install && npm run test
+      - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && rm -rf build && npm run test

.github/workflows/test.e2e.yaml

@@ -0,0 +1,62 @@
+name: E2E Tests
+
+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:
+      # Docker compose needs a lot of space to build images, so we need to free up some space first in the GitHub Actions runner
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: npm run prerun && bash ./Tests/Scripts/enable-billing-env-var.sh
+      - run: npm run dev
+      - name: Wait for server to start
+        run: bash ./Tests/Scripts/status-check.sh http://localhost
+      - name: Run E2E Tests. Run docker container e2e in docker compose file
+        run: export $(grep -v '^#' config.env | xargs) && docker-compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker-compose -f docker-compose.dev.yml logs e2e && exit 1)
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        # Run this on failure
+        if: failure()
+        with:
+          # Name of the artifact to upload.
+          # Optional. Default is 'artifact'
+          name: test-results
+      
+          # A file, directory or wildcard pattern that describes what to upload
+          # Required.
+          path: |
+            ./E2E/playwright-report
+            ./E2E/test-results
+      
+        
+          # Duration after which artifact will expire in days. 0 means using default retention.
+          # Minimum 1 day.
+          # Maximum 90 days unless changed from the repository settings page.
+          # Optional. Defaults to repository settings.
+          retention-days: 7
+    
+      
+  

.github/workflows/test.probe.yaml

@@ -19,5 +19,6 @@ jobs:
           node-version: 18.3.0
       - run: cd Common && npm install
       - run: cd CommonServer && npm install
-      - run: cd Probe && npm install && npm run test
+      - run: cd Probe && npm install
+      - run: cd Probe && npm run test
   

.gitignore

@@ -13,7 +13,7 @@ node_modules
 
 .idea
 # testing
-/coverage
+**/coverage
 
 # production
 /build
@@ -96,4 +96,18 @@ HelmChart/Values/*.values.yaml
 Llama/Models/tokenizer*
 Llama/Models/llama*
 
-Llama/__pycache__/*
+Llama/__pycache__/*
+
+Examples/otel-dotnet/obj/*
+
+InfrastructureAgent/sea-prep.blob
+InfrastructureAgent/InfrastructureAgent
+InfrastructureAgent/build/*
+
+
+InfrastructureAgent/err.log
+InfrastructureAgent/out.log
+InfrastructureAgent/daemon.pid
+App/greenlock/.greenlockrc
+App/greenlock/greenlock.d/config.json
+App/greenlock/greenlock.d/config.json.bak

.vscode/launch.json

@@ -29,8 +29,8 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/DashboardAPI",
-            "name": "Dashboard API: Debug with Docker",
+            "localRoot": "${workspaceFolder}/App",
+            "name": "App: Debug with Docker",
             "port": 9232,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -41,34 +41,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/ApiReference",
-            "name": "API Reference: Debug with Docker",
-            "port": 9178,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/LinkShortener",
-            "name": "Link Shortener: Debug with Docker",
-            "port": 9826,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/TestServer",
@@ -113,9 +85,9 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Workflow",
-            "name": "Workflow: Debug with Docker",
-            "port": 9212,
+            "localRoot": "${workspaceFolder}/IsolatedVM",
+            "name": "Isolated VM: Debug with Docker",
+            "port": 9974,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
             "skipFiles": [
@@ -127,9 +99,9 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Notification",
-            "name": "Notification: Debug with Docker",
-            "port": 9111,
+            "localRoot": "${workspaceFolder}/Workflow",
+            "name": "Workflow: Debug with Docker",
+            "port": 9212,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
             "skipFiles": [
@@ -181,90 +153,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Ingestor",
-            "name": "Probe API: Debug with Docker",
-            "port": 9251,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Identity",
-            "name": "Identity: Debug with Docker",
-            "port": 9132,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Identity",
-            "name": "File: Debug with Docker",
-            "port": 9012,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Alert",
-            "name": "Alert: Debug with Docker",
-            "port": 9133,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Alert",
-            "name": "Integration: Debug with Docker",
-            "port": 9134,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/licensing",
-            "name": "Licensing: Debug with Docker",
-            "port": 9233,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/HttpTestServer",
@@ -279,20 +167,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/home",
-            "name": "Home: Debug with Docker",
-            "port": 9235,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/script-runnner",
@@ -334,6 +208,19 @@
                 "debug:test"
             ],
         },
+        {
+            "name": "Probe: Debug Tests",
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true,
+            "request": "launch",
+            "cwd": "${workspaceRoot}/Probe",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run-script",
+                "debug:test"
+            ],
+        },
         {
             "name": "Accounts: Debug Local Files",
             "type": "node",

Accounts/Dockerfile.tpl

@@ -3,8 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:current-alpine
-USER root
+FROM node:21.7.2-alpine3.18
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
@@ -15,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -26,6 +29,8 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
@@ -33,6 +38,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
 
@@ -40,6 +47,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -50,6 +59,8 @@ COPY ./CommonServer /usr/src/CommonServer
 
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
+# Set version in ./CommonUI/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 
@@ -69,17 +80,20 @@ RUN npm install
 #   - 3003:  accounts
 EXPOSE 3003
 
-
+RUN npm i -D webpack-cli
 
 {{ if eq .Env.ENVIRONMENT "development" }}
 RUN mkdir /usr/src/app/dev-env
 RUN touch /usr/src/app/dev-env/.env
+RUN npm i -D webpack-dev-server
+
 #Run the app
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source
 COPY ./Accounts /usr/src/app
 # Bundle app source
+
 RUN npm run build
 #Run the app
 CMD [ "npm", "start" ]

Accounts/Serve.ts

@@ -1,5 +1,5 @@
 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';
 
@@ -7,10 +7,20 @@ export const APP_NAME: string = 'accounts';
 
 const app: ExpressApplication = Express.getExpressApp();
 
-const init: () => Promise<void> = async (): Promise<void> => {
+const init: PromiseVoidFunction = async (): Promise<void> => {
     try {
         // init the app
-        await App(APP_NAME, undefined, true);
+        await App.init({
+            appName: APP_NAME,
+            port: undefined,
+            isFrontendApp: true,
+            statusOptions: {
+                liveCheck: async () => {},
+                readyCheck: async () => {},
+            },
+        });
+        // add default routes
+        await App.addDefaultRoutes();
     } catch (err) {
         logger.error('App Init Failed:');
         logger.error(err);

Accounts/nodemon.json

@@ -1,4 +1,4 @@
 {
     "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'HOST=localhost' >> /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3003 --mode=development"
+    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3003 --mode=development"
 }

Accounts/package.json

@@ -1,32 +1,17 @@
 {
-    "name": "accounts",
+    "name": "@oneuptime/accounts",
     "version": "0.1.0",
     "private": false,
-    "dependencies": {
-        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
-        "CommonUI": "file:../CommonUI",
-        "crypto-js": "^4.1.1",
-        "formik": "^2.2.9",
-        "Model": "file:../Model",
-        "react": "^18.1.0",
-        "react-dom": "^18.1.0",
-        "react-router": "^6.3.0",
-        "react-router-dom": "^6.3.0",
-        "react-scripts": "5.0.1",
-        "the-new-css-reset": "^1.7.3",
-        "typescript": "^4.6.4",
-        "use-async-effect": "^2.2.7"
-    },
     "scripts": {
         "dev": "npx nodemon",
         "build": "webpack build --mode=production",
         "test": "",
         "compile": "tsc",
+        "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
         "start": "node --require ts-node/register Serve.ts",
         "audit": "npm audit --audit-level=low",
         "configure": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
-        "dep-check": "depcheck ./ --skip-missing=true'"
+        "dep-check": "npm install -g depcheck && depcheck ./ --skip-missing=true"
     },
     "browserslist": {
         "production": [
@@ -40,27 +25,30 @@
             "last 1 safari version"
         ]
     },
+    "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.2.0",
+        "react-dom": "^18.1.0",
+        "react-router-dom": "^6.22.3",
+        "sass-loader": "^13.3.3",
+        "style-loader": "^3.3.4",
+        "ts-loader": "^9.5.1",
+        "use-async-effect": "^2.2.7"
+    },
     "devDependencies": {
-        "@testing-library/jest-dom": "^5.16.4",
-        "@testing-library/react": "^13.2.0",
-        "@testing-library/user-event": "^13.5.0",
-        "@types/jest": "^27.5.1",
         "@types/node": "^16.11.35",
-        "@types/react": "^18.0.9",
+        "@types/react": "^18.2.38",
         "@types/react-dom": "^18.0.4",
         "@types/react-router-dom": "^5.3.3",
-        "css-loader": "^6.7.1",
-        "customize-cra": "^1.0.0",
-        "dotenv-webpack": "^7.1.0",
         "nodemon": "^2.0.20",
-        "process": "0.11.10",
-        "react-app-rewired": "^2.2.1",
-        "sass": "^1.51.0",
-        "sass-loader": "^12.6.0",
-        "ts-loader": "^9.3.0",
         "ts-node": "^10.9.1",
-        "webpack": "^5.76.0",
-        "webpack-cli": "^4.9.2",
-        "webpack-dev-server": "^4.9.0"
+        "webpack": "^5.76.0"
     }
 }

Accounts/src/Index.tsx

@@ -3,6 +3,12 @@ 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',
+});
+
 const root: any = ReactDOM.createRoot(
     document.getElementById('root') as HTMLElement
 );

Accounts/src/Pages/ForgotPassword.tsx

@@ -47,7 +47,7 @@ const ForgotPassword: () => JSX.Element = () => {
                             modelType={User}
                             name="Forgot Password"
                             id="login-form"
-                            apiUrl={apiUrl}
+                            createOrUpdateApiUrl={apiUrl}
                             fields={[
                                 {
                                     field: {

Accounts/src/Pages/Login.tsx

@@ -69,6 +69,7 @@ const LoginPage: () => JSX.Element = () => {
                                 title: 'Email',
                                 fieldType: FormFieldSchemaType.Email,
                                 required: true,
+                                dataTestId: 'email',
                             },
                             {
                                 field: {
@@ -85,9 +86,10 @@ const LoginPage: () => JSX.Element = () => {
                                     url: new Route('/accounts/forgot-password'),
                                     openLinkInNewTab: false,
                                 },
+                                dataTestId: 'password',
                             },
                         ]}
-                        apiUrl={apiUrl}
+                        createOrUpdateApiUrl={apiUrl}
                         formType={FormType.Create}
                         submitButtonText={'Login'}
                         onSuccess={(

Accounts/src/Pages/Register.tsx

@@ -40,26 +40,28 @@ const RegisterPage: () => JSX.Element = () => {
         Navigation.navigate(DASHBOARD_URL);
     }
 
-    const fetchReseller: Function = async (
+    type FetchResellerFunction = (resellerId: string) => Promise<void>;
+
+    const fetchReseller: FetchResellerFunction = async (
         resellerId: string
     ): Promise<void> => {
         setIsLoading(true);
 
         try {
             const reseller: ListResult<Reseller> =
-                await ModelAPI.getList<Reseller>(
-                    Reseller,
-                    {
+                await ModelAPI.getList<Reseller>({
+                    modelType: Reseller,
+                    query: {
                         resellerId: resellerId,
                     },
-                    1,
-                    0,
-                    {
+                    limit: 1,
+                    skip: 0,
+                    select: {
                         hidePhoneNumberOnSignup: true,
                     },
-                    {},
-                    {}
-                );
+                    sort: {},
+                    requestOptions: {},
+                });
 
             if (reseller.data.length > 0) {
                 setResller(reseller.data[0]);
@@ -102,6 +104,7 @@ const RegisterPage: () => JSX.Element = () => {
             required: true,
             disabled: Boolean(initialValues && initialValues['email']),
             title: 'Email',
+            dataTestId: 'email',
         },
         {
             field: {
@@ -111,6 +114,7 @@ const RegisterPage: () => JSX.Element = () => {
             placeholder: 'Jeff Smith',
             required: true,
             title: 'Full Name',
+            dataTestId: 'name',
         },
     ];
 
@@ -124,6 +128,7 @@ const RegisterPage: () => JSX.Element = () => {
                 placeholder: 'Acme, Inc.',
                 required: true,
                 title: 'Company Name',
+                dataTestId: 'companyName',
             },
         ]);
 
@@ -137,6 +142,7 @@ const RegisterPage: () => JSX.Element = () => {
                 required: true,
                 placeholder: '+11234567890',
                 title: 'Phone Number',
+                dataTestId: 'companyPhoneNumber',
             });
         }
     }
@@ -153,6 +159,7 @@ const RegisterPage: () => JSX.Element = () => {
             placeholder: 'Password',
             title: 'Password',
             required: true,
+            dataTestId: 'password',
         },
         {
             field: {
@@ -167,7 +174,8 @@ const RegisterPage: () => JSX.Element = () => {
             title: 'Confirm Password',
             overrideFieldKey: 'confirmPassword',
             required: true,
-            forceShow: true,
+            showEvenIfPermissionDoesNotExist: true,
+            dataTestId: 'confirmPassword',
         },
     ]);
 
@@ -209,7 +217,7 @@ const RegisterPage: () => JSX.Element = () => {
                         initialValues={initialValues}
                         maxPrimaryButtonWidth={true}
                         fields={formFields}
-                        apiUrl={apiUrl}
+                        createOrUpdateApiUrl={apiUrl}
                         onBeforeCreate={(item: User): Promise<User> => {
                             const utmParams: Dictionary<string> =
                                 UserUtil.getUtmParams();

Accounts/src/Pages/ResetPassword.tsx

@@ -85,7 +85,7 @@ const RegisterPage: () => JSX.Element = () => {
                                     required: true,
                                 },
                             ]}
-                            apiUrl={apiUrl}
+                            createOrUpdateApiUrl={apiUrl}
                             formType={FormType.Create}
                             submitButtonText={'Reset Password'}
                             onSuccess={() => {

Accounts/src/Pages/VerifyEmail.tsx

@@ -11,13 +11,14 @@ import Navigation from 'CommonUI/src/Utils/Navigation';
 import ObjectID from 'Common/Types/ObjectID';
 import URL from 'Common/Types/API/URL';
 import API from 'CommonUI/src/Utils/API/API';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const VerifyEmail: () => JSX.Element = () => {
     const apiUrl: URL = VERIFY_EMAIL_API_URL;
     const [error, setError] = useState<string>('');
     const [isLoading, setIsLoading] = useState<boolean>(true);
 
-    const init: () => Promise<void> = async (): Promise<void> => {
+    const init: PromiseVoidFunction = async (): Promise<void> => {
         // Ping an API here.
         setError('');
         setIsLoading(true);
@@ -30,15 +31,15 @@ const VerifyEmail: () => JSX.Element = () => {
                 Navigation.getLastParam()?.toString().replace('/', '') || ''
             );
 
-            await ModelAPI.createOrUpdate<EmailVerificationToken>(
-                emailverificationToken,
-                EmailVerificationToken,
-                FormType.Create,
-                {},
-                {
+            await ModelAPI.createOrUpdate<EmailVerificationToken>({
+                model: emailverificationToken,
+                modelType: EmailVerificationToken,
+                formType: FormType.Create,
+                miscDataProps: {},
+                requestOptions: {
                     overrideRequestUrl: apiUrl,
-                }
-            );
+                },
+            });
         } catch (err) {
             setError(API.getFriendlyMessage(err));
         }

Accounts/src/Utils/Login.ts

@@ -6,12 +6,12 @@ import Name from 'Common/Types/Name';
 import { DASHBOARD_URL } from 'CommonUI/src/Config';
 import { JSONObject } from 'Common/Types/JSON';
 import User from 'Model/Models/User';
-import JSONFunctions from 'Common/Types/JSONFunctions';
 import Analytics from 'CommonUI/src/Utils/Analytics';
+import BaseModel from 'Common/Models/BaseModel';
 
 export default abstract class LoginUtil {
     public static login(value: JSONObject): void {
-        const user: User = JSONFunctions.fromJSON(
+        const user: User = BaseModel.fromJSON(
             value['user'] as JSONObject,
             User
         ) as User;

Accounts/tsconfig.json

@@ -3,11 +3,13 @@
         // these options are overrides used only by ts-node
         // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
         "compilerOptions": {
-            "module": "commonjs"
+            "module": "commonjs",
+            "resolveJsonModule": true, 
         }
     },
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
         /* Projects */
         // "incremental": true,                              /* Enable incremental compilation */
         // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
@@ -15,43 +17,47 @@
         // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects */
         // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
         // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
         /* Language and Environment */
         "target": "es2017" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
         // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
         "jsx": "react" /* Specify what JSX code is generated. */,
-        "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
-        "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
+        "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+        "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
         // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
         // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
         // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
         // "reactNamespace": "",                             /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
         // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
         // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+
         /* Modules */
         "module": "es2022" /* Specify what module code is generated. */,
         // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-        "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
+        "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
         // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
         // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
         // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-        "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */
-        "types": [
-            "node"
-        ], /* Specify type package names to be included without being referenced in a source file. */
+        "typeRoots": [
+            "./node_modules/@types"
+        ], /* Specify multiple folders that act like `./node_modules/@types`. */
+        "types": ["node"],                                      /* Specify type package names to be included without being referenced in a source file. */
         // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
         // "resolveJsonModule": true,                        /* Enable importing .json files */
         // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
+
         /* JavaScript Support */
         // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
         // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
         // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
+
         /* Emit */
         // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
         // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
         // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-        "sourceMap": true, /* Create source map files for emitted JavaScript files. */
+        "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
         // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
-        "outDir": "./build/dist", /* Specify an output folder for all emitted files. */
+        "outDir": "./build/dist",                                   /* Specify an output folder for all emitted files. */
         // "removeComments": true,                           /* Disable emitting comments. */
         // "noEmit": true,                                   /* Disable emitting files from a compilation. */
         // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
@@ -69,34 +75,38 @@
         // "preserveConstEnums": true,                       /* Disable erasing `const enum` declarations in generated code. */
         // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
         // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
         /* Interop Constraints */
         // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
         // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
         "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
         // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
         "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+
         /* Type Checking */
         "strict": true /* Enable all strict type-checking options. */,
-        "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */
-        "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */
-        "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-        "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
-        "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
-        "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */
-        "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */
-        "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
-        "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */
-        "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */
-        "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
-        "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
-        "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
-        "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
-        "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
-        "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */
+         "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied `any` type.. */
+        "strictNullChecks": true,                         /* When type checking, take into account `null` and `undefined`. */
+       "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+        "strictBindCallApply": true,                      /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
+        "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+        "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
+        "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
+        "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+        "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
+        "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
+       "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+        "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+        "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+        "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
+        "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+         "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
         // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
         // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
         /* Completeness */
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
+                "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+        "resolveJsonModule": true
     }
-}
+}

Accounts/webpack.config.js

@@ -1,3 +1,8 @@
+require('ts-loader');
+require('file-loader');
+require('style-loader');
+require('css-loader');
+require('sass-loader');
 const path = require("path");
 const webpack = require("webpack");
 const dotenv = require('dotenv');

AdminDashboard/Dockerfile.tpl

@@ -3,8 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:current-alpine
-USER root
+FROM node:21.7.2-alpine3.18
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
@@ -15,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -26,12 +29,16 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 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
 
@@ -39,6 +46,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -49,6 +58,8 @@ COPY ./CommonServer /usr/src/CommonServer
 
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
+# Set version in ./CommonUI/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 
@@ -67,10 +78,13 @@ RUN npm install
 #   - 3158:  AdminDashboard
 EXPOSE 3158
 
+RUN npm i -D webpack-cli
+
 {{ if eq .Env.ENVIRONMENT "development" }}
 #Run the app
 RUN mkdir /usr/src/app/dev-env
 RUN touch /usr/src/app/dev-env/.env
+RUN npm i -D webpack-dev-server
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source

AdminDashboard/Serve.ts

@@ -1,15 +1,27 @@
 import App from 'CommonServer/Utils/StartServer';
 import Express, { ExpressApplication } from 'CommonServer/Utils/Express';
 import logger from 'CommonServer/Utils/Logger';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 export const APP_NAME: string = 'admin';
 
 const app: ExpressApplication = Express.getExpressApp();
 
-const init: () => Promise<void> = async (): Promise<void> => {
+const init: PromiseVoidFunction = async (): Promise<void> => {
     try {
         // init the app
-        await App(APP_NAME, undefined, true);
+        await App.init({
+            appName: APP_NAME,
+            port: undefined,
+            isFrontendApp: true,
+            statusOptions: {
+                liveCheck: async () => {},
+                readyCheck: async () => {},
+            },
+        });
+
+        // add default routes
+        await App.addDefaultRoutes();
     } catch (err) {
         logger.error('App Init Failed:');
         logger.error(err);

AdminDashboard/nodemon.json

@@ -1,4 +1,4 @@
 {
     "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'HOST=localhost' >> /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3158 --mode=development"
+    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3158 --mode=development"
 }

AdminDashboard/package.json

@@ -1,28 +1,18 @@
 {
-    "name": "admin-dashboard",
+    "name": "@oneuptime/admin-dashboard",
     "version": "0.1.0",
     "private": false,
     "dependencies": {
-        "@headlessui/react": "^1.7.7",
-        "@heroicons/react": "^2.0.13",
-        "@stripe/react-stripe-js": "^1.15.0",
-        "@stripe/stripe-js": "^1.44.1",
         "Common": "file:../Common",
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
+        "dotenv": "^16.4.5",
+        "file-loader": "^6.2.0",
         "Model": "file:../Model",
-        "react": "^18.1.0",
-        "react-dnd": "^16.0.1",
-        "react-dnd-html5-backend": "^16.0.1",
+        "react": "^18.2.0",
         "react-dom": "^18.1.0",
-        "react-icons": "^4.4.0",
-        "react-router": "^6.3.0",
-        "react-router-dom": "^6.3.0",
-        "reactflow": "^11.5.3",
-        "stripe": "^11.0.0",
-        "the-new-css-reset": "^1.7.3",
-        "typescript": "^4.6.4",
-        "use-async-effect": "^2.2.6"
+        "react-router-dom": "^6.22.3",
+        "style-loader": "^3.3.4"
     },
     "scripts": {
         "dev": "npx nodemon",
@@ -30,10 +20,11 @@
         "test": "react-app-rewired test",
         "eject": "webpack eject",
         "compile": "tsc",
+        "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
         "start": "node --require ts-node/register Serve.ts",
         "audit": "npm audit --audit-level=low",
         "configure": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
-        "dep-check": "depcheck ./ --skip-missing=true'"
+        "dep-check": "npm install -g depcheck && depcheck ./ --skip-missing=true"
     },
     "browserslist": {
         "production": [
@@ -48,24 +39,17 @@
         ]
     },
     "devDependencies": {
-        "@testing-library/jest-dom": "^5.16.4",
-        "@testing-library/react": "^13.2.0",
-        "@testing-library/user-event": "^13.5.0",
-        "@types/jest": "^27.5.1",
         "@types/node": "^16.11.35",
-        "@types/react": "^18.0.9",
+        "@types/react": "^18.2.38",
         "@types/react-dom": "^18.0.4",
         "@types/react-router-dom": "^5.3.3",
-        "css-loader": "^6.7.1",
-        "customize-cra": "^1.0.0",
+        "css-loader": "^6.8.1",
         "nodemon": "^2.0.20",
         "react-app-rewired": "^2.2.1",
         "sass": "^1.51.0",
         "sass-loader": "^12.6.0",
-        "ts-loader": "^9.3.0",
+        "ts-loader": "^9.5.1",
         "ts-node": "^10.9.1",
-        "webpack": "^5.76.0",
-        "webpack-cli": "^4.9.2",
-        "webpack-dev-server": "^4.9.0"
+        "webpack": "^5.76.0"
     }
 }

AdminDashboard/src/App.tsx

@@ -19,7 +19,7 @@ import Users from './Pages/Users/Index';
 import Logout from './Pages/Logout/Logout';
 
 // Settings Pages.
-import SettingsEmail from './Pages/Settings/SMTP/Index';
+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';

AdminDashboard/src/Components/Footer/Footer.tsx

@@ -8,6 +8,7 @@ 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 { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const DashboardFooter: () => JSX.Element = () => {
     const [showAboutModal, setShowAboutModal] = React.useState<boolean>(false);
@@ -17,7 +18,7 @@ const DashboardFooter: () => JSX.Element = () => {
         {}
     );
 
-    const fetchVersions: () => Promise<void> = async (): Promise<void> => {
+    const fetchVersions: PromiseVoidFunction = async (): Promise<void> => {
         setIsAboutModalLoading(true);
 
         try {
@@ -34,14 +35,6 @@ const DashboardFooter: () => JSX.Element = () => {
                     name: 'Dashboard',
                     path: '/dashboard',
                 },
-                {
-                    name: 'Notification',
-                    path: '/notification',
-                },
-                {
-                    name: 'Identity Service',
-                    path: '/identity',
-                },
             ];
 
             for (const app of apps) {

AdminDashboard/src/Components/Header/ProjectPicker.tsx

@@ -14,8 +14,9 @@ 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/RadioButtons';
+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<Project>;
@@ -32,7 +33,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         null
     );
 
-    const getFooter: Function = (): ReactElement => {
+    const getFooter: GetReactElementFunction = (): ReactElement => {
         if (!BILLING_ENABLED) {
             return <></>;
         }
@@ -40,7 +41,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         return (
             <Toggle
                 title="Yearly Plan"
-                initialValue={isSubscriptionPlanYearly}
+                value={isSubscriptionPlanYearly}
                 description="(Save 20%)"
                 onChange={(value: boolean) => {
                     setIsSubscriptionPlanYearly(value);
@@ -109,7 +110,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         refreshFields();
     }, [isSubscriptionPlanYearly]);
 
-    const refreshFields: Function = (): void => {
+    const refreshFields: VoidFunction = (): void => {
         let formFields: Array<Field<Project>> = [
             {
                 field: {

AdminDashboard/src/Index.tsx

@@ -2,7 +2,11 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App';
 import { BrowserRouter } from 'react-router-dom';
-// import 'the-new-css-reset/css/reset.css';
+import Telemetry from 'CommonUI/src/Utils/Telemetry';
+
+Telemetry.init({
+    serviceName: 'AdminDashboard',
+});
 
 const root: any = ReactDOM.createRoot(
     document.getElementById('root') as HTMLElement

AdminDashboard/src/Pages/Logout/Logout.tsx

@@ -10,11 +10,12 @@ import Navigation from 'CommonUI/src/Utils/Navigation';
 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';
 
 const Logout: FunctionComponent = (): ReactElement => {
     const [error, setError] = React.useState<string | null>(null);
 
-    const logout: Function = async () => {
+    const logout: PromiseVoidFunction = async (): Promise<void> => {
         UiAnalytics.logout();
         await UserUtil.logout();
         Navigation.navigate(ACCOUNTS_URL);

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -17,9 +17,10 @@ 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/RadioButtons';
+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] =
@@ -29,7 +30,7 @@ const Projects: FunctionComponent = (): ReactElement => {
         refreshFields();
     }, [isSubscriptionPlanYearly]);
 
-    const refreshFields: Function = (): void => {
+    const refreshFields: VoidFunction = (): void => {
         let formFields: Array<Field<Project>> = [
             {
                 field: {
@@ -155,7 +156,7 @@ const Projects: FunctionComponent = (): ReactElement => {
 
     const [fields, setFields] = useState<Array<Field<Project>>>([]);
 
-    const getFooter: Function = (): ReactElement => {
+    const getFooter: GetReactElementFunction = (): ReactElement => {
         if (!BILLING_ENABLED) {
             return <></>;
         }
@@ -163,7 +164,7 @@ const Projects: FunctionComponent = (): ReactElement => {
         return (
             <Toggle
                 title="Yearly Plan"
-                initialValue={isSubscriptionPlanYearly}
+                value={isSubscriptionPlanYearly}
                 description="(Save 20%)"
                 onChange={(value: boolean) => {
                     setIsSubscriptionPlanYearly(value);
@@ -221,16 +222,30 @@ const Projects: FunctionComponent = (): ReactElement => {
                 noItemsMessage={'No projects found.'}
                 formFields={fields}
                 showRefreshButton={true}
-                showFilterButton={true}
                 viewPageRoute={Navigation.getCurrentRoute()}
-                columns={[
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            createdAt: true,
+                        },
+                        title: 'Created At',
+                        type: FieldType.DateTime,
+                    },
+                ]}
+                columns={[
                     {
                         field: {
                             name: true,
                         },
                         title: 'Name',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -238,7 +253,6 @@ const Projects: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Created At',
                         type: FieldType.DateTime,
-                        isFilterable: true,
                     },
                 ]}
             />

AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx

@@ -65,7 +65,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                             twilioAuthToken: true,
                         },
                         title: 'Twilio Auth Token',
-                        fieldType: FormFieldSchemaType.Password,
+                        fieldType: FormFieldSchemaType.Text,
                         required: true,
                         description:
                             'You can find this in your Twilio console.',

AdminDashboard/src/Pages/Settings/Email/Index.tsx

@@ -12,10 +12,10 @@ 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 { JSONObject } from 'Common/Types/JSON';
 import DropdownUtil from 'CommonUI/src/Utils/Dropdown';
 import Pill from 'CommonUI/src/Components/Pill/Pill';
 import { Green, Red } from 'Common/Types/BrandColors';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const Settings: FunctionComponent = (): ReactElement => {
     const [emailServerType, setemailServerType] =
@@ -25,18 +25,18 @@ const Settings: FunctionComponent = (): ReactElement => {
 
     const [error, setError] = React.useState<string>('');
 
-    const fetchItem: Function = async (): Promise<void> => {
+    const fetchItem: PromiseVoidFunction = async (): Promise<void> => {
         setIsLoading(true);
 
         const globalConfig: GlobalConfig | null =
-            await ModelAPI.getItem<GlobalConfig>(
-                GlobalConfig,
-                ObjectID.getZeroObjectID(),
-                {
+            await ModelAPI.getItem<GlobalConfig>({
+                modelType: GlobalConfig,
+                id: ObjectID.getZeroObjectID(),
+                select: {
                     _id: true,
                     emailServerType: true,
-                }
-            );
+                },
+            });
 
         if (globalConfig) {
             setemailServerType(
@@ -88,6 +88,42 @@ const Settings: FunctionComponent = (): ReactElement => {
         >
             {/* Project Settings View  */}
 
+            <CardModelDetail
+                name="Admin Notification Email"
+                cardProps={{
+                    title: 'Admin Notification Email',
+                    description:
+                        'Enter the email address where you would like to receive admin-level notifications.',
+                }}
+                isEditable={true}
+                editButtonText="Edit Email"
+                formFields={[
+                    {
+                        field: {
+                            adminNotificationEmail: true,
+                        },
+                        title: 'Admin Notification Email',
+                        fieldType: FormFieldSchemaType.Email,
+                        required: false,
+                    },
+                ]}
+                modelDetailProps={{
+                    modelType: GlobalConfig,
+                    id: 'model-detail-global-config',
+                    fields: [
+                        {
+                            field: {
+                                adminNotificationEmail: true,
+                            },
+                            title: 'Admin Notification Email',
+                            fieldType: FieldType.Email,
+                            placeholder: 'None',
+                        },
+                    ],
+                    modelId: ObjectID.getZeroObjectID(),
+                }}
+            />
+
             <CardModelDetail
                 name="Internal SMTP Settings"
                 cardProps={{
@@ -182,7 +218,8 @@ const Settings: FunctionComponent = (): ReactElement => {
                             title: 'Use SSL / TLS',
                             stepId: 'server-info',
                             fieldType: FormFieldSchemaType.Toggle,
-                            description: 'Make email communication secure?',
+                            description:
+                                'If you use port 465, please enable this. Do not enable this if you use port 587.',
                         },
                         {
                             field: {
@@ -286,7 +323,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             )}
 
             {emailServerType === EmailServerType.Sendgrid ? (
-                <CardModelDetail
+                <CardModelDetail<GlobalConfig>
                     name="Sendgrid Settings"
                     cardProps={{
                         title: 'Sendgrid Settings',
@@ -338,7 +375,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                                 },
                                 title: '',
                                 placeholder: 'None',
-                                getElement: (item: JSONObject) => {
+                                getElement: (item: GlobalConfig) => {
                                     if (
                                         item['sendgridApiKey'] &&
                                         item['sendgridFromEmail'] &&

AdminDashboard/src/Pages/Settings/Probes/Index.tsx

@@ -7,23 +7,22 @@ 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 { JSONObject } from 'Common/Types/JSON';
 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 IsNull from 'Common/Types/Database/IsNull';
+import IsNull from 'Common/Types/BaseDatabase/IsNull';
 import Banner from 'CommonUI/src/Components/Banner/Banner';
-import URL from 'Common/Types/API/URL';
 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 { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes';
 
 const Settings: FunctionComponent = (): ReactElement => {
     const [showKeyModal, setShowKeyModal] = useState<boolean>(false);
 
-    const [currentProbe, setCurrentProbe] = useState<JSONObject | null>(null);
+    const [currentProbe, setCurrentProbe] = useState<Probe | null>(null);
 
     return (
         <Page
@@ -56,9 +55,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                 openInNewTab={true}
                 title="Need help with setting up Global Probes?"
                 description="Here is a guide which will help you get set up"
-                link={URL.fromString(
-                    'https://github.com/OneUptime/oneuptime/blob/master/Docs/Probe/CustomProbe.md'
-                )}
+                link={Route.fromString('/docs/probe/custom-probe')}
             />
 
             <ModelTable<Probe>
@@ -80,7 +77,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                 modelAPI={AdminModelAPI}
                 noItemsMessage={'No probes found.'}
                 showRefreshButton={true}
-                showFilterButton={true}
                 onBeforeCreate={(item: Probe) => {
                     item.isGlobalProbe = true;
                     return Promise.resolve(item);
@@ -129,9 +125,9 @@ const Settings: FunctionComponent = (): ReactElement => {
                         title: 'Show ID and Key',
                         buttonStyleType: ButtonStyleType.NORMAL,
                         onClick: async (
-                            item: JSONObject,
-                            onCompleteAction: Function,
-                            onError: (err: Error) => void
+                            item: Probe,
+                            onCompleteAction: VoidFunction,
+                            onError: ErrorFunction
                         ) => {
                             try {
                                 setCurrentProbe(item);
@@ -145,6 +141,22 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                     },
                 ]}
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            description: true,
+                        },
+                        title: 'Description',
+                        type: FieldType.Text,
+                    },
+                ]}
                 columns={[
                     {
                         field: {
@@ -152,8 +164,8 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Name',
                         type: FieldType.Text,
-                        isFilterable: true,
-                        getElement: (item: JSONObject): ReactElement => {
+
+                        getElement: (item: Probe): ReactElement => {
                             return <ProbeElement probe={item} />;
                         },
                     },
@@ -163,7 +175,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Description',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -171,15 +182,12 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Status',
                         type: FieldType.Text,
-                        isFilterable: false,
-                        getElement: (item: JSONObject): ReactElement => {
+                        getElement: (item: Probe): ReactElement => {
                             if (
                                 item &&
                                 item['lastAlive'] &&
                                 OneUptimeDate.getNumberOfMinutesBetweenDates(
-                                    OneUptimeDate.fromString(
-                                        item['lastAlive'] as string
-                                    ),
+                                    OneUptimeDate.fromString(item['lastAlive']),
                                     OneUptimeDate.getCurrentDate()
                                 ) < 5
                             ) {
@@ -187,6 +195,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                                     <Statusbubble
                                         text={'Connected'}
                                         color={Green}
+                                        shouldAnimate={true}
                                     />
                                 );
                             }
@@ -195,6 +204,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                                 <Statusbubble
                                     text={'Disconnected'}
                                     color={Red}
+                                    shouldAnimate={false}
                                 />
                             );
                         },

AdminDashboard/src/Pages/Users/Index.tsx

@@ -72,16 +72,37 @@ const Users: FunctionComponent = (): ReactElement => {
                     },
                 ]}
                 showRefreshButton={true}
-                showFilterButton={true}
                 viewPageRoute={Navigation.getCurrentRoute()}
-                columns={[
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Full Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            email: true,
+                        },
+                        title: 'Email',
+                        type: FieldType.Email,
+                    },
+                    {
+                        field: {
+                            createdAt: true,
+                        },
+                        title: 'Created At',
+                        type: FieldType.DateTime,
+                    },
+                ]}
+                columns={[
                     {
                         field: {
                             name: true,
                         },
                         title: 'Full Name',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -89,7 +110,6 @@ const Users: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Email',
                         type: FieldType.Email,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -97,7 +117,6 @@ const Users: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Created At',
                         type: FieldType.DateTime,
-                        isFilterable: true,
                     },
                 ]}
             />

AdminDashboard/tsconfig.json

@@ -3,7 +3,8 @@
         // these options are overrides used only by ts-node
         // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
         "compilerOptions": {
-            "module": "commonjs"
+            "module": "commonjs",
+            "resolveJsonModule": true, 
         }
     },
     "compilerOptions": {
@@ -38,7 +39,7 @@
         // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
         // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
         "typeRoots": [
-         
+            "./node_modules/@types"
         ], /* Specify multiple folders that act like `./node_modules/@types`. */
         "types": ["node"],                                      /* Specify type package names to be included without being referenced in a source file. */
         // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
@@ -105,6 +106,7 @@
 
         /* Completeness */
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
+                "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+        "resolveJsonModule": true
     }
 }

AdminDashboard/webpack.config.js

@@ -1,3 +1,8 @@
+require('ts-loader');
+require('file-loader');
+require('style-loader');
+require('css-loader');
+require('sass-loader');
 const path = require("path");
 const webpack = require("webpack");
 const dotenv = require('dotenv');

ApiReference/.gitignore

@@ -1,2 +0,0 @@
-node_modules
-npm-debug.log

ApiReference/Dockerfile.tpl

@@ -1,72 +0,0 @@
-# Pull base image nodejs image.
-FROM node:current-alpine
-USER root
-RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
-
-
-ARG GIT_SHA
-ARG APP_VERSION
-
-ENV GIT_SHA=${GIT_SHA}
-ENV APP_VERSION=${APP_VERSION}
-
-
-# Install bash. 
-RUN apk add bash && apk add curl
-
-#Use bash shell by default
-SHELL ["/bin/bash", "-c"]
-
-
-RUN mkdir /usr/src
-
-WORKDIR /usr/src/Common
-COPY ./Common/package*.json /usr/src/Common/
-RUN npm install
-COPY ./Common /usr/src/Common
-
-
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-RUN npm install
-COPY ./Model /usr/src/Model
-
-
-
-WORKDIR /usr/src/CommonServer
-COPY ./CommonServer/package*.json /usr/src/CommonServer/
-RUN npm install
-COPY ./CommonServer /usr/src/CommonServer
-
-
-
-# Install app
-
-
-
-ENV PRODUCTION=true
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-
-WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY ./ApiReference/package*.json /usr/src/app/
-RUN npm install
-
-
-# Expose ports.
-#   - 1445: OneUptime Docs
-EXPOSE 1445
-
-
-{{ if eq .Env.ENVIRONMENT "development" }}
-#Run the app
-CMD [ "npm", "run", "dev" ]
-{{ else }}
-# Copy app source
-COPY ./ApiReference /usr/src/app
-# Bundle app source
-RUN npm run compile
-#Run the app
-CMD [ "npm", "start" ]
-{{ end }}

ApiReference/Index.ts

@@ -1,106 +0,0 @@
-import Express, {
-    ExpressApplication,
-    ExpressRequest,
-    ExpressResponse,
-    ExpressStatic,
-} from 'CommonServer/Utils/Express';
-import logger from 'CommonServer/Utils/Logger';
-import App from 'CommonServer/Utils/StartServer';
-import path from 'path';
-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';
-
-const ResourceDictionary: Dictionary<ModelDocumentation> =
-    ResourceUtil.getResourceDictionaryByPath();
-
-const APP_NAME: string = 'reference';
-
-const app: ExpressApplication = Express.getExpressApp();
-
-// Set the view engine to ejs
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'ejs');
-
-// Public static files
-app.use(ExpressStatic(path.join(__dirname, 'public'), { maxAge: 2592000 }));
-
-app.use(
-    '/reference',
-    ExpressStatic(path.join(__dirname, 'public'), { maxAge: 2592000 })
-);
-
-// Index page
-app.get(['/reference'], (_req: ExpressRequest, res: ExpressResponse) => {
-    return res.redirect('/reference/introduction');
-});
-
-app.get(
-    ['/reference/page-not-found'],
-    (req: ExpressRequest, res: ExpressResponse) => {
-        return PageNotFoundServiceHandler.executeResponse(req, res);
-    }
-);
-
-// All Pages
-app.get(['/reference/:page'], (req: ExpressRequest, res: ExpressResponse) => {
-    const page: string | undefined = req.params['page'];
-
-    if (!page) {
-        return PageNotFoundServiceHandler.executeResponse(req, res);
-    }
-
-    const currentResource: ModelDocumentation | undefined =
-        ResourceDictionary[page];
-
-    if (req.params['page'] === 'permissions') {
-        return PermissionServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'authentication') {
-        return AuthenticationServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'pagination') {
-        return PaginationServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'errors') {
-        return ErrorServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'introduction') {
-        return IntroductionServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'status') {
-        return StatusServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'data-types') {
-        return DataTypeServiceHandler.executeResponse(req, res);
-    } else if (currentResource) {
-        return ModelServiceHandler.executeResponse(req, res);
-    }
-    // page not found
-    return PageNotFoundServiceHandler.executeResponse(req, res);
-});
-
-app.get('/*', (req: ExpressRequest, res: ExpressResponse) => {
-    return PageNotFoundServiceHandler.executeResponse(req, res);
-});
-
-const init: () => Promise<void> = async (): Promise<void> => {
-    try {
-        // init the app
-        await App(APP_NAME);
-    } catch (err) {
-        logger.error('App Init Failed:');
-        logger.error(err);
-        throw err;
-    }
-};
-
-init().catch((err: Error) => {
-    logger.error(err);
-    logger.info('Exiting node process');
-    process.exit(1);
-});
-
-export default app;

ApiReference/README.md

@@ -1,9 +0,0 @@
-# OneUptime API Documentation
-
-[![Build Status](https://travis-ci.org/OneUptime/ApiReference.svg?branch=master)](https://travis-ci.org/OneUptime/ApiReference)
-
-This is the API Reference for OneUptime which is hosted at [https://oneuptime.com/reference](https://oneuptime.com/reference).
-
-# Contribute
-
-Feel free to send PR's and contribute. Please send PR's to master and we'll have our team review them for you.

ApiReference/nodemon.json

@@ -1,5 +0,0 @@
-{
-    "watch": ["./", "../Common", "../CommonServer", "../Model"],
-    "ext": "ts,json,tsx,env,js,jsx,ejs",
-    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
-}

ApiReference/package.json

@@ -1,55 +0,0 @@
-{
-    "name": "oneuptime-homepage",
-    "version": "3.0.0",
-    "scripts": {
-        "configure": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
-        "start": "node --require ts-node/register Index.ts",
-        "compile": "tsc",
-        "dev": "npx nodemon",
-        "test": "jest",
-        "lighthouse-test": "jest --forceExit lighthouse-tests/test/index.test.js --env=node",
-        "lighthouse": "start-server-and-test http://localhost:1444",
-        "smoketest": "jest --forceExit smoketest/index.test.js --env=node",
-        "audit": "npm audit --audit-level=low",
-        "light-house": "node lighthouse.js --web",
-        "light-house-mobile": "node lighthouse.js --mobile",
-        "dep-check": "depcheck ./ --skip-missing=true --ignores='ejs,puppeteer'"
-    },
-    "dependencies": {
-        "@types/body-parser": "^1.19.2",
-        "@types/cli-table": "^0.3.0",
-        "@types/compression": "^1.7.2",
-        "@types/ejs": "^3.1.1",
-        "@types/minify": "^8.0.0",
-        "@types/try-to-catch": "^3.0.0",
-        "axios": "^0.26.1",
-        "body-parser": "^1.19.2",
-        "cli-table": "^0.3.11",
-        "Common": "file:../Common",
-        "CommonServer": "file:../CommonServer",
-        "compression": "^1.7.4",
-        "ejs": "^3.1.8",
-        "express": "^4.18.1",
-        "Model": "file:../Model",
-        "ts-node": "^10.9.1",
-        "xmlbuilder2": "^3.0.2"
-    },
-    "resolutions": {},
-    "devDependencies": {
-        "@types/jest": "^27.5.1",
-        "@types/node": "^17.0.22",
-        "chrome-launcher": "^0.15.0",
-        "commander": "^9.1.0",
-        "depcheck": "^1.4.3",
-        "jest": "^28.1.0",
-        "lighthouse": "^9.5.0",
-        "nodemon": "^2.0.20",
-        "npm-force-resolutions": "0.0.10",
-        "ora": "^6.1.0",
-        
-        "start-server-and-test": "^1.14.0",
-        "ts-jest": "^28.0.2",
-        "ts-node-dev": "^1.1.8",
-        "typescript": "^4.6.4"
-    }
-}

App/.gitignore

@@ -26,4 +26,5 @@ container_security_dir
 /.nyc_output
 
 /greenlock.d/config.json
-/greenlock.d/config.json.bak
+/greenlock.d/config.json.bak
+/.greenlockrc

App/Dockerfile.tpl

@@ -1,10 +1,9 @@
 #
-# OneUptime-DashboardAPI Dockerfile
+# OneUptime-App Dockerfile
 #
 
 # Pull base image nodejs image.
-FROM node:current-alpine
-USER root
+FROM node:21.2-alpine3.18
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
@@ -15,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -30,12 +33,16 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 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
 
@@ -43,6 +50,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -53,7 +62,9 @@ ENV PRODUCTION=true
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY ./DashboardAPI/package*.json /usr/src/app/
+COPY ./App/package*.json /usr/src/app/
+# Set version in ./App/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/app/package.json
 RUN npm install
 
 # Expose ports.
@@ -65,7 +76,7 @@ EXPOSE 3002
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source
-COPY ./DashboardAPI /usr/src/app
+COPY ./App /usr/src/app
 # Bundle app source
 RUN npm run compile
 #Run the app

App/FeatureSet/ApiReference/Index.ts

@@ -0,0 +1,89 @@
+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<void> => {
+        const ResourceDictionary: Dictionary<ModelDocumentation> =
+            ResourceUtil.getResourceDictionaryByPath();
+
+        const app: ExpressApplication = Express.getExpressApp();
+
+        app.use('/reference', ExpressStatic(StaticPath, { maxAge: 2592000 }));
+
+        // Index page
+        app.get(
+            ['/reference'],
+            (_req: ExpressRequest, res: ExpressResponse) => {
+                return res.redirect('/reference/introduction');
+            }
+        );
+
+        app.get(
+            ['/reference/page-not-found'],
+            (req: ExpressRequest, res: ExpressResponse) => {
+                return PageNotFoundServiceHandler.executeResponse(req, res);
+            }
+        );
+
+        // All Pages
+        app.get(
+            ['/reference/:page'],
+            (req: ExpressRequest, res: ExpressResponse) => {
+                const page: string | undefined = req.params['page'];
+
+                if (!page) {
+                    return PageNotFoundServiceHandler.executeResponse(req, res);
+                }
+
+                const currentResource: ModelDocumentation | undefined =
+                    ResourceDictionary[page];
+
+                if (req.params['page'] === 'permissions') {
+                    return PermissionServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'authentication') {
+                    return AuthenticationServiceHandler.executeResponse(
+                        req,
+                        res
+                    );
+                } else if (req.params['page'] === 'pagination') {
+                    return PaginationServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'errors') {
+                    return ErrorServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'introduction') {
+                    return IntroductionServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'status') {
+                    return StatusServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'data-types') {
+                    return DataTypeServiceHandler.executeResponse(req, res);
+                } else if (currentResource) {
+                    return ModelServiceHandler.executeResponse(req, res);
+                }
+                // page not found
+                return PageNotFoundServiceHandler.executeResponse(req, res);
+            }
+        );
+
+        app.get('/reference/*', (req: ExpressRequest, res: ExpressResponse) => {
+            return PageNotFoundServiceHandler.executeResponse(req, res);
+        });
+    },
+};
+
+export default APIReferenceFeatureSet;

App/FeatureSet/ApiReference/Service/Authentication.ts

@@ -1,5 +1,6 @@
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -17,7 +18,7 @@ export default class ServiceHandler {
         pageDescription =
             'Learn how to authenticate requests with OneUptime API';
 
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: page,
             resources: Resources,
             pageTitle: pageTitle,

App/FeatureSet/ApiReference/Service/DataType.ts

@@ -2,6 +2,7 @@ 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<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -17,7 +18,7 @@ export default class ServiceHandler {
             'select',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/Select.md'
+                    `${CodeExamplesPath}/DataTypes/Select.md`
                 );
             }
         );
@@ -27,7 +28,7 @@ export default class ServiceHandler {
             'sort',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/Sort.md'
+                    `${CodeExamplesPath}/DataTypes/Sort.md`
                 );
             }
         );
@@ -37,7 +38,7 @@ export default class ServiceHandler {
             'equal-to',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/EqualTo.md'
+                    `${CodeExamplesPath}/DataTypes/EqualTo.md`
                 );
             }
         );
@@ -47,7 +48,7 @@ export default class ServiceHandler {
             'equal-to-or-null',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/EqualToOrNull.md'
+                    `${CodeExamplesPath}/DataTypes/EqualToOrNull.md`
                 );
             }
         );
@@ -57,7 +58,7 @@ export default class ServiceHandler {
             'greater-than',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/GreaterThan.md'
+                    `${CodeExamplesPath}/DataTypes/GreaterThan.md`
                 );
             }
         );
@@ -67,7 +68,7 @@ export default class ServiceHandler {
             'greater-than-or-equal',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/GreaterThanOrEqual.md'
+                    `${CodeExamplesPath}/DataTypes/GreaterThanOrEqual.md`
                 );
             }
         );
@@ -77,7 +78,7 @@ export default class ServiceHandler {
             'less-than',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/LessThan.md'
+                    `${CodeExamplesPath}/DataTypes/LessThan.md`
                 );
             }
         );
@@ -87,7 +88,7 @@ export default class ServiceHandler {
             'less-than-or-equal',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/LessThanOrEqual.md'
+                    `${CodeExamplesPath}/DataTypes/LessThanOrEqual.md`
                 );
             }
         );
@@ -97,7 +98,7 @@ export default class ServiceHandler {
             'is-null',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/IsNull.md'
+                    `${CodeExamplesPath}/DataTypes/IsNull.md`
                 );
             }
         );
@@ -107,7 +108,7 @@ export default class ServiceHandler {
             'not-null',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/NotNull.md'
+                    `${CodeExamplesPath}/DataTypes/NotNull.md`
                 );
             }
         );
@@ -117,13 +118,13 @@ export default class ServiceHandler {
             'not-equals',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/DataTypes/NotEqualTo.md'
+                    `${CodeExamplesPath}/DataTypes/NotEqualTo.md`
                 );
             }
         );
 
         res.status(200);
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: 'data-types',
             pageTitle: 'Data Types',
             pageDescription:

App/FeatureSet/ApiReference/Service/Errors.ts

@@ -1,5 +1,6 @@
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -16,7 +17,7 @@ export default class ServiceHandler {
         pageTitle = 'Errors';
         pageDescription = 'Learn more about how we return errors from API';
 
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: page,
             resources: Resources,
             pageTitle: pageTitle,

App/FeatureSet/ApiReference/Service/Introduction.ts

@@ -1,5 +1,6 @@
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 const FeaturedResources: Array<ModelDocumentation> =
@@ -17,9 +18,9 @@ export default class ServiceHandler {
 
         pageData.featuredResources = FeaturedResources;
         pageTitle = 'Introduction';
-        pageDescription = 'API Documentation for OneUptime';
+        pageDescription = 'API Reference for OneUptime';
 
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: page,
             resources: Resources,
             pageTitle: pageTitle,

App/FeatureSet/ApiReference/Service/Model.ts

@@ -6,12 +6,13 @@ import Permission, {
     PermissionHelper,
     PermissionProps,
 } from 'Common/Types/Permission';
-import { DashboardApiRoute } from 'Common/ServiceRoute';
+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<ModelDocumentation> = ResourceUtil.getResources();
 const ResourceDictionary: Dictionary<ModelDocumentation> =
@@ -108,7 +109,7 @@ export default class ServiceHandler {
             'list-request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/ListRequest.md'
+                    `${CodeExamplesPath}/Model/ListRequest.md`
                 );
             }
         );
@@ -118,7 +119,7 @@ export default class ServiceHandler {
             'item-request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/ItemRequest.md'
+                    `${CodeExamplesPath}/Model/ItemRequest.md`
                 );
             }
         );
@@ -128,7 +129,7 @@ export default class ServiceHandler {
             'item-response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/ItemResponse.md'
+                    `${CodeExamplesPath}/Model/ItemResponse.md`
                 );
             }
         );
@@ -138,7 +139,7 @@ export default class ServiceHandler {
             'count-request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/CountRequest.md'
+                    `${CodeExamplesPath}/Model/CountRequest.md`
                 );
             }
         );
@@ -148,7 +149,7 @@ export default class ServiceHandler {
             'count-response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/CountResponse.md'
+                    `${CodeExamplesPath}/Model/CountResponse.md`
                 );
             }
         );
@@ -158,7 +159,7 @@ export default class ServiceHandler {
             'update-request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/UpdateRequest.md'
+                    `${CodeExamplesPath}/Model/UpdateRequest.md`
                 );
             }
         );
@@ -168,7 +169,7 @@ export default class ServiceHandler {
             'update-response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/UpdateResponse.md'
+                    `${CodeExamplesPath}/Model/UpdateResponse.md`
                 );
             }
         );
@@ -178,7 +179,7 @@ export default class ServiceHandler {
             'create-request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/CreateRequest.md'
+                    `${CodeExamplesPath}/Model/CreateRequest.md`
                 );
             }
         );
@@ -188,7 +189,7 @@ export default class ServiceHandler {
             'create-response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/CreateResponse.md'
+                    `${CodeExamplesPath}/Model/CreateResponse.md`
                 );
             }
         );
@@ -198,7 +199,7 @@ export default class ServiceHandler {
             'delete-request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/DeleteRequest.md'
+                    `${CodeExamplesPath}/Model/DeleteRequest.md`
                 );
             }
         );
@@ -208,7 +209,7 @@ export default class ServiceHandler {
             'delete-response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/DeleteResponse.md'
+                    `${CodeExamplesPath}/Model/DeleteResponse.md`
                 );
             }
         );
@@ -218,7 +219,7 @@ export default class ServiceHandler {
             'list-response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Model/ListResponse.md'
+                    `${CodeExamplesPath}/Model/ListResponse.md`
                 );
             }
         );
@@ -226,13 +227,13 @@ export default class ServiceHandler {
         pageData.exampleObjectID = ObjectID.generate();
 
         pageData.apiPath =
-            DashboardApiRoute.toString() +
+            AppApiRoute.toString() +
             currentResource.model.crudApiPath?.toString();
 
         pageData.isMasterAdminApiDocs =
             currentResource.model.isMasterAdminApiDocs;
 
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: page,
             resources: Resources,
             pageTitle: pageTitle,

App/FeatureSet/ApiReference/Service/PageNotFound.ts

@@ -1,5 +1,6 @@
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -9,7 +10,7 @@ export default class ServiceHandler {
         res: ExpressResponse
     ): Promise<void> {
         res.status(404);
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: '404',
             pageTitle: 'Page Not Found',
             pageDescription: "Page you're looking for is not found.",

App/FeatureSet/ApiReference/Service/Pagination.ts

@@ -2,6 +2,7 @@ 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';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -23,7 +24,7 @@ export default class ServiceHandler {
             'response',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Pagination/Response.md'
+                    `${CodeExamplesPath}/Pagination/Response.md`
                 );
             }
         );
@@ -33,12 +34,12 @@ export default class ServiceHandler {
             'request',
             async () => {
                 return await LocalFile.read(
-                    '/usr/src/app/CodeExamples/Pagination/Request.md'
+                    `${CodeExamplesPath}/Pagination/Request.md`
                 );
             }
         );
 
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: page,
             resources: Resources,
             pageTitle: pageTitle,

App/FeatureSet/ApiReference/Service/Permissions.ts

@@ -1,6 +1,7 @@
 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<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -23,7 +24,7 @@ export default class ServiceHandler {
             }
         );
 
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: page,
             resources: Resources,
             pageTitle: pageTitle,

App/FeatureSet/ApiReference/Service/Status.ts

@@ -1,5 +1,6 @@
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -9,7 +10,7 @@ export default class ServiceHandler {
         res: ExpressResponse
     ): Promise<void> {
         res.status(200);
-        return res.render('pages/index', {
+        return res.render(`${ViewsPath}/pages/index`, {
             page: 'status',
             pageTitle: 'Status',
             pageDescription: '200 - Success',