chore: Fix missing end dates in MonitorStatusTimeline

chore: Add mutex lock and release for MonitorStatusTimeline creation

.dockerignore

@@ -6,6 +6,7 @@ node_modules
 # dependencies
 /node_modules
 node_modules
+**/node_modules
 
 .idea
 # testing
@@ -53,4 +54,7 @@ tests/coverage
 
 settings.json
 
-GoSDK/tester/
+GoSDK/tester/
+
+Llama/Models/*
+

.eslintrc.json

@@ -82,15 +82,21 @@
         "@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": "off",
+        "@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": [
             "error",
@@ -107,6 +113,7 @@
         "no-console": "error",
         "no-undef": "error",
         "no-empty": "error",
+        "no-control-regex": "off",
         "prefer-arrow-callback": "error",
         "constructor-super": "error",
         "no-case-declarations": "error",
@@ -178,11 +185,32 @@
                 "ignoreReadBeforeAssign": false
             }
         ],
-        "no-var": "error"
+        "no-var": "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": {
             "version": "18.1.0"
         }
     }
-}
+}

.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,9 +38,10 @@ 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-api-reference:
+
+  docker-build-otel-collector:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -50,12 +51,12 @@ jobs:
 
       - name: Preinstall 
         run: npm run prerun
-        
-      # build image for home
+      
+      # build image for accounts service
       - name: build docker image
-        run: sudo docker build -f ./ApiReference/Dockerfile .
+        run: sudo docker build -f ./OTelCollector/Dockerfile .
 
-  docker-build-dashboard-api:
+  docker-build-app:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -69,7 +70,38 @@ 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
+    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 ./AdminDashboard/Dockerfile .
 
   docker-build-dashboard:
     runs-on: ubuntu-latest
@@ -86,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:
@@ -116,96 +133,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Haraka/Dockerfile .
 
-  docker-build-helm-chart:
-    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 ./HelmChart/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 licensing
-      - name: build docker image
-        run: sudo docker build -f ./Integration/Dockerfile .
-
-  docker-build-licensing:
-    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 licensing
-      - name: build docker image
-        run: sudo docker build -f ./Licensing/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
@@ -222,7 +149,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Probe/Dockerfile .
 
-  docker-build-probe-api:
+  docker-build-ingestor:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -235,22 +162,7 @@ jobs:
         
       # build image probe api
       - name: build docker image
-        run: sudo docker build -f ./ProbeAPI/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 .
+        run: sudo docker build -f ./Ingestor/Dockerfile .
 
   docker-build-status-page:
     runs-on: ubuntu-latest
@@ -267,38 +179,6 @@ 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:
-    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 ./Workflow/Dockerfile .
-
-
   docker-build-test-server:
     runs-on: ubuntu-latest
     env:
@@ -312,4 +192,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/code-analysis.yml

@@ -1,20 +0,0 @@
-name: Code Analysis
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  sonarcloud:
-    name: SonarCloud
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/common-jobs.yaml

@@ -8,7 +8,21 @@ on:
       - 'release'
 
 jobs:
-  lint:
+  helm-lint:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install Helm
+        run: |
+          curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+      - name: Lint Helm Chart 
+        run: |
+          helm lint ./HelmChart/Public/oneuptime
+          
+  js-lint:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}

.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,48 @@ 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@v4
+      # Setup Go
+      - uses: actions/setup-go@v5
+      - run: cd InfrastructureAgent && go build .
+  
+
+  compile-admin-dashboard:
+    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 AdminDashboard && npm install && npm run compile && npm run dep-check
 
   compile-dashboard:
     runs-on: ubuntu-latest
@@ -119,105 +145,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-helm-chart:
-    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 HelmChart && 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-licensing:
-    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 Licensing && 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
@@ -230,7 +159,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
@@ -244,9 +185,9 @@ 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-probe-api:
+  compile-ingestor:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -258,23 +199,9 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd ProbeAPI && 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:
@@ -288,36 +215,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
@@ -331,4 +229,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/playwright.yml.skip

@@ -11,7 +11,7 @@ jobs:
     env:
       BASE_URL: http://localhost
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-node@v3
       with:
         node-version: 16

.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

@@ -35,7 +35,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -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
@@ -96,7 +158,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -141,7 +203,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  workflow-docker-image-deploy:
+  otel-collector-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -150,14 +212,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/workflow
-            ghcr.io/oneuptime/workflow
+            oneuptime/otel-collector
+            ghcr.io/oneuptime/otel-collector
           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@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -174,7 +236,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy workflow.
+      # Build and deploy otel-collector.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -192,7 +254,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Workflow/Dockerfile
+          file: ./OTelCollector/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -202,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:
@@ -211,14 +273,14 @@ 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
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -235,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
@@ -253,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@v3
-        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
@@ -340,7 +341,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -385,7 +386,9 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  realtime-docker-image-deploy:
+
+
+  test-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -394,14 +397,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/realtime
-            ghcr.io/oneuptime/realtime
+            oneuptime/test
+            ghcr.io/oneuptime/test
           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@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -418,7 +421,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy realtime.
+      # Build and deploy test.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -436,7 +439,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Realtime/Dockerfile
+          file: ./Tests/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -446,7 +449,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  probe-api-docker-image-deploy:
+  ingestor-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -455,14 +458,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/probe-api
-            ghcr.io/oneuptime/probe-api
+            oneuptime/ingestor
+            ghcr.io/oneuptime/ingestor
           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@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -479,7 +482,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy probe-api.
+      # Build and deploy ingestor.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -497,190 +500,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./ProbeAPI/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}}
-
-  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@v3
-        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}}
-
-  licensing-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/licensing
-            ghcr.io/oneuptime/licensing
-          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@v3
-        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 licensing.
-
-      - 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: ./Licensing/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@v3
-        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
+          file: ./Ingestor/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -706,7 +526,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -751,189 +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@v3
-        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@v3
-        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}}
-
-  helm-chart-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/helm-chart
-            ghcr.io/oneuptime/helm-chart
-          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@v3
-        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 helm-chart.
-
-      - 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: ./HelmChart/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
@@ -950,7 +587,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -995,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@v3
-        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
@@ -1072,7 +648,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -1117,7 +693,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  dashboard-api-docker-image-deploy:
+  admin-dashboard-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -1126,14 +702,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/dashboard-api
-            ghcr.io/oneuptime/dashboard-api
+            oneuptime/admin-dashboard
+            ghcr.io/oneuptime/admin-dashboard
           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@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -1150,7 +726,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy dashboard-api.
+      # Build and deploy admin-dashboard.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -1168,7 +744,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./DashboardAPI/Dockerfile
+          file: ./AdminDashboard/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -1178,7 +754,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  api-reference-docker-image-deploy:
+  app-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -1187,14 +763,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/api-reference
-            ghcr.io/oneuptime/api-reference
+            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
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -1211,7 +787,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy api-reference.
+      # Build and deploy app.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -1229,7 +805,7 @@ jobs:
       - 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
@@ -1255,7 +831,7 @@ jobs:
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
             
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -1299,3 +875,16 @@ jobs:
           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: [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.ingestor.yaml

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

.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
@@ -88,3 +88,28 @@ Backups/*.tar
 
 Haraka/dkim/keys/private_base64.txt
 Haraka/dkim/keys/public_base64.txt
+
+.eslintcache
+
+HelmChart/Values/*.values.yaml
+
+Llama/Models/tokenizer*
+Llama/Models/llama*
+
+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
+Examples/otel-dotnet/bin/Debug/net6.0/Grpc.Core.Api.dll.txt
+InfrastructureAgent/oneuptime-infrastructure-agent

.vscode/launch.json

@@ -19,6 +19,14 @@
         }
     ],
     "configurations": [
+        {
+            "name": "Debug Infrastructure Agent",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "./InfrastructureAgent",
+            "args": ["start"],
+        },
         {
             "name": "Node.js - Debug Current File",
             "type": "node",
@@ -29,8 +37,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 +49,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",
@@ -99,8 +79,8 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/ProbeAPI",
-            "name": "Probe API: Debug with Docker",
+            "localRoot": "${workspaceFolder}/Ingestor",
+            "name": "Ingestor: Debug with Docker",
             "port": 9932,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -111,6 +91,20 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/IsolatedVM",
+            "name": "Isolated VM: Debug with Docker",
+            "port": 9974,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Workflow",
@@ -125,34 +119,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/data-ingestor",
-            "name": "Data Ingestor: Debug with Docker",
-            "port": 9338,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Notification",
-            "name": "Notification: Debug with Docker",
-            "port": 9111,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Realtime",
@@ -195,90 +161,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/ProbeAPI",
-            "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",
@@ -293,20 +175,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",
@@ -348,6 +216,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,10 +3,10 @@
 #
 
 # Pull base image nodejs image.
-FROM node:current-alpine
-USER root
+FROM node:21.7.3-alpine3.18
 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
 
@@ -14,8 +14,12 @@ 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 update && apk add bash && apk add curl
+RUN apk add bash && apk add curl
 
 #Use bash shell by default
 SHELL ["/bin/bash", "-c"]
@@ -23,28 +27,28 @@ SHELL ["/bin/bash", "-c"]
 
 RUN mkdir /usr/src
 
-# Install common
-RUN mkdir /usr/src/Common
 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
 
 
 
-# Install Model
-RUN mkdir /usr/src/Model
 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
 
 
 
-# Install CommonServer
-RUN mkdir /usr/src/CommonServer
 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
 
@@ -52,20 +56,20 @@ COPY ./CommonServer /usr/src/CommonServer
 
 
 # Install CommonUI
-RUN mkdir /usr/src/CommonUI
+
 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
 
 
 
-#SET ENV Variables
+
 ENV PRODUCTION=true
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
-RUN mkdir /usr/src/app
-
 WORKDIR /usr/src/app
 
 # Install app dependencies
@@ -76,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,18 +7,31 @@ 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);
+        throw err;
     }
 };
 
 init().catch((err: Error) => {
     logger.error(err);
+    logger.info('Exiting node process');
+    process.exit(1);
 });
 
 export default app;

Accounts/nodemon.json

@@ -1,4 +1,4 @@
 {
     "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && printenv > /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,31 +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"
-    },
     "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": [
@@ -39,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/public/index.html

@@ -108,16 +108,7 @@
   <!-- End Google Tag Manager (noscript) -->
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
-  <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
 
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-    To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   <script src="/accounts/dist/bundle.js"></script>
   <script>
     tailwind.config = {

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

@@ -8,12 +8,13 @@ import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import { LOGIN_API_URL } from '../Utils/ApiPaths';
 import URL from 'Common/Types/API/URL';
 import { JSONObject } from 'Common/Types/JSON';
-import LoginUtil from '../Utils/Login';
+import LoginUtil from 'CommonUI/src/Utils/Login';
 import UserUtil from 'CommonUI/src/Utils/User';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 import { DASHBOARD_URL } from 'CommonUI/src/Config';
 import Alert, { AlertType } from 'CommonUI/src/Components/Alerts/Alert';
 import UiAnalytics from 'CommonUI/src/Utils/Analytics';
+import useAsyncEffect from 'use-async-effect';
 
 const LoginPage: () => JSX.Element = () => {
     const apiUrl: URL = LOGIN_API_URL;
@@ -28,6 +29,16 @@ const LoginPage: () => JSX.Element = () => {
 
     const [showSsoTip, setShowSSOTip] = useState<boolean>(false);
 
+    const [initialValues, setInitialValues] = React.useState<JSONObject>({});
+
+    useAsyncEffect(async () => {
+        if (Navigation.getQueryStringByName('email')) {
+            setInitialValues({
+                email: Navigation.getQueryStringByName('email'),
+            });
+        }
+    }, []);
+
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
             <div className="">
@@ -66,9 +77,14 @@ const LoginPage: () => JSX.Element = () => {
                                 field: {
                                     email: true,
                                 },
-                                title: 'Email',
                                 fieldType: FormFieldSchemaType.Email,
+                                placeholder: 'jeff@example.com',
                                 required: true,
+                                disabled: Boolean(
+                                    initialValues && initialValues['email']
+                                ),
+                                title: 'Email',
+                                dataTestId: 'email',
                             },
                             {
                                 field: {
@@ -85,9 +101,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={(
@@ -106,8 +123,8 @@ const LoginPage: () => JSX.Element = () => {
                         }}
                         maxPrimaryButtonWidth={true}
                         footer={
-                            <div className="actions pointer text-center mt-4 hover:underline fw-semibold">
-                                <p>
+                            <div className="actions text-center mt-4 hover:underline fw-semibold">
+                                <div>
                                     {!showSsoTip && (
                                         <div
                                             onClick={() => {
@@ -121,20 +138,18 @@ const LoginPage: () => JSX.Element = () => {
 
                                     {showSsoTip && (
                                         <div className="text-gray-500 text-sm">
-                                            Please sign in with your username
-                                            and password. Once you have signed
-                                            in, you&apos;ll be able to sign in
-                                            via SSO that&apos;s configured for
-                                            your project.
+                                            Please sign in with your SSO
+                                            provider like Okta, Auth0, Entra ID
+                                            or any other SAML 2.0 provider.
                                         </div>
                                     )}
-                                </p>
+                                </div>
                             </div>
                         }
                     />
                 </div>
                 <div className="mt-10 text-center">
-                    <p className="text-muted mb-0 text-gray-500">
+                    <div className="text-muted mb-0 text-gray-500">
                         Don&apos;t have an account?{' '}
                         <Link
                             to={new Route('/accounts/register')}
@@ -142,7 +157,7 @@ const LoginPage: () => JSX.Element = () => {
                         >
                             Register.
                         </Link>
-                    </p>
+                    </div>
                 </div>
             </div>
         </div>

Accounts/src/Pages/Register.tsx

@@ -1,11 +1,11 @@
-import React, { useEffect } from 'react';
+import React, { useState } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Link from 'CommonUI/src/Components/Link/Link';
 import Route from 'Common/Types/API/Route';
 import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
 import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
-import LoginUtil from '../Utils/Login';
+import LoginUtil from 'CommonUI/src/Utils/Login';
 import { JSONObject } from 'Common/Types/JSON';
 import UserUtil from 'CommonUI/src/Utils/User';
 import Navigation from 'CommonUI/src/Utils/Navigation';
@@ -16,17 +16,64 @@ import Fields from 'CommonUI/src/Components/Forms/Types/Fields';
 import Dictionary from 'Common/Types/Dictionary';
 import UiAnalytics from 'CommonUI/src/Utils/Analytics';
 import LocalStorage from 'CommonUI/src/Utils/LocalStorage';
+import Reseller from 'Model/Models/Reseller';
+import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
+import BaseAPI from 'CommonUI/src/Utils/API/API';
+import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
+import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
+import useAsyncEffect from 'use-async-effect';
 
 const RegisterPage: () => JSX.Element = () => {
     const apiUrl: URL = SIGNUP_API_URL;
 
     const [initialValues, setInitialValues] = React.useState<JSONObject>({});
 
+    const [error, setError] = useState<string>('');
+
+    const [isLoading, setIsLoading] = React.useState<boolean>(false);
+
+    const [reseller, setResller] = React.useState<Reseller | undefined>(
+        undefined
+    );
+
     if (UserUtil.isLoggedIn()) {
         Navigation.navigate(DASHBOARD_URL);
     }
 
-    useEffect(() => {
+    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>({
+                    modelType: Reseller,
+                    query: {
+                        resellerId: resellerId,
+                    },
+                    limit: 1,
+                    skip: 0,
+                    select: {
+                        hidePhoneNumberOnSignup: true,
+                    },
+                    sort: {},
+                    requestOptions: {},
+                });
+
+            if (reseller.data.length > 0) {
+                setResller(reseller.data[0]);
+            }
+        } catch (err) {
+            setError(BaseAPI.getFriendlyMessage(err));
+        }
+
+        setIsLoading(false);
+    };
+
+    useAsyncEffect(async () => {
         // if promo code is found, please save it in localstorage.
         if (Navigation.getQueryStringByName('promoCode')) {
             LocalStorage.setItem(
@@ -40,6 +87,11 @@ const RegisterPage: () => JSX.Element = () => {
                 email: Navigation.getQueryStringByName('email'),
             });
         }
+
+        // if promo code is found, please save it in localstorage.
+        if (Navigation.getQueryStringByName('partnerId')) {
+            await fetchReseller(Navigation.getQueryStringByName('partnerId')!);
+        }
     }, []);
 
     let formFields: Fields<User> = [
@@ -52,6 +104,7 @@ const RegisterPage: () => JSX.Element = () => {
             required: true,
             disabled: Boolean(initialValues && initialValues['email']),
             title: 'Email',
+            dataTestId: 'email',
         },
         {
             field: {
@@ -61,6 +114,7 @@ const RegisterPage: () => JSX.Element = () => {
             placeholder: 'Jeff Smith',
             required: true,
             title: 'Full Name',
+            dataTestId: 'name',
         },
     ];
 
@@ -74,8 +128,13 @@ const RegisterPage: () => JSX.Element = () => {
                 placeholder: 'Acme, Inc.',
                 required: true,
                 title: 'Company Name',
+                dataTestId: 'companyName',
             },
-            {
+        ]);
+
+        // If reseller wants to hide phone number on sign up, we hide it.
+        if (!reseller || !reseller.hidePhoneNumberOnSignup) {
+            formFields.push({
                 field: {
                     companyPhoneNumber: true,
                 },
@@ -83,8 +142,9 @@ const RegisterPage: () => JSX.Element = () => {
                 required: true,
                 placeholder: '+11234567890',
                 title: 'Phone Number',
-            },
-        ]);
+                dataTestId: 'companyPhoneNumber',
+            });
+        }
     }
 
     formFields = formFields.concat([
@@ -99,6 +159,7 @@ const RegisterPage: () => JSX.Element = () => {
             placeholder: 'Password',
             title: 'Password',
             required: true,
+            dataTestId: 'password',
         },
         {
             field: {
@@ -113,10 +174,19 @@ const RegisterPage: () => JSX.Element = () => {
             title: 'Confirm Password',
             overrideFieldKey: 'confirmPassword',
             required: true,
-            forceShow: true,
+            showEvenIfPermissionDoesNotExist: true,
+            dataTestId: 'confirmPassword',
         },
     ]);
 
+    if (error) {
+        return <ErrorMessage error={error} />;
+    }
+
+    if (isLoading) {
+        return <PageLoader isVisible={true} />;
+    }
+
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
             <div className="sm:mx-auto sm:w-full sm:max-w-md">
@@ -142,12 +212,12 @@ const RegisterPage: () => JSX.Element = () => {
                     <ModelForm<User>
                         modelType={User}
                         id="register-form"
-                        showAsColumns={2}
+                        showAsColumns={reseller ? 1 : 2}
                         name="Register"
                         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/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');
@@ -7,13 +12,13 @@ const readEnvFile = (pathToFile) => {
 
     const parsed = dotenv.config({ path: pathToFile }).parsed;
 
-    const env = {};
+    const env = {
+    };
 
     for (const key in parsed) {
         env[key] = JSON.stringify(parsed[key]);
     }
 
-
     return env;
 }
 

AdminDashboard/Dockerfile.tpl

@@ -3,10 +3,10 @@
 #
 
 # Pull base image nodejs image.
-FROM node:current-alpine
-USER root
+FROM node:21.7.3-alpine3.18
 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
 
@@ -14,8 +14,12 @@ 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 update && apk add bash && apk add curl
+RUN apk add bash && apk add curl
 
 #Use bash shell by default
 SHELL ["/bin/bash", "-c"]
@@ -23,27 +27,27 @@ SHELL ["/bin/bash", "-c"]
 
 RUN mkdir /usr/src
 
-# Install common
-RUN mkdir /usr/src/Common
 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
 
 
-# Install Model
-RUN mkdir /usr/src/Model
 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
 
 
 
-# Install CommonServer
-RUN mkdir /usr/src/CommonServer
 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
 
@@ -51,19 +55,19 @@ COPY ./CommonServer /usr/src/CommonServer
 
 
 # Install CommonUI
-RUN mkdir /usr/src/CommonUI
+
 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
 
 
-#SET ENV Variables
+
 ENV PRODUCTION=true
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
-RUN mkdir /usr/src/app
-
 WORKDIR /usr/src/app
 
 # Install app dependencies
@@ -71,12 +75,16 @@ COPY ./AdminDashboard/package*.json /usr/src/app/
 RUN npm install  
 
 # Expose ports.
-#   - 3005:  AdminDashboard
-EXPOSE 3005
+#   - 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
@@ -86,4 +94,3 @@ RUN npm run build
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
-

AdminDashboard/README.md

@@ -0,0 +1,46 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

AdminDashboard/Serve.ts

@@ -0,0 +1,38 @@
+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: PromiseVoidFunction = async (): Promise<void> => {
+    try {
+        // init the app
+        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);
+        throw err;
+    }
+};
+
+init().catch((err: Error) => {
+    logger.error(err);
+    logger.info('Exiting node process');
+    process.exit(1);
+});
+
+export default app;

AdminDashboard/dev-env/README.md

@@ -0,0 +1 @@
+This is where env will be stored for the dev environment. This is where you will find the .env file when you exec into the container.

AdminDashboard/index.d.ts

@@ -0,0 +1,4 @@
+declare module '*.png';
+declare module '*.svg';
+declare module '*.jpg';
+declare module '*.gif';

AdminDashboard/nodemon.json

@@ -0,0 +1,4 @@
+{
+    "watch": ["webpack.config.js"],
+    "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

@@ -0,0 +1,55 @@
+{
+    "name": "@oneuptime/admin-dashboard",
+    "version": "0.1.0",
+    "private": false,
+    "dependencies": {
+        "Common": "file:../Common",
+        "CommonServer": "file:../CommonServer",
+        "CommonUI": "file:../CommonUI",
+        "dotenv": "^16.4.5",
+        "file-loader": "^6.2.0",
+        "Model": "file:../Model",
+        "react": "^18.2.0",
+        "react-dom": "^18.1.0",
+        "react-router-dom": "^6.22.3",
+        "style-loader": "^3.3.4"
+    },
+    "scripts": {
+        "dev": "npx nodemon",
+        "build": "webpack build --mode=production",
+        "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": "npm install -g depcheck && depcheck ./ --skip-missing=true"
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    },
+    "devDependencies": {
+        "@types/node": "^16.11.35",
+        "@types/react": "^18.2.38",
+        "@types/react-dom": "^18.0.4",
+        "@types/react-router-dom": "^5.3.3",
+        "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.5.1",
+        "ts-node": "^10.9.1",
+        "webpack": "^5.76.0"
+    }
+}

AdminDashboard/public/assets/fonts/rw-widgets/rw-widgets.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
+<defs>
+<font id="rw-widgets" horiz-adv-x="1000" >
+<font-face font-family="rw-widgets" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="up-dir" unicode="&#xe800;" d="M571 171q0-14-10-25t-25-10h-500q-15 0-25 10t-11 25 11 26l250 250q10 10 25 10t25-10l250-250q10-11 10-26z" horiz-adv-x="571.4" />
+
+<glyph glyph-name="search" unicode="&#xe801;" d="M643 386q0 103-73 176t-177 74-177-74-73-176 73-177 177-73 177 73 73 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 153-31 125-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="down-dir" unicode="&#xe803;" d="M571 457q0-14-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 11-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" />
+
+<glyph glyph-name="calendar" unicode="&#xe804;" d="M71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-7 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 37 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 37 27 63t63 26h35q37 0 64-26t26-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="clock" unicode="&#xe805;" d="M500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="angle-left" unicode="&#xf104;" d="M350 546q0-7-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 261q-6 5-6 12t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="357.1" />
+
+<glyph glyph-name="angle-right" unicode="&#xf105;" d="M332 314q0-7-5-12l-261-261q-5-5-12-5t-13 5l-28 28q-6 6-6 13t6 13l219 219-219 220q-6 5-6 12t6 13l28 28q5 6 13 6t12-6l261-260q5-5 5-13z" horiz-adv-x="357.1" />
+</font>
+</defs>
+</svg>

AdminDashboard/public/assets/img/favicons/site.webmanifest

@@ -0,0 +1,56 @@
+{
+    "name": "OneUptime Account",
+    "short_name": "OneUptime",
+    "icons": [
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-36x36.png",
+            "sizes": "36x36",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-48x48.png",
+            "sizes": "48x48",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-72x72.png",
+            "sizes": "72x72",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-96x96.png",
+            "sizes": "96x96",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-144x144.png",
+            "sizes": "144x144",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-384x384.png",
+            "sizes": "384x384",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "start_url": ".",
+    "theme_color": "#121212",
+    "background_color": "#121212",
+    "display": "standalone"
+  }
+  

AdminDashboard/public/assets/js/landing.base.js

@@ -0,0 +1,11 @@
+
+$(document).ready(function() {
+  setTimeout(()=>{
+      
+      $('div.bar').tipsy({
+        gravity: 'se',
+        html: true,
+        offset: 1
+      });
+    },1000);
+});