refactor: Update Postgres configuration in Helm chart

This code change updates the Postgres configuration in the Helm chart to support both internal and external Postgres databases. It adds the necessary environment variables and secrets blocks to handle the external Postgres database configuration. This enhancement allows users to easily switch between using an internal or external Postgres database when deploying the Helm chart.

.eslintrc.json

@@ -113,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",

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name:  Docker Build
+name: Build
 
 on:
   pull_request:
@@ -25,6 +25,21 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Accounts/Dockerfile .
 
+  docker-build-isolated-vm:
+    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 ./IsolatedVM/Dockerfile .
+
 
   docker-build-otel-collector:
     runs-on: ubuntu-latest
@@ -57,6 +72,22 @@ jobs:
       - name: build docker image
         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:
@@ -148,7 +179,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./StatusPage/Dockerfile .
 
-
   docker-build-test-server:
     runs-on: ubuntu-latest
     env:
@@ -162,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/compile.yml

@@ -25,6 +25,19 @@ jobs:
       - run: cd CommonUI && npm install --force
       - run: cd Accounts && npm install && npm run compile && npm run dep-check
 
+  compile-isolated-vm:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd CommonServer && npm install
+      - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
+
   compile-common-server:
     runs-on: ubuntu-latest
     env:
@@ -77,6 +90,31 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - 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:
@@ -132,6 +170,7 @@ jobs:
       - 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:

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     - run: echo "Build number is ${{ steps.buildnumber.outputs.build_number }}"
 
   github-release:
-    needs: generate-build-number
+    needs: [generate-build-number]
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/release'
     permissions:
@@ -31,7 +31,11 @@ jobs:
       - run: echo "${{needs.generate-build-number.outputs.build_number}}"
       - name: "Build Changelog"
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v3.7.1
+        uses: mikepenz/release-changelog-builder-action@v4.2.0
+        with:
+          configuration: "./Scripts/Release/ChangelogConfig.json"
+      - run: echo "Changelog:"    
+      - run: echo "${{steps.build_changelog.outputs.changelog}}"
       - uses: ncipollo/release-action@v1
         with:
           tag: "7.0.${{needs.generate-build-number.outputs.build_number}}"
@@ -42,7 +46,7 @@ jobs:
 
   helm-chart-deploy:
     runs-on: ubuntu-latest
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     env: 
         CI_COMMIT_AUTHOR: Continuous Integration
     steps:
@@ -88,7 +92,7 @@ jobs:
           git push origin master
 
   nginx-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -147,8 +151,128 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+  e2e-docker-image-deploy:
+    needs: [generate-build-number, github-release]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/e2e
+            ghcr.io/oneuptime/e2e
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy e2e.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./E2E/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  isolated-vm-docker-image-deploy:
+    needs: [generate-build-number, github-release]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/isolated-vm
+            ghcr.io/oneuptime/isolated-vm
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy isolated-vm.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IsolatedVM/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   test-server-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -208,7 +332,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   otel-collector-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -270,7 +394,7 @@ jobs:
 
 
   status-page-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -330,7 +454,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   test-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -390,7 +514,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   ingestor-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -450,7 +574,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   probe-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -511,7 +635,7 @@ jobs:
 
 
   haraka-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -571,7 +695,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   admin-dashboard-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -632,7 +756,7 @@ jobs:
 
 
   dashboard-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -692,7 +816,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   app-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -752,7 +876,7 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
   accounts-docker-image-deploy:
-    needs: generate-build-number
+    needs: [generate-build-number, github-release]
     runs-on: ubuntu-latest
     steps:
       - name: Docker Meta
@@ -810,3 +934,52 @@ jobs:
           build-args: |
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+
+  publish-npm-packages:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number, github-release]
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+      NPM_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
+      PACKAGE_VERSION: 7.0.${{needs.generate-build-number.outputs.build_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+      - name: Preinstall 
+        run: npm run prerun
+      - name: Publish Infrastructure Agent
+        run: bash ./Scripts/NPM/PublishAllPackages.sh
+        
+  infrastructure-agent-deploy:
+    needs: [generate-build-number, github-release]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+          
+      - name: Set up Go
+        uses: actions/setup-go@v4
+
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          install-only: true
+
+      - name: Show GoReleaser version
+        run: goreleaser -v
+
+      - name: Run GoReleaser
+        run: cd InfrastructureAgent && export GORELEASER_CURRENT_TAG=7.0.${{needs.generate-build-number.outputs.build_number}} && goreleaser release --clean --snapshot
+      
+      # Upload binaries to github release
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            InfrastructureAgent/dist/*
+          token: ${{ secrets.GITHUB_TOKEN }}
+          draft: false
+          prerelease: false
+          tag_name: 7.0.${{needs.generate-build-number.outputs.build_number}}

.github/workflows/test-release.yaml

@@ -80,6 +80,68 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+
+  e2e-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/e2e
+            ghcr.io/oneuptime/e2e
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy e2e.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./E2E/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   test-server-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -202,6 +264,67 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+  isolated-vm-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/isolated-vm
+            ghcr.io/oneuptime/isolated-vm
+          tags: |
+            type=raw,value=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 isolated-vm.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IsolatedVM/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   status-page-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -753,9 +876,10 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+          
   test-helm-chart:
     runs-on: ubuntu-latest
-    needs: [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]
+    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:
@@ -763,4 +887,4 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd HelmChart && cd Tests && bash index.sh
+      - run: cd HelmChart && cd Tests && bash index.sh

.github/workflows/test.e2e.yaml

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

.github/workflows/test.probe.yaml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   test:
-    runs-on: self-hosted # this needs to be self-hosted because ICMP checks are disbled in hosted runners
+    runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

.gitignore

@@ -98,4 +98,18 @@ Llama/Models/llama*
 
 Llama/__pycache__/*
 
-Examples/otel-dotnet/obj/*
+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

.prettierignore

@@ -50,4 +50,7 @@ marketing/*/*
 licenses/*
 certifications/*
 ApiReference/public/assets/*
-JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/*
+JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/*
+
+
+CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts

.prettierrc.json

@@ -4,5 +4,9 @@
     "semi": true,
     "singleQuote": true,
     "bracketSpacing": true,
-    "arrowParens": "avoid"
+    "arrowParens": "avoid",
+    "plugins": ["@trivago/prettier-plugin-sort-imports"],
+    "importOrderSeparation": true,
+    "importOrderSortSpecifiers": true,
+    "importOrderParserPlugins": ["typescript", "decorators", "dynamicImport", "jsx"]
 }

.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",
@@ -83,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",
@@ -139,34 +161,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Ingestor",
-            "name": "Probe API: Debug with Docker",
-            "port": 9251,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Identity",
-            "name": "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}/HttpTestServer",
@@ -222,19 +216,6 @@
                 "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,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.6-alpine3.18
+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
 
 
@@ -14,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -25,6 +29,8 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
@@ -32,6 +38,8 @@ COPY ./Common /usr/src/Common
 
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
+# Set version in ./Model/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
 RUN npm install
 COPY ./Model /usr/src/Model
 
@@ -39,6 +47,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -49,6 +59,8 @@ COPY ./CommonServer /usr/src/CommonServer
 
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
+# Set version in ./CommonUI/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 

Accounts/Serve.ts

@@ -1,7 +1,7 @@
-import App from 'CommonServer/Utils/StartServer';
 import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 import Express, { ExpressApplication } from 'CommonServer/Utils/Express';
 import logger from 'CommonServer/Utils/Logger';
+import App from 'CommonServer/Utils/StartServer';
 
 export const APP_NAME: string = 'accounts';
 
@@ -10,7 +10,17 @@ const app: ExpressApplication = Express.getExpressApp();
 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);
@@ -20,7 +30,7 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
 
 init().catch((err: Error) => {
     logger.error(err);
-    logger.info('Exiting node process');
+    logger.error('Exiting node process');
     process.exit(1);
 });
 

Accounts/nodemon.json

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

Accounts/package-lock.json

@@ -1,24 +1,24 @@
 {
-    "name": "accounts",
+    "name": "@oneuptime/accounts",
     "version": "0.1.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "accounts",
+            "name": "@oneuptime/accounts",
             "version": "0.1.0",
             "dependencies": {
                 "Common": "file:../Common",
                 "CommonServer": "file:../CommonServer",
                 "CommonUI": "file:../CommonUI",
-                "css-loader": "^6.10.0",
-                "dotenv": "^16.4.1",
-                "express": "^4.18.2",
+                "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.21.3",
+                "react": "^18.3.1",
+                "react-dom": "^18.3.1",
+                "react-router-dom": "^6.23.1",
                 "sass-loader": "^13.3.3",
                 "style-loader": "^3.3.4",
                 "ts-loader": "^9.5.1",
@@ -35,19 +35,19 @@
             }
         },
         "../Common": {
-            "name": "common",
+            "name": "@oneuptime/common",
             "version": "1.0.0",
-            "license": "MIT",
+            "license": "Apache-2.0",
             "dependencies": {
                 "@types/crypto-js": "^4.2.2",
                 "@types/uuid": "^8.3.4",
-                "axios": "^1.6.7",
+                "axios": "^1.6.8",
                 "crypto-js": "^4.1.1",
                 "json5": "^2.2.3",
                 "moment": "^2.30.1",
                 "moment-timezone": "^0.5.45",
-                "posthog-js": "^1.104.4",
-                "reflect-metadata": "^0.2.1",
+                "posthog-js": "^1.116.6",
+                "reflect-metadata": "^0.2.2",
                 "slugify": "^1.6.5",
                 "typeorm": "^0.3.20",
                 "uuid": "^8.3.2"
@@ -61,49 +61,46 @@
             }
         },
         "../CommonServer": {
-            "name": "common-server",
+            "name": "@oneuptime/common-server",
             "version": "1.0.0",
-            "license": "MIT",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@clickhouse/client": "^0.2.7",
-                "@elastic/elasticsearch": "^8.11.0",
+                "@clickhouse/client": "^0.2.10",
+                "@elastic/elasticsearch": "^8.12.1",
                 "@opentelemetry/api": "^1.7.0",
-                "@opentelemetry/api-logs": "^0.48.0",
-                "@opentelemetry/exporter-logs-otlp-http": "^0.48.0",
-                "@opentelemetry/exporter-metrics-otlp-proto": "^0.48.0",
-                "@opentelemetry/exporter-trace-otlp-proto": "^0.48.0",
+                "@opentelemetry/api-logs": "^0.49.1",
+                "@opentelemetry/auto-instrumentations-node": "^0.43.0",
+                "@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
+                "@opentelemetry/exporter-metrics-otlp-proto": "^0.49.1",
+                "@opentelemetry/exporter-trace-otlp-proto": "^0.49.1",
                 "@opentelemetry/id-generator-aws-xray": "^1.2.1",
-                "@opentelemetry/instrumentation-express": "^0.35.0",
-                "@opentelemetry/instrumentation-http": "^0.48.0",
-                "@opentelemetry/sdk-logs": "^0.48.0",
+                "@opentelemetry/sdk-logs": "^0.49.1",
                 "@opentelemetry/sdk-metrics": "^1.21.0",
                 "@opentelemetry/sdk-node": "^0.48.0",
                 "@opentelemetry/sdk-trace-node": "^1.21.0",
-                "@socket.io/redis-adapter": "^8.2.1",
+                "acme-client": "^5.3.0",
                 "airtable": "^0.12.2",
-                "axios": "^1.6.4",
                 "bullmq": "^5.3.3",
                 "Common": "file:../Common",
                 "cookie-parser": "^1.4.6",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
-                "dotenv": "^16.4.1",
-                "ejs": "^3.1.8",
-                "express": "^4.17.3",
+                "dotenv": "^16.4.4",
+                "ejs": "^3.1.10",
+                "express": "^4.19.2",
                 "ioredis": "^5.3.2",
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
                 "markdown-it": "^13.0.1",
                 "Model": "file:../Model",
                 "node-cron": "^3.0.3",
-                "nodemailer": "^6.9.9",
+                "nodemailer": "^6.9.10",
                 "pg": "^8.7.3",
-                "socket.io": "^4.7.2",
+                "socket.io": "^4.7.4",
                 "stripe": "^10.17.0",
-                "twilio": "^4.19.3",
+                "twilio": "^4.22.0",
                 "typeorm": "^0.3.20",
-                "typeorm-extension": "^2.2.13",
-                "vm2": "^3.9.14"
+                "typeorm-extension": "^2.2.13"
             },
             "devDependencies": {
                 "@faker-js/faker": "^6.3.1",
@@ -124,43 +121,48 @@
             }
         },
         "../CommonUI": {
-            "name": "common-ui",
+            "name": "@oneuptime/common-ui",
             "version": "1.0.0",
-            "license": "MIT",
+            "license": "Apache-2.0",
             "dependencies": {
+                "@babel/runtime": "^7.24.1",
                 "@monaco-editor/react": "^4.4.6",
-                "@opentelemetry/api": "^1.7.0",
-                "@opentelemetry/context-zone": "^1.21.0",
-                "@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
-                "@opentelemetry/instrumentation": "^0.48.0",
-                "@opentelemetry/instrumentation-fetch": "^0.48.0",
-                "@opentelemetry/instrumentation-xml-http-request": "^0.48.0",
+                "@nivo/core": "^0.85.1",
+                "@nivo/line": "^0.85.1",
+                "@opentelemetry/api": "^1.8.0",
+                "@opentelemetry/context-zone": "^1.22.0",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
+                "@opentelemetry/instrumentation": "^0.49.1",
+                "@opentelemetry/instrumentation-fetch": "^0.49.1",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.49.1",
                 "@opentelemetry/resources": "^1.21.0",
                 "@opentelemetry/sdk-trace-web": "^1.21.0",
                 "@opentelemetry/semantic-conventions": "^1.21.0",
                 "@tippyjs/react": "^4.2.6",
+                "@types/react-highlight": "^0.12.8",
                 "Common": "file:../Common",
                 "formik": "^2.2.9",
                 "history": "^5.3.0",
                 "lodash": "^4.17.21",
                 "Model": "file:../Model",
-                "moment-timezone": "^0.5.44",
+                "moment-timezone": "^0.5.45",
                 "prop-types": "^15.8.1",
                 "react": "^18.2.0",
                 "react-beautiful-dnd": "^13.1.1",
-                "react-big-calendar": "^1.8.7",
+                "react-big-calendar": "^1.11.2",
                 "react-color": "^2.19.3",
                 "react-dom": "^18.1.0",
                 "react-dropzone": "^14.2.2",
-                "react-error-boundary": "^4.0.12",
+                "react-error-boundary": "^4.0.13",
+                "react-highlight": "^0.15.0",
                 "react-markdown": "^8.0.3",
-                "react-router-dom": "^6.21.3",
+                "react-router-dom": "^6.22.3",
                 "react-select": "^5.4.0",
                 "react-spinners": "^0.13.6",
                 "react-toggle": "^4.1.3",
-                "reactflow": "^11.10.3",
+                "reactflow": "^11.10.4",
                 "remark-gfm": "^3.0.1",
-                "socket.io-client": "^4.7.4",
+                "socket.io-client": "^4.7.5",
                 "tippy.js": "^6.3.7",
                 "universal-cookie": "^4.0.4",
                 "use-async-effect": "^2.2.6"
@@ -186,9 +188,9 @@
             }
         },
         "../Model": {
-            "name": "model",
+            "name": "@oneuptime/model",
             "version": "1.0.0",
-            "license": "ISC",
+            "license": "Apache-2.0",
             "dependencies": {
                 "Common": "file:../Common",
                 "typeorm": "^0.3.20"
@@ -265,9 +267,10 @@
             }
         },
         "node_modules/@remix-run/router": {
-            "version": "1.14.2",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
-            "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
+            "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
+            "license": "MIT",
             "engines": {
                 "node": ">=14.0.0"
             }
@@ -660,12 +663,12 @@
             }
         },
         "node_modules/body-parser": {
-            "version": "1.20.1",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-            "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+            "version": "1.20.2",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
             "dependencies": {
                 "bytes": "3.1.2",
-                "content-type": "~1.0.4",
+                "content-type": "~1.0.5",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
                 "destroy": "1.2.0",
@@ -673,7 +676,7 @@
                 "iconv-lite": "0.4.24",
                 "on-finished": "2.4.1",
                 "qs": "6.11.0",
-                "raw-body": "2.5.1",
+                "raw-body": "2.5.2",
                 "type-is": "~1.6.18",
                 "unpipe": "1.0.0"
             },
@@ -761,13 +764,18 @@
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-            "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
             "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
-                "get-intrinsic": "^1.2.1",
-                "set-function-length": "^1.1.1"
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -920,9 +928,9 @@
             }
         },
         "node_modules/cookie": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+            "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -939,15 +947,15 @@
             "dev": true
         },
         "node_modules/css-loader": {
-            "version": "6.10.0",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
-            "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
+            "version": "6.11.0",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+            "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
             "dependencies": {
                 "icss-utils": "^5.1.0",
                 "postcss": "^8.4.33",
-                "postcss-modules-extract-imports": "^3.0.0",
-                "postcss-modules-local-by-default": "^4.0.4",
-                "postcss-modules-scope": "^3.1.1",
+                "postcss-modules-extract-imports": "^3.1.0",
+                "postcss-modules-local-by-default": "^4.0.5",
+                "postcss-modules-scope": "^3.2.0",
                 "postcss-modules-values": "^4.0.0",
                 "postcss-value-parser": "^4.2.0",
                 "semver": "^7.5.4"
@@ -999,16 +1007,19 @@
             }
         },
         "node_modules/define-data-property": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
             "dependencies": {
-                "get-intrinsic": "^1.2.1",
-                "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.0"
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
             },
             "engines": {
                 "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/depd": {
@@ -1038,14 +1049,14 @@
             }
         },
         "node_modules/dotenv": {
-            "version": "16.4.1",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz",
-            "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==",
+            "version": "16.4.5",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+            "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
             "engines": {
                 "node": ">=12"
             },
             "funding": {
-                "url": "https://github.com/motdotla/dotenv?sponsor=1"
+                "url": "https://dotenvx.com"
             }
         },
         "node_modules/ee-first": {
@@ -1086,6 +1097,25 @@
                 "node": ">=10.13.0"
             }
         },
+        "node_modules/es-define-property": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+            "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.2.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/es-module-lexer": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
@@ -1160,16 +1190,16 @@
             }
         },
         "node_modules/express": {
-            "version": "4.18.2",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-            "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+            "version": "4.19.2",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
             "dependencies": {
                 "accepts": "~1.3.8",
                 "array-flatten": "1.1.1",
-                "body-parser": "1.20.1",
+                "body-parser": "1.20.2",
                 "content-disposition": "0.5.4",
                 "content-type": "~1.0.4",
-                "cookie": "0.5.0",
+                "cookie": "0.6.0",
                 "cookie-signature": "1.0.6",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
@@ -1322,15 +1352,19 @@
             }
         },
         "node_modules/get-intrinsic": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-            "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+            "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
             "dependencies": {
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
                 "has-proto": "^1.0.1",
                 "has-symbols": "^1.0.3",
                 "hasown": "^2.0.0"
             },
+            "engines": {
+                "node": ">= 0.4"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -1378,20 +1412,20 @@
             }
         },
         "node_modules/has-property-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-            "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
             "dependencies": {
-                "get-intrinsic": "^1.2.2"
+                "es-define-property": "^1.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/has-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-            "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+            "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -1411,9 +1445,9 @@
             }
         },
         "node_modules/hasown": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-            "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
             "dependencies": {
                 "function-bind": "^1.1.2"
             },
@@ -1889,9 +1923,9 @@
             }
         },
         "node_modules/postcss-modules-extract-imports": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-            "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+            "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
             "engines": {
                 "node": "^10 || ^12 || >= 14"
             },
@@ -1900,9 +1934,9 @@
             }
         },
         "node_modules/postcss-modules-local-by-default": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
-            "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+            "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
             "dependencies": {
                 "icss-utils": "^5.0.0",
                 "postcss-selector-parser": "^6.0.2",
@@ -1916,9 +1950,9 @@
             }
         },
         "node_modules/postcss-modules-scope": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
-            "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+            "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
             "dependencies": {
                 "postcss-selector-parser": "^6.0.4"
             },
@@ -1944,9 +1978,9 @@
             }
         },
         "node_modules/postcss-selector-parser": {
-            "version": "6.0.13",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-            "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+            "version": "6.0.16",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+            "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
             "dependencies": {
                 "cssesc": "^3.0.0",
                 "util-deprecate": "^1.0.2"
@@ -2017,9 +2051,9 @@
             }
         },
         "node_modules/raw-body": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+            "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
             "dependencies": {
                 "bytes": "3.1.2",
                 "http-errors": "2.0.0",
@@ -2031,9 +2065,9 @@
             }
         },
         "node_modules/react": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-            "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+            "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
             "dependencies": {
                 "loose-envify": "^1.1.0"
             },
@@ -2042,23 +2076,24 @@
             }
         },
         "node_modules/react-dom": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-            "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+            "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
             "dependencies": {
                 "loose-envify": "^1.1.0",
-                "scheduler": "^0.23.0"
+                "scheduler": "^0.23.2"
             },
             "peerDependencies": {
-                "react": "^18.2.0"
+                "react": "^18.3.1"
             }
         },
         "node_modules/react-router": {
-            "version": "6.21.3",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
-            "integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
+            "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
+            "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.14.2"
+                "@remix-run/router": "1.16.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -2068,12 +2103,13 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.21.3",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
-            "integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
+            "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
+            "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.14.2",
-                "react-router": "6.21.3"
+                "@remix-run/router": "1.16.1",
+                "react-router": "6.23.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -2156,9 +2192,9 @@
             }
         },
         "node_modules/scheduler": {
-            "version": "0.23.0",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-            "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+            "version": "0.23.2",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+            "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
             "dependencies": {
                 "loose-envify": "^1.1.0"
             }
@@ -2253,14 +2289,16 @@
             }
         },
         "node_modules/set-function-length": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-            "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
             "dependencies": {
-                "define-data-property": "^1.1.1",
-                "get-intrinsic": "^1.2.1",
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
                 "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.0"
+                "has-property-descriptors": "^1.0.2"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -2272,13 +2310,17 @@
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
         "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+            "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"

Accounts/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "accounts",
+    "name": "@oneuptime/accounts",
     "version": "0.1.0",
     "private": false,
     "scripts": {
@@ -29,14 +29,14 @@
         "Common": "file:../Common",
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
-        "css-loader": "^6.10.0",
-        "dotenv": "^16.4.1",
-        "express": "^4.18.2",
+        "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.21.3",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-router-dom": "^6.23.1",
         "sass-loader": "^13.3.3",
         "style-loader": "^3.3.4",
         "ts-loader": "^9.5.1",

Accounts/src/App.tsx

@@ -1,18 +1,18 @@
-import React, { ReactElement } from 'react';
-import {
-    Routes,
-    Route,
-    useNavigate,
-    useLocation,
-    useParams,
-} from 'react-router-dom';
+import ForgotPasswordPage from './Pages/ForgotPassword';
 import LoginPage from './Pages/Login';
 import NotFound from './Pages/NotFound';
-import ForgotPasswordPage from './Pages/ForgotPassword';
 import RegisterPage from './Pages/Register';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import VerifyEmail from './Pages/VerifyEmail';
 import ResetPasswordPage from './Pages/ResetPassword';
+import VerifyEmail from './Pages/VerifyEmail';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import React, { ReactElement } from 'react';
+import {
+    Route,
+    Routes,
+    useLocation,
+    useNavigate,
+    useParams,
+} from 'react-router-dom';
 
 function App(): ReactElement {
     Navigation.setNavigateHook(useNavigate());

Accounts/src/Index.tsx

@@ -1,10 +1,9 @@
+import App from './App';
+import Telemetry from 'CommonUI/src/Utils/Telemetry';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import App from './App';
 import { BrowserRouter } from 'react-router-dom';
 
-import Telemetry from 'CommonUI/src/Utils/Telemetry';
-
 Telemetry.init({
     serviceName: 'Accounts',
 });

Accounts/src/Pages/ForgotPassword.tsx

@@ -1,12 +1,12 @@
-import React, { useState } from 'react';
-import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
-import User from 'Model/Models/User';
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
-import Link from 'CommonUI/src/Components/Link/Link';
 import { FORGOT_PASSWORD_API_URL } from '../Utils/ApiPaths';
+import Route from 'Common/Types/API/Route';
 import URL from 'Common/Types/API/URL';
+import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import Link from 'CommonUI/src/Components/Link/Link';
+import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
+import User from 'Model/Models/User';
+import React, { useState } from 'react';
 
 const ForgotPassword: () => JSX.Element = () => {
     const apiUrl: URL = FORGOT_PASSWORD_API_URL;

Accounts/src/Pages/Login.tsx

@@ -1,19 +1,20 @@
-import React, { useState } from 'react';
-import User from 'Model/Models/User';
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
-import Link from 'CommonUI/src/Components/Link/Link';
-import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import { LOGIN_API_URL } from '../Utils/ApiPaths';
+import Route from 'Common/Types/API/Route';
 import URL from 'Common/Types/API/URL';
 import { JSONObject } from 'Common/Types/JSON';
-import LoginUtil from '../Utils/Login';
-import UserUtil from 'CommonUI/src/Utils/User';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import { DASHBOARD_URL } from 'CommonUI/src/Config';
 import Alert, { AlertType } from 'CommonUI/src/Components/Alerts/Alert';
+import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import Link from 'CommonUI/src/Components/Link/Link';
+import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
 import UiAnalytics from 'CommonUI/src/Utils/Analytics';
+import LoginUtil from 'CommonUI/src/Utils/Login';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import UserUtil from 'CommonUI/src/Utils/User';
+import User from 'Model/Models/User';
+import React, { useState } from 'react';
+import useAsyncEffect from 'use-async-effect';
 
 const LoginPage: () => JSX.Element = () => {
     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,6 +101,7 @@ const LoginPage: () => JSX.Element = () => {
                                     url: new Route('/accounts/forgot-password'),
                                     openLinkInNewTab: false,
                                 },
+                                dataTestId: 'password',
                             },
                         ]}
                         createOrUpdateApiUrl={apiUrl}
@@ -106,7 +123,7 @@ const LoginPage: () => JSX.Element = () => {
                         }}
                         maxPrimaryButtonWidth={true}
                         footer={
-                            <div className="actions pointer text-center mt-4 hover:underline fw-semibold">
+                            <div className="actions text-center mt-4 hover:underline fw-semibold">
                                 <div>
                                     {!showSsoTip && (
                                         <div
@@ -121,11 +138,9 @@ 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>
                                     )}
                                 </div>

Accounts/src/Pages/Register.tsx

@@ -1,26 +1,26 @@
-import React, { useState } from 'react';
-import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
-import User from 'Model/Models/User';
-import Link from 'CommonUI/src/Components/Link/Link';
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
-import LoginUtil from '../Utils/Login';
-import { JSONObject } from 'Common/Types/JSON';
-import UserUtil from 'CommonUI/src/Utils/User';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import { BILLING_ENABLED, DASHBOARD_URL } from 'CommonUI/src/Config';
-import URL from 'Common/Types/API/URL';
 import { SIGNUP_API_URL } from '../Utils/ApiPaths';
-import Fields from 'CommonUI/src/Components/Forms/Types/Fields';
+import Route from 'Common/Types/API/Route';
+import URL from 'Common/Types/API/URL';
 import Dictionary from 'Common/Types/Dictionary';
+import { JSONObject } from 'Common/Types/JSON';
+import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
+import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
+import Fields from 'CommonUI/src/Components/Forms/Types/Fields';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import Link from 'CommonUI/src/Components/Link/Link';
+import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
+import { BILLING_ENABLED, DASHBOARD_URL } from 'CommonUI/src/Config';
+import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
+import BaseAPI from 'CommonUI/src/Utils/API/API';
 import UiAnalytics from 'CommonUI/src/Utils/Analytics';
 import LocalStorage from 'CommonUI/src/Utils/LocalStorage';
-import Reseller from 'Model/Models/Reseller';
+import LoginUtil from 'CommonUI/src/Utils/Login';
 import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
-import BaseAPI from 'CommonUI/src/Utils/API/API';
-import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
-import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import UserUtil from 'CommonUI/src/Utils/User';
+import Reseller from 'Model/Models/Reseller';
+import User from 'Model/Models/User';
+import React, { useState } from 'react';
 import useAsyncEffect from 'use-async-effect';
 
 const RegisterPage: () => JSX.Element = () => {
@@ -104,6 +104,7 @@ const RegisterPage: () => JSX.Element = () => {
             required: true,
             disabled: Boolean(initialValues && initialValues['email']),
             title: 'Email',
+            dataTestId: 'email',
         },
         {
             field: {
@@ -113,6 +114,7 @@ const RegisterPage: () => JSX.Element = () => {
             placeholder: 'Jeff Smith',
             required: true,
             title: 'Full Name',
+            dataTestId: 'name',
         },
     ];
 
@@ -126,6 +128,7 @@ const RegisterPage: () => JSX.Element = () => {
                 placeholder: 'Acme, Inc.',
                 required: true,
                 title: 'Company Name',
+                dataTestId: 'companyName',
             },
         ]);
 
@@ -139,6 +142,7 @@ const RegisterPage: () => JSX.Element = () => {
                 required: true,
                 placeholder: '+11234567890',
                 title: 'Phone Number',
+                dataTestId: 'companyPhoneNumber',
             });
         }
     }
@@ -155,6 +159,7 @@ const RegisterPage: () => JSX.Element = () => {
             placeholder: 'Password',
             title: 'Password',
             required: true,
+            dataTestId: 'password',
         },
         {
             field: {
@@ -170,6 +175,7 @@ const RegisterPage: () => JSX.Element = () => {
             overrideFieldKey: 'confirmPassword',
             required: true,
             showEvenIfPermissionDoesNotExist: true,
+            dataTestId: 'confirmPassword',
         },
     ]);
 

Accounts/src/Pages/ResetPassword.tsx

@@ -1,14 +1,13 @@
-import React, { useState } from 'react';
-import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
-import User from 'Model/Models/User';
-import Link from 'CommonUI/src/Components/Link/Link';
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
-
-import URL from 'Common/Types/API/URL';
 import { RESET_PASSWORD_API_URL } from '../Utils/ApiPaths';
+import Route from 'Common/Types/API/Route';
+import URL from 'Common/Types/API/URL';
+import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import Link from 'CommonUI/src/Components/Link/Link';
+import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
 import Navigation from 'CommonUI/src/Utils/Navigation';
+import User from 'Model/Models/User';
+import React, { useState } from 'react';
 
 const RegisterPage: () => JSX.Element = () => {
     const apiUrl: URL = RESET_PASSWORD_API_URL;

Accounts/src/Pages/VerifyEmail.tsx

@@ -1,17 +1,17 @@
-import React, { useEffect, useState } from 'react';
+import { VERIFY_EMAIL_API_URL } from '../Utils/ApiPaths';
 import Route from 'Common/Types/API/Route';
-import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
+import URL from 'Common/Types/API/URL';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import ObjectID from 'Common/Types/ObjectID';
+import { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import Link from 'CommonUI/src/Components/Link/Link';
 import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
-import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
-import EmailVerificationToken from 'Model/Models/EmailVerificationToken';
-import { VERIFY_EMAIL_API_URL } from '../Utils/ApiPaths';
-import { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import ObjectID from 'Common/Types/ObjectID';
-import URL from 'Common/Types/API/URL';
+import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
 import API from 'CommonUI/src/Utils/API/API';
-import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import EmailVerificationToken from 'Model/Models/EmailVerificationToken';
+import React, { useEffect, useState } from 'react';
 
 const VerifyEmail: () => JSX.Element = () => {
     const apiUrl: URL = VERIFY_EMAIL_API_URL;

Accounts/tsconfig.json

@@ -3,7 +3,8 @@
         // these options are overrides used only by ts-node
         // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
         "compilerOptions": {
-            "module": "commonjs"
+            "module": "commonjs",
+            "resolveJsonModule": true, 
         }
     },
     "compilerOptions": {
@@ -105,6 +106,7 @@
 
         /* Completeness */
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
+                "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+        "resolveJsonModule": true
     }
 }

AdminDashboard/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.6-alpine3.18
+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
 
 
@@ -14,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -25,12 +29,16 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
 
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
+# Set version in ./Model/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
 RUN npm install
 COPY ./Model /usr/src/Model
 
@@ -38,6 +46,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -48,6 +58,8 @@ COPY ./CommonServer /usr/src/CommonServer
 
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
+# Set version in ./CommonUI/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 

AdminDashboard/Serve.ts

@@ -1,7 +1,7 @@
-import App from 'CommonServer/Utils/StartServer';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 import Express, { ExpressApplication } from 'CommonServer/Utils/Express';
 import logger from 'CommonServer/Utils/Logger';
-import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import App from 'CommonServer/Utils/StartServer';
 
 export const APP_NAME: string = 'admin';
 
@@ -10,7 +10,18 @@ const app: ExpressApplication = Express.getExpressApp();
 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);
@@ -20,7 +31,7 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
 
 init().catch((err: Error) => {
     logger.error(err);
-    logger.info('Exiting node process');
+    logger.error('Exiting node process');
     process.exit(1);
 });
 

AdminDashboard/nodemon.json

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

AdminDashboard/package-lock.json

@@ -1,22 +1,22 @@
 {
-    "name": "admin-dashboard",
+    "name": "@oneuptime/admin-dashboard",
     "version": "0.1.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "admin-dashboard",
+            "name": "@oneuptime/admin-dashboard",
             "version": "0.1.0",
             "dependencies": {
                 "Common": "file:../Common",
                 "CommonServer": "file:../CommonServer",
                 "CommonUI": "file:../CommonUI",
-                "dotenv": "^16.4.1",
+                "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.21.3",
+                "react": "^18.3.1",
+                "react-dom": "^18.3.1",
+                "react-router-dom": "^6.23.1",
                 "style-loader": "^3.3.4"
             },
             "devDependencies": {
@@ -35,21 +35,21 @@
             }
         },
         "../Common": {
-            "name": "common",
+            "name": "@oneuptime/common",
             "version": "1.0.0",
-            "license": "MIT",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/crypto-js": "^4.1.1",
+                "@types/crypto-js": "^4.2.2",
                 "@types/uuid": "^8.3.4",
-                "axios": "^1.6.2",
+                "axios": "^1.6.8",
                 "crypto-js": "^4.1.1",
                 "json5": "^2.2.3",
-                "moment": "^2.29.2",
-                "moment-timezone": "^0.5.40",
-                "posthog-js": "^1.77.0",
-                "reflect-metadata": "^0.1.13",
+                "moment": "^2.30.1",
+                "moment-timezone": "^0.5.45",
+                "posthog-js": "^1.130.1",
+                "reflect-metadata": "^0.2.2",
                 "slugify": "^1.6.5",
-                "typeorm": "^0.3.6",
+                "typeorm": "^0.3.20",
                 "uuid": "^8.3.2"
             },
             "devDependencies": {
@@ -61,40 +61,47 @@
             }
         },
         "../CommonServer": {
-            "name": "common-server",
+            "name": "@oneuptime/common-server",
             "version": "1.0.0",
-            "license": "MIT",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@clickhouse/client": "^0.2.1",
-                "@elastic/elasticsearch": "^8.1.0",
+                "@clickhouse/client": "^0.2.10",
+                "@elastic/elasticsearch": "^8.12.1",
                 "@opentelemetry/api": "^1.7.0",
-                "@opentelemetry/auto-instrumentations-node": "^0.40.1",
-                "@opentelemetry/sdk-node": "^0.45.1",
-                "@socket.io/redis-adapter": "^8.2.1",
+                "@opentelemetry/api-logs": "^0.49.1",
+                "@opentelemetry/auto-instrumentations-node": "^0.43.0",
+                "@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
+                "@opentelemetry/exporter-metrics-otlp-proto": "^0.49.1",
+                "@opentelemetry/exporter-trace-otlp-proto": "^0.49.1",
+                "@opentelemetry/id-generator-aws-xray": "^1.2.1",
+                "@opentelemetry/sdk-logs": "^0.49.1",
+                "@opentelemetry/sdk-metrics": "^1.21.0",
+                "@opentelemetry/sdk-node": "^0.48.0",
+                "@opentelemetry/sdk-trace-node": "^1.21.0",
+                "acme-client": "^5.3.0",
                 "airtable": "^0.12.2",
-                "axios": "^1.6.2",
-                "bullmq": "^3.6.6",
+                "bullmq": "^5.3.3",
                 "Common": "file:../Common",
                 "cookie-parser": "^1.4.6",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
-                "dotenv": "^16.0.0",
-                "ejs": "^3.1.8",
-                "express": "^4.17.3",
+                "dotenv": "^16.4.4",
+                "ejs": "^3.1.10",
+                "express": "^4.19.2",
                 "ioredis": "^5.3.2",
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
-                "markdown-it": "^13.0.1",
+                "marked": "^12.0.2",
                 "Model": "file:../Model",
-                "nodemailer": "^6.7.3",
+                "node-cron": "^3.0.3",
+                "nodemailer": "^6.9.10",
                 "pg": "^8.7.3",
-                "socket.io": "^4.7.2",
+                "redis-semaphore": "^5.5.1",
+                "socket.io": "^4.7.4",
                 "stripe": "^10.17.0",
-                "twilio": "^4.19.3",
-                "typeorm": "^0.3.10",
-                "typeorm-extension": "^2.2.13",
-                "vm2": "^3.9.14",
-                "winston": "^3.6.0"
+                "twilio": "^4.22.0",
+                "typeorm": "^0.3.20",
+                "typeorm-extension": "^2.2.13"
             },
             "devDependencies": {
                 "@faker-js/faker": "^6.3.1",
@@ -105,8 +112,8 @@
                 "@types/jest": "^27.4.1",
                 "@types/json2csv": "^5.0.3",
                 "@types/jsonwebtoken": "^8.5.9",
-                "@types/markdown-it": "^12.2.3",
                 "@types/node": "^17.0.22",
+                "@types/node-cron": "^3.0.7",
                 "@types/nodemailer": "^6.4.7",
                 "jest": "^27.5.1",
                 "jest-mock-extended": "^3.0.5",
@@ -114,34 +121,48 @@
             }
         },
         "../CommonUI": {
-            "name": "common-ui",
+            "name": "@oneuptime/common-ui",
             "version": "1.0.0",
-            "license": "MIT",
+            "license": "Apache-2.0",
             "dependencies": {
+                "@babel/runtime": "^7.24.1",
                 "@monaco-editor/react": "^4.4.6",
+                "@nivo/core": "^0.86.0",
+                "@nivo/line": "^0.86.0",
+                "@opentelemetry/api": "^1.8.0",
+                "@opentelemetry/context-zone": "^1.23.0",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
+                "@opentelemetry/instrumentation": "^0.51.0",
+                "@opentelemetry/instrumentation-fetch": "^0.51.0",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.51.0",
+                "@opentelemetry/resources": "^1.23.0",
+                "@opentelemetry/sdk-trace-web": "^1.23.0",
+                "@opentelemetry/semantic-conventions": "^1.23.0",
                 "@tippyjs/react": "^4.2.6",
+                "@types/react-highlight": "^0.12.8",
                 "Common": "file:../Common",
-                "formik": "^2.2.9",
+                "formik": "^2.4.6",
                 "history": "^5.3.0",
                 "lodash": "^4.17.21",
                 "Model": "file:../Model",
-                "moment-timezone": "^0.5.43",
+                "moment-timezone": "^0.5.45",
                 "prop-types": "^15.8.1",
-                "react": "^18.2.0",
+                "react": "^18.3.1",
                 "react-beautiful-dnd": "^13.1.1",
-                "react-big-calendar": "^1.8.5",
+                "react-big-calendar": "^1.11.2",
                 "react-color": "^2.19.3",
-                "react-dom": "^18.1.0",
+                "react-dom": "^18.3.1",
                 "react-dropzone": "^14.2.2",
-                "react-error-boundary": "^4.0.11",
+                "react-error-boundary": "^4.0.13",
+                "react-highlight": "^0.15.0",
                 "react-markdown": "^8.0.3",
-                "react-router-dom": "^6.3.0",
+                "react-router-dom": "^6.22.3",
                 "react-select": "^5.4.0",
                 "react-spinners": "^0.13.6",
                 "react-toggle": "^4.1.3",
-                "reactflow": "^11.5.3",
+                "reactflow": "^11.11.1",
                 "remark-gfm": "^3.0.1",
-                "socket.io-client": "^4.7.2",
+                "socket.io-client": "^4.7.5",
                 "tippy.js": "^6.3.7",
                 "universal-cookie": "^4.0.4",
                 "use-async-effect": "^2.2.6"
@@ -167,12 +188,12 @@
             }
         },
         "../Model": {
-            "name": "model",
+            "name": "@oneuptime/model",
             "version": "1.0.0",
-            "license": "ISC",
+            "license": "Apache-2.0",
             "dependencies": {
                 "Common": "file:../Common",
-                "typeorm": "^0.3.17"
+                "typeorm": "^0.3.20"
             },
             "devDependencies": {
                 "@types/jest": "^27.4.1",
@@ -4009,9 +4030,10 @@
             }
         },
         "node_modules/@remix-run/router": {
-            "version": "1.14.2",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
-            "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
+            "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
+            "license": "MIT",
             "engines": {
                 "node": ">=14.0.0"
             }
@@ -7915,14 +7937,14 @@
             }
         },
         "node_modules/dotenv": {
-            "version": "16.4.1",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz",
-            "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==",
+            "version": "16.4.5",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+            "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
             "engines": {
                 "node": ">=12"
             },
             "funding": {
-                "url": "https://github.com/motdotla/dotenv?sponsor=1"
+                "url": "https://dotenvx.com"
             }
         },
         "node_modules/dotenv-expand": {
@@ -16705,9 +16727,9 @@
             }
         },
         "node_modules/react": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-            "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+            "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
             "dependencies": {
                 "loose-envify": "^1.1.0"
             },
@@ -16900,15 +16922,15 @@
             }
         },
         "node_modules/react-dom": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-            "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+            "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
             "dependencies": {
                 "loose-envify": "^1.1.0",
-                "scheduler": "^0.23.0"
+                "scheduler": "^0.23.2"
             },
             "peerDependencies": {
-                "react": "^18.2.0"
+                "react": "^18.3.1"
             }
         },
         "node_modules/react-error-overlay": {
@@ -16936,11 +16958,12 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.21.3",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
-            "integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
+            "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
+            "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.14.2"
+                "@remix-run/router": "1.16.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -16950,12 +16973,13 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.21.3",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
-            "integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
+            "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
+            "license": "MIT",
             "dependencies": {
-                "@remix-run/router": "1.14.2",
-                "react-router": "6.21.3"
+                "@remix-run/router": "1.16.1",
+                "react-router": "6.23.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -17681,9 +17705,9 @@
             }
         },
         "node_modules/scheduler": {
-            "version": "0.23.0",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-            "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+            "version": "0.23.2",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+            "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
             "dependencies": {
                 "loose-envify": "^1.1.0"
             }

AdminDashboard/package.json

@@ -1,17 +1,17 @@
 {
-    "name": "admin-dashboard",
+    "name": "@oneuptime/admin-dashboard",
     "version": "0.1.0",
     "private": false,
     "dependencies": {
         "Common": "file:../Common",
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
-        "dotenv": "^16.4.1",
+        "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.21.3",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-router-dom": "^6.23.1",
         "style-loader": "^3.3.4"
     },
     "scripts": {

AdminDashboard/src/App.tsx

@@ -1,29 +1,28 @@
-import React from 'react';
-import {
-    Routes,
-    Route as PageRoute,
-    useNavigate,
-    useLocation,
-    useParams,
-} from 'react-router-dom';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import User from 'CommonUI/src/Utils/User';
+import MasterPage from './Components/MasterPage/MasterPage';
+import Init from './Pages/Init/Init';
+import Logout from './Pages/Logout/Logout';
+import Projects from './Pages/Projects/Index';
+import SettingsAPIKey from './Pages/Settings/APIKey/Index';
+import SettingsAuthentication from './Pages/Settings/Authentication/Index';
+import SettingsCallSMS from './Pages/Settings/CallSMS/Index';
+// Settings Pages.
+import SettingsEmail from './Pages/Settings/Email/Index';
+import SettingsProbes from './Pages/Settings/Probes/Index';
+import Users from './Pages/Users/Index';
+import PageMap from './Utils/PageMap';
+import RouteMap from './Utils/RouteMap';
 import URL from 'Common/Types/API/URL';
 import { ACCOUNTS_URL, DASHBOARD_URL } from 'CommonUI/src/Config';
-import MasterPage from './Components/MasterPage/MasterPage';
-import RouteMap from './Utils/RouteMap';
-import PageMap from './Utils/PageMap';
-import Init from './Pages/Init/Init';
-import Projects from './Pages/Projects/Index';
-import Users from './Pages/Users/Index';
-import Logout from './Pages/Logout/Logout';
-
-// Settings Pages.
-import SettingsEmail from './Pages/Settings/SMTP/Index';
-import SettingsCallSMS from './Pages/Settings/CallSMS/Index';
-import SettingsProbes from './Pages/Settings/Probes/Index';
-import SettingsAuthentication from './Pages/Settings/Authentication/Index';
-import SettingsAPIKey from './Pages/Settings/APIKey/Index';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import User from 'CommonUI/src/Utils/User';
+import React from 'react';
+import {
+    Route as PageRoute,
+    Routes,
+    useLocation,
+    useNavigate,
+    useParams,
+} from 'react-router-dom';
 
 const App: () => JSX.Element = () => {
     Navigation.setNavigateHook(useNavigate());

AdminDashboard/src/Components/Footer/Footer.tsx

@@ -1,14 +1,14 @@
-import React from 'react';
-import Footer from 'CommonUI/src/Components/Footer/Footer';
-import URL from 'Common/Types/API/URL';
-import API from 'Common/Utils/API';
-import { HOST, HTTP_PROTOCOL } from 'CommonUI/src/Config';
-import { JSONObject } from 'Common/Types/JSON';
-import BadDataException from 'Common/Types/Exception/BadDataException';
-import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
-import Dictionary from 'Common/Types/Dictionary';
 import HTTPResponse from 'Common/Types/API/HTTPResponse';
+import URL from 'Common/Types/API/URL';
+import Dictionary from 'Common/Types/Dictionary';
+import BadDataException from 'Common/Types/Exception/BadDataException';
 import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import { JSONObject } from 'Common/Types/JSON';
+import API from 'Common/Utils/API';
+import Footer from 'CommonUI/src/Components/Footer/Footer';
+import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
+import { HOST, HTTP_PROTOCOL } from 'CommonUI/src/Config';
+import React from 'react';
 
 const DashboardFooter: () => JSX.Element = () => {
     const [showAboutModal, setShowAboutModal] = React.useState<boolean>(false);

AdminDashboard/src/Components/Header/Header.tsx

@@ -1,11 +1,11 @@
-import React, { FunctionComponent, ReactElement } from 'react';
 import Help from './Help';
-import Header from 'CommonUI/src/Components/Header/Header';
 import Logo from './Logo';
-import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import { DASHBOARD_URL } from 'CommonUI/src/Config';
 import UserProfile from './UserProfile';
+import Button, { ButtonStyleType } from 'CommonUI/src/Components/Button/Button';
+import Header from 'CommonUI/src/Components/Header/Header';
+import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 const DashboardHeader: FunctionComponent = (): ReactElement => {
     return (

AdminDashboard/src/Components/Header/Help.tsx

@@ -1,10 +1,10 @@
-import React, { ReactElement, useState } from 'react';
+import URL from 'Common/Types/API/URL';
+import IconProp from 'Common/Types/Icon/IconProp';
 import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton';
 import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem';
 import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu';
 import IconDropdownRow from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownRow';
-import IconProp from 'Common/Types/Icon/IconProp';
-import URL from 'Common/Types/API/URL';
+import React, { ReactElement, useState } from 'react';
 
 const Help: () => JSX.Element = (): ReactElement => {
     const [isDropdownVisible, setIsDropdownVisible] = useState<boolean>(false);

AdminDashboard/src/Components/Header/Logo.tsx

@@ -1,9 +1,8 @@
 // Tailwind
-
-import React, { FunctionComponent, ReactElement } from 'react';
+import Route from 'Common/Types/API/Route';
 import Image from 'CommonUI/src/Components/Image/Image';
 import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
-import Route from 'Common/Types/API/Route';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 export interface ComponentProps {
     onClick: () => void;

AdminDashboard/src/Components/Header/Notifications.tsx

@@ -1,8 +1,8 @@
-import React, { ReactElement, useState } from 'react';
-import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton';
-import Notifications from 'CommonUI/src/Components/Header/Notifications/Notifications';
-import NotificationItem from 'CommonUI/src/Components/Header/Notifications/NotificationItem';
 import IconProp from 'Common/Types/Icon/IconProp';
+import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton';
+import NotificationItem from 'CommonUI/src/Components/Header/Notifications/NotificationItem';
+import Notifications from 'CommonUI/src/Components/Header/Notifications/Notifications';
+import React, { ReactElement, useState } from 'react';
 
 const DashboardHeader: () => JSX.Element = (): ReactElement => {
     const [isDropdownVisible, setIsDropdownVisible] = useState<boolean>(false);

AdminDashboard/src/Components/Header/ProjectPicker.tsx

@@ -1,22 +1,22 @@
+import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan';
+import IconProp from 'Common/Types/Icon/IconProp';
+import { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
+import Field from 'CommonUI/src/Components/Forms/Types/Field';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import ProjectPicker from 'CommonUI/src/Components/Header/ProjectPicker/ProjectPicker';
+import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal';
+import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons';
+import Toggle from 'CommonUI/src/Components/Toggle/Toggle';
+import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config';
+import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes';
+import ProjectUtil from 'CommonUI/src/Utils/Project';
+import Project from 'Model/Models/Project';
 import React, {
     FunctionComponent,
     ReactElement,
-    useState,
     useEffect,
+    useState,
 } from 'react';
-import ProjectPicker from 'CommonUI/src/Components/Header/ProjectPicker/ProjectPicker';
-import IconProp from 'Common/Types/Icon/IconProp';
-import Project from 'Model/Models/Project';
-import ModelFormModal from 'CommonUI/src/Components/ModelFormModal/ModelFormModal';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
-import ProjectUtil from 'CommonUI/src/Utils/Project';
-import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config';
-import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan';
-import Field from 'CommonUI/src/Components/Forms/Types/Field';
-import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons';
-import Toggle from 'CommonUI/src/Components/Toggle/Toggle';
-import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes';
 
 export interface ComponentProps {
     projects: Array<Project>;
@@ -41,7 +41,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         return (
             <Toggle
                 title="Yearly Plan"
-                initialValue={isSubscriptionPlanYearly}
+                value={isSubscriptionPlanYearly}
                 description="(Save 20%)"
                 onChange={(value: boolean) => {
                     setIsSubscriptionPlanYearly(value);

AdminDashboard/src/Components/Header/SearchBox.tsx

@@ -1,6 +1,6 @@
-import React, { FunctionComponent, ReactElement } from 'react';
 import SearchBox from 'CommonUI/src/Components/Header/SearchBox';
 import Project from 'Model/Models/Project';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 export interface ComponentProps {
     onChange: (search: string) => void;

AdminDashboard/src/Components/Header/UserProfile.tsx

@@ -1,15 +1,15 @@
-import React, { FunctionComponent, ReactElement, useState } from 'react';
-import IconProp from 'Common/Types/Icon/IconProp';
-import Route from 'Common/Types/API/Route';
-import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
 import PageMap from '../../Utils/PageMap';
-import BlankProfilePic from 'CommonUI/src/Images/users/blank-profile.svg';
+import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
+import Route from 'Common/Types/API/Route';
+import IconProp from 'Common/Types/Icon/IconProp';
 import HeaderIconDropdownButton from 'CommonUI/src/Components/Header/HeaderIconDropdownButton';
 import IconDropdownItem from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownItem';
 import IconDropdownMenu from 'CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu';
-import Navigation from 'CommonUI/src/Utils/Navigation';
 import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import BlankProfilePic from 'CommonUI/src/Images/users/blank-profile.svg';
+import Navigation from 'CommonUI/src/Utils/Navigation';
 import User from 'CommonUI/src/Utils/User';
+import React, { FunctionComponent, ReactElement, useState } from 'react';
 
 const DashboardUserProfile: FunctionComponent = (): ReactElement => {
     const [isDropdownVisible, setIsDropdownVisible] = useState<boolean>(false);

AdminDashboard/src/Components/MasterPage/MasterPage.tsx

@@ -1,9 +1,9 @@
-import MasterPage from 'CommonUI/src/Components/MasterPage/MasterPage';
 import Footer from '../Footer/Footer';
 import Header from '../Header/Header';
 import NavBar from '../NavBar/NavBar';
-import React, { FunctionComponent, ReactElement } from 'react';
+import MasterPage from 'CommonUI/src/Components/MasterPage/MasterPage';
 import TopAlert from 'CommonUI/src/Components/TopAlert/TopAlert';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 export interface ComponentProps {
     children: ReactElement | Array<ReactElement>;

AdminDashboard/src/Components/NavBar/NavBar.tsx

@@ -1,10 +1,10 @@
-import React, { FunctionComponent, ReactElement } from 'react';
-import NavBar from 'CommonUI/src/Components/Navbar/NavBar';
-import NavBarItem from 'CommonUI/src/Components/Navbar/NavBarItem';
-import Route from 'Common/Types/API/Route';
-import IconProp from 'Common/Types/Icon/IconProp';
 import PageMap from '../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
+import Route from 'Common/Types/API/Route';
+import IconProp from 'Common/Types/Icon/IconProp';
+import NavBar from 'CommonUI/src/Components/Navbar/NavBar';
+import NavBarItem from 'CommonUI/src/Components/Navbar/NavBarItem';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 const DashboardNavbar: FunctionComponent = (): ReactElement => {
     return (

AdminDashboard/src/Index.tsx

@@ -1,8 +1,8 @@
+import App from './App';
+import Telemetry from 'CommonUI/src/Utils/Telemetry';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import App from './App';
 import { BrowserRouter } from 'react-router-dom';
-import Telemetry from 'CommonUI/src/Utils/Telemetry';
 
 Telemetry.init({
     serviceName: 'AdminDashboard',

AdminDashboard/src/Pages/Init/Init.tsx

@@ -1,9 +1,9 @@
+import PageMap from '../../Utils/PageMap';
+import RouteMap from '../../Utils/RouteMap';
 import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
 import Page from 'CommonUI/src/Components/Page/Page';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 import React, { FunctionComponent, ReactElement, useEffect } from 'react';
-import RouteMap from '../../Utils/RouteMap';
-import PageMap from '../../Utils/PageMap';
 
 const Init: FunctionComponent = (): ReactElement => {
     useEffect(() => {

AdminDashboard/src/Pages/Logout/Logout.tsx

@@ -1,16 +1,15 @@
-import React, { FunctionComponent, ReactElement, useEffect } from 'react';
-
-import Page from 'CommonUI/src/Components/Page/Page';
-import Route from 'Common/Types/API/Route';
-import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
 import PageMap from '../../Utils/PageMap';
+import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
+import Route from 'Common/Types/API/Route';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
 import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
-import UserUtil from 'CommonUI/src/Utils/User';
-import Navigation from 'CommonUI/src/Utils/Navigation';
+import Page from 'CommonUI/src/Components/Page/Page';
 import { ACCOUNTS_URL } from 'CommonUI/src/Config';
 import UiAnalytics from 'CommonUI/src/Utils/Analytics';
-import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
-import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import UserUtil from 'CommonUI/src/Utils/User';
+import React, { FunctionComponent, ReactElement, useEffect } from 'react';
 
 const Logout: FunctionComponent = (): ReactElement => {
     const [error, setError] = React.useState<string | null>(null);

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -1,26 +1,26 @@
+import AdminModelAPI from '../../Utils/ModelAPI';
+import PageMap from '../../Utils/PageMap';
+import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
 import Route from 'Common/Types/API/Route';
+import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan';
+import Field from 'CommonUI/src/Components/Forms/Types/Field';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
 import Page from 'CommonUI/src/Components/Page/Page';
+import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons';
+import Toggle from 'CommonUI/src/Components/Toggle/Toggle';
+import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config';
+import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes';
+import Navigation from 'CommonUI/src/Utils/Navigation';
+import Project from 'Model/Models/Project';
+import User from 'Model/Models/User';
 import React, {
     FunctionComponent,
     ReactElement,
     useEffect,
     useState,
 } from 'react';
-import PageMap from '../../Utils/PageMap';
-import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
-import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
-import FieldType from 'CommonUI/src/Components/Types/FieldType';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import Navigation from 'CommonUI/src/Utils/Navigation';
-import Project from 'Model/Models/Project';
-import User from 'Model/Models/User';
-import { BILLING_ENABLED, getAllEnvVars } from 'CommonUI/src/Config';
-import Field from 'CommonUI/src/Components/Forms/Types/Field';
-import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan';
-import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons';
-import Toggle from 'CommonUI/src/Components/Toggle/Toggle';
-import AdminModelAPI from '../../Utils/ModelAPI';
-import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes';
 
 const Projects: FunctionComponent = (): ReactElement => {
     const [isSubscriptionPlanYearly, setIsSubscriptionPlanYearly] =
@@ -164,7 +164,7 @@ const Projects: FunctionComponent = (): ReactElement => {
         return (
             <Toggle
                 title="Yearly Plan"
-                initialValue={isSubscriptionPlanYearly}
+                value={isSubscriptionPlanYearly}
                 description="(Save 20%)"
                 onChange={(value: boolean) => {
                     setIsSubscriptionPlanYearly(value);
@@ -222,16 +222,30 @@ const Projects: FunctionComponent = (): ReactElement => {
                 noItemsMessage={'No projects found.'}
                 formFields={fields}
                 showRefreshButton={true}
-                showFilterButton={true}
                 viewPageRoute={Navigation.getCurrentRoute()}
-                columns={[
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            createdAt: true,
+                        },
+                        title: 'Created At',
+                        type: FieldType.DateTime,
+                    },
+                ]}
+                columns={[
                     {
                         field: {
                             name: true,
                         },
                         title: 'Name',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -239,7 +253,6 @@ const Projects: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Created At',
                         type: FieldType.DateTime,
-                        isFilterable: true,
                     },
                 ]}
             />

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

@@ -1,14 +1,14 @@
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
-import Page from 'CommonUI/src/Components/Page/Page';
-import React, { FunctionComponent, ReactElement } from 'react';
 import PageMap from '../../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../../Utils/RouteMap';
 import DashboardSideMenu from '../SideMenu';
-import GlobalConfig from 'Model/Models/GlobalConfig';
+import Route from 'Common/Types/API/Route';
 import ObjectID from 'Common/Types/ObjectID';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
+import Page from 'CommonUI/src/Components/Page/Page';
 import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import GlobalConfig from 'Model/Models/GlobalConfig';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 const Settings: FunctionComponent = (): ReactElement => {
     return (

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

@@ -1,14 +1,14 @@
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
-import Page from 'CommonUI/src/Components/Page/Page';
-import React, { FunctionComponent, ReactElement } from 'react';
 import PageMap from '../../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../../Utils/RouteMap';
 import DashboardSideMenu from '../SideMenu';
-import GlobalConfig from 'Model/Models/GlobalConfig';
+import Route from 'Common/Types/API/Route';
 import ObjectID from 'Common/Types/ObjectID';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
+import Page from 'CommonUI/src/Components/Page/Page';
 import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import GlobalConfig from 'Model/Models/GlobalConfig';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 const Settings: FunctionComponent = (): ReactElement => {
     return (

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

@@ -1,14 +1,14 @@
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
-import Page from 'CommonUI/src/Components/Page/Page';
-import React, { FunctionComponent, ReactElement } from 'react';
 import PageMap from '../../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../../Utils/RouteMap';
 import DashboardSideMenu from '../SideMenu';
-import GlobalConfig from 'Model/Models/GlobalConfig';
+import Route from 'Common/Types/API/Route';
 import ObjectID from 'Common/Types/ObjectID';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
+import Page from 'CommonUI/src/Components/Page/Page';
 import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import GlobalConfig from 'Model/Models/GlobalConfig';
+import React, { FunctionComponent, ReactElement } from 'react';
 
 const Settings: FunctionComponent = (): ReactElement => {
     return (

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

@@ -1,22 +1,21 @@
-import Route from 'Common/Types/API/Route';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
-import Page from 'CommonUI/src/Components/Page/Page';
-import React, { FunctionComponent, ReactElement, useEffect } from 'react';
 import PageMap from '../../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../../Utils/RouteMap';
 import DashboardSideMenu from '../SideMenu';
-import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig';
-import ObjectID from 'Common/Types/ObjectID';
-import FieldType from 'CommonUI/src/Components/Types/FieldType';
-import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
-import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
-import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
-import { JSONObject } from 'Common/Types/JSON';
-import DropdownUtil from 'CommonUI/src/Utils/Dropdown';
-import Pill from 'CommonUI/src/Components/Pill/Pill';
+import Route from 'Common/Types/API/Route';
 import { Green, Red } from 'Common/Types/BrandColors';
 import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
+import ObjectID from 'Common/Types/ObjectID';
+import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
+import CardModelDetail from 'CommonUI/src/Components/ModelDetail/CardModelDetail';
+import Page from 'CommonUI/src/Components/Page/Page';
+import Pill from 'CommonUI/src/Components/Pill/Pill';
+import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import DropdownUtil from 'CommonUI/src/Utils/Dropdown';
+import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
+import GlobalConfig, { EmailServerType } from 'Model/Models/GlobalConfig';
+import React, { FunctionComponent, ReactElement, useEffect } from 'react';
 
 const Settings: FunctionComponent = (): ReactElement => {
     const [emailServerType, setemailServerType] =
@@ -89,6 +88,42 @@ const Settings: FunctionComponent = (): ReactElement => {
         >
             {/* Project Settings View  */}
 
+            <CardModelDetail
+                name="Admin Notification Email"
+                cardProps={{
+                    title: 'Admin Notification Email',
+                    description:
+                        'Enter the email address where you would like to receive admin-level notifications.',
+                }}
+                isEditable={true}
+                editButtonText="Edit Email"
+                formFields={[
+                    {
+                        field: {
+                            adminNotificationEmail: true,
+                        },
+                        title: 'Admin Notification Email',
+                        fieldType: FormFieldSchemaType.Email,
+                        required: false,
+                    },
+                ]}
+                modelDetailProps={{
+                    modelType: GlobalConfig,
+                    id: 'model-detail-global-config',
+                    fields: [
+                        {
+                            field: {
+                                adminNotificationEmail: true,
+                            },
+                            title: 'Admin Notification Email',
+                            fieldType: FieldType.Email,
+                            placeholder: 'None',
+                        },
+                    ],
+                    modelId: ObjectID.getZeroObjectID(),
+                }}
+            />
+
             <CardModelDetail
                 name="Internal SMTP Settings"
                 cardProps={{
@@ -183,7 +218,8 @@ const Settings: FunctionComponent = (): ReactElement => {
                             title: 'Use SSL / TLS',
                             stepId: 'server-info',
                             fieldType: FormFieldSchemaType.Toggle,
-                            description: 'Make email communication secure?',
+                            description:
+                                'If you use port 465, please enable this. Do not enable this if you use port 587.',
                         },
                         {
                             field: {
@@ -287,7 +323,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             )}
 
             {emailServerType === EmailServerType.Sendgrid ? (
-                <CardModelDetail
+                <CardModelDetail<GlobalConfig>
                     name="Sendgrid Settings"
                     cardProps={{
                         title: 'Sendgrid Settings',
@@ -339,7 +375,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                                 },
                                 title: '',
                                 placeholder: 'None',
-                                getElement: (item: JSONObject) => {
+                                getElement: (item: GlobalConfig) => {
                                     if (
                                         item['sendgridApiKey'] &&
                                         item['sendgridFromEmail'] &&

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

@@ -1,30 +1,28 @@
-import Route from 'Common/Types/API/Route';
-import Page from 'CommonUI/src/Components/Page/Page';
-import React, { FunctionComponent, ReactElement, useState } from 'react';
+import AdminModelAPI from '../../../Utils/ModelAPI';
 import PageMap from '../../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../../Utils/RouteMap';
 import DashboardSideMenu from '../SideMenu';
-import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
-import Probe from 'Model/Models/Probe';
-import FieldType from 'CommonUI/src/Components/Types/FieldType';
-import { JSONObject } from 'Common/Types/JSON';
-import OneUptimeDate from 'Common/Types/Date';
-import { Green, Red } from 'Common/Types/BrandColors';
-import Statusbubble from 'CommonUI/src/Components/StatusBubble/StatusBubble';
-import ProbeElement from 'CommonUI/src/Components/Probe/Probe';
+import Route from 'Common/Types/API/Route';
 import IsNull from 'Common/Types/BaseDatabase/IsNull';
-import Banner from 'CommonUI/src/Components/Banner/Banner';
-import URL from 'Common/Types/API/URL';
-import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
-import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button';
-import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
-import AdminModelAPI from '../../../Utils/ModelAPI';
+import { Green, Red } from 'Common/Types/BrandColors';
+import OneUptimeDate from 'Common/Types/Date';
 import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes';
+import Banner from 'CommonUI/src/Components/Banner/Banner';
+import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button';
+import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
+import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
+import Page from 'CommonUI/src/Components/Page/Page';
+import ProbeElement from 'CommonUI/src/Components/Probe/Probe';
+import Statusbubble from 'CommonUI/src/Components/StatusBubble/StatusBubble';
+import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import Probe from 'Model/Models/Probe';
+import React, { FunctionComponent, ReactElement, useState } from 'react';
 
 const Settings: FunctionComponent = (): ReactElement => {
     const [showKeyModal, setShowKeyModal] = useState<boolean>(false);
 
-    const [currentProbe, setCurrentProbe] = useState<JSONObject | null>(null);
+    const [currentProbe, setCurrentProbe] = useState<Probe | null>(null);
 
     return (
         <Page
@@ -57,9 +55,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                 openInNewTab={true}
                 title="Need help with setting up Global Probes?"
                 description="Here is a guide which will help you get set up"
-                link={URL.fromString(
-                    'https://github.com/OneUptime/oneuptime/blob/master/Docs/Probe/CustomProbe.md'
-                )}
+                link={Route.fromString('/docs/probe/custom-probe')}
             />
 
             <ModelTable<Probe>
@@ -81,7 +77,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                 modelAPI={AdminModelAPI}
                 noItemsMessage={'No probes found.'}
                 showRefreshButton={true}
-                showFilterButton={true}
                 onBeforeCreate={(item: Probe) => {
                     item.isGlobalProbe = true;
                     return Promise.resolve(item);
@@ -130,7 +125,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                         title: 'Show ID and Key',
                         buttonStyleType: ButtonStyleType.NORMAL,
                         onClick: async (
-                            item: JSONObject,
+                            item: Probe,
                             onCompleteAction: VoidFunction,
                             onError: ErrorFunction
                         ) => {
@@ -146,6 +141,22 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                     },
                 ]}
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            description: true,
+                        },
+                        title: 'Description',
+                        type: FieldType.Text,
+                    },
+                ]}
                 columns={[
                     {
                         field: {
@@ -153,8 +164,8 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Name',
                         type: FieldType.Text,
-                        isFilterable: true,
-                        getElement: (item: JSONObject): ReactElement => {
+
+                        getElement: (item: Probe): ReactElement => {
                             return <ProbeElement probe={item} />;
                         },
                     },
@@ -164,7 +175,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Description',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -172,15 +182,12 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Status',
                         type: FieldType.Text,
-                        isFilterable: false,
-                        getElement: (item: JSONObject): ReactElement => {
+                        getElement: (item: Probe): ReactElement => {
                             if (
                                 item &&
                                 item['lastAlive'] &&
                                 OneUptimeDate.getNumberOfMinutesBetweenDates(
-                                    OneUptimeDate.fromString(
-                                        item['lastAlive'] as string
-                                    ),
+                                    OneUptimeDate.fromString(item['lastAlive']),
                                     OneUptimeDate.getCurrentDate()
                                 ) < 5
                             ) {

AdminDashboard/src/Pages/Settings/SideMenu.tsx

@@ -1,11 +1,11 @@
-import React, { ReactElement } from 'react';
+import PageMap from '../../Utils/PageMap';
+import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
 import Route from 'Common/Types/API/Route';
 import IconProp from 'Common/Types/Icon/IconProp';
 import SideMenu from 'CommonUI/src/Components/SideMenu/SideMenu';
 import SideMenuItem from 'CommonUI/src/Components/SideMenu/SideMenuItem';
 import SideMenuSection from 'CommonUI/src/Components/SideMenu/SideMenuSection';
-import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
-import PageMap from '../../Utils/PageMap';
+import React, { ReactElement } from 'react';
 
 const DashboardSideMenu: () => JSX.Element = (): ReactElement => {
     return (

AdminDashboard/src/Pages/Users/Index.tsx

@@ -1,15 +1,31 @@
-import Route from 'Common/Types/API/Route';
-import Page from 'CommonUI/src/Components/Page/Page';
-import React, { FunctionComponent, ReactElement } from 'react';
 import PageMap from '../../Utils/PageMap';
 import RouteMap, { RouteUtil } from '../../Utils/RouteMap';
-import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
-import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import Route from 'Common/Types/API/Route';
+import { ErrorFunction } from 'Common/Types/FunctionTypes';
+import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button';
 import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
+import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
+import ModelTable from 'CommonUI/src/Components/ModelTable/ModelTable';
+import Page from 'CommonUI/src/Components/Page/Page';
+import FieldType from 'CommonUI/src/Components/Types/FieldType';
+import API from 'CommonUI/src/Utils/API/API';
+import ModelAPI from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 import User from 'Model/Models/User';
+import React, { FunctionComponent, ReactElement, useState } from 'react';
 
 const Users: FunctionComponent = (): ReactElement => {
+    const [showConfirmVerifyEmailModal, setShowConfirmVerifyEmailModal] =
+        useState<boolean>(false);
+    const [selectedUser, setSelectedUser] = useState<User | null>(null);
+    const [error, setError] = useState<string | null>(null);
+
+    const [isConfimModalLoading, setIsConfirmModalLoading] =
+        useState<boolean>(false);
+
+    const [refreshItemsTrigger, setRefreshItemsTrigger] =
+        useState<boolean>(false);
+
     return (
         <Page
             title={'Users'}
@@ -34,6 +50,7 @@ const Users: FunctionComponent = (): ReactElement => {
                 isDeleteable={false}
                 isEditable={false}
                 showViewIdButton={true}
+                refreshToggle={refreshItemsTrigger}
                 isCreateable={true}
                 name="Users"
                 isViewable={false}
@@ -41,6 +58,30 @@ const Users: FunctionComponent = (): ReactElement => {
                     title: 'Users',
                     description: 'Here is a list of users in OneUptime.',
                 }}
+                actionButtons={[
+                    {
+                        title: 'Verify Email',
+                        buttonStyleType: ButtonStyleType.NORMAL,
+                        isVisible: (item: User) => {
+                            return !item.isEmailVerified;
+                        },
+                        onClick: async (
+                            item: User,
+                            onCompleteAction: VoidFunction,
+                            onError: ErrorFunction
+                        ) => {
+                            try {
+                                setSelectedUser(item);
+                                setShowConfirmVerifyEmailModal(true);
+
+                                onCompleteAction();
+                            } catch (err) {
+                                onCompleteAction();
+                                onError(err as Error);
+                            }
+                        },
+                    },
+                ]}
                 noItemsMessage={'No users found.'}
                 formFields={[
                     {
@@ -72,16 +113,14 @@ const Users: FunctionComponent = (): ReactElement => {
                     },
                 ]}
                 showRefreshButton={true}
-                showFilterButton={true}
                 viewPageRoute={Navigation.getCurrentRoute()}
-                columns={[
+                filters={[
                     {
                         field: {
                             name: true,
                         },
                         title: 'Full Name',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -89,7 +128,6 @@ const Users: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Email',
                         type: FieldType.Email,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -97,10 +135,86 @@ const Users: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Created At',
                         type: FieldType.DateTime,
-                        isFilterable: true,
+                    },
+                ]}
+                columns={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Full Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            email: true,
+                        },
+                        title: 'Email',
+                        type: FieldType.Email,
+                    },
+                    {
+                        field: {
+                            isEmailVerified: true,
+                        },
+                        title: 'Email Verified',
+                        type: FieldType.Boolean,
+                    },
+                    {
+                        field: {
+                            createdAt: true,
+                        },
+                        title: 'Created At',
+                        type: FieldType.DateTime,
                     },
                 ]}
             />
+
+            {error ? (
+                <ConfirmModal
+                    title={`Error`}
+                    description={error}
+                    submitButtonText={'Close'}
+                    onSubmit={async () => {
+                        setError(null);
+                    }}
+                    submitButtonType={ButtonStyleType.NORMAL}
+                />
+            ) : (
+                <></>
+            )}
+
+            {showConfirmVerifyEmailModal && selectedUser ? (
+                <ConfirmModal
+                    title={`Verify Email`}
+                    description={`Are you sure you want to verify the email - ${selectedUser.email}?`}
+                    isLoading={isConfimModalLoading}
+                    submitButtonText={'Verify Email'}
+                    onClose={async () => {
+                        setShowConfirmVerifyEmailModal(false);
+                        setSelectedUser(null);
+                    }}
+                    onSubmit={async () => {
+                        try {
+                            setIsConfirmModalLoading(true);
+                            await ModelAPI.updateById<User>({
+                                modelType: User,
+                                id: selectedUser.id!,
+                                data: {
+                                    isEmailVerified: true,
+                                },
+                            });
+                        } catch (err) {
+                            setError(API.getFriendlyMessage(err as Error));
+                        }
+
+                        setRefreshItemsTrigger(!refreshItemsTrigger);
+                        setIsConfirmModalLoading(false);
+                        setShowConfirmVerifyEmailModal(false);
+                    }}
+                />
+            ) : (
+                <></>
+            )}
         </Page>
     );
 };

AdminDashboard/src/Utils/RouteMap.ts

@@ -1,7 +1,7 @@
-import Route from 'Common/Types/API/Route';
-import Dictionary from 'Common/Types/Dictionary';
 import PageMap from './PageMap';
 import RouteParams from './RouteParams';
+import Route from 'Common/Types/API/Route';
+import Dictionary from 'Common/Types/Dictionary';
 import ObjectID from 'Common/Types/ObjectID';
 
 const RouteMap: Dictionary<Route> = {

AdminDashboard/tsconfig.json

@@ -3,7 +3,8 @@
         // these options are overrides used only by ts-node
         // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
         "compilerOptions": {
-            "module": "commonjs"
+            "module": "commonjs",
+            "resolveJsonModule": true, 
         }
     },
     "compilerOptions": {
@@ -105,6 +106,7 @@
 
         /* Completeness */
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
+                "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+        "resolveJsonModule": true
     }
 }

App/Dockerfile.tpl

@@ -14,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -29,12 +33,16 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
 
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
+# Set version in ./Model/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
 RUN npm install
 COPY ./Model /usr/src/Model
 
@@ -42,6 +50,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -53,6 +63,8 @@ WORKDIR /usr/src/app
 
 # Install app dependencies
 COPY ./App/package*.json /usr/src/app/
+# Set version in ./App/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/app/package.json
 RUN npm install
 
 # Expose ports.

App/FeatureSet/ApiReference/Index.ts

@@ -1,73 +1,89 @@
+import AuthenticationServiceHandler from './Service/Authentication';
+import DataTypeServiceHandler from './Service/DataType';
+import ErrorServiceHandler from './Service/Errors';
+import IntroductionServiceHandler from './Service/Introduction';
+import ModelServiceHandler from './Service/Model';
+import PageNotFoundServiceHandler from './Service/PageNotFound';
+import PaginationServiceHandler from './Service/Pagination';
+import PermissionServiceHandler from './Service/Permissions';
+import StatusServiceHandler from './Service/Status';
+import { StaticPath } from './Utils/Config';
+import ResourceUtil, { ModelDocumentation } from './Utils/Resources';
+import Dictionary from 'Common/Types/Dictionary';
+import FeatureSet from 'CommonServer/Types/FeatureSet';
 import Express, {
     ExpressApplication,
     ExpressRequest,
     ExpressResponse,
     ExpressStatic,
 } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from './Utils/Resources';
-import IntroductionServiceHandler from './Service/Introduction';
-import ErrorServiceHandler from './Service/Errors';
-import PermissionServiceHandler from './Service/Permissions';
-import AuthenticationServiceHandler from './Service/Authentication';
-import PageNotFoundServiceHandler from './Service/PageNotFound';
-import ModelServiceHandler from './Service/Model';
-import PaginationServiceHandler from './Service/Pagination';
-import StatusServiceHandler from './Service/Status';
-import DataTypeServiceHandler from './Service/DataType';
-import Dictionary from 'Common/Types/Dictionary';
-import { StaticPath } from './Utils/Config';
 
-const ResourceDictionary: Dictionary<ModelDocumentation> =
-    ResourceUtil.getResourceDictionaryByPath();
+const APIReferenceFeatureSet: FeatureSet = {
+    init: async (): Promise<void> => {
+        const ResourceDictionary: Dictionary<ModelDocumentation> =
+            ResourceUtil.getResourceDictionaryByPath();
 
-const app: ExpressApplication = Express.getExpressApp();
+        const app: ExpressApplication = Express.getExpressApp();
 
-app.use('/reference', ExpressStatic(StaticPath, { maxAge: 2592000 }));
+        app.use('/reference', ExpressStatic(StaticPath, { maxAge: 2592000 }));
 
-// Index page
-app.get(['/reference'], (_req: ExpressRequest, res: ExpressResponse) => {
-    return res.redirect('/reference/introduction');
-});
+        // Index page
+        app.get(
+            ['/reference'],
+            (_req: ExpressRequest, res: ExpressResponse) => {
+                return res.redirect('/reference/introduction');
+            }
+        );
 
-app.get(
-    ['/reference/page-not-found'],
-    (req: ExpressRequest, res: ExpressResponse) => {
-        return PageNotFoundServiceHandler.executeResponse(req, res);
-    }
-);
+        app.get(
+            ['/reference/page-not-found'],
+            (req: ExpressRequest, res: ExpressResponse) => {
+                return PageNotFoundServiceHandler.executeResponse(req, res);
+            }
+        );
 
-// All Pages
-app.get(['/reference/:page'], (req: ExpressRequest, res: ExpressResponse) => {
-    const page: string | undefined = req.params['page'];
+        // All Pages
+        app.get(
+            ['/reference/:page'],
+            (req: ExpressRequest, res: ExpressResponse) => {
+                const page: string | undefined = req.params['page'];
 
-    if (!page) {
-        return PageNotFoundServiceHandler.executeResponse(req, res);
-    }
+                if (!page) {
+                    return PageNotFoundServiceHandler.executeResponse(req, res);
+                }
 
-    const currentResource: ModelDocumentation | undefined =
-        ResourceDictionary[page];
+                const currentResource: ModelDocumentation | undefined =
+                    ResourceDictionary[page];
 
-    if (req.params['page'] === 'permissions') {
-        return PermissionServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'authentication') {
-        return AuthenticationServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'pagination') {
-        return PaginationServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'errors') {
-        return ErrorServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'introduction') {
-        return IntroductionServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'status') {
-        return StatusServiceHandler.executeResponse(req, res);
-    } else if (req.params['page'] === 'data-types') {
-        return DataTypeServiceHandler.executeResponse(req, res);
-    } else if (currentResource) {
-        return ModelServiceHandler.executeResponse(req, res);
-    }
-    // page not found
-    return PageNotFoundServiceHandler.executeResponse(req, res);
-});
+                if (req.params['page'] === 'permissions') {
+                    return PermissionServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'authentication') {
+                    return AuthenticationServiceHandler.executeResponse(
+                        req,
+                        res
+                    );
+                } else if (req.params['page'] === 'pagination') {
+                    return PaginationServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'errors') {
+                    return ErrorServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'introduction') {
+                    return IntroductionServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'status') {
+                    return StatusServiceHandler.executeResponse(req, res);
+                } else if (req.params['page'] === 'data-types') {
+                    return DataTypeServiceHandler.executeResponse(req, res);
+                } else if (currentResource) {
+                    return ModelServiceHandler.executeResponse(req, res);
+                }
+                // page not found
+                return PageNotFoundServiceHandler.executeResponse(req, res);
+            }
+        );
 
-app.get('/reference/*', (req: ExpressRequest, res: ExpressResponse) => {
-    return PageNotFoundServiceHandler.executeResponse(req, res);
-});
+        app.get('/reference/*', (req: ExpressRequest, res: ExpressResponse) => {
+            return PageNotFoundServiceHandler.executeResponse(req, res);
+        });
+    },
+};
+
+export default APIReferenceFeatureSet;

App/FeatureSet/ApiReference/Service/Authentication.ts

@@ -1,6 +1,6 @@
-import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
 import { ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/DataType.ts

@@ -1,8 +1,8 @@
+import { CodeExamplesPath, ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
 import LocalCache from 'CommonServer/Infrastructure/LocalCache';
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import LocalFile from 'CommonServer/Utils/LocalFile';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
-import { CodeExamplesPath, ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Errors.ts

@@ -1,6 +1,6 @@
-import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
 import { ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Introduction.ts

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

App/FeatureSet/ApiReference/Service/Model.ts

@@ -1,3 +1,7 @@
+import { CodeExamplesPath, ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import PageNotFoundServiceHandler from './PageNotFound';
+import { AppApiRoute } from 'Common/ServiceRoute';
 import { ColumnAccessControl } from 'Common/Types/BaseDatabase/AccessControl';
 import { getTableColumns } from 'Common/Types/Database/TableColumn';
 import Dictionary from 'Common/Types/Dictionary';
@@ -6,13 +10,9 @@ import Permission, {
     PermissionHelper,
     PermissionProps,
 } from 'Common/Types/Permission';
-import { AppApiRoute } from 'Common/ServiceRoute';
 import LocalCache from 'CommonServer/Infrastructure/LocalCache';
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 import LocalFile from 'CommonServer/Utils/LocalFile';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
-import PageNotFoundServiceHandler from './PageNotFound';
-import { CodeExamplesPath, ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 const ResourceDictionary: Dictionary<ModelDocumentation> =

App/FeatureSet/ApiReference/Service/PageNotFound.ts

@@ -1,6 +1,6 @@
-import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
 import { ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Pagination.ts

@@ -1,8 +1,8 @@
-import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
-import LocalFile from 'CommonServer/Utils/LocalFile';
-import LocalCache from 'CommonServer/Infrastructure/LocalCache';
 import { CodeExamplesPath, ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import LocalCache from 'CommonServer/Infrastructure/LocalCache';
+import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
+import LocalFile from 'CommonServer/Utils/LocalFile';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Permissions.ts

@@ -1,7 +1,7 @@
+import { ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
 import { PermissionHelper, PermissionProps } from 'Common/Types/Permission';
 import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
-import { ViewsPath } from '../Utils/Config';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Status.ts

@@ -1,6 +1,6 @@
-import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
-import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
 import { ViewsPath } from '../Utils/Config';
+import ResourceUtil, { ModelDocumentation } from '../Utils/Resources';
+import { ExpressRequest, ExpressResponse } from 'CommonServer/Utils/Express';
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Utils/Resources.ts

@@ -1,8 +1,8 @@
 import BaseModel from 'Common/Models/BaseModel';
-import Models from 'Model/Models/Index';
 import ArrayUtil from 'Common/Types/ArrayUtil';
 import Dictionary from 'Common/Types/Dictionary';
 import { IsBillingEnabled } from 'CommonServer/EnvironmentConfig';
+import Models from 'Model/Models/Index';
 
 export interface ModelDocumentation {
     name: string;

App/FeatureSet/ApiReference/views/main/introduction.ejs

@@ -29,7 +29,7 @@
              </svg>
           </div>
        </div>
-       <h1 class="font-bold text-xl">API Documentation</h1>
+       <h1 class="font-bold text-xl">API Reference</h1>
        <p class="lead">Use the OneUptime API to access any resource in your projects, create automated
           workflows, and more
           and

App/FeatureSet/Docs/Content/installation/docker-compose.md

@@ -20,6 +20,9 @@ Depending on your usage and budget, you can choose from different system require
 
 
 #### Prerequisites for Single-Server Deployment
+
+Installation tutorial: [https://youtu.be/j1SWmMW2oL4](https://youtu.be/j1SWmMW2oL4)
+
 Before you start the deployment process, please make sure you have:
 
 - A server running Debian, Ubuntu, or RHEL derivative
@@ -47,7 +50,10 @@ If you don't like to use npm or do not have it installed, run this instead:
 
 ```
 # Read env vars from config.env file and run docker-compose up.
-export $(grep -v '^#' config.env | xargs) && docker compose up --remove-orphans -d
+(export $(grep -v '^#' config.env | xargs) && docker compose up --remove-orphans -d)
+
+# Use sudo if you're having permission issues with binding ports. 
+sudo bash -c "(export $(grep -v '^#' config.env | xargs) && docker compose up --remove-orphans -d)"
 ```
 
 To update: 

App/FeatureSet/Docs/Content/installation/local-development.md

@@ -1,4 +1,4 @@
-# Development
+# Local Development
 
 For local development you need to use docker-compose.dev.yml file. 
 

App/FeatureSet/Docs/Content/introduction/getting-started.md

@@ -0,0 +1,49 @@
+### OneUptime: The Complete Open-Source Observability Platform
+
+OneUptime is a comprehensive solution for monitoring and managing your online services. Whether you need to check the availability of your website, dashboard, API, or any other online resource, OneUptime can alert your team when downtime happens and keep your customers informed with a status page. OneUptime also helps you handle incidents, set up on-call rotations, run tests, secure your services, analyze logs, track performance, and debug errors.
+
+OneUptime replaces multiple tools with one integrated platform:
+
+
+##### Uptime Monitoring
+
+Monitor the availability and response time of your online services from multiple locations around the world. Get notified via email, SMS, Slack, or other channels when something goes wrong. Replace tools like Pingdom.
+
+
+##### Status Pages
+
+Communicate with your customers and stakeholders during downtime or maintenance. Create a custom-branded status page that shows the current status and history of your services. Replace tools like StatusPage.io.
+
+
+##### Incident Management
+
+Manage incidents from start to finish with a collaborative workflow. Create incident reports, assign tasks, update stakeholders, and document resolutions. Replace tools like Incident.io.
+
+
+##### On Call and Alerts
+
+Schedule on-call shifts for your team and define escalation policies. Ensure that the right person is notified at the right time when an incident occurs. Replace tools like PagerDuty.
+
+
+##### Logs Management
+
+Collect, store, and analyze logs from your online services. Search, filter, and visualize log data to gain insights and troubleshoot issues. Replace tools like Loggly.
+
+
+##### Workflows
+
+Integrate OneUptime with your existing tools and automate your workflows. Integrate with tools like Slack, Jira, GitHub, and 5000+ more.
+
+
+##### Application Performance Monitoring
+
+Measure and optimize the performance of your online apps and services. Track key metrics such as traces, response time, throughput, error rate, and user satisfaction. Replace tools like NewRelic and DataDog.
+
+##### Error Tracking
+
+Detect and diagnose errors in your online services. Get detailed error reports with stack traces, context, and user feedback. Replace tools like Sentry.
+
+##### Reliability Autopilot
+
+Scan your code and fix performance issues and errors automatically. Get recommendations for improving the reliability of your online services.
+

App/FeatureSet/Docs/Content/monitor/custom-code-monitor.md

@@ -0,0 +1,27 @@
+# Custom Code Monitor
+
+Custom Code Monitor allows you to write custom scripts to monitor your applications. You can use this feature to monitor your applications in a way that is not possible with the existing monitors. For example, you can have multi-step API requests. 
+
+#### Example
+
+The following example shows how to use a Synthetic Monitor:
+
+```javascript
+// You can use axios module.
+
+await axios.get('https://api.example.com/');
+
+// Axios Documentation here: https://axios-http.com/docs/intro
+
+return {
+    data: 'Hello World' // return any data you like here. 
+};
+```
+
+### Things to consider
+
+- You can use `console.log` to log the data in the console. This will be available in the logs section of the monitor.
+- You can return the data from the script using the `return` statement. 
+- This is a JavaScript script, so you can use all the JavaScript features in the script.
+- You can use `axios` module to make HTTP requests in the script. You can use it to make API calls from the script.
+- Timeout for the script is 2 minutes. If the script takes more than 2 mins, it will be terminated.

App/FeatureSet/Docs/Content/monitor/monitor-secrets.md

@@ -0,0 +1,34 @@
+# Monitor Secrets
+
+You can use secrets to store sensitive information that you want to use in your monitoring checks. Secrets are encrypted and stored securely. 
+
+### Adding a secret
+
+To add a secret, please go to OneUptime Dashboard -> Project Settings -> Monitor Secrets -> Create Monitor Secret.
+
+![Create Secret](/docs/static/images/CreateMonitorSecret.png)
+
+You can select which monitors have access to the secret. In this case we added `ApiKey` secret and selected monitors to have access to it.
+
+**Please note**: Secrets are encrypted and stored securely. If you lose the secret, you will need to create a new secret. You cannot view or update the secret after its saved. 
+
+### Using a secret
+
+You can use secrets in the following monitoring types:
+
+- API (in request headers, request body, and URL)
+- Website, IP, Port, Ping, SSL Certificate (in URL)
+- Synthetic Monitor, Custom Code Monitor (in the code)
+
+
+![Using Secret](/docs/static/images/UsingMonitorSecret.png)
+
+To use a secret, add `{{monitorSecrets.SECRET_NAME}}` in the field where you want to use the secret. For example, in this case we added `{{monitorSecrets.ApiKey}}` in the Requets Header field.
+
+
+### Monitor Secret Permissions
+
+You can select which monitors have access to the secret. You can also update the permissions at any time. So, if you want to add a new monitor to have access to the secret, you can do so by updating the permissions.
+
+
+

App/FeatureSet/Docs/Content/monitor/synthetic-monitor.md

@@ -0,0 +1,71 @@
+# Synthetic Monitor
+
+Synthetic monitoring is a way to proactively monitor your applications by simulating user interactions. You can create a synthetic monitor to check the availability and performance of your applications from different locations around the world.
+
+#### Example
+
+The following example shows how to use a Synthetic Monitor:
+
+```javascript
+// You can use axios module, and page object from Playwright here.
+// Page Object is a class that represents a single page in a browser.
+
+await page.goto('https://playwright.dev/');
+
+// Playwright Documentation here: https://playwright.dev/docs/intro
+
+// Here are some of the variables that you can use in the context of the monitored object:
+
+console.log(browserType) // This will list the browser type in the current run context - Chromium, Firefox, Webkit
+
+console.log(screenSizeType) // This will list the screen size type in the current run context - Mobile, Tablet, Desktop
+
+// Playwright page object belongs to that specific browser context, so you can use it to interact with the browser.
+
+// To take screenshots,
+
+const screenshots = {};
+
+screenshots['screenshot-name'] = await page.screenshot(); // you can save multiple screenshots and have them with different names.
+
+// when you want to return a value, use return statement with data as a prop. You can also add screenshots in the screenshots array.
+
+return {
+    data: 'Hello World',
+    screenshots: screenshots 
+};
+```
+
+### Use of Playwright
+
+We use Playwright to simulate user interactions. You can use Playwright `page` object to interact with the browser and perform actions like clicking buttons, filling forms, and taking screenshots. 
+
+### Screenshots
+
+You can take screenshots of the page at any point in the script. You can take multiple screenshots and return them in the screenshots array. These screenshots will be available in the OneUptime Dashboard for that specific monitor.
+
+```javascript
+
+// To take screenshots,
+
+const screenshots = {};
+
+screenshots['screenshot-name'] = await page.screenshot();
+
+return {
+    data: 'Hello World',
+    screenshots: screenshots 
+};
+
+```
+
+### Things to consider
+
+- You only have `page` object available in the context of the script. This is from Playwright Page class. You can use it to run all the interactions with the browser.
+- You can use `console.log` to log the data in the console. This will be available in the logs section of the monitor.
+- You can return the data from the script using the `return` statement. You can also return screenshots in the screenshots array.
+- You can use `browserType` and `screenSizeType` variables to get the browser type and screen size type in the current run context. Feel free to use them in your script if you like. 
+- This is a JavaScript script, so you can use all the JavaScript features in the script.
+- You can use `axios` module to make HTTP requests in the script. You can use it to make API calls from the script.
+- If you are using oneuptime.com, you will always have the latest version of Playwright & browsers available in the context of the script. If you're self-hosting, please make sure you update the probes to have the latest version of Playwright and the browsers. 
+- Timeout for the script is 2 minutes. If the script takes more than 2 mins, it will be terminated.

App/FeatureSet/Docs/Content/probe/ip-address.md

@@ -5,5 +5,7 @@ Please whitelist the following IP's in your firewall to allow our probes to moni
 - 51.159.99.250
 - 62.210.173.51
 - 51.159.101.36
+- 172.174.206.132
+- 57.151.99.117  
 
 These IP's can change, we will let you know in advance if this happens. 

App/FeatureSet/Docs/Content/telemetry/fluentd.md

@@ -36,13 +36,13 @@ You can find the full list of supported sources [here](https://www.fluentd.org/d
 
 On the telemetry service page, click on "Create Telemetry Service" button.
 
-![Create Service](/Docs/Telemetry/Images/CreateService.png)
+![Create Service](/docs/static/images/CreateService.png)
 
 Once you create a telemetry service, click on "View Service" and you will be redirected to the telemetry service page.
 
 Click on View Service Token and copy the token. You will need this token to configure the telemetry service. **Please keep this token safe.**
 
-![View Service](/Docs/Telemetry/Images/ViewServiceToken.png)
+![View Service](/docs/static/images/ViewServiceToken.png)
 
 
 ## Configuration

App/FeatureSet/Docs/Content/telemetry/open-telemetry.md

@@ -8,13 +8,13 @@ After you sign up to OneUptime and create a project. Click on more in the Naviga
 
 On the telemetry service page, click on "Create Telemetry Service" button.
 
-![Create Service](/Docs/Telemetry/Images/CreateService.png)
+![Create Service](/docs/static/images/CreateService.png)
 
 Once you create a telemetry service, click on "View Service" and you will be redirected to the telemetry service page.
 
 Click on View Service Token and copy the token. You will need this token to configure the telemetry service. Please keep this token safe.
 
-![View Service](/Docs/Telemetry/Images/ViewServiceToken.png)
+![View Service](/docs/static/images/ViewServiceToken.png)
 
 
 ### Step 2 - Configure the telemetry service in your application.

App/FeatureSet/Docs/Index.ts

@@ -1,22 +1,93 @@
-import 'ejs';
+import { ContentPath, StaticPath, ViewsPath } from './Utils/Config';
+import DocsNav, { NavGroup, NavLink } from './Utils/Nav';
+import DocsRender from './Utils/Render';
+import FeatureSet from 'CommonServer/Types/FeatureSet';
 import Express, {
+    ExpressApplication,
     ExpressRequest,
     ExpressResponse,
     ExpressStatic,
-    ExpressApplication,
 } from 'CommonServer/Utils/Express';
-import { StaticPath, ViewsPath } from './Utils/Config';
+import LocalFile from 'CommonServer/Utils/LocalFile';
+import logger from 'CommonServer/Utils/Logger';
+import 'ejs';
 
-const app: ExpressApplication = Express.getExpressApp();
+const DocsFeatureSet: FeatureSet = {
+    init: async (): Promise<void> => {
+        const app: ExpressApplication = Express.getExpressApp();
 
-app.get('/docs', (_req: ExpressRequest, res: ExpressResponse) => {
-    res.render(`${ViewsPath}/index`, {
-        support: false,
-        footerCards: true,
-        cta: true,
-        blackLogo: false,
-        requestDemoCta: false,
-    });
-});
+        app.get('/docs', (_req: ExpressRequest, res: ExpressResponse) => {
+            res.redirect('/docs/introduction/getting-started');
+        });
 
-app.use('/docs/static', ExpressStatic(StaticPath));
+        app.get(
+            '/docs/:categorypath/:pagepath',
+            async (_req: ExpressRequest, res: ExpressResponse) => {
+                try {
+                    const fullPath: string =
+                        `${_req.params['categorypath']}/${_req.params['pagepath']}`.toLowerCase();
+
+                    // read file from Content folder.
+                    let contentInMarkdown: string = await LocalFile.read(
+                        `${ContentPath}/${fullPath}.md`
+                    );
+
+                    // remove first line from content because we dont want to show title in content. Title is already in nav.
+
+                    contentInMarkdown = contentInMarkdown
+                        .split('\n')
+                        .slice(1)
+                        .join('\n');
+
+                    const renderedContent: string = await DocsRender.render(
+                        contentInMarkdown
+                    );
+
+                    const currentCategory: NavGroup | undefined = DocsNav.find(
+                        (category: NavGroup) => {
+                            return category.links.find((link: NavLink) => {
+                                return link.url
+                                    .toLocaleLowerCase()
+                                    .includes(fullPath);
+                            });
+                        }
+                    );
+
+                    const currrentNavLink: NavLink | undefined =
+                        currentCategory?.links.find((link: NavLink) => {
+                            return link.url
+                                .toLocaleLowerCase()
+                                .includes(fullPath);
+                        });
+
+                    if (!currentCategory || !currrentNavLink) {
+                        // render not found.
+
+                        res.status(404);
+                        return res.render(`${ViewsPath}/NotFound`, {
+                            nav: DocsNav,
+                        });
+                    }
+
+                    res.render(`${ViewsPath}/Index`, {
+                        nav: DocsNav,
+                        content: renderedContent,
+                        category: currentCategory,
+                        link: currrentNavLink,
+                        githubPath: fullPath,
+                    });
+                } catch (err) {
+                    logger.error(err);
+                    res.status(500);
+                    return res.render(`${ViewsPath}/ServerError`, {
+                        nav: DocsNav,
+                    });
+                }
+            }
+        );
+
+        app.use('/docs/static', ExpressStatic(StaticPath));
+    },
+};
+
+export default DocsFeatureSet;

App/FeatureSet/Docs/Static/scripts/infrastructure-agent/install.sh

@@ -0,0 +1,77 @@
+#!/bin/sh
+set -e
+
+usage() {
+  echo "Usage: $0 [-b bindir] [-d]"
+  echo "  -b sets the directory for the binary installation, default is ./bin"
+  echo "  -d enables debug mode"
+  exit 1
+}
+
+# Default parameters
+BINDIR=/usr/bin
+DEBUG=0
+
+# Parse command-line options
+while getopts "b:d" opt; do
+  case ${opt} in
+    b )
+      BINDIR=$OPTARG
+      ;;
+    d )
+      set -x
+      DEBUG=1
+      ;;
+    \? )
+      usage
+      ;;
+  esac
+done
+
+echo "Installing to ${BINDIR}"
+mkdir -p "${BINDIR}"
+
+# Detect platform and architecture
+OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+ARCH=$(uname -m)
+case $ARCH in
+  x86_64)
+    ARCH=amd64
+    ;;
+  aarch64)
+    ARCH=arm64
+    ;;
+  *arm*)
+    ARCH=arm
+    ;;
+  *)
+    echo "Architecture $ARCH is not supported"
+    exit 1
+    ;;
+esac
+
+# Fetch the latest release tag from GitHub
+REPO="oneuptime/oneuptime"
+API_URL="https://api.github.com/repos/${REPO}/releases/latest"
+TAG=$(curl -s ${API_URL} | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+
+if [ "$TAG" = "" ]; then
+  echo "Failed to find the latest release. Please check your internet connection or GitHub API limits."
+  exit 1
+fi
+
+echo "Fetching the latest release: $TAG"
+
+# Construct the URL for the binary release
+URL="https://github.com/${REPO}/releases/download/${TAG}/oneuptime-infrastructure-agent_${OS}_${ARCH}.tar.gz"
+
+# Download and extract the binary
+curl -sL "${URL}" | tar xz -C "${BINDIR}"
+
+# Check if the binary is executable
+if [ ! -x "${BINDIR}/oneuptime-infrastructure-agent" ]; then
+  echo "Failed to install oneuptime-infrastructure-agent"
+  exit 1
+fi
+
+echo "oneuptime-infrastructure-agent installed successfully to ${BINDIR}. Please configure the agent using 'oneuptime-infrastructure-agent configure'."

App/FeatureSet/Docs/Utils/Config.ts

@@ -1,2 +1,3 @@
 export const ViewsPath: string = '/usr/src/app/FeatureSet/Docs/Views';
 export const StaticPath: string = '/usr/src/app/FeatureSet/Docs/Static';
+export const ContentPath: string = '/usr/src/app/FeatureSet/Docs/Content';

App/FeatureSet/Docs/Utils/Nav.ts

@@ -0,0 +1,75 @@
+export interface NavLink {
+    title: string;
+    url: string;
+}
+
+export interface NavGroup {
+    title: string;
+    links: NavLink[];
+}
+
+const DocsNav: NavGroup[] = [
+    {
+        title: 'Introduction',
+        links: [
+            {
+                title: 'Getting Started',
+                url: '/docs/introduction/getting-started',
+            },
+        ],
+    },
+    {
+        title: 'Installation',
+        links: [
+            {
+                title: 'Local Development',
+                url: '/docs/installation/local-development',
+            },
+            {
+                title: 'Docker Compose',
+                url: '/docs/installation/docker-compose',
+            },
+            {
+                title: 'Kubernetes and Helm',
+                url: 'https://artifacthub.io/packages/helm/oneuptime/oneuptime',
+            },
+        ],
+    },
+    {
+        title: 'Monitor',
+        links: [
+            {
+                title: 'Custom Code Monitor',
+                url: '/docs/monitor/custom-code-monitor',
+            },
+            {
+                title: 'Synthetic Monitor',
+                url: '/docs/monitor/synthetic-monitor',
+            },
+            {
+                title: 'JavaScript Expressions',
+                url: '/docs/monitor/javascript-expression',
+            },
+            {
+                title: 'Monitor Secrets',
+                url: '/docs/monitor/monitor-secrets',
+            },
+        ],
+    },
+    {
+        title: 'Probe',
+        links: [
+            { title: 'Custom Probes', url: '/docs/probe/custom-probe' },
+            { title: 'IP Addresses', url: '/docs/probe/ip-address' },
+        ],
+    },
+    {
+        title: 'Telemetry',
+        links: [
+            { title: 'OpenTelemetry', url: '/docs/telemetry/open-telemetry' },
+            { title: 'Fluentd', url: '/docs/telemetry/fluentd' },
+        ],
+    },
+];
+
+export default DocsNav;

App/FeatureSet/Docs/Utils/Render.ts

@@ -0,0 +1,10 @@
+import Markdown, { MarkdownContentType } from 'CommonServer/Types/Markdown';
+
+export default class DocsRender {
+    public static async render(markdownContent: string): Promise<string> {
+        return Markdown.convertToHTML(
+            markdownContent,
+            MarkdownContentType.Docs
+        );
+    }
+}

App/FeatureSet/Docs/Views/Index.ejs

@@ -0,0 +1,34 @@
+<html lang="en" class="h-full antialiased __variable_e66fe9 __variable_b436a8 light nbuofyfqi idc0_350"
+    style="color-scheme: light;">
+
+<head>
+    <%- include('./Partials/Head.ejs') %>
+</head>
+
+<body class="flex min-h-full bg-white ">
+    
+    <div class="flex w-full flex-col">
+        <%- include('./Partials/Header.ejs') %>
+       
+        <div class="relative mx-auto flex w-full max-w-8xl flex-auto justify-center sm:px-2 lg:px-8 xl:px-12">
+            <div class="hidden lg:relative lg:block lg:flex-none">
+                <div class="absolute inset-y-0 right-0 w-[50vw] bg-slate-50 "></div>
+                <div
+                    class="absolute bottom-0 right-0 top-16 hidden h-12 w-px bg-gradient-to-t from-slate-800 ">
+                </div>
+                <div class="absolute bottom-0 right-0 top-28 hidden w-px bg-slate-800 "></div>
+                <div
+                    class="sticky top-[4.75rem] -ml-0.5 h-[calc(100vh-4.75rem)] w-64 overflow-y-auto overflow-x-hidden py-16 pl-0.5 pr-8 xl:w-72 xl:pr-16">
+                  <%- include('./Partials/Nav.ejs') %>
+                </div>
+            </div>
+            <div class="min-w-0 max-w-2xl flex-auto px-4 py-16 lg:max-w-none lg:pl-8 lg:pr-0 xl:px-16">
+                <%- include('./Partials/Content.ejs', { category: category, link: link, content: content }) %>
+                <%- include('./Partials/OpenSourceCommitment.ejs', { githubPath: githubPath }) %>
+            </div>
+         
+        </div>
+    </div>
+</body>
+
+</html>

App/FeatureSet/Docs/Views/Partials/Content.ejs

@@ -0,0 +1,11 @@
+<article>
+    <header class="mb-9 space-y-1">
+        <p class="text-base font-bold text-sky-500"><%- category.title %></p>
+        <h1 class="font-bold text-3xl tracking-tight text-slate-900 "><%- link.title %>
+        </h1>
+    </header>
+    <div
+        class="prose prose-slate max-w-none   prose-headings:scroll-mt-28 prose-headings:font-display prose-headings:font-normal lg:prose-headings:scroll-mt-[8.5rem] prose-lead:text-slate-500  prose-a:font-semibold  prose-a:no-underline prose-a:shadow-[inset_0_-2px_0_0_var(--tw-prose-background,#fff),inset_0_calc(-1*(var(--tw-prose-underline-size,4px)+2px))_0_0_var(--tw-prose-underline,theme(colors.sky.300))] hover:prose-a:[--tw-prose-underline-size:6px] prose-pre:rounded-xl prose-pre:bg-slate-900 prose-pre:shadow-lg     ">
+        <%- content %>
+    </div>
+</article>

App/FeatureSet/Docs/Views/Partials/Head.ejs

@@ -0,0 +1,15 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="preload" href="/docs/static/fonts/f1.woff2" as="font" crossorigin="" type="font/woff2">
+<link rel="preload" href="/docs/static/fonts/f2.woff2" as="font" crossorigin="" type="font/woff2">
+<link rel="stylesheet" href="/docs/static/css/style.css" crossorigin="" data-precedence="next">
+<title>OneUptime Documentation</title>
+<meta name="description"
+    content="Cache every single thing your app could ever do ahead of time, so your code never even has to run at all.">
+<link rel="icon" href="/favicon.ico" type="image/x-icon" sizes="16x16">
+<meta name="next-size-adjust">
+<link rel="stylesheet" href="/docs/static/css/style.css" crossorigin="" data-precedence="next" />
+<script src="https://cdn.tailwindcss.com"></script>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/a11y-dark.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
+<script>hljs.highlightAll();</script>

App/FeatureSet/Docs/Views/Partials/Header.ejs

@@ -0,0 +1,17 @@
+<header
+    class="sticky top-0 z-50 flex flex-none flex-wrap items-center justify-between bg-white px-4 py-5 shadow-md shadow-slate-900/5 transition duration-500 sm:px-6 lg:px-8   ">
+   
+    <div class="relative flex flex-grow basis-0 items-center"><a aria-label="Home page" href="/">
+        <img class="h-8 w-auto" src="/img/3-transparent.svg" alt="">
+    </a></div>
+    
+    <div class="relative flex basis-0 justify-end gap-6 sm:gap-8 md:flex-grow">
+        <a class="group" aria-label="GitHub" target="_blank" href="https://github.com/oneuptime/oneuptime"><svg
+                aria-hidden="true" viewBox="0 0 16 16"
+                class="h-6 w-6 fill-slate-400 group-hover:fill-slate-500 ">
+                <path
+                    d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z">
+                </path>
+            </svg></a>
+    </div>
+</header>

App/FeatureSet/Docs/Views/Partials/Nav.ejs

@@ -0,0 +1,33 @@
+<nav class="text-base lg:text-sm">
+        <ul role="list" class="space-y-9">
+                <% for(var i=0; i<nav.length; i++) {%>
+                        <li>
+                                <h2 class="font-display font-medium text-slate-900 "><%- nav[i].title -%>
+                                </h2>
+
+                                <ul role="list"
+                                        class="mt-2 space-y-2 border-l-2 border-slate-100 lg:mt-4 lg:space-y-4 lg:border-slate-200 ">
+                                        <% if(nav[i].links.length> 0) { %>
+                                                <% for(var j=0; j<nav[i].links.length; j++) {%>
+                                                        <% if(link.url===nav[i].links[j].url) { %>
+                                                                <li class="relative"><a
+                                                                                class="block w-full pl-3.5 before:pointer-events-none before:absolute before:-left-1 before:top-1/2 before:h-1.5 before:w-1.5 before:-translate-y-1/2 before:rounded-full font-semibold text-sky-500 before:bg-sky-500"
+                                                                                href="<%- nav[i].links[j].url -%>"><%-
+                                                                                        nav[i].links[j].title -%></a>
+                                                                </li>
+                                                                <% } else { %>
+                                                                        <li class="relative"><a
+                                                                                        class="block w-full pl-3.5 before:pointer-events-none before:absolute before:-left-1 before:top-1/2 before:h-1.5 before:w-1.5 before:-translate-y-1/2 before:rounded-full text-slate-500 before:hidden before:bg-slate-300 hover:text-slate-600 hover:before:block   "
+                                                                                        href="<%- nav[i].links[j].url -%>"><%-
+                                                                                        nav[i].links[j].title -%></a></li>
+
+                                                                        <% } %>
+                                                                                <% } %>
+                                                                                        <% } %>
+
+                                </ul>
+                        </li>
+                        <% } %>
+
+        </ul>
+</nav>

App/FeatureSet/Docs/Views/Partials/OpenSourceCommitment.ejs

@@ -0,0 +1,22 @@
+<div class=" font-medium leading-6 text-gray-900 mt-24">Our Commitment to Open Source
+</div>
+
+<div class="mt-2 text-gray-900">
+    <ul role="list" class="divide-y divide-gray-100 rounded-md border border-gray-200">
+        <li class="items-center justify-between py-4 pl-4 pr-5 leading-6">
+            <div class="items-center">
+
+                <div class="p-1 space-y-2">
+                    
+                   
+
+                        <div>Everything we do at OneUptime is 100% open-source. You can contribute and improve this post here <a class="underline"
+                            target="_blank"
+                            href="https://github.com/OneUptime/oneuptime/tree/master/App/FeatureSet/Docs/Content/<%- githubPath -%>.md">here.</a></div>
+
+                </div>
+            </div>
+        </li>
+
+    </ul>
+</div>

App/FeatureSet/Docs/Views/Partials/Pagination.ejs

@@ -0,0 +1,13 @@
+<dl class="mt-12 flex border-t border-slate-200 pt-6 ">
+    <div class="ml-auto text-right">
+        <dt class="font-display text-sm font-medium text-slate-900 ">Next</dt>
+        <dd class="mt-1"><a
+                class="flex items-center gap-x-1 text-base font-semibold text-slate-500 hover:text-slate-600  "
+                href="/docs/installation">Installation<svg viewBox="0 0 16 16" aria-hidden="true"
+                    class="h-4 w-4 flex-none fill-current">
+                    <path
+                        d="m9.182 13.423-1.17-1.16 3.505-3.505H3V7.065h8.517l-3.506-3.5L9.181 2.4l5.512 5.511-5.511 5.512Z">
+                    </path>
+                </svg></a></dd>
+    </div>
+</dl>

App/FeatureSet/Home/API/BlogAPI.ts

@@ -0,0 +1,89 @@
+import BlogPostUtil, { BlogPost, BlogPostHeader } from '../Utils/BlogPost';
+import { ViewsPath } from '../Utils/Config';
+import NotFoundUtil from '../Utils/NotFound';
+import ServerErrorUtil from '../Utils/ServerError';
+import Text from 'Common/Types/Text';
+import Express, {
+    ExpressApplication,
+    ExpressRequest,
+    ExpressResponse,
+} from 'CommonServer/Utils/Express';
+import logger from 'CommonServer/Utils/Logger';
+
+const app: ExpressApplication = Express.getExpressApp();
+
+app.get(
+    '/blog/post/:file',
+    async (req: ExpressRequest, res: ExpressResponse) => {
+        try {
+            const fileName: string = req.params['file'] as string;
+
+            const blogPost: BlogPost | null = await BlogPostUtil.getBlogPost(
+                fileName
+            );
+
+            if (!blogPost) {
+                return NotFoundUtil.renderNotFound(res);
+            }
+
+            res.render(`${ViewsPath}/Blog/Post`, {
+                support: false,
+                footerCards: true,
+                cta: true,
+                blackLogo: false,
+                requestDemoCta: false,
+                blogPost: blogPost,
+            });
+        } catch (e) {
+            logger.error(e);
+            return ServerErrorUtil.renderServerError(res);
+        }
+    }
+);
+
+// List all blog posts with tag
+
+app.get(
+    '/blog/tag/:tagName',
+    async (req: ExpressRequest, res: ExpressResponse) => {
+        try {
+            const tagName: string = req.params['tagName'] as string;
+
+            const blogPosts: Array<BlogPostHeader> =
+                await BlogPostUtil.getBlogPostList(tagName);
+
+            res.render(`${ViewsPath}/Blog/ListByTag`, {
+                support: false,
+                footerCards: true,
+                cta: true,
+                blackLogo: false,
+                requestDemoCta: false,
+                blogPosts: blogPosts,
+                tagName: Text.fromDashesToPascalCase(tagName),
+            });
+        } catch (e) {
+            logger.error(e);
+            return ServerErrorUtil.renderServerError(res);
+        }
+    }
+);
+
+// main blog page
+app.get('/blog', async (_req: ExpressRequest, res: ExpressResponse) => {
+    try {
+        const blogPosts: Array<BlogPostHeader> =
+            await BlogPostUtil.getBlogPostList();
+
+        res.render(`${ViewsPath}/Blog/List`, {
+            support: false,
+            footerCards: true,
+            cta: true,
+            blackLogo: false,
+            requestDemoCta: false,
+            blogPosts: blogPosts,
+        });
+    } catch (e) {
+        logger.error(e);
+        return ServerErrorUtil.renderServerError(res);
+    }
+});