refactor: Enhance lazy loading of components in StatusPage for improved type safety and maintainability

Release

.github/workflows/compile.yml

@@ -389,6 +389,22 @@ jobs:
           max_attempts: 3
           command: cd MCP && npm update @oneuptime/common && npm install && npm run compile && npm run dep-check
 
+  compile-mobile-app:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - name: Compile MobileApp
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd MobileApp && npm install && npm run compile
+
   compile-ai-agent:
     runs-on: ubuntu-latest
     env:

.github/workflows/release.yml

@@ -1913,12 +1913,51 @@ jobs:
     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
+      # Aggressively free disk space before anything else
+      - name: Aggressive Disk Cleanup
+        run: |
+          echo "=== Disk space BEFORE cleanup ==="
+          df -h /
+          # Remove pre-installed software not needed for this job
+          sudo rm -rf /usr/share/dotnet || true
+          sudo rm -rf /usr/local/lib/android || true
+          sudo rm -rf /opt/ghc || true
+          sudo rm -rf /opt/hostedtoolcache || true
+          sudo rm -rf /usr/local/share/boost || true
+          sudo rm -rf /usr/local/graalvm/ || true
+          sudo rm -rf /usr/local/share/powershell || true
+          sudo rm -rf /usr/local/share/chromium || true
+          sudo rm -rf /usr/local/lib/node_modules || true
+          sudo rm -rf /usr/share/swift || true
+          sudo rm -rf /usr/share/miniconda || true
+          sudo rm -rf /usr/lib/google-cloud-sdk || true
+          sudo rm -rf /usr/lib/jvm || true
+          sudo rm -rf /usr/lib/firefox || true
+          sudo rm -rf /usr/lib/heroku || true
+          sudo rm -rf /usr/local/julia* || true
+          sudo rm -rf /opt/az || true
+          sudo rm -rf /opt/microsoft || true
+          sudo rm -rf /opt/pipx || true
+          sudo rm -rf /opt/actionarchivecache || true
+          sudo rm -rf /imagegeneration || true
+          sudo rm -rf /usr/share/az_* || true
+          sudo rm -rf /usr/share/sbt || true
+          sudo rm -rf /usr/share/gradle* || true
+          sudo rm -rf /usr/share/kotlinc || true
+          sudo rm -rf /usr/share/ri || true
+          sudo rm -rf /usr/local/.ghcup || true
+          # Clean apt cache
+          sudo apt-get clean || true
+          sudo rm -rf /var/lib/apt/lists/* || true
+          # Clean temp files
+          sudo rm -rf /tmp/* || true
+          # Docker cleanup
+          docker system prune -af --volumes || true
+          echo "=== Disk space AFTER aggressive cleanup ==="
+          df -h /
       - 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: true
           android: true
           dotnet: true
@@ -1926,6 +1965,10 @@ jobs:
           large-packages: true
           docker-images: true
           swap-storage: true
+      - name: Final Disk Space Check
+        run: |
+          echo "=== Disk space after all cleanup ==="
+          df -h /
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
@@ -2001,12 +2044,51 @@ jobs:
     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
+      # Aggressively free disk space before anything else
+      - name: Aggressive Disk Cleanup
+        run: |
+          echo "=== Disk space BEFORE cleanup ==="
+          df -h /
+          # Remove pre-installed software not needed for this job
+          sudo rm -rf /usr/share/dotnet || true
+          sudo rm -rf /usr/local/lib/android || true
+          sudo rm -rf /opt/ghc || true
+          sudo rm -rf /opt/hostedtoolcache || true
+          sudo rm -rf /usr/local/share/boost || true
+          sudo rm -rf /usr/local/graalvm/ || true
+          sudo rm -rf /usr/local/share/powershell || true
+          sudo rm -rf /usr/local/share/chromium || true
+          sudo rm -rf /usr/local/lib/node_modules || true
+          sudo rm -rf /usr/share/swift || true
+          sudo rm -rf /usr/share/miniconda || true
+          sudo rm -rf /usr/lib/google-cloud-sdk || true
+          sudo rm -rf /usr/lib/jvm || true
+          sudo rm -rf /usr/lib/firefox || true
+          sudo rm -rf /usr/lib/heroku || true
+          sudo rm -rf /usr/local/julia* || true
+          sudo rm -rf /opt/az || true
+          sudo rm -rf /opt/microsoft || true
+          sudo rm -rf /opt/pipx || true
+          sudo rm -rf /opt/actionarchivecache || true
+          sudo rm -rf /imagegeneration || true
+          sudo rm -rf /usr/share/az_* || true
+          sudo rm -rf /usr/share/sbt || true
+          sudo rm -rf /usr/share/gradle* || true
+          sudo rm -rf /usr/share/kotlinc || true
+          sudo rm -rf /usr/share/ri || true
+          sudo rm -rf /usr/local/.ghcup || true
+          # Clean apt cache
+          sudo apt-get clean || true
+          sudo rm -rf /var/lib/apt/lists/* || true
+          # Clean temp files
+          sudo rm -rf /tmp/* || true
+          # Docker cleanup
+          docker system prune -af --volumes || true
+          echo "=== Disk space AFTER aggressive cleanup ==="
+          df -h /
       - 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: true
           android: true
           dotnet: true
@@ -2014,6 +2096,10 @@ jobs:
           large-packages: true
           docker-images: true
           swap-storage: true
+      - name: Final Disk Space Check
+        run: |
+          echo "=== Disk space after all cleanup ==="
+          df -h /
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
@@ -2200,6 +2286,145 @@ jobs:
           tag_name: ${{needs.read-version.outputs.major_minor}}
 
 
+  # Build Android release APK and attach to GitHub Release.
+  # Required secrets setup guide: MobileApp/docs/RELEASE_SIGNING.md
+  mobile-app-android-deploy:
+    needs: [draft-github-release, generate-build-number, read-version]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Install dependencies
+        run: cd MobileApp && npm install
+
+      - name: Decode Android keystore
+        run: |
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > /tmp/release.keystore
+
+      - name: Build release APK
+        env:
+          ANDROID_KEYSTORE_FILE: /tmp/release.keystore
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        run: |
+          cd MobileApp/android
+          ./gradlew assembleRelease \
+            -PversionName=${{ needs.read-version.outputs.major_minor }} \
+            -PversionCode=${{ needs.generate-build-number.outputs.build_number }}
+
+      - name: Upload APK to GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: MobileApp/android/app/build/outputs/apk/release/*.apk
+          token: ${{ secrets.GITHUB_TOKEN }}
+          draft: true
+          prerelease: false
+          tag_name: ${{ needs.read-version.outputs.major_minor }}
+
+  # Build iOS release IPA and attach to GitHub Release.
+  # Required secrets setup guide: MobileApp/docs/RELEASE_SIGNING.md
+  mobile-app-ios-deploy:
+    needs: [draft-github-release, generate-build-number, read-version]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Install dependencies
+        run: cd MobileApp && npm install
+
+      - name: Install CocoaPods dependencies
+        run: cd MobileApp/ios && pod install
+
+      - name: Import signing certificate
+        env:
+          IOS_DISTRIBUTION_CERTIFICATE_BASE64: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE_BASE64 }}
+          IOS_DISTRIBUTION_CERTIFICATE_PASSWORD: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE_PASSWORD }}
+        run: |
+          CERTIFICATE_PATH=$RUNNER_TEMP/distribution.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          KEYCHAIN_PASSWORD=$(openssl rand -base64 32)
+
+          echo "$IOS_DISTRIBUTION_CERTIFICATE_BASE64" | base64 --decode > "$CERTIFICATE_PATH"
+
+          security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+
+          security import "$CERTIFICATE_PATH" -P "$IOS_DISTRIBUTION_CERTIFICATE_PASSWORD" \
+            -A -t cert -f pkcs12 -k "$KEYCHAIN_PATH"
+          security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security list-keychain -d user -s "$KEYCHAIN_PATH"
+
+      - name: Install provisioning profile
+        env:
+          IOS_PROVISIONING_PROFILE_BASE64: ${{ secrets.IOS_PROVISIONING_PROFILE_BASE64 }}
+        run: |
+          PROFILE_PATH=$RUNNER_TEMP/profile.mobileprovision
+          echo "$IOS_PROVISIONING_PROFILE_BASE64" | base64 --decode > "$PROFILE_PATH"
+
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp "$PROFILE_PATH" ~/Library/MobileDevice/Provisioning\ Profiles/
+
+      - name: Build archive
+        run: |
+          cd MobileApp
+          xcodebuild -workspace ios/OneUptime.xcworkspace \
+            -scheme OneUptime \
+            -configuration Release \
+            -sdk iphoneos \
+            -archivePath $RUNNER_TEMP/OneUptime.xcarchive \
+            archive \
+            MARKETING_VERSION=${{ needs.read-version.outputs.major_minor }} \
+            CURRENT_PROJECT_VERSION=${{ needs.generate-build-number.outputs.build_number }}
+
+      - name: Prepare ExportOptions.plist with team ID
+        env:
+          IOS_TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
+        run: |
+          /usr/libexec/PlistBuddy -c "Add :teamID string $IOS_TEAM_ID" MobileApp/ios/ExportOptions.plist || \
+          /usr/libexec/PlistBuddy -c "Set :teamID $IOS_TEAM_ID" MobileApp/ios/ExportOptions.plist
+
+      - name: Export IPA
+        run: |
+          cd MobileApp
+          xcodebuild -exportArchive \
+            -archivePath $RUNNER_TEMP/OneUptime.xcarchive \
+            -exportOptionsPlist ios/ExportOptions.plist \
+            -exportPath $RUNNER_TEMP/build
+
+      - name: Upload IPA to GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ${{ runner.temp }}/build/*.ipa
+          token: ${{ secrets.GITHUB_TOKEN }}
+          draft: true
+          prerelease: false
+          tag_name: ${{ needs.read-version.outputs.major_minor }}
+
+      - name: Cleanup keychain
+        if: always()
+        run: |
+          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db || true
+
   finalize-github-release:
     name: Publish GitHub release
     needs: [infrastructure-agent-deploy, generate-build-number, read-version]

.github/workflows/terraform-provider-e2e.yml

@@ -134,6 +134,10 @@ jobs:
           terraform_wrapper: false
 
       - name: Run E2E Tests
-        run: |
-          chmod +x ./E2E/Terraform/e2e-tests/scripts/*.sh
-          ./E2E/Terraform/e2e-tests/scripts/index.sh
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 60
+          max_attempts: 3
+          command: |
+            chmod +x ./E2E/Terraform/e2e-tests/scripts/*.sh
+            ./E2E/Terraform/e2e-tests/scripts/index.sh

.github/workflows/test.mobile-app.yaml

@@ -0,0 +1,39 @@
+name: MobileApp Test
+
+on:
+  pull_request:
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  expo-doctor:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd MobileApp && npm install
+      - name: Run Expo Doctor
+        run: cd MobileApp && npx expo-doctor@latest
+
+  expo-web-export:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd MobileApp && npm install
+      - name: Export Web Bundle
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: cd MobileApp && npx expo export --platform web

AIAgent/package-lock.json

@@ -73,6 +73,7 @@
         "ejs": "^3.1.10",
         "elkjs": "^0.10.0",
         "esbuild": "^0.25.5",
+        "expo-server-sdk": "^3.15.0",
         "express": "^4.21.1",
         "formik": "^2.4.6",
         "history": "^5.3.0",

APIReference/Routes.ts

@@ -1,5 +1,6 @@
 import AuthenticationServiceHandler from "./Service/Authentication";
 import DataTypeServiceHandler from "./Service/DataType";
+import DataTypeDetailServiceHandler from "./Service/DataTypeDetail";
 import ErrorServiceHandler from "./Service/Errors";
 import OpenAPIServiceHandler from "./Service/OpenAPI";
 import IntroductionServiceHandler from "./Service/Introduction";
@@ -10,6 +11,7 @@ import PermissionServiceHandler from "./Service/Permissions";
 import StatusServiceHandler from "./Service/Status";
 import { StaticPath } from "./Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "./Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "./Utils/DataTypes";
 import Dictionary from "Common/Types/Dictionary";
 import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, {
@@ -24,6 +26,9 @@ const APIReferenceFeatureSet: FeatureSet = {
     const ResourceDictionary: Dictionary<ModelDocumentation> =
       ResourceUtil.getResourceDictionaryByPath();
 
+    const DataTypeDictionary: Dictionary<DataTypeDocumentation> =
+      DataTypeUtil.getDataTypeDictionaryByPath();
+
     const app: ExpressApplication = Express.getExpressApp();
 
     // Serve static files for the API reference with a cache max age of 30 days
@@ -72,6 +77,8 @@ const APIReferenceFeatureSet: FeatureSet = {
           return StatusServiceHandler.executeResponse(req, res);
         } else if (req.params["page"] === "data-types") {
           return DataTypeServiceHandler.executeResponse(req, res);
+        } else if (DataTypeDictionary[page]) {
+          return DataTypeDetailServiceHandler.executeResponse(req, res);
         } else if (currentResource) {
           return ModelServiceHandler.executeResponse(req, res);
         }

APIReference/Service/Authentication.ts

@@ -1,11 +1,13 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import Dictionary from "Common/Types/Dictionary";
 
 // Retrieve resources documentation
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   public static async executeResponse(
@@ -27,6 +29,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page,
       resources: Resources,
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,

APIReference/Service/DataType.ts

@@ -1,12 +1,14 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { CodeExamplesPath, ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import LocalFile from "Common/Server/Utils/LocalFile";
 import Dictionary from "Common/Types/Dictionary";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   public static async executeResponse(
@@ -153,6 +155,7 @@ export default class ServiceHandler {
       pageDescription:
         "Data Types that can be used to interact with OneUptime API",
       resources: Resources,
+      dataTypes: DataTypes,
       pageData: pageData,
     });
   }

APIReference/Service/Errors.ts

@@ -1,11 +1,13 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import Dictionary from "Common/Types/Dictionary";
 
 // Fetch a list of resources used in the application
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   // Handles the HTTP response for a given request
@@ -28,6 +30,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page,
       resources: Resources,
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,

APIReference/Service/Introduction.ts

@@ -1,11 +1,13 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import Dictionary from "Common/Types/Dictionary";
 
 // Get all resources and featured resources from ResourceUtil
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 const FeaturedResources: Array<ModelDocumentation> =
   ResourceUtil.getFeaturedResources();
 
@@ -34,6 +36,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page,
       resources: Resources,
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,

APIReference/Service/Model.ts

@@ -3,8 +3,10 @@ import CodeExampleGenerator, {
   CodeExamples,
 } from "../Utils/CodeExampleGenerator";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import PageNotFoundServiceHandler from "./PageNotFound";
 import { AppApiRoute } from "Common/ServiceRoute";
+import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl";
 import {
   getTableColumns,
@@ -314,9 +316,13 @@ function generateApiCodeExamples(
 
 // Get all resources and resource dictionary
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 const ResourceDictionary: Dictionary<ModelDocumentation> =
   ResourceUtil.getResourceDictionaryByPath();
 
+// Dynamically built from DataTypes registry — no manual updates needed when new types are added
+const TypeToDocPath: Dictionary<string> = DataTypeUtil.getTypeToDocPathMap();
+
 // Get all permission props
 const PermissionDictionary: Dictionary<PermissionProps> =
   PermissionHelper.getAllPermissionPropsAsDictionary();
@@ -392,6 +398,32 @@ export default class ServiceHandler {
     delete tableColumns["deletedByUser"];
     delete tableColumns["version"];
 
+    // For columns with a modelType (Entity/EntityArray), resolve the related model's documentation path
+    for (const key in tableColumns) {
+      const column: TableColumnMetadata | undefined = tableColumns[key];
+      if (column?.modelType) {
+        try {
+          const relatedModelInstance: BaseModel = new column.modelType();
+          if (relatedModelInstance.enableDocumentation) {
+            (column as any).modelDocumentationPath =
+              relatedModelInstance.getAPIDocumentationPath();
+            (column as any).modelName = relatedModelInstance.singularName;
+          }
+        } catch {
+          // If model instantiation fails, skip linking
+        }
+      }
+
+      // Resolve non-entity complex types to their documentation paths
+      if (column?.type && !(column as any).modelDocumentationPath) {
+        const typeStr: string = column.type.toString();
+        const docPath: string | undefined = TypeToDocPath[typeStr];
+        if (docPath) {
+          (column as any).typeDocumentationPath = docPath;
+        }
+      }
+    }
+
     // Set page data
     pageData["title"] = currentResource.model.singularName;
     pageData["description"] = currentResource.model.tableDescription;
@@ -586,6 +618,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page,
       resources: Resources,
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,

APIReference/Service/OpenAPI.ts

@@ -5,12 +5,14 @@ import {
 } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import URL from "Common/Types/API/URL";
 import Dictionary from "Common/Types/Dictionary";
 
 // Fetch a list of resources used in the application
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   // Handles the HTTP response for a given request
@@ -36,6 +38,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page,
       resources: Resources,
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,

APIReference/Service/PageNotFound.ts

@@ -1,9 +1,11 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources(); // Get an array of model documentation resources
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   // This is a static method that handles the response
@@ -21,6 +23,7 @@ export default class ServiceHandler {
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: "Page you're looking for is not found.", // The page description
       resources: Resources, // The array of model documentation resources
+      dataTypes: DataTypes,
       pageData: {}, // An empty object to hold any additional page data
     });
   }

APIReference/Service/Pagination.ts

@@ -1,12 +1,14 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { CodeExamplesPath, ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import LocalFile from "Common/Server/Utils/LocalFile";
 import Dictionary from "Common/Types/Dictionary";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources(); // Get all resources from ResourceUtil
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   public static async executeResponse(
@@ -49,6 +51,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page, // Pass the page parameter
       resources: Resources, // Pass all resources
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled, // Pass the page title
       pageDescription: pageDescription, // Pass the page description

APIReference/Service/Permissions.ts

@@ -1,11 +1,17 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import { PermissionHelper, PermissionProps } from "Common/Types/Permission";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
+import {
+  PermissionGroup,
+  PermissionHelper,
+  PermissionProps,
+} from "Common/Types/Permission";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import Dictionary from "Common/Types/Dictionary";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const DataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   public static async executeResponse(
@@ -25,16 +31,39 @@ export default class ServiceHandler {
     pageDescription = "Learn how permissions work with OneUptime";
 
     // Filter permissions to only include those assignable to tenants
-    pageData["permissions"] = PermissionHelper.getAllPermissionProps().filter(
-      (i: PermissionProps) => {
+    const tenantPermissions: Array<PermissionProps> =
+      PermissionHelper.getAllPermissionProps().filter((i: PermissionProps) => {
         return i.isAssignableToTenant;
-      },
-    );
+      });
+
+    // Group permissions by PermissionGroup
+    const permissionGroups: Array<{
+      group: string;
+      permissions: Array<PermissionProps>;
+    }> = [];
+
+    for (const group of Object.values(PermissionGroup)) {
+      const groupPermissions: Array<PermissionProps> = tenantPermissions.filter(
+        (p: PermissionProps) => {
+          return p.group === group;
+        },
+      );
+
+      if (groupPermissions.length > 0) {
+        permissionGroups.push({
+          group: group,
+          permissions: groupPermissions,
+        });
+      }
+    }
+
+    pageData["permissionGroups"] = permissionGroups;
 
     // Render the page
     return res.render(`${ViewsPath}/pages/index`, {
       page: page,
       resources: Resources,
+      dataTypes: DataTypes,
       pageTitle: pageTitle,
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,

APIReference/Service/Status.ts

@@ -1,10 +1,12 @@
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import DataTypeUtil, { DataTypeDocumentation } from "../Utils/DataTypes";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 // Retrieve resources from ResourceUtil
 const resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+const dataTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
 
 export default class ServiceHandler {
   public static async executeResponse(
@@ -21,6 +23,7 @@ export default class ServiceHandler {
       enableGoogleTagManager: IsBillingEnabled,
       pageDescription: "200 - Success",
       resources: resources, // Pass resources to the template
+      dataTypes: dataTypes,
       pageData: {}, // Pass empty data to the template
     });
   }

APIReference/Utils/DataTypes.ts

@@ -0,0 +1,422 @@
+import Dictionary from "Common/Types/Dictionary";
+
+export interface DataTypeDocumentation {
+  name: string;
+  path: string;
+  description: string;
+  /*
+   * Additional column type display strings that should link to this data type page.
+   * Used for cases where the TableColumnType enum value doesn't match the PascalCase name
+   * (e.g., enum "Date" should link to the "DateTime" data type page).
+   */
+  columnTypeAliases?: Array<string>;
+  /*
+   * Category for grouping in sidebar navigation.
+   * Types with the same category are grouped under a collapsible heading.
+   */
+  category?: string;
+}
+
+export interface DataTypeCategory {
+  name: string;
+  types: Array<DataTypeDocumentation>;
+}
+
+export default class DataTypeUtil {
+  public static getDataTypes(): Array<DataTypeDocumentation> {
+    return [
+      {
+        name: "ObjectID",
+        path: "object-id",
+        description:
+          "A unique identifier for objects, typically a UUID string.",
+      },
+      {
+        name: "Decimal",
+        path: "decimal",
+        description: "A decimal number type for precise numeric values.",
+      },
+      {
+        name: "Name",
+        path: "name",
+        description: "A structured name type representing a text name value.",
+      },
+      {
+        name: "EqualTo",
+        path: "equal-to",
+        description:
+          "A query filter that matches objects where a field is equal to the specified value.",
+      },
+      {
+        name: "EqualToOrNull",
+        path: "equal-to-or-null",
+        description:
+          "A query filter that matches objects where a field is equal to the specified value or is null.",
+      },
+      {
+        name: "MonitorSteps",
+        path: "monitor-steps",
+        description:
+          "Complex nested object describing monitor check configuration including steps and default status.",
+        category: "Monitor",
+      },
+      {
+        name: "MonitorStep",
+        path: "monitor-step",
+        description:
+          "A single monitor step defining a check target, request configuration, and criteria for determining status.",
+        category: "Monitor",
+      },
+      {
+        name: "Recurring",
+        path: "recurring",
+        description:
+          "Object describing a recurring interval schedule (e.g., every 5 minutes, daily).",
+      },
+      {
+        name: "RestrictionTimes",
+        path: "restriction-times",
+        description:
+          "Object describing on-call duty time restrictions (daily or weekly windows).",
+      },
+      {
+        name: "MonitorCriteria",
+        path: "monitor-criteria",
+        description:
+          "A collection of monitor criteria instances used to evaluate monitor check results.",
+        category: "Monitor",
+      },
+      {
+        name: "PositiveNumber",
+        path: "positive-number",
+        description: "A number type that must be greater than zero.",
+        columnTypeAliases: ["Small Positive Number", "Big Positive Number"],
+      },
+      {
+        name: "MonitorCriteriaInstance",
+        path: "monitor-criteria-instance",
+        description:
+          "A single criteria rule defining conditions and the resulting monitor status when conditions are met.",
+        category: "Monitor",
+      },
+      {
+        name: "NotEqual",
+        path: "not-equal",
+        description:
+          "A query filter that matches objects where a field is not equal to the specified value.",
+      },
+      {
+        name: "Email",
+        path: "email",
+        description: "An email address type with built-in format validation.",
+      },
+      {
+        name: "Phone",
+        path: "phone",
+        description: "A phone number type with built-in format validation.",
+      },
+      {
+        name: "Color",
+        path: "color",
+        description:
+          "A color value represented as a hex string (e.g., #3498db).",
+      },
+      {
+        name: "Domain",
+        path: "domain",
+        description: "A domain name type (e.g., example.com).",
+      },
+      {
+        name: "Version",
+        path: "version",
+        description: "A semantic version type (e.g., 1.0.0).",
+      },
+      {
+        name: "IP",
+        path: "ip",
+        description:
+          "An IP address type supporting both IPv4 and IPv6 formats.",
+      },
+      {
+        name: "Route",
+        path: "route",
+        description: "A URL route/path segment type.",
+      },
+      {
+        name: "URL",
+        path: "url",
+        description: "A full URL type with protocol, host, and path.",
+      },
+      {
+        name: "Permission",
+        path: "permission",
+        description:
+          "A string identifier representing an access control permission in OneUptime.",
+      },
+      {
+        name: "Search",
+        path: "search",
+        description:
+          "A query filter for text search that matches objects containing the specified string.",
+      },
+      {
+        name: "GreaterThan",
+        path: "greater-than",
+        description:
+          "A query filter that matches objects where a field is greater than the specified value.",
+      },
+      {
+        name: "GreaterThanOrEqual",
+        path: "greater-than-or-equal",
+        description:
+          "A query filter that matches objects where a field is greater than or equal to the specified value.",
+      },
+      {
+        name: "GreaterThanOrNull",
+        path: "greater-than-or-null",
+        description:
+          "A query filter that matches objects where a field is greater than the specified value or is null.",
+      },
+      {
+        name: "LessThanOrNull",
+        path: "less-than-or-null",
+        description:
+          "A query filter that matches objects where a field is less than the specified value or is null.",
+      },
+      {
+        name: "LessThan",
+        path: "less-than",
+        description:
+          "A query filter that matches objects where a field is less than the specified value.",
+      },
+      {
+        name: "LessThanOrEqual",
+        path: "less-than-or-equal",
+        description:
+          "A query filter that matches objects where a field is less than or equal to the specified value.",
+      },
+      {
+        name: "Port",
+        path: "port",
+        description: "A network port number type (1-65535).",
+      },
+      {
+        name: "Hostname",
+        path: "hostname",
+        description: "A hostname type (e.g., api.example.com).",
+      },
+      {
+        name: "HashedString",
+        path: "hashed-string",
+        description:
+          "A string that is stored in hashed form. Used for sensitive data like passwords and API keys.",
+      },
+      {
+        name: "DateTime",
+        path: "date-time",
+        description:
+          "An ISO 8601 date-time string (e.g., 2024-01-15T10:30:00.000Z).",
+        columnTypeAliases: ["Date"],
+      },
+      {
+        name: "Buffer",
+        path: "buffer",
+        description:
+          "A binary data buffer, typically base64-encoded when serialized to JSON.",
+      },
+      {
+        name: "InBetween",
+        path: "in-between",
+        description:
+          "A query filter that matches objects where a field value is between two specified values (inclusive).",
+      },
+      {
+        name: "NotNull",
+        path: "not-null",
+        description:
+          "A query filter that matches objects where a field is not null.",
+      },
+      {
+        name: "IsNull",
+        path: "is-null",
+        description:
+          "A query filter that matches objects where a field is null.",
+      },
+      {
+        name: "Includes",
+        path: "includes",
+        description:
+          "A query filter that matches objects where a field value is included in the specified array of values.",
+      },
+      {
+        name: "DashboardComponent",
+        path: "dashboard-component",
+        description:
+          "A configuration object for a dashboard component including its type, layout, and settings.",
+      },
+      {
+        name: "DashboardViewConfig",
+        path: "dashboard-view-config",
+        description:
+          "A configuration object for a dashboard view including its components and layout.",
+      },
+      {
+        name: "CriteriaFilter",
+        path: "criteria-filter",
+        description:
+          "A single filter condition within a MonitorCriteriaInstance that defines what to check and how to compare it.",
+        category: "Monitor",
+      },
+      {
+        name: "CriteriaIncident",
+        path: "criteria-incident",
+        description:
+          "Configuration for an incident that is automatically created when a MonitorCriteriaInstance's conditions are met.",
+        category: "Monitor",
+      },
+      {
+        name: "CriteriaAlert",
+        path: "criteria-alert",
+        description:
+          "Configuration for an alert that is automatically created when a MonitorCriteriaInstance's conditions are met.",
+        category: "Monitor",
+      },
+      {
+        name: "CheckOn",
+        path: "check-on",
+        description:
+          "Enum specifying what aspect of a monitor response to evaluate (e.g., response code, response time, body content).",
+        category: "Monitor",
+      },
+      {
+        name: "FilterType",
+        path: "filter-type",
+        description:
+          "Enum specifying the comparison operator used in a CriteriaFilter (e.g., Equal To, Greater Than, Contains).",
+        category: "Monitor",
+      },
+      {
+        name: "FilterCondition",
+        path: "filter-condition",
+        description:
+          "Enum specifying how multiple filters are combined: 'All' (AND) or 'Any' (OR).",
+        category: "Monitor",
+      },
+      {
+        name: "MonitorStepLogMonitor",
+        path: "monitor-step-log-monitor",
+        description:
+          "Configuration for a Log monitor step, defining which logs to query and evaluate.",
+        category: "Monitor",
+      },
+      {
+        name: "MonitorStepTraceMonitor",
+        path: "monitor-step-trace-monitor",
+        description:
+          "Configuration for a Trace monitor step, defining which spans to query and evaluate.",
+        category: "Monitor",
+      },
+      {
+        name: "MonitorStepMetricMonitor",
+        path: "monitor-step-metric-monitor",
+        description:
+          "Configuration for a Metric monitor step, defining which metrics to query and evaluate.",
+        category: "Monitor",
+      },
+      {
+        name: "MonitorStepSnmpMonitor",
+        path: "monitor-step-snmp-monitor",
+        description:
+          "Configuration for an SNMP monitor step, defining the SNMP device connection and OIDs to query.",
+        category: "Monitor",
+      },
+    ];
+  }
+
+  public static getDataTypesByCategory(): Array<DataTypeCategory> {
+    const allTypes: Array<DataTypeDocumentation> = DataTypeUtil.getDataTypes();
+    const uncategorized: Array<DataTypeDocumentation> = [];
+    const categoryMap: Dictionary<Array<DataTypeDocumentation>> = {};
+    const categoryOrder: Array<string> = [];
+
+    for (const dt of allTypes) {
+      if (dt.category) {
+        if (!categoryMap[dt.category]) {
+          categoryMap[dt.category] = [];
+          categoryOrder.push(dt.category);
+        }
+        categoryMap[dt.category]!.push(dt);
+      } else {
+        uncategorized.push(dt);
+      }
+    }
+
+    const result: Array<DataTypeCategory> = [];
+
+    // Add uncategorized types first under "General"
+    if (uncategorized.length > 0) {
+      result.push({ name: "General", types: uncategorized });
+    }
+
+    // Add categorized groups
+    for (const cat of categoryOrder) {
+      if (categoryMap[cat]) {
+        result.push({ name: cat, types: categoryMap[cat]! });
+      }
+    }
+
+    return result;
+  }
+
+  public static getDataTypeDictionaryByPath(): Dictionary<DataTypeDocumentation> {
+    const dict: Dictionary<DataTypeDocumentation> = {};
+
+    for (const dataType of DataTypeUtil.getDataTypes()) {
+      dict[dataType.path] = dataType;
+    }
+
+    return dict;
+  }
+
+  /*
+   * Convert PascalCase name to space-separated display string.
+   * e.g., "ObjectID" → "Object ID", "MonitorSteps" → "Monitor Steps",
+   *        "HashedString" → "Hashed String", "IP" → "IP"
+   */
+  private static pascalCaseToDisplayString(name: string): string {
+    return name
+      .replace(/([a-z])([A-Z])/g, "$1 $2")
+      .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2");
+  }
+
+  /*
+   * Build a mapping from column type display strings to data type page paths.
+   * Automatically derives both PascalCase and display-string variants from each
+   * data type's name, so adding a new entry to getDataTypes() is all that's needed.
+   */
+  public static getTypeToDocPathMap(): Dictionary<string> {
+    const map: Dictionary<string> = {};
+
+    for (const dt of DataTypeUtil.getDataTypes()) {
+      // Map PascalCase name: "ObjectID" → "object-id"
+      map[dt.name] = dt.path;
+
+      // Map display string: "Object ID" → "object-id"
+      const displayName: string = DataTypeUtil.pascalCaseToDisplayString(
+        dt.name,
+      );
+      if (displayName !== dt.name) {
+        map[displayName] = dt.path;
+      }
+
+      // Map any explicit aliases (for edge cases like enum "Date" → "date-time")
+      if (dt.columnTypeAliases) {
+        for (const alias of dt.columnTypeAliases) {
+          map[alias] = dt.path;
+        }
+      }
+    }
+
+    return map;
+  }
+}

APIReference/package-lock.json

@@ -73,6 +73,7 @@
         "ejs": "^3.1.10",
         "elkjs": "^0.10.0",
         "esbuild": "^0.25.5",
+        "expo-server-sdk": "^3.15.0",
         "express": "^4.21.1",
         "formik": "^2.4.6",
         "history": "^5.3.0",
@@ -278,6 +279,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.6.tgz",
       "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -1390,7 +1392,8 @@
     "node_modules/@types/node": {
       "version": "17.0.45",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
-      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+      "peer": true
     },
     "node_modules/@types/prettier": {
       "version": "2.7.3",
@@ -1661,6 +1664,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001565",
         "electron-to-chromium": "^1.4.601",
@@ -4008,6 +4012,7 @@
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",

APIReference/views/main/data-type.ejs

@@ -0,0 +1,179 @@
+<main class="py-12">
+    <article class="prose">
+        <!-- Type Hierarchy Breadcrumb -->
+        <% if (pageData.typeHierarchy && pageData.typeHierarchy.length > 0) { %>
+            <nav class="mb-6">
+                <ol class="flex items-center flex-wrap gap-1 text-sm">
+                    <% for (var h = 0; h < pageData.typeHierarchy.length; h++) { %>
+                        <% if (h > 0) { %>
+                            <li class="text-slate-400">
+                                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path></svg>
+                            </li>
+                        <% } %>
+                        <% if (pageData.typeHierarchy[h].path && pageData.typeHierarchy[h].name !== pageData.title) { %>
+                            <li><a href="/reference/<%= pageData.typeHierarchy[h].path %>" class="text-indigo-600 hover:text-indigo-700 hover:underline font-medium"><%= pageData.typeHierarchy[h].name %></a></li>
+                        <% } else { %>
+                            <li class="text-slate-900 font-semibold"><%= pageData.typeHierarchy[h].name %></li>
+                        <% } %>
+                    <% } %>
+                </ol>
+            </nav>
+        <% } %>
+
+        <!-- Hero Section -->
+        <div class="mb-8">
+            <div class="flex items-center gap-3 mb-4">
+                <div class="flex items-center justify-center w-10 h-10 rounded-xl bg-emerald-600 shadow-lg shadow-emerald-500/30">
+                    <svg class="w-5 h-5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 7h.01M7 3h5c.512 0 1.024.195 1.414.586l7 7a2 2 0 010 2.828l-7 7a2 2 0 01-2.828 0l-7-7A1.994 1.994 0 013 12V7a4 4 0 014-4z"></path>
+                    </svg>
+                </div>
+                <span class="text-xs font-semibold text-emerald-600 uppercase tracking-wider"><%= pageData.isEnum ? 'Enum' : 'Data Type' %></span>
+            </div>
+            <h1 class="font-bold text-3xl text-slate-900 tracking-tight mb-3"><%= pageData.title %></h1>
+            <p class="text-lg text-slate-600 leading-relaxed max-w-2xl"><%- pageData.description %></p>
+        </div>
+
+        <!-- At a Glance Summary Box -->
+        <div class="mb-10 rounded-xl border border-slate-200 bg-slate-50 p-5">
+            <h4 class="text-xs font-semibold text-slate-500 uppercase tracking-wider mb-3">At a Glance</h4>
+            <div class="flex flex-wrap gap-x-8 gap-y-3 text-sm">
+                <div>
+                    <span class="text-slate-500">Kind</span>
+                    <span class="ml-2 font-medium text-slate-900"><%= pageData.isEnum ? 'Enum' : 'Data Type' %></span>
+                </div>
+                <% if (pageData.isEnum && pageData.valueCount > 0) { %>
+                    <div>
+                        <span class="text-slate-500">Values</span>
+                        <span class="ml-2 font-medium text-slate-900"><%= pageData.valueCount %></span>
+                    </div>
+                <% } else if (pageData.propertyCount > 0) { %>
+                    <div>
+                        <span class="text-slate-500">Properties</span>
+                        <span class="ml-2 font-medium text-slate-900"><%= pageData.propertyCount %></span>
+                    </div>
+                <% } %>
+                <div>
+                    <span class="text-slate-500">JSON Format</span>
+                    <code class="ml-2 text-xs font-mono bg-white px-2 py-0.5 rounded border border-slate-200 text-slate-700">{"_type": "<%= pageData.jsonWrapperType %>", "value": ...}</code>
+                </div>
+            </div>
+        </div>
+
+        <% if (pageData.isEnum) { %>
+            <!-- Quick Navigation for Enum Values -->
+            <% if (pageData.values.length >= 4) { %>
+                <div class="mb-6">
+                    <div class="flex flex-wrap gap-1.5">
+                        <% for (var qv = 0; qv < pageData.values.length; qv++) { %>
+                            <a href="#value-<%= pageData.values[qv].value.toLowerCase().replace(/\s+/g, '-') %>" class="rounded-md bg-white px-2.5 py-1 text-xs font-medium text-slate-600 ring-1 ring-inset ring-slate-200 hover:bg-slate-50 hover:text-slate-900 transition-colors no-underline"><%= pageData.values[qv].value %></a>
+                        <% } %>
+                    </div>
+                </div>
+            <% } %>
+
+            <h3 id="values" class="text-base font-semibold text-slate-800 mb-4 scroll-mt-24">Possible Values</h3>
+            <div class="my-6 rounded-xl border border-slate-200 bg-white overflow-hidden">
+                <ul role="list" class="m-0 w-full list-none divide-y divide-slate-100 p-0">
+                    <% for (var v = 0; v < pageData.values.length; v++) { %>
+                        <li id="value-<%= pageData.values[v].value.toLowerCase().replace(/\s+/g, '-') %>" class="m-0 px-5 py-5 hover:bg-slate-50/50 transition-colors scroll-mt-24">
+                            <dl class="m-0 flex flex-wrap items-start gap-x-3 gap-y-2">
+                                <dt class="sr-only">Index</dt>
+                                <dd class="text-xs font-mono text-slate-300 w-6 pt-0.5 flex-shrink-0"><%= v + 1 %>.</dd>
+                                <dt class="sr-only">Value</dt>
+                                <dd><code class="model-inline-code"><%= pageData.values[v].value %></code></dd>
+                                <dt class="sr-only">Description</dt>
+                                <dd class="w-full flex-none pl-9 text-sm text-slate-600"><%- pageData.values[v].description %></dd>
+                            </dl>
+                        </li>
+                    <% } %>
+                </ul>
+            </div>
+        <% } else if (pageData.properties && pageData.properties.length > 0) { %>
+            <!-- Quick Navigation for Properties -->
+            <% if (pageData.properties.length >= 4) { %>
+                <div class="mb-6">
+                    <div class="flex flex-wrap gap-1.5">
+                        <% for (var qp = 0; qp < pageData.properties.length; qp++) { %>
+                            <a href="#prop-<%= pageData.properties[qp].name %>" class="rounded-md bg-white px-2.5 py-1 text-xs font-medium text-slate-600 ring-1 ring-inset ring-slate-200 hover:bg-slate-50 hover:text-slate-900 transition-colors no-underline"><%= pageData.properties[qp].name %></a>
+                        <% } %>
+                    </div>
+                </div>
+            <% } %>
+
+            <h3 id="properties" class="text-base font-semibold text-slate-800 mb-4 scroll-mt-24">Properties</h3>
+            <div class="my-6 rounded-xl border border-slate-200 bg-white overflow-hidden">
+                <ul role="list" class="m-0 w-full list-none divide-y divide-slate-100 p-0">
+                    <% for (var p = 0; p < pageData.properties.length; p++) { %>
+                        <li id="prop-<%= pageData.properties[p].name %>" class="m-0 px-5 py-5 hover:bg-slate-50/50 transition-colors scroll-mt-24">
+                            <div class="mb-1.5">
+                                <code class="text-sm font-semibold text-slate-900"><%= pageData.properties[p].name %></code>
+                                <% if (pageData.properties[p].required) { %>
+                                    <span class="ml-2 inline-flex items-center rounded-full bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700 ring-1 ring-inset ring-amber-600/20">Required</span>
+                                <% } %>
+                            </div>
+                            <div class="mb-2">
+                                <span class="inline-flex items-center rounded-md bg-slate-100 px-2 py-0.5 text-xs font-mono text-slate-600">
+                                    <% if (pageData.properties[p].typeLinks && pageData.properties[p].typeLinks.length > 0) { %>
+                                        <% var typeLinks = pageData.properties[p].typeLinks; %>
+                                        <% for (var tl = 0; tl < typeLinks.length; tl++) { %>
+                                            <% if (typeLinks[tl].path) { %>
+                                                <a href="/reference/<%= typeLinks[tl].path %>" class="text-indigo-600 hover:text-indigo-700 hover:underline font-medium"><%= typeLinks[tl].label %></a>
+                                            <% } else { %>
+                                                <%= typeLinks[tl].label %>
+                                            <% } %>
+                                        <% } %>
+                                    <% } else { %>
+                                        <%= pageData.properties[p].type %>
+                                    <% } %>
+                                </span>
+                            </div>
+                            <p class="m-0 text-sm text-slate-600 leading-relaxed"><%- pageData.properties[p].description %></p>
+                        </li>
+                    <% } %>
+                </ul>
+            </div>
+        <% } %>
+
+        <!-- JSON Example Section -->
+        <div class="border-t border-slate-200 pt-8 mt-10">
+            <h3 id="example" class="text-base font-semibold text-slate-800 mb-4 scroll-mt-24">JSON Example</h3>
+            <%- include('../partials/code', { title: "JSON", code: pageData.jsonExample, requestType: "", requestUrl: "" }) %>
+        </div>
+
+        <% if (pageData.title === "Permission") { %>
+            <div class="mt-6 rounded-lg border border-indigo-100 bg-indigo-50 p-4">
+                <p class="text-sm text-indigo-800 m-0">
+                    For a complete list of all available permissions and their descriptions, see the
+                    <a href="/reference/permissions" class="font-medium text-indigo-600 hover:text-indigo-700 hover:underline">Permissions guide</a>.
+                </p>
+            </div>
+        <% } %>
+
+        <!-- Related Types Section -->
+        <% if (pageData.relatedTypes && pageData.relatedTypes.length > 0) { %>
+            <div class="border-t border-slate-200 pt-8 mt-10">
+                <h3 id="related-types" class="text-base font-semibold text-slate-800 mb-4 scroll-mt-24">Related Types</h3>
+                <div class="my-6 grid grid-cols-1 sm:grid-cols-2 gap-3">
+                    <% for (var r = 0; r < pageData.relatedTypes.length; r++) { %>
+                        <a href="/reference/<%= pageData.relatedTypes[r].path %>" class="group flex items-start gap-3 rounded-xl border border-slate-200 bg-white p-5 hover:border-indigo-300 hover:shadow-sm transition-all no-underline">
+                            <div class="flex-shrink-0 mt-0.5">
+                                <div class="flex items-center justify-center w-8 h-8 rounded-lg bg-indigo-50 group-hover:bg-indigo-100 transition-colors">
+                                    <svg class="w-4 h-4 text-indigo-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"></path></svg>
+                                </div>
+                            </div>
+                            <div>
+                                <div class="text-sm font-semibold text-slate-900 group-hover:text-indigo-600 transition-colors"><%= pageData.relatedTypes[r].name %></div>
+                                <div class="text-xs text-slate-500 mt-0.5"><%= pageData.relatedTypes[r].relationship %></div>
+                                <% if (pageData.relatedTypes[r].description) { %>
+                                    <div class="text-xs text-slate-400 mt-1 line-clamp-2"><%= pageData.relatedTypes[r].description %></div>
+                                <% } %>
+                            </div>
+                        </a>
+                    <% } %>
+                </div>
+            </div>
+        <% } %>
+
+    </article>
+</main>

APIReference/views/main/model.ejs

@@ -47,7 +47,13 @@
                      <dd><code class="model-inline-code"><%= Object.keys(pageData.columns)[i] -%></code></dd>
                      <dt class="sr-only">Type</dt>
                      <dd class="font-mono text-xs text-slate-500">
-                        <%= pageData.columns[Object.keys(pageData.columns)[i]].type -%>
+                        <% if(pageData.columns[Object.keys(pageData.columns)[i]].modelDocumentationPath) { %>
+                           <a href="/reference/<%= pageData.columns[Object.keys(pageData.columns)[i]].modelDocumentationPath -%>" class="text-indigo-600 hover:text-indigo-700 hover:underline font-medium"><%= pageData.columns[Object.keys(pageData.columns)[i]].modelName -%></a>
+                        <% } else if(pageData.columns[Object.keys(pageData.columns)[i]].typeDocumentationPath) { %>
+                           <a href="/reference/<%= pageData.columns[Object.keys(pageData.columns)[i]].typeDocumentationPath -%>" class="text-indigo-600 hover:text-indigo-700 hover:underline font-medium"><%= pageData.columns[Object.keys(pageData.columns)[i]].type -%></a>
+                        <% } else { %>
+                           <%= pageData.columns[Object.keys(pageData.columns)[i]].type -%>
+                        <% } %>
                         <% if(pageData.columns[Object.keys(pageData.columns)[i]].required){ %>
                            <span class="ml-1.5 inline-flex items-center rounded-full bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700 ring-1 ring-inset ring-amber-600/20">Required</span>
                         <% } %>

APIReference/views/main/permissions.ejs

@@ -14,23 +14,49 @@
          <p class="text-lg text-slate-600 leading-relaxed max-w-2xl">Your API Token needs permissions to create, update, read or delete any resource. If you do not have permissions to make a request a <code class="inline-code">4xx</code> status will be sent as response. You can manage permissions for your API Key in Project Settings > API Keys.</p>
       </div>
 
-      <h2 id="consuming-webhooks" class="scroll-mt-24 text-xl font-semibold text-slate-900 mb-6 mt-12">
-         Permissions List
-      </h2>
-      <p class="text-slate-600 leading-relaxed mb-6">Here is a list of all the permissions:</p>
-
-      <div class="rounded-xl border border-slate-200 bg-white overflow-hidden">
-         <ul role="list" class="m-0 divide-y divide-slate-100 p-0">
-            <% for(var i=0; i<pageData.permissions.length; i++) {%>
-               <li class="m-0 px-5 py-4 hover:bg-slate-50/50 transition-colors">
-                  <dl class="m-0 flex flex-wrap items-center gap-x-3 gap-y-2">
-                     <dd><code class="inline-code"><%= pageData.permissions[i].permission -%></code></dd>
-                     <dd class="font-mono text-xs text-slate-500"><%= pageData.permissions[i].title -%></dd>
-                     <dd class="w-full flex-none text-sm text-slate-600 mt-1"><%= pageData.permissions[i].description -%></dd>
-                  </dl>
-               </li>
-            <% } %>
-         </ul>
+      <!-- Quick Navigation -->
+      <div class="my-6 flex gap-3 rounded-xl border border-indigo-500/20 bg-indigo-50/50 p-4">
+         <div class="flex-shrink-0">
+            <svg viewBox="0 0 16 16" aria-hidden="true" class="h-5 w-5 fill-indigo-500 stroke-white">
+               <circle cx="8" cy="8" r="8" stroke-width="0"></circle>
+               <path fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.75 7.75h1.5v3.5"></path>
+               <circle cx="8" cy="4" r=".5" fill="none"></circle>
+            </svg>
+         </div>
+         <div>
+            <p class="text-sm font-medium text-indigo-900 mb-2">Jump to a category</p>
+            <div class="flex flex-wrap gap-2">
+               <% for(var g=0; g<pageData.permissionGroups.length; g++) { %>
+                  <a href="#<%= pageData.permissionGroups[g].group.toLowerCase().replace(/ /g, '-') -%>"
+                     class="inline-flex items-center gap-1.5 rounded-md bg-white px-2.5 py-1 text-xs font-medium text-slate-700 ring-1 ring-inset ring-slate-200 hover:bg-indigo-50 hover:text-indigo-700 hover:ring-indigo-200 transition-colors">
+                     <%= pageData.permissionGroups[g].group %>
+                     <span class="text-slate-400">(<%= pageData.permissionGroups[g].permissions.length %>)</span>
+                  </a>
+               <% } %>
+            </div>
+         </div>
       </div>
+
+      <% for(var g=0; g<pageData.permissionGroups.length; g++) { %>
+         <h2 id="<%= pageData.permissionGroups[g].group.toLowerCase().replace(/ /g, '-') -%>"
+            class="scroll-mt-24 text-xl font-semibold text-slate-900 mb-4 mt-12 <%= g > 0 ? 'pt-8 border-t border-slate-200' : '' %>">
+            <%= pageData.permissionGroups[g].group %>
+            <span class="ml-2 align-middle inline-flex items-center rounded-full bg-slate-100 px-2.5 py-0.5 text-xs font-medium text-slate-600"><%= pageData.permissionGroups[g].permissions.length %></span>
+         </h2>
+
+         <div class="rounded-xl border border-slate-200 bg-white overflow-hidden">
+            <ul role="list" class="m-0 list-none divide-y divide-slate-100 p-0">
+               <% for(var i=0; i<pageData.permissionGroups[g].permissions.length; i++) { %>
+                  <li class="m-0 px-5 py-4 hover:bg-slate-50/50 transition-colors">
+                     <dl class="m-0 flex flex-wrap items-center gap-x-3 gap-y-2">
+                        <dd><code class="inline-code"><%= pageData.permissionGroups[g].permissions[i].permission -%></code></dd>
+                        <dd class="font-mono text-xs text-slate-500"><%= pageData.permissionGroups[g].permissions[i].title -%></dd>
+                        <dd class="w-full flex-none text-sm text-slate-600 mt-1"><%= pageData.permissionGroups[g].permissions[i].description -%></dd>
+                     </dl>
+                  </li>
+               <% } %>
+            </ul>
+         </div>
+      <% } %>
    </article>
-</main>
+</main>

APIReference/views/partials/nav.ejs

@@ -406,6 +406,52 @@
                         </ul>
                     </div>
                 </li>
+                <% if (typeof dataTypes !== 'undefined' && dataTypes && dataTypes.length > 0) { %>
+                <%
+                    // Group data types by category
+                    var _dtGeneral = [];
+                    var _dtCategories = {};
+                    var _dtCatOrder = [];
+                    for (var _di = 0; _di < dataTypes.length; _di++) {
+                        var _dt = dataTypes[_di];
+                        if (_dt.category) {
+                            if (!_dtCategories[_dt.category]) {
+                                _dtCategories[_dt.category] = [];
+                                _dtCatOrder.push(_dt.category);
+                            }
+                            _dtCategories[_dt.category].push(_dt);
+                        } else {
+                            _dtGeneral.push(_dt);
+                        }
+                    }
+                %>
+                <li class="relative mt-6">
+                    <h6 class="text-xs font-semibold text-slate-900 uppercase tracking-wide">Data Types</h6>
+                    <div class="relative mt-3 pl-2">
+                        <div class="absolute inset-y-0 left-2 w-px bg-slate-200"></div>
+                        <ul role="list" class="border-l border-transparent space-y-1">
+                            <% for(var i=0; i<_dtGeneral.length; i++) {%>
+                                <li class="relative"><a
+                                        class="nav-link flex justify-between gap-2 py-1.5 pr-3 text-sm transition pl-4 text-slate-600 hover:text-slate-900 -ml-px border-l-2 border-transparent hover:border-slate-300"
+                                        href="/reference/<%= _dtGeneral[i].path -%>"><span class="truncate"><%= _dtGeneral[i].name -%></span></a></li>
+                            <% } %>
+                        </ul>
+                        <% for (var _ci = 0; _ci < _dtCatOrder.length; _ci++) { %>
+                            <% var _catName = _dtCatOrder[_ci]; var _catTypes = _dtCategories[_catName]; %>
+                            <div class="mt-3 mb-1 pl-4">
+                                <span class="text-[10px] font-semibold text-slate-400 uppercase tracking-wider"><%= _catName %></span>
+                            </div>
+                            <ul role="list" class="border-l border-transparent space-y-1">
+                                <% for(var _ti=0; _ti<_catTypes.length; _ti++) {%>
+                                    <li class="relative"><a
+                                            class="nav-link flex justify-between gap-2 py-1.5 pr-3 text-sm transition pl-4 text-slate-600 hover:text-slate-900 -ml-px border-l-2 border-transparent hover:border-slate-300"
+                                            href="/reference/<%= _catTypes[_ti].path -%>"><span class="truncate"><%= _catTypes[_ti].name -%></span></a></li>
+                                <% } %>
+                            </ul>
+                        <% } %>
+                    </div>
+                </li>
+                <% } %>
                 <li class="sticky bottom-0 z-10 mt-6 min-[416px]:hidden"><a
                         class="inline-flex gap-0.5 justify-center overflow-hidden text-sm font-medium transition rounded-full bg-indigo-600 py-1.5 px-4 text-white hover:bg-indigo-700 shadow-sm w-full"
                         href="/#">Sign in</a></li>
@@ -537,6 +583,45 @@
                   <% } %>
                </ul>
             </li>
+            <% if (typeof dataTypes !== 'undefined' && dataTypes && dataTypes.length > 0) { %>
+            <%
+                // Group data types by category for mobile nav
+                var _mGeneral = [];
+                var _mCategories = {};
+                var _mCatOrder = [];
+                for (var _mi = 0; _mi < dataTypes.length; _mi++) {
+                    var _mdt = dataTypes[_mi];
+                    if (_mdt.category) {
+                        if (!_mCategories[_mdt.category]) {
+                            _mCategories[_mdt.category] = [];
+                            _mCatOrder.push(_mdt.category);
+                        }
+                        _mCategories[_mdt.category].push(_mdt);
+                    } else {
+                        _mGeneral.push(_mdt);
+                    }
+                }
+            %>
+            <li class="relative">
+               <h6 class="text-xs font-semibold text-slate-900 uppercase tracking-wide mb-3">Data Types</h6>
+               <ul role="list" class="space-y-1 border-l border-slate-200 ml-2">
+                  <% for(var i=0; i<_mGeneral.length; i++) {%>
+                     <li><a class="mobile-nav-link block py-2 pl-4 text-sm text-slate-600 hover:text-slate-900 border-l-2 border-transparent hover:border-slate-300 -ml-px transition truncate" href="/reference/<%= _mGeneral[i].path -%>"><%= _mGeneral[i].name -%></a></li>
+                  <% } %>
+               </ul>
+               <% for (var _mci = 0; _mci < _mCatOrder.length; _mci++) { %>
+                  <% var _mCatName = _mCatOrder[_mci]; var _mCatTypes = _mCategories[_mCatName]; %>
+                  <div class="mt-3 mb-1 ml-4">
+                     <span class="text-[10px] font-semibold text-slate-400 uppercase tracking-wider"><%= _mCatName %></span>
+                  </div>
+                  <ul role="list" class="space-y-1 border-l border-slate-200 ml-2">
+                     <% for(var _mti=0; _mti<_mCatTypes.length; _mti++) {%>
+                        <li><a class="mobile-nav-link block py-2 pl-4 text-sm text-slate-600 hover:text-slate-900 border-l-2 border-transparent hover:border-slate-300 -ml-px transition truncate" href="/reference/<%= _mCatTypes[_mti].path -%>"><%= _mCatTypes[_mti].name -%></a></li>
+                     <% } %>
+                  </ul>
+               <% } %>
+            </li>
+            <% } %>
          </ul>
       </nav>
 

Accounts/package-lock.json

@@ -77,6 +77,7 @@
                 "ejs": "^3.1.10",
                 "elkjs": "^0.10.0",
                 "esbuild": "^0.25.5",
+                "expo-server-sdk": "^3.15.0",
                 "express": "^4.21.1",
                 "formik": "^2.4.6",
                 "history": "^5.3.0",

Accounts/src/Pages/Register.tsx

@@ -32,6 +32,7 @@ import Reseller from "Common/Models/DatabaseModels/Reseller";
 import User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 import useAsyncEffect from "use-async-effect";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 
 const RegisterPage: () => JSX.Element = () => {
   const apiUrl: URL = SIGNUP_API_URL;
@@ -172,6 +173,36 @@ const RegisterPage: () => JSX.Element = () => {
     }
   }
 
+  if (!BILLING_ENABLED) {
+    formFields = formFields.concat([
+      {
+        overrideField: {
+          selfHostedCompanyName: true,
+        },
+        overrideFieldKey: "selfHostedCompanyName",
+        fieldType: FormFieldSchemaType.Text,
+        placeholder: "Acme, Inc.",
+        required: false,
+        title: "Company Name",
+        dataTestId: "selfHostedCompanyName",
+        showEvenIfPermissionDoesNotExist: true,
+        disableSpellCheck: true,
+      },
+      {
+        overrideField: {
+          selfHostedPhoneNumber: true,
+        },
+        overrideFieldKey: "selfHostedPhoneNumber",
+        fieldType: FormFieldSchemaType.Phone,
+        required: false,
+        placeholder: "+11234567890",
+        title: "Phone Number",
+        dataTestId: "selfHostedPhoneNumber",
+        showEvenIfPermissionDoesNotExist: true,
+      },
+    ]);
+  }
+
   formFields = formFields.concat([
     {
       field: {
@@ -206,6 +237,25 @@ const RegisterPage: () => JSX.Element = () => {
     },
   ]);
 
+  if (!IsBillingEnabled) {
+    formFields = formFields.concat([
+      {
+        overrideField: {
+          notifySelfHosted: true,
+        },
+        overrideFieldKey: "notifySelfHosted",
+
+        fieldType: FormFieldSchemaType.Checkbox,
+        required: false,
+        defaultValue: true,
+        title: "Notify me about security patches and new releases",
+        dataTestId: "notifySelfHosted",
+        showEvenIfPermissionDoesNotExist: true,
+        spanFullRow: true,
+      },
+    ]);
+  }
+
   if (isCaptchaEnabled) {
     formFields = formFields.concat([
       {
@@ -330,6 +380,7 @@ const RegisterPage: () => JSX.Element = () => {
               if (value && value.email) {
                 UiAnalytics.userAuth(value.email);
                 UiAnalytics.capture("accounts/register");
+                UiAnalytics.capture("sign_up");
               }
 
               LoginUtil.login({

AdminDashboard/package-lock.json

@@ -76,6 +76,7 @@
                 "ejs": "^3.1.10",
                 "elkjs": "^0.10.0",
                 "esbuild": "^0.25.5",
+                "expo-server-sdk": "^3.15.0",
                 "express": "^4.21.1",
                 "formik": "^2.4.6",
                 "history": "^5.3.0",

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -12,7 +12,6 @@ import Toggle from "Common/UI/Components/Toggle/Toggle";
 import FieldType from "Common/UI/Components/Types/FieldType";
 import { BILLING_ENABLED, getAllEnvVars } from "Common/UI/Config";
 import { GetReactElementFunction } from "Common/UI/Types/FunctionTypes";
-import Navigation from "Common/UI/Utils/Navigation";
 import Project from "Common/Models/DatabaseModels/Project";
 import User from "Common/Models/DatabaseModels/User";
 import React, {
@@ -21,6 +20,7 @@ import React, {
   useEffect,
   useState,
 } from "react";
+import Navigation from "Common/UI/Utils/Navigation";
 
 const Projects: FunctionComponent = (): ReactElement => {
   const [isSubscriptionPlanYearly, setIsSubscriptionPlanYearly] =

AdminDashboard/src/Pages/Projects/View/Delete.tsx

@@ -1,3 +1,4 @@
+import AdminModelAPI from "../../../Utils/ModelAPI";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
@@ -17,6 +18,7 @@ const DeletePage: FunctionComponent = (): ReactElement => {
       modelId={modelId}
       modelNameField="name"
       modelType={Project}
+      modelAPI={AdminModelAPI}
       title={"Project"}
       breadcrumbLinks={[
         {
@@ -41,6 +43,7 @@ const DeletePage: FunctionComponent = (): ReactElement => {
       <ModelDelete
         modelType={Project}
         modelId={modelId}
+        modelAPI={AdminModelAPI}
         onDeleteSuccess={() => {
           Navigation.navigate(RouteMap[PageMap.PROJECTS] as Route);
         }}

AdminDashboard/src/Pages/Projects/View/Index.tsx

@@ -1,3 +1,4 @@
+import AdminModelAPI from "../../../Utils/ModelAPI";
 import ObjectID from "Common/Types/ObjectID";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
@@ -19,6 +20,7 @@ const Projects: FunctionComponent = (): ReactElement => {
       modelId={modelId}
       modelNameField="name"
       modelType={Project}
+      modelAPI={AdminModelAPI}
       title={"Project"}
       breadcrumbLinks={[
         {
@@ -43,6 +45,7 @@ const Projects: FunctionComponent = (): ReactElement => {
       <div>
         <CardModelDetail<Project>
           name="Project"
+          modelAPI={AdminModelAPI}
           cardProps={{
             title: "Project",
             description: "Project details",

AdminDashboard/src/Pages/Users/View/Delete.tsx

@@ -1,3 +1,4 @@
+import AdminModelAPI from "../../../Utils/ModelAPI";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
@@ -17,6 +18,7 @@ const DeletePage: FunctionComponent = (): ReactElement => {
       modelId={modelId}
       modelNameField="email"
       modelType={User}
+      modelAPI={AdminModelAPI}
       title={"User"}
       breadcrumbLinks={[
         {
@@ -39,6 +41,7 @@ const DeletePage: FunctionComponent = (): ReactElement => {
       <ModelDelete
         modelType={User}
         modelId={modelId}
+        modelAPI={AdminModelAPI}
         onDeleteSuccess={() => {
           Navigation.navigate(RouteMap[PageMap.USERS] as Route);
         }}

AdminDashboard/src/Pages/Users/View/Index.tsx

@@ -1,3 +1,4 @@
+import AdminModelAPI from "../../../Utils/ModelAPI";
 import ObjectID from "Common/Types/ObjectID";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
@@ -19,6 +20,7 @@ const Users: FunctionComponent = (): ReactElement => {
       modelId={modelId}
       modelNameField="email"
       modelType={User}
+      modelAPI={AdminModelAPI}
       title={"User"}
       breadcrumbLinks={[
         {
@@ -41,6 +43,7 @@ const Users: FunctionComponent = (): ReactElement => {
       <div>
         <CardModelDetail<User>
           name="User"
+          modelAPI={AdminModelAPI}
           cardProps={{
             title: "User",
             description: "User details",

AdminDashboard/src/Pages/Users/View/Settings.tsx

@@ -1,3 +1,4 @@
+import AdminModelAPI from "../../../Utils/ModelAPI";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
@@ -19,6 +20,7 @@ const UserSettings: FunctionComponent = (): ReactElement => {
       modelId={modelId}
       modelNameField="email"
       modelType={User}
+      modelAPI={AdminModelAPI}
       title={"User"}
       breadcrumbLinks={[
         {
@@ -52,6 +54,7 @@ const UserSettings: FunctionComponent = (): ReactElement => {
     >
       <CardModelDetail<User>
         name="user-master-admin-settings"
+        modelAPI={AdminModelAPI}
         cardProps={{
           title: "Master Admin Access",
           description:

App/FeatureSet/BaseAPI/Index.ts

@@ -23,6 +23,7 @@ import WhatsAppLogAPI from "./WhatsAppLogAPI";
 // Import API
 import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
 import EnterpriseLicenseAPI from "Common/Server/API/EnterpriseLicenseAPI";
+import OpenSourceDeploymentAPI from "Common/Server/API/OpenSourceDeploymentAPI";
 import MonitorAPI from "Common/Server/API/MonitorAPI";
 import ShortLinkAPI from "Common/Server/API/ShortLinkAPI";
 import StatusPageAPI from "Common/Server/API/StatusPageAPI";
@@ -35,9 +36,11 @@ import UserWebAuthnAPI from "Common/Server/API/UserWebAuthnAPI";
 import MonitorTest from "Common/Models/DatabaseModels/MonitorTest";
 import IncidentInternalNoteAPI from "Common/Server/API/IncidentInternalNoteAPI";
 import IncidentPublicNoteAPI from "Common/Server/API/IncidentPublicNoteAPI";
+import IncidentEpisodePublicNoteAPI from "Common/Server/API/IncidentEpisodePublicNoteAPI";
 import ScheduledMaintenanceInternalNoteAPI from "Common/Server/API/ScheduledMaintenanceInternalNoteAPI";
 import ScheduledMaintenancePublicNoteAPI from "Common/Server/API/ScheduledMaintenancePublicNoteAPI";
 import IncidentAPI from "Common/Server/API/IncidentAPI";
+import IncidentEpisodeAPI from "Common/Server/API/IncidentEpisodeAPI";
 import ScheduledMaintenanceAPI from "Common/Server/API/ScheduledMaintenanceAPI";
 import AlertAPI from "Common/Server/API/AlertAPI";
 // User Notification methods.
@@ -128,10 +131,48 @@ import AlertEpisodeOwnerUserService, {
 import AlertEpisodeStateTimelineService, {
   Service as AlertEpisodeStateTimelineServiceType,
 } from "Common/Server/Services/AlertEpisodeStateTimelineService";
+
+// IncidentEpisode Services
+
+import IncidentEpisodeFeedService, {
+  Service as IncidentEpisodeFeedServiceType,
+} from "Common/Server/Services/IncidentEpisodeFeedService";
+import IncidentEpisodeInternalNoteService, {
+  Service as IncidentEpisodeInternalNoteServiceType,
+} from "Common/Server/Services/IncidentEpisodeInternalNoteService";
+import IncidentEpisodeMemberService, {
+  Service as IncidentEpisodeMemberServiceType,
+} from "Common/Server/Services/IncidentEpisodeMemberService";
+import IncidentEpisodeOwnerTeamService, {
+  Service as IncidentEpisodeOwnerTeamServiceType,
+} from "Common/Server/Services/IncidentEpisodeOwnerTeamService";
+import IncidentEpisodeOwnerUserService, {
+  Service as IncidentEpisodeOwnerUserServiceType,
+} from "Common/Server/Services/IncidentEpisodeOwnerUserService";
+import IncidentEpisodeStateTimelineService, {
+  Service as IncidentEpisodeStateTimelineServiceType,
+} from "Common/Server/Services/IncidentEpisodeStateTimelineService";
+
+import IncidentEpisodeRoleMemberService, {
+  Service as IncidentEpisodeRoleMemberServiceType,
+} from "Common/Server/Services/IncidentEpisodeRoleMemberService";
+
 import AlertGroupingRuleService, {
   Service as AlertGroupingRuleServiceType,
 } from "Common/Server/Services/AlertGroupingRuleService";
 
+import IncidentGroupingRuleService, {
+  Service as IncidentGroupingRuleServiceType,
+} from "Common/Server/Services/IncidentGroupingRuleService";
+
+import IncidentSlaService, {
+  Service as IncidentSlaServiceType,
+} from "Common/Server/Services/IncidentSlaService";
+
+import IncidentSlaRuleService, {
+  Service as IncidentSlaRuleServiceType,
+} from "Common/Server/Services/IncidentSlaRuleService";
+
 import IncidentCustomFieldService, {
   Service as IncidentCustomFieldServiceType,
 } from "Common/Server/Services/IncidentCustomFieldService";
@@ -153,6 +194,12 @@ import IncidentOwnerUserService, {
 import IncidentSeverityService, {
   Service as IncidentSeverityServiceType,
 } from "Common/Server/Services/IncidentSeverityService";
+import IncidentRoleService, {
+  Service as IncidentRoleServiceType,
+} from "Common/Server/Services/IncidentRoleService";
+import IncidentMemberService, {
+  Service as IncidentMemberServiceType,
+} from "Common/Server/Services/IncidentMemberService";
 import IncidentStateService, {
   Service as IncidentStateServiceType,
 } from "Common/Server/Services/IncidentStateService";
@@ -263,6 +310,9 @@ import OnCallDutyPolicyScheduleService, {
 import ProjectCallSMSConfigService, {
   Service as ProjectCallSMSConfigServiceType,
 } from "Common/Server/Services/ProjectCallSMSConfigService";
+import ProjectUserProfileService, {
+  Service as ProjectUserProfileServiceType,
+} from "Common/Server/Services/ProjectUserProfileService";
 import ProjectSmtpConfigService, {
   Service as ProjectSMTPConfigServiceType,
 } from "Common/Server/Services/ProjectSmtpConfigService";
@@ -362,6 +412,9 @@ import StatusPageSSOService, {
 import TeamMemberService, {
   TeamMemberService as TeamMemberServiceType,
 } from "Common/Server/Services/TeamMemberService";
+import TeamMemberCustomFieldService, {
+  Service as TeamMemberCustomFieldServiceType,
+} from "Common/Server/Services/TeamMemberCustomFieldService";
 import TeamPermissionService, {
   Service as TeamPermissionServiceType,
 } from "Common/Server/Services/TeamPermissionService";
@@ -457,6 +510,18 @@ import AlertEpisodeOwnerTeam from "Common/Models/DatabaseModels/AlertEpisodeOwne
 import AlertEpisodeOwnerUser from "Common/Models/DatabaseModels/AlertEpisodeOwnerUser";
 import AlertEpisodeStateTimeline from "Common/Models/DatabaseModels/AlertEpisodeStateTimeline";
 import AlertGroupingRule from "Common/Models/DatabaseModels/AlertGroupingRule";
+import IncidentGroupingRule from "Common/Models/DatabaseModels/IncidentGroupingRule";
+import IncidentSla from "Common/Models/DatabaseModels/IncidentSla";
+import IncidentSlaRule from "Common/Models/DatabaseModels/IncidentSlaRule";
+
+// IncidentEpisode Models
+import IncidentEpisodeFeed from "Common/Models/DatabaseModels/IncidentEpisodeFeed";
+import IncidentEpisodeInternalNote from "Common/Models/DatabaseModels/IncidentEpisodeInternalNote";
+import IncidentEpisodeMember from "Common/Models/DatabaseModels/IncidentEpisodeMember";
+import IncidentEpisodeOwnerTeam from "Common/Models/DatabaseModels/IncidentEpisodeOwnerTeam";
+import IncidentEpisodeOwnerUser from "Common/Models/DatabaseModels/IncidentEpisodeOwnerUser";
+import IncidentEpisodeStateTimeline from "Common/Models/DatabaseModels/IncidentEpisodeStateTimeline";
+import IncidentEpisodeRoleMember from "Common/Models/DatabaseModels/IncidentEpisodeRoleMember";
 
 import IncidentCustomField from "Common/Models/DatabaseModels/IncidentCustomField";
 import IncidentNoteTemplate from "Common/Models/DatabaseModels/IncidentNoteTemplate";
@@ -464,6 +529,8 @@ import IncidentPostmortemTemplate from "Common/Models/DatabaseModels/IncidentPos
 import IncidentOwnerTeam from "Common/Models/DatabaseModels/IncidentOwnerTeam";
 import IncidentOwnerUser from "Common/Models/DatabaseModels/IncidentOwnerUser";
 import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity";
+import IncidentRole from "Common/Models/DatabaseModels/IncidentRole";
+import IncidentMember from "Common/Models/DatabaseModels/IncidentMember";
 import IncidentState from "Common/Models/DatabaseModels/IncidentState";
 import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline";
 import IncidentTemplate from "Common/Models/DatabaseModels/IncidentTemplate";
@@ -499,6 +566,7 @@ import OnCallDutyPolicyScheduleLayer from "Common/Models/DatabaseModels/OnCallDu
 import OnCallDutyPolicyScheduleLayerUser from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser";
 import ProjectCallSMSConfig from "Common/Models/DatabaseModels/ProjectCallSMSConfig";
 import ProjectSmtpConfig from "Common/Models/DatabaseModels/ProjectSmtpConfig";
+import ProjectUserProfile from "Common/Models/DatabaseModels/ProjectUserProfile";
 import PromoCode from "Common/Models/DatabaseModels/PromoCode";
 import CodeRepository from "Common/Models/DatabaseModels/CodeRepository";
 import Reseller from "Common/Models/DatabaseModels/Reseller";
@@ -527,6 +595,7 @@ import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource"
 import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso";
 import Team from "Common/Models/DatabaseModels/Team";
 import TeamMember from "Common/Models/DatabaseModels/TeamMember";
+import TeamMemberCustomField from "Common/Models/DatabaseModels/TeamMemberCustomField";
 import TeamPermission from "Common/Models/DatabaseModels/TeamPermission";
 import TeamComplianceSetting from "Common/Models/DatabaseModels/TeamComplianceSetting";
 import TelemetryUsageBilling from "Common/Models/DatabaseModels/TelemetryUsageBilling";
@@ -1001,6 +1070,77 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    // IncidentEpisode Routes
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new IncidentEpisodeAPI().getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentEpisodeFeed, IncidentEpisodeFeedServiceType>(
+        IncidentEpisodeFeed,
+        IncidentEpisodeFeedService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        IncidentEpisodeInternalNote,
+        IncidentEpisodeInternalNoteServiceType
+      >(
+        IncidentEpisodeInternalNote,
+        IncidentEpisodeInternalNoteService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentEpisodeMember, IncidentEpisodeMemberServiceType>(
+        IncidentEpisodeMember,
+        IncidentEpisodeMemberService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        IncidentEpisodeOwnerTeam,
+        IncidentEpisodeOwnerTeamServiceType
+      >(IncidentEpisodeOwnerTeam, IncidentEpisodeOwnerTeamService).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        IncidentEpisodeOwnerUser,
+        IncidentEpisodeOwnerUserServiceType
+      >(IncidentEpisodeOwnerUser, IncidentEpisodeOwnerUserService).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        IncidentEpisodeStateTimeline,
+        IncidentEpisodeStateTimelineServiceType
+      >(
+        IncidentEpisodeStateTimeline,
+        IncidentEpisodeStateTimelineService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        IncidentEpisodeRoleMember,
+        IncidentEpisodeRoleMemberServiceType
+      >(
+        IncidentEpisodeRoleMember,
+        IncidentEpisodeRoleMemberService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<AlertGroupingRule, AlertGroupingRuleServiceType>(
@@ -1009,6 +1149,32 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentGroupingRule, IncidentGroupingRuleServiceType>(
+        IncidentGroupingRule,
+        IncidentGroupingRuleService,
+      ).getRouter(),
+    );
+
+    // IncidentSla
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentSla, IncidentSlaServiceType>(
+        IncidentSla,
+        IncidentSlaService,
+      ).getRouter(),
+    );
+
+    // IncidentSlaRule
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentSlaRule, IncidentSlaRuleServiceType>(
+        IncidentSlaRule,
+        IncidentSlaRuleService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAnalyticsAPI<ExceptionInstance, ExceptionInstanceServiceType>(
@@ -1264,6 +1430,14 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<ProjectUserProfile, ProjectUserProfileServiceType>(
+        ProjectUserProfile,
+        ProjectUserProfileService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<MonitorGroupResource, MonitorGroupResourceServiceType>(
@@ -1280,6 +1454,14 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<TeamMemberCustomField, TeamMemberCustomFieldServiceType>(
+        TeamMemberCustomField,
+        TeamMemberCustomFieldService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<TeamPermission, TeamPermissionServiceType>(
@@ -1466,6 +1648,22 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentRole, IncidentRoleServiceType>(
+        IncidentRole,
+        IncidentRoleService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentMember, IncidentMemberServiceType>(
+        IncidentMember,
+        IncidentMemberService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<IncidentOwnerUser, IncidentOwnerUserServiceType>(
@@ -1810,6 +2008,10 @@ const BaseAPIFeatureSet: FeatureSet = {
       `/${APP_NAME.toLocaleLowerCase()}`,
       new EnterpriseLicenseAPI().getRouter(),
     );
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new OpenSourceDeploymentAPI().getRouter(),
+    );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new SlackAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1944,6 +2146,11 @@ const BaseAPIFeatureSet: FeatureSet = {
       new IncidentPublicNoteAPI().getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new IncidentEpisodePublicNoteAPI().getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new IncidentInternalNoteAPI().getRouter(),

App/FeatureSet/Identity/API/Authentication.ts

@@ -17,9 +17,11 @@ import ObjectID from "Common/Types/ObjectID";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import DatabaseConfig from "Common/Server/DatabaseConfig";
 import {
+  AppVersion,
   EncryptionSecret,
   IsBillingEnabled,
 } from "Common/Server/EnvironmentConfig";
+import API from "Common/Utils/API";
 import AccessTokenService from "Common/Server/Services/AccessTokenService";
 import EmailVerificationTokenService from "Common/Server/Services/EmailVerificationTokenService";
 import MailService from "Common/Server/Services/MailService";
@@ -29,6 +31,7 @@ import UserSessionService, {
   SessionMetadata,
 } from "Common/Server/Services/UserSessionService";
 import CookieUtil from "Common/Server/Utils/Cookie";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
 import Express, {
   ExpressRequest,
   ExpressResponse,
@@ -54,6 +57,11 @@ const router: ExpressRouter = Express.getRouter();
 
 const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
 
+interface FinalizeUserLoginResult {
+  sessionMetadata: SessionMetadata;
+  accessToken: string;
+}
+
 type FinalizeUserLoginInput = {
   req: ExpressRequest;
   res: ExpressResponse;
@@ -63,9 +71,9 @@ type FinalizeUserLoginInput = {
 
 const finalizeUserLogin: (
   data: FinalizeUserLoginInput,
-) => Promise<SessionMetadata> = async (
+) => Promise<FinalizeUserLoginResult> = async (
   data: FinalizeUserLoginInput,
-): Promise<SessionMetadata> => {
+): Promise<FinalizeUserLoginResult> => {
   const { req, res, user, isGlobalLogin } = data;
 
   const sessionMetadata: SessionMetadata =
@@ -87,7 +95,21 @@ const finalizeUserLogin: (
     accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
   });
 
-  return sessionMetadata;
+  // Generate access token for response body (used by mobile clients)
+  const accessToken: string = JSONWebToken.signUserLoginToken({
+    tokenData: {
+      userId: user.id!,
+      email: user.email!,
+      name: user.name!,
+      timezone: user.timezone || null,
+      isMasterAdmin: user.isMasterAdmin!,
+      isGlobalLogin: isGlobalLogin,
+      sessionId: sessionMetadata.session.id!,
+    },
+    expiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+  });
+
+  return { sessionMetadata, accessToken };
 };
 
 router.post(
@@ -251,6 +273,28 @@ router.post(
 
         logger.info("User signed up: " + savedUser.email?.toString());
 
+        if (!IsBillingEnabled && miscDataProps["notifySelfHosted"] === true) {
+          const instanceUrl: string = new URL(httpProtocol, host).toString();
+
+          API.post({
+            url: URL.fromString(
+              "https://oneuptime.com/api/open-source-deployment/register",
+            ),
+            data: {
+              email: savedUser.email?.toString() || "",
+              name: savedUser.name?.toString() || "",
+              companyName:
+                (miscDataProps["selfHostedCompanyName"] as string) || undefined,
+              companyPhoneNumber:
+                (miscDataProps["selfHostedPhoneNumber"] as string) || undefined,
+              oneuptimeVersion: AppVersion,
+              instanceUrl: instanceUrl,
+            },
+          }).catch((err: Error) => {
+            logger.error(err);
+          });
+        }
+
         return Response.sendEntityResponse(req, res, savedUser, User);
       }
 
@@ -552,8 +596,10 @@ router.post(
     next: NextFunction,
   ): Promise<void> => {
     try {
+      // Try cookie first, then fallback to request body (for mobile clients)
       const refreshToken: string | undefined =
-        CookieUtil.getRefreshTokenFromExpressRequest(req);
+        CookieUtil.getRefreshTokenFromExpressRequest(req) ||
+        (req.body.refreshToken as string | undefined);
 
       if (!refreshToken) {
         CookieUtil.removeAllCookies(req, res);
@@ -658,7 +704,26 @@ router.post(
         accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
       });
 
-      return Response.sendEmptySuccessResponse(req, res);
+      // Generate access token for response body (used by mobile clients)
+      const newAccessToken: string = JSONWebToken.signUserLoginToken({
+        tokenData: {
+          userId: user.id!,
+          email: user.email!,
+          name: user.name!,
+          timezone: user.timezone || null,
+          isMasterAdmin: user.isMasterAdmin!,
+          isGlobalLogin: isGlobalLogin,
+          sessionId: renewedSession.session.id!,
+        },
+        expiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+      });
+
+      return Response.sendJsonObjectResponse(req, res, {
+        accessToken: newAccessToken,
+        refreshToken: renewedSession.refreshToken,
+        refreshTokenExpiresAt:
+          renewedSession.refreshTokenExpiresAt.toISOString(),
+      });
     } catch (err) {
       return next(err);
     }
@@ -673,8 +738,10 @@ router.post(
     next: NextFunction,
   ): Promise<void> => {
     try {
+      // Try cookie first, then fallback to request body (for mobile clients)
       const refreshToken: string | undefined =
-        CookieUtil.getRefreshTokenFromExpressRequest(req);
+        CookieUtil.getRefreshTokenFromExpressRequest(req) ||
+        (req.body.refreshToken as string | undefined);
 
       if (refreshToken) {
         await UserSessionService.revokeSessionByRefreshToken(refreshToken, {
@@ -987,14 +1054,21 @@ const login: LoginFunction = async (options: {
       if (alreadySavedUser.password.toString() === user.password!.toString()) {
         logger.info("User logged in: " + alreadySavedUser.email?.toString());
 
-        await finalizeUserLogin({
+        const loginResult: FinalizeUserLoginResult = await finalizeUserLogin({
           req,
           res,
           user: alreadySavedUser,
           isGlobalLogin: true,
         });
 
-        return Response.sendEntityResponse(req, res, alreadySavedUser, User);
+        return Response.sendEntityResponse(req, res, alreadySavedUser, User, {
+          miscData: {
+            accessToken: loginResult.accessToken,
+            refreshToken: loginResult.sessionMetadata.refreshToken,
+            refreshTokenExpiresAt:
+              loginResult.sessionMetadata.refreshTokenExpiresAt.toISOString(),
+          },
+        });
       }
     }
     return Response.sendErrorResponse(

App/FeatureSet/Notification/Services/CallService.ts

@@ -70,6 +70,7 @@ export default class CallService {
       customTwilioConfig?: TwilioConfig | undefined;
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
+      monitorId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;
@@ -144,6 +145,10 @@ export default class CallService {
         callLog.alertId = options.alertId;
       }
 
+      if (options.monitorId) {
+        callLog.monitorId = options.monitorId;
+      }
+
       if (options.scheduledMaintenanceId) {
         callLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
       }

App/FeatureSet/Notification/Services/MailService.ts

@@ -483,6 +483,7 @@ export default class MailService {
           timeout?: number | undefined;
           incidentId?: ObjectID | undefined;
           alertId?: ObjectID | undefined;
+          monitorId?: ObjectID | undefined;
           scheduledMaintenanceId?: ObjectID | undefined;
           statusPageId?: ObjectID | undefined;
           statusPageAnnouncementId?: ObjectID | undefined;
@@ -516,6 +517,10 @@ export default class MailService {
         emailLog.alertId = options.alertId;
       }
 
+      if (options.monitorId) {
+        emailLog.monitorId = options.monitorId;
+      }
+
       if (options.scheduledMaintenanceId) {
         emailLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
       }

App/FeatureSet/Notification/Services/SmsService.ts

@@ -33,6 +33,7 @@ export default class SmsService {
       userOnCallLogTimelineId?: ObjectID | undefined;
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
+      monitorId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;
@@ -91,6 +92,10 @@ export default class SmsService {
         smsLog.alertId = options.alertId;
       }
 
+      if (options.monitorId) {
+        smsLog.monitorId = options.monitorId;
+      }
+
       if (options.scheduledMaintenanceId) {
         smsLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
       }

App/FeatureSet/Notification/Services/WhatsAppService.ts

@@ -41,6 +41,7 @@ export default class WhatsAppService {
       userOnCallLogTimelineId?: ObjectID | undefined;
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
+      monitorId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;
@@ -96,6 +97,10 @@ export default class WhatsAppService {
         whatsAppLog.alertId = options.alertId;
       }
 
+      if (options.monitorId) {
+        whatsAppLog.monitorId = options.monitorId;
+      }
+
       if (options.scheduledMaintenanceId) {
         whatsAppLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
       }

App/FeatureSet/Notification/Templates/AcknowledgeIncidentEpisode.hbs

@@ -0,0 +1,66 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Incident Episode " episodeNumber ": " incidentEpisodeTitle) }}
+
+{{> InfoBlock info=(concat "A new incident episode has been created in the project - " projectName)}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Incident Episode Title:" text=incidentEpisodeTitle }}
+{{> DetailBoxField title="Current State: " text=currentState  }}
+{{> DetailBoxField title="Resources Affected: " text=resourcesAffected  }}
+{{> DetailBoxField title="Severity: " text=incidentEpisodeSeverity  }}
+{{> DetailBoxField title="Root Cause: " text=rootCause  }}
+{{> DetailBoxField title="Description: " text=incidentEpisodeDescription  }}
+{{> DetailBoxEnd this }}
+
+{{#if incidentsList}}
+{{> TitleBlock title=(concat "Incidents in this Episode (" incidentsCount ")") }}
+<!-- Incidents List Container -->
+<table class="st-Copy st-Width st-Width--mobile" border="0" cellpadding="0" cellspacing="0"
+  width="600" style="min-width: 600px;">
+  <tbody>
+    <tr>
+      <td class="st-Spacer st-Spacer--gutter"
+        style="border: 0; margin:0; padding: 0; font-size: 1px; line-height: 1px; mso-line-height-rule: exactly;"
+        width="64">
+        <div class="st-Spacer st-Spacer--filler"></div>
+      </td>
+      <td style="border: 0; margin: 0; padding: 0;">
+        {{{incidentsList}}}
+      </td>
+      <td class="st-Spacer st-Spacer--gutter"
+        style="border: 0; margin:0; padding: 0; font-size: 1px; line-height: 1px; mso-line-height-rule: exactly;"
+        width="64">
+        <div class="st-Spacer st-Spacer--filler"></div>
+      </td>
+    </tr>
+    <tr>
+      <td class="st-Spacer st-Spacer--stacked" colspan="3" height="16"
+        style="border: 0; margin: 0; padding: 0; font-size: 1px; line-height: 1px; mso-line-height-rule: exactly;">
+        <div class="st-Spacer st-Spacer--filler"></div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<!-- /Incidents List Container -->
+{{/if}}
+
+{{> InfoBlock info="ACTION REQUIRED: Please acknowledge this incident episode by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=acknowledgeIncidentEpisodeLink buttonText="Acknowledge Incident Episode"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=acknowledgeIncidentEpisodeLink}}
+
+{{> InfoBlock info="You will be notified when the status of this incident episode changes."}}
+
+{{> TitleBlock title="Why am I receiving this email?"}}
+{{> InfoBlock info="You are receiving this email because you are a member of the team that is responsible for this incident episode or you are currently on-call."}}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/IncidentEpisodeOwnerAdded.hbs

@@ -0,0 +1,30 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Incident Episode " episodeNumber ": " episodeTitle) }}
+
+{{> InfoBlock info="You have been added as the owner of this incident episode."}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Episode Title:" text=episodeTitle }}
+{{> DetailBoxField title="Current State: " text=currentState  }}
+{{> DetailBoxField title="Severity: " text=episodeSeverity  }}
+{{> DetailBoxField title="Description: " text=episodeDescription  }}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this incident episode by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=episodeViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=episodeViewLink}}
+
+{{> InfoBlock info="You will be notified when the status of this incident episode changes."}}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/IncidentEpisodeOwnerNotePosted.hbs

@@ -0,0 +1,37 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Incident Episode " episodeNumber ": " episodeTitle) }}
+
+{{> InfoBlock info="A new note has been posted on this incident episode."}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Episode Title:" text=episodeTitle }}
+{{> DetailBoxField title="Current State: " text=currentState  }}
+{{> DetailBoxField title="Severity: " text=episodeSeverity  }}
+{{#if isPrivateNote}}
+{{> DetailBoxField title="Private Note: " text=note  }}
+{{else}}
+{{> DetailBoxField title="Public Note: " text=note  }}
+{{/if}}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this incident episode by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=episodeViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=episodeViewLink}}
+
+{{> InfoBlock info="You will be notified when the status of this incident episode changes."}}
+
+{{> OwnerInfo this }}
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/IncidentEpisodeOwnerResourceCreated.hbs

@@ -0,0 +1,35 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Incident Episode " episodeNumber ": " episodeTitle) }}
+
+{{> InfoBlock info=(concat "A new incident episode has been created in the project - " projectName)}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Episode Title:" text=episodeTitle }}
+{{> DetailBoxField title="Current State: " text=currentState  }}
+{{> DetailBoxField title="Episode Created By: " text=declaredBy  }}
+{{> DetailBoxField title="Episode Created At: " text=declaredAt  }}
+{{> DetailBoxField title="Severity: " text=episodeSeverity  }}
+{{> DetailBoxField title="Description: " text=episodeDescription  }}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this incident episode by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=episodeViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=episodeViewLink}}
+
+{{> InfoBlock info="You will be notified when the status of this incident episode changes."}}
+
+{{> OwnerInfo this }}
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/IncidentEpisodeOwnerStateChanged.hbs

@@ -0,0 +1,37 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Incident Episode " episodeNumber ": " episodeTitle) }}
+
+{{> InfoBlock info="Incident episode state has changed"}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> StateTransition this}}
+{{#ifNotCond previousStateDurationText ""}}
+{{> DetailBoxField title="Duration in Previous State:" text=previousStateDurationText }}
+{{/ifNotCond}}
+{{> DetailBoxField title="Episode Title:" text=episodeTitle }}
+{{> DetailBoxField title="State changed at:" text=stateChangedAt }}
+{{> DetailBoxField title="Severity:" text=episodeSeverity }}
+{{> DetailBoxField title="Description:" text=episodeDescription }}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this incident episode by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=episodeViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=episodeViewLink}}
+
+{{> InfoBlock info="You will be notified when the status of this incident episode changes."}}
+
+{{> OwnerInfo this }}
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/IncidentMemberAdded.hbs

@@ -0,0 +1,32 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Incident " incidentNumber ": " incidentTitle) }}
+
+{{> InfoBlock info=(concat "You have been assigned as " incidentRole " to this incident.")}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Incident Title:" text=incidentTitle }}
+{{> DetailBoxField title="Your Role: " text=incidentRole  }}
+{{> DetailBoxField title="Current State: " text=currentState  }}
+{{> DetailBoxField title="Resources Affected: " text=resourcesAffected  }}
+{{> DetailBoxField title="Severity: " text=incidentSeverity  }}
+{{> DetailBoxField title="Description: " text=incidentDescription  }}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this incident by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=incidentViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=incidentViewLink}}
+
+{{> InfoBlock info="You will be notified when the status of this incident changes."}}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/Invoice.hbs

@@ -0,0 +1,37 @@
+{{> Start this}}
+
+{{> Logo this}}
+
+{{> EmailTitle title="Invoice from OneUptime" }}
+
+{{> InfoBlock info="A new invoice has been generated for your account. Here are the details:"}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Invoice Number:" text=invoiceNumber }}
+{{> DetailBoxField title="Invoice Date:" text=invoiceDate }}
+{{> DetailBoxField title="Amount:" text=amount }}
+{{#if description}}
+{{> DetailBoxField title="Description:" text=description }}
+{{/if}}
+{{> DetailBoxEnd this }}
+
+{{#if invoicePdfUrl}}
+{{> InfoBlock info="You can view and download your invoice by clicking the button below:"}}
+
+{{> ButtonBlock buttonUrl=invoicePdfUrl buttonText="View Invoice PDF"}}
+
+{{> InfoBlock info="Or copy and paste this link:"}}
+{{> InfoBlock info=invoicePdfUrl}}
+{{/if}}
+
+{{#if dashboardLink}}
+{{> InfoBlock info="You can also view all your invoices in your dashboard:"}}
+
+{{> ButtonBlock buttonUrl=dashboardLink buttonText="View Billing Dashboard"}}
+{{/if}}
+
+{{> InfoBlock info="You have received this email because you are subscribed to receive invoice notifications for this project."}}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/SubscriberEpisodeCreated.hbs

@@ -0,0 +1,36 @@
+{{> Start this}}
+
+{{> CustomLogo this}}
+
+{{> EmailTitle title=(concat "New Incident: " episodeTitle) }}
+
+{{> InfoBlock info="A new incident has been reported that may affect the services you're subscribed to."}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Incident" text=episodeTitle }}
+{{#if episodeSeverity}}
+{{> DetailBoxField title="Severity" text=episodeSeverity  }}
+{{/if}}
+{{> DetailBoxField title="Affected Resources" text=resourcesAffected  }}
+{{#if episodeDescription}}
+{{> DetailBoxField title="Description" text=episodeDescription  }}
+{{/if}}
+{{> DetailBoxEnd this }}
+
+{{#if detailsUrl}}
+{{> ButtonBlock buttonUrl=detailsUrl buttonText="View Incident Details"}}
+{{else}}
+{{> ButtonBlock buttonUrl=statusPageUrl buttonText="View Status Page"}}
+{{/if}}
+
+{{> VerticalSpace this}}
+
+{{#if subscriberEmailNotificationFooterText}}
+{{> InfoBlock info=subscriberEmailNotificationFooterText }}
+{{/if}}
+
+{{> UnsubscribeBlock this}}
+
+{{> Footer this}}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/SubscriberEpisodeNoteCreated.hbs

@@ -0,0 +1,30 @@
+{{> Start this}}
+
+{{> CustomLogo this}}
+{{> EmailTitle title=(concat "Incident: " episodeTitle) }}
+
+{{> InfoBlock info="A new note has been added to the incident. Here are the details:"}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Incident Title" text=episodeTitle }}
+{{> DetailBoxField title="Resources Affected" text=resourcesAffected  }}
+{{#if episodeSeverity}}
+{{> DetailBoxField title="Severity" text=episodeSeverity  }}
+{{/if}}
+{{> DetailBoxField title="Note" text=note  }}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
+
+
+{{#if detailsUrl}}
+{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
+{{else}}
+{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
+{{/if}}
+
+{{> UnsubscribeBlock this}}
+{{> VerticalSpace this}}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/SubscriberEpisodeStateChanged.hbs

@@ -0,0 +1,34 @@
+{{> Start this}}
+
+{{> CustomLogo this}}
+
+{{> EmailTitle title=emailTitle }}
+
+{{> InfoBlock info="The status of an incident affecting services you're subscribed to has been updated."}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Incident" text=episodeTitle }}
+{{> DetailBoxField title="Current State" text=episodeState  }}
+{{#if episodeSeverity}}
+{{> DetailBoxField title="Severity" text=episodeSeverity  }}
+{{/if}}
+{{> DetailBoxField title="Affected Resources" text=resourcesAffected  }}
+{{> DetailBoxEnd this }}
+
+{{#if detailsUrl}}
+{{> ButtonBlock buttonUrl=detailsUrl buttonText="View Incident Details"}}
+{{else}}
+{{> ButtonBlock buttonUrl=statusPageUrl buttonText="View Status Page"}}
+{{/if}}
+
+{{> VerticalSpace this}}
+
+{{#if subscriberEmailNotificationFooterText}}
+{{> InfoBlock info=subscriberEmailNotificationFooterText }}
+{{/if}}
+
+{{> UnsubscribeBlock this}}
+
+{{> Footer this}}
+
+{{> End this}}

App/package-lock.json

@@ -83,6 +83,7 @@
         "ejs": "^3.1.10",
         "elkjs": "^0.10.0",
         "esbuild": "^0.25.5",
+        "expo-server-sdk": "^3.15.0",
         "express": "^4.21.1",
         "formik": "^2.4.6",
         "history": "^5.3.0",
@@ -1609,13 +1610,13 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.1.tgz",
-      "integrity": "sha512-hU4EGxxt+j7TQijx1oYdAjw4xuIp1wRQSsbMFwSthCWeBQur1eF+qJ5iQ5sN3Tw8YRzQNKb8jszgBdMDVqwJcw==",
+      "version": "1.13.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
+      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
+        "follow-redirects": "^1.15.11",
+        "form-data": "^4.0.5",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -2388,9 +2389,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -4191,9 +4192,9 @@
       "dev": true
     },
     "node_modules/qs": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"

Common/Models/DatabaseModels/AIAgent.ts

@@ -77,6 +77,7 @@ export enum AIAgentConnectionStatus {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectAIAgent,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -99,7 +100,11 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -126,7 +131,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -154,7 +159,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -176,7 +181,7 @@ export default class AIAgent extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [],
   })
   @TableColumn({
@@ -202,7 +207,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -231,6 +236,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgent,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -258,6 +264,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgent,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -299,6 +306,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgent,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -328,7 +336,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [],
   })
   @TableColumn({
@@ -358,7 +366,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [],
   })
   @TableColumn({
@@ -421,7 +429,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.ProjectOwner],
+    read: [Permission.ProjectOwner, Permission.ReadAllProjectResources],
     update: [],
   })
   @TableColumn({ type: TableColumnType.Entity, modelType: User })
@@ -446,7 +454,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.ProjectOwner],
+    read: [Permission.ProjectOwner, Permission.ReadAllProjectResources],
     update: [],
   })
   @TableColumn({
@@ -490,6 +498,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgent,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -515,7 +524,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectMember,
       Permission.CreateProjectAIAgent,
     ],
-    read: [Permission.Public],
+    read: [Permission.Public, Permission.ReadAllProjectResources],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -552,6 +561,7 @@ export default class AIAgent extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgent,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/AIAgentOwnerTeam.ts

@@ -41,6 +41,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAIAgentOwnerTeam,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -85,6 +86,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -122,6 +124,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -153,6 +156,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -191,6 +195,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -222,6 +227,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -259,6 +265,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -290,6 +297,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -328,6 +336,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -352,6 +361,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -386,6 +396,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -410,6 +421,7 @@ export default class AIAgentOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AIAgentOwnerUser.ts

@@ -40,6 +40,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAIAgentOwnerUser,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -84,6 +85,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -121,6 +123,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -152,6 +155,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -190,6 +194,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -221,6 +226,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -258,6 +264,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -289,6 +296,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -327,6 +335,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -351,6 +360,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -385,6 +395,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -409,6 +420,7 @@ export default class AIAgentOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAIAgentOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AIAgentTask.ts

@@ -55,6 +55,7 @@ import { AIAgentTaskMetadata } from "../../Types/AI/AIAgentTaskMetadata";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectAIAgentTask,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -82,6 +83,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -120,6 +122,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -150,6 +153,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -183,6 +187,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -216,6 +221,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -258,6 +264,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -293,6 +300,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -323,6 +331,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -354,6 +363,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -387,6 +397,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -415,6 +426,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -438,6 +450,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -495,7 +508,11 @@ export default class AIAgentTask extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [],
   })
   @TableColumn({ type: TableColumnType.Entity, modelType: User })
@@ -515,7 +532,11 @@ export default class AIAgentTask extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [],
   })
   @TableColumn({
@@ -543,6 +564,7 @@ export default class AIAgentTask extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AIAgentTaskLog.ts

@@ -53,6 +53,7 @@ import LogSeverity from "../../Types/Log/LogSeverity";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectAIAgentTask,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -80,6 +81,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -118,6 +120,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -148,6 +151,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -186,6 +190,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -216,6 +221,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -254,6 +260,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -284,6 +291,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -318,6 +326,7 @@ export default class AIAgentTaskLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -379,7 +388,11 @@ export default class AIAgentTaskLog extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [],
   })
   @TableColumn({ type: TableColumnType.Entity, modelType: User })
@@ -399,7 +412,11 @@ export default class AIAgentTaskLog extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [],
   })
   @TableColumn({

Common/Models/DatabaseModels/AIAgentTaskPullRequest.ts

@@ -55,6 +55,7 @@ import EnableDocumentation from "../../Types/Database/EnableDocumentation";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectAIAgentTask,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -82,6 +83,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -120,6 +122,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -150,6 +153,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -188,6 +192,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -218,6 +223,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -256,6 +262,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -286,6 +293,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -324,6 +332,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -354,6 +363,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -388,6 +398,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -420,6 +431,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -454,6 +466,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -483,6 +496,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -512,6 +526,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -548,6 +563,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -577,6 +593,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -606,6 +623,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -635,6 +653,7 @@ export default class AIAgentTaskPullRequest extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTask,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -693,7 +712,11 @@ export default class AIAgentTaskPullRequest extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [],
   })
   @TableColumn({ type: TableColumnType.Entity, modelType: User })
@@ -713,7 +736,11 @@ export default class AIAgentTaskPullRequest extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadAllProjectResources,
+    ],
     update: [],
   })
   @TableColumn({

Common/Models/DatabaseModels/AIAgentTaskTelemetryException.ts

@@ -40,6 +40,7 @@ import TelemetryException from "./TelemetryException";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectAIAgentTaskTelemetryException,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -79,6 +80,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -115,6 +117,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -145,6 +148,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -181,6 +185,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -211,6 +216,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -247,6 +253,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -277,6 +284,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -314,6 +322,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -337,6 +346,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -370,6 +380,7 @@ export default class AIAgentTaskTelemetryException extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectAIAgentTaskTelemetryException,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/Alert.ts

@@ -57,6 +57,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlert,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -106,6 +107,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -142,6 +144,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -173,6 +176,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -209,6 +213,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -244,6 +249,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -281,6 +287,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -357,6 +364,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -399,6 +407,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -409,9 +418,8 @@ export default class Alert extends BaseModel {
   })
   @TableColumn({
     type: TableColumnType.ObjectID,
-    title: "Deleted by User ID",
-    description:
-      "User ID who deleted this object (if this object was deleted by a User)",
+    title: "Monitor ID",
+    description: "ID of the monitor this alert belongs to",
   })
   @Column({
     type: ColumnType.ObjectID,
@@ -432,6 +440,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -443,9 +452,9 @@ export default class Alert extends BaseModel {
   @TableColumn({
     required: false,
     type: TableColumnType.EntityArray,
-    modelType: Monitor,
+    modelType: OnCallDutyPolicy,
     title: "On-Call Duty Policies",
-    description: "List of on-call duty policy affected by this alert.",
+    description: "List of on-call duty policies affected by this alert.",
   })
   @ManyToMany(
     () => {
@@ -456,15 +465,15 @@ export default class Alert extends BaseModel {
   @JoinTable({
     name: "AlertOnCallDutyPolicy",
     inverseJoinColumn: {
-      name: "monitorId",
-      referencedColumnName: "_id",
-    },
-    joinColumn: {
       name: "onCallDutyPolicyId",
       referencedColumnName: "_id",
     },
+    joinColumn: {
+      name: "alertId",
+      referencedColumnName: "_id",
+    },
   })
-  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // monitors affected by this alert.
+  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // on-call duty policies affected by this alert.
 
   @ColumnAccessControl({
     create: [
@@ -478,6 +487,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -525,6 +535,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -566,6 +577,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -579,13 +591,13 @@ export default class Alert extends BaseModel {
     type: TableColumnType.ObjectID,
     required: true,
     isDefaultValueColumn: true,
+    canReadOnRelationQuery: true,
     title: "Current Alert State ID",
     description: "Current Alert State ID",
     example: "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
   })
   @Column({
     type: ColumnType.ObjectID,
-
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
@@ -603,6 +615,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -644,6 +657,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -679,13 +693,14 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
   @TableColumn({
     manyToOneRelationColumn: "monitorStatusWhenThisAlertWasCreatedId",
     type: TableColumnType.Entity,
-    modelType: AlertState,
+    modelType: MonitorStatus,
     title: "Monitor status when this alert was created",
     description: "Monitor status when this alert was created",
   })
@@ -714,6 +729,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -748,6 +764,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -776,6 +793,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -809,6 +827,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -834,6 +853,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -841,6 +861,7 @@ export default class Alert extends BaseModel {
     isDefaultValueColumn: false,
     required: false,
     type: TableColumnType.JSON,
+    computed: true,
   })
   @Column({
     type: ColumnType.JSON,
@@ -856,6 +877,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -881,6 +903,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -913,6 +936,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -939,6 +963,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -968,6 +993,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1002,6 +1028,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1035,6 +1062,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1055,6 +1083,33 @@ export default class Alert extends BaseModel {
   })
   public alertNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Alert Number With Prefix",
+    description: "Alert number with prefix (e.g., 'ALT-42' or '#42')",
+    computed: true,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public alertNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],
@@ -1086,6 +1141,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1127,6 +1183,7 @@ export default class Alert extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/AlertCustomField.ts

@@ -40,6 +40,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertCustomField,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -75,6 +76,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -110,6 +112,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -140,6 +143,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -174,6 +178,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -208,6 +213,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -236,6 +242,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -272,6 +279,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -296,6 +304,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -329,6 +338,7 @@ export default class AlertCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertEpisode.ts

@@ -53,6 +53,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisode,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -103,6 +104,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -139,6 +141,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -169,6 +172,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -204,6 +208,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -237,6 +242,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -254,6 +260,32 @@ export default class AlertEpisode extends BaseModel {
   })
   public episodeNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Episode Number With Prefix",
+    description: "Episode number with prefix (e.g., 'AE-42' or '#42')",
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public episodeNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -266,6 +298,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -307,6 +340,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -342,6 +376,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -383,6 +418,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -417,6 +453,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -450,6 +487,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -483,6 +521,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -504,6 +543,31 @@ export default class AlertEpisode extends BaseModel {
   })
   public resolvedAt?: Date = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "All Alerts Resolved At",
+    description:
+      "When all alerts in this episode were first detected as resolved. Used for resolve delay calculation.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public allAlertsResolvedAt?: Date = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -516,6 +580,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -557,6 +622,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -591,6 +657,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -632,6 +699,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -666,6 +734,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -708,6 +777,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -742,6 +812,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -783,6 +854,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -810,6 +882,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -818,6 +891,7 @@ export default class AlertEpisode extends BaseModel {
     type: TableColumnType.Number,
     required: true,
     isDefaultValueColumn: true,
+    computed: true,
     title: "Alert Count",
     description: "Denormalized count of alerts in this episode",
     defaultValue: 0,
@@ -841,6 +915,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -869,6 +944,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -897,6 +973,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -929,6 +1006,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -976,6 +1054,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1013,6 +1092,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1082,6 +1162,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1113,6 +1194,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1143,6 +1225,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1176,6 +1259,7 @@ export default class AlertEpisode extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisode,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/AlertEpisodeFeed.ts

@@ -55,6 +55,7 @@ export enum AlertEpisodeFeedEventType {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisodeFeed,
+    Permission.ReadAllProjectResources,
   ],
   delete: [],
   update: [],
@@ -90,6 +91,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -126,6 +128,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -156,6 +159,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -192,6 +196,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -221,6 +226,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -258,6 +264,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -332,6 +339,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -360,6 +368,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -388,6 +397,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -416,6 +426,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -447,6 +458,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -484,6 +496,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -512,6 +525,7 @@ export default class AlertEpisodeFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertEpisodeInternalNote.ts

@@ -43,6 +43,7 @@ import {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisodeInternalNote,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -87,6 +88,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -123,6 +125,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -153,6 +156,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -189,6 +193,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -218,6 +223,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -255,6 +261,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -329,6 +336,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -361,6 +369,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -404,6 +413,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -435,6 +445,7 @@ export default class AlertEpisodeInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertEpisodeMember.ts

@@ -41,6 +41,7 @@ export enum AlertEpisodeMemberAddedBy {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisodeMember,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -86,6 +87,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -122,6 +124,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -152,6 +155,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -188,6 +192,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -218,6 +223,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -254,6 +260,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -284,6 +291,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -312,6 +320,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -344,6 +353,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -381,6 +391,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -410,6 +421,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -446,6 +458,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -475,6 +488,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -512,6 +526,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -535,6 +550,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -568,6 +584,7 @@ export default class AlertEpisodeMember extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeMember,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertEpisodeOwnerTeam.ts

@@ -33,6 +33,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisodeOwnerTeam,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -78,6 +79,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -114,6 +116,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -144,6 +147,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -181,6 +185,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -211,6 +216,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -248,6 +254,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -279,6 +286,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -316,6 +324,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -339,6 +348,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -372,6 +382,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -400,6 +411,7 @@ export default class AlertEpisodeOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertEpisodeOwnerUser.ts

@@ -32,6 +32,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisodeOwnerUser,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -77,6 +78,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -113,6 +115,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -143,6 +146,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -179,6 +183,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -209,6 +214,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -246,6 +252,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -277,6 +284,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -314,6 +322,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -337,6 +346,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -370,6 +380,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -398,6 +409,7 @@ export default class AlertEpisodeOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertEpisodeStateTimeline.ts

@@ -36,6 +36,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertEpisodeStateTimeline,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -82,6 +83,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -118,6 +120,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -148,6 +151,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -184,6 +188,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -213,6 +218,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -250,6 +256,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -324,6 +331,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -365,6 +373,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -395,6 +404,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -421,6 +431,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -428,6 +439,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
     isDefaultValueColumn: false,
     required: false,
     type: TableColumnType.JSON,
+    computed: true,
   })
   @Column({
     type: ColumnType.JSON,
@@ -448,6 +460,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -478,6 +491,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -506,6 +520,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertFeed.ts

@@ -57,6 +57,7 @@ export enum AlertFeedEventType {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertFeed,
+    Permission.ReadAllProjectResources,
   ],
   delete: [],
   update: [],
@@ -92,6 +93,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -128,6 +130,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -159,6 +162,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -195,6 +199,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -225,6 +230,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -262,6 +268,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -337,6 +344,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -367,6 +375,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -395,6 +404,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -424,6 +434,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -456,6 +467,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -493,6 +505,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -522,6 +535,7 @@ export default class AlertFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertGroupingRule.ts

@@ -62,6 +62,7 @@ export interface AlertGroupingRuleGroupByFields {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertGroupingRule,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -104,6 +105,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -139,6 +141,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -168,6 +171,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -201,6 +205,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -232,6 +237,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -267,6 +273,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -301,6 +308,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -334,6 +342,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -379,6 +388,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -424,6 +434,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -469,6 +480,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -514,6 +526,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -546,6 +559,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -578,6 +592,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -610,6 +625,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -644,6 +660,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -657,13 +674,13 @@ export default class AlertGroupingRule extends BaseModel {
     title: "Group By Monitor",
     description:
       "When enabled, alerts from different monitors will be grouped into separate episodes. When disabled, alerts from any monitor can be grouped together.",
-    defaultValue: true,
+    defaultValue: false,
     isDefaultValueColumn: true,
   })
   @Column({
     type: ColumnType.Boolean,
     nullable: false,
-    default: true,
+    default: false,
   })
   public groupByMonitor?: boolean = undefined;
 
@@ -678,6 +695,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -712,6 +730,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -746,6 +765,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -780,6 +800,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -814,6 +835,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -848,6 +870,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -879,6 +902,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -910,6 +934,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -941,6 +966,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -975,6 +1001,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1009,6 +1036,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1043,6 +1071,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1077,6 +1106,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1111,6 +1141,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1145,6 +1176,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1190,6 +1222,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1229,6 +1262,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1261,6 +1295,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1300,6 +1335,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1321,6 +1357,8 @@ export default class AlertGroupingRule extends BaseModel {
   })
   public defaultAssignToTeamId?: ObjectID = undefined;
 
+  // Episode Configuration Fields
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -1332,6 +1370,145 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditAlertGroupingRule,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: Label,
+    title: "Episode Labels",
+    description:
+      "Labels to automatically apply to episodes created by this rule.",
+  })
+  @ManyToMany(
+    () => {
+      return Label;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "AlertGroupingRuleEpisodeLabel",
+    inverseJoinColumn: {
+      name: "labelId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "alertGroupingRuleId",
+      referencedColumnName: "_id",
+    },
+  })
+  public episodeLabels?: Array<Label> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateAlertGroupingRule,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditAlertGroupingRule,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: User,
+    title: "Episode Owner Users",
+    description:
+      "Users to automatically add as owners to episodes created by this rule.",
+  })
+  @ManyToMany(
+    () => {
+      return User;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "AlertGroupingRuleEpisodeOwnerUser",
+    inverseJoinColumn: {
+      name: "userId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "alertGroupingRuleId",
+      referencedColumnName: "_id",
+    },
+  })
+  public episodeOwnerUsers?: Array<User> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateAlertGroupingRule,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditAlertGroupingRule,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: Team,
+    title: "Episode Owner Teams",
+    description:
+      "Teams to automatically add as owners to episodes created by this rule.",
+  })
+  @ManyToMany(
+    () => {
+      return Team;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "AlertGroupingRuleEpisodeOwnerTeam",
+    inverseJoinColumn: {
+      name: "teamId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "alertGroupingRuleId",
+      referencedColumnName: "_id",
+    },
+  })
+  public episodeOwnerTeams?: Array<Team> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateAlertGroupingRule,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1368,6 +1545,7 @@ export default class AlertGroupingRule extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertGroupingRule,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertInternalNote.ts

@@ -43,6 +43,7 @@ import {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertInternalNote,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -87,6 +88,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -123,6 +125,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -154,6 +157,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -190,6 +194,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -220,6 +225,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -257,6 +263,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -333,6 +340,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -367,6 +375,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -410,6 +419,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -443,6 +453,7 @@ export default class AlertInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertNoteTemplate.ts

@@ -40,6 +40,7 @@ import { PlanType } from "../../Types/Billing/SubscriptionPlan";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertNoteTemplate,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -84,6 +85,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -121,6 +123,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -152,6 +155,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -188,6 +192,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -223,6 +228,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -259,6 +265,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -297,6 +304,7 @@ export default class AlertNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertOwnerTeam.ts

@@ -33,6 +33,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertOwnerTeam,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -78,6 +79,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -115,6 +117,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -146,6 +149,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -184,6 +188,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -215,6 +220,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -252,6 +258,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -283,6 +290,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -321,6 +329,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -345,6 +354,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -379,6 +389,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -408,6 +419,7 @@ export default class AlertOwnerTeam extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerTeam,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertOwnerUser.ts

@@ -32,6 +32,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertOwnerUser,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -77,6 +78,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -114,6 +116,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -145,6 +148,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -183,6 +187,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -214,6 +219,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -251,6 +257,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -282,6 +289,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -320,6 +328,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -344,6 +353,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -378,6 +388,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -407,6 +418,7 @@ export default class AlertOwnerUser extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertOwnerUser,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/AlertSeverity.ts

@@ -44,6 +44,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertSeverity,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -91,6 +92,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -127,6 +129,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -158,6 +161,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -189,6 +193,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -219,6 +224,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -254,6 +260,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -291,6 +298,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -314,6 +322,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -347,6 +356,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -375,6 +385,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -414,6 +425,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertSeverity,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/AlertState.ts

@@ -44,6 +44,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertState,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -94,6 +95,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -130,6 +132,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -161,6 +164,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -197,6 +201,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -232,6 +237,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -269,6 +275,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -292,6 +299,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -325,6 +333,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -353,6 +362,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -391,6 +401,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -424,6 +435,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -457,6 +469,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -491,6 +504,7 @@ export default class AlertState extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertState,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/AlertStateTimeline.ts

@@ -36,6 +36,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadAlertStateTimeline,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -82,6 +83,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -119,6 +121,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -150,6 +153,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -187,6 +191,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -217,6 +222,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -255,6 +261,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -332,6 +339,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -374,6 +382,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -405,6 +414,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -434,6 +444,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -441,6 +452,7 @@ export default class AlertStateTimeline extends BaseModel {
     isDefaultValueColumn: false,
     required: false,
     type: TableColumnType.JSON,
+    computed: true,
     example: {
       previousState: "created",
       newState: "acknowledged",
@@ -466,6 +478,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -498,6 +511,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -527,6 +541,7 @@ export default class AlertStateTimeline extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadAlertStateTimeline,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/ApiKey.ts

@@ -43,6 +43,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ReadProjectApiKey,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -74,6 +75,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -108,6 +110,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -137,6 +140,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -170,6 +174,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -198,6 +203,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -226,6 +232,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -261,6 +268,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -335,6 +343,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -361,6 +370,7 @@ export default class ApiKey extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/ApiKeyPermission.ts

@@ -49,6 +49,7 @@ import {
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ReadProjectApiKey,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -93,6 +94,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -133,6 +135,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -162,6 +165,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -198,6 +202,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -227,6 +232,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -263,6 +269,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -290,6 +297,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -347,6 +355,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -382,6 +391,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -428,6 +438,7 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadProjectApiKey,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/BillingInvoice.ts

@@ -36,6 +36,7 @@ export enum InvoiceStatus {
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ReadInvoices,
+    Permission.ReadAllProjectResources,
   ],
   delete: [],
   update: [],
@@ -58,6 +59,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -89,6 +91,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -114,6 +117,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -146,6 +150,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -169,6 +174,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -202,6 +208,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -225,6 +232,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -245,6 +253,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -266,6 +275,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -287,6 +297,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -308,6 +319,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -329,6 +341,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -350,6 +363,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -371,6 +385,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -390,6 +405,7 @@ export default class BillingInvoice extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadInvoices,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/BillingPaymentMethod.ts

@@ -31,6 +31,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadBillingPaymentMethod,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -64,6 +65,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -100,6 +102,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -130,6 +133,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -167,6 +171,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -191,6 +196,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -225,6 +231,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -253,6 +260,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -273,6 +281,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -293,6 +302,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -317,6 +327,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -341,6 +352,7 @@ export default class BillingPaymentMethod extends BaseModel {
       Permission.ProjectUser,
       Permission.ProjectMember,
       Permission.ReadBillingPaymentMethod,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/CallLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -38,6 +39,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadCallLog,
+    Permission.ReadAllProjectResources,
   ],
   delete: [],
   update: [],
@@ -67,6 +69,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -99,6 +102,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -125,6 +129,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -152,6 +157,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -179,6 +185,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -203,6 +210,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -228,6 +236,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -253,6 +262,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -282,6 +292,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -314,6 +325,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -340,6 +352,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -372,6 +385,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -398,6 +412,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -430,6 +445,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -456,6 +472,67 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this Call (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this Call (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -488,6 +565,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -515,6 +593,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -547,6 +626,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -573,6 +653,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -605,6 +686,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -632,6 +714,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -664,6 +747,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -690,6 +774,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -724,6 +809,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -751,6 +837,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -784,6 +871,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -811,6 +899,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -843,6 +932,7 @@ export default class CallLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/CodeRepository.ts

@@ -55,6 +55,7 @@ import {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadCodeRepository,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -100,6 +101,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -136,6 +138,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -167,6 +170,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -198,6 +202,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -228,6 +233,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -262,6 +268,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -292,6 +299,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -322,6 +330,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -352,6 +361,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -388,6 +398,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -417,6 +428,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -447,6 +459,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -504,6 +517,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -541,6 +555,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -565,6 +580,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -598,6 +614,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -627,6 +644,7 @@ export default class CodeRepository extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadCodeRepository,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/Dashboard.ts

@@ -45,6 +45,7 @@ import DashboardViewConfig from "../../Types/Dashboard/DashboardViewConfig";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadDashboard,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -88,6 +89,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -124,6 +126,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -154,6 +157,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -184,6 +188,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -214,6 +219,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -246,6 +252,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -283,6 +290,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -307,6 +315,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -341,6 +350,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -370,6 +380,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -417,6 +428,7 @@ export default class Dashboard extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadDashboard,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/DataMigration.ts

@@ -93,6 +93,7 @@ export default class DataMigration extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectLabel,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/Domain.ts

@@ -33,6 +33,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectDomain,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -69,6 +70,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -104,6 +106,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -134,6 +137,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -165,6 +169,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -194,6 +199,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -230,6 +236,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -254,6 +261,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -287,6 +295,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -316,6 +325,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -347,6 +357,7 @@ export default class Domain extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectDomain,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/EmailLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import ProjectSmtpConfig from "./ProjectSmtpConfig";
@@ -39,6 +40,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadEmailLog,
+    Permission.ReadAllProjectResources,
   ],
   delete: [],
   update: [],
@@ -68,6 +70,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -100,6 +103,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -126,6 +130,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -153,6 +158,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -180,6 +186,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -205,6 +212,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -230,6 +238,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -255,6 +264,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -288,6 +298,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -316,6 +327,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -348,6 +360,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -374,6 +387,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -406,6 +420,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -432,6 +447,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -464,6 +480,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -490,6 +507,67 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this email (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this email (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -522,6 +600,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -549,6 +628,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -581,6 +661,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -607,6 +688,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -639,6 +721,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -666,6 +749,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -698,6 +782,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -725,6 +810,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -759,6 +845,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -786,6 +873,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -819,6 +907,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -846,6 +935,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -878,6 +968,7 @@ export default class EmailLog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/Incident.ts

@@ -1,3 +1,4 @@
+import IncidentEpisode from "./IncidentEpisode";
 import IncidentSeverity from "./IncidentSeverity";
 import IncidentState from "./IncidentState";
 import Label from "./Label";
@@ -59,6 +60,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadProjectIncident,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -109,6 +111,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -145,6 +148,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -176,6 +180,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -212,6 +217,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -247,6 +253,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -281,6 +288,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -313,6 +321,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -350,6 +359,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -424,6 +434,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -470,6 +481,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -481,9 +493,9 @@ export default class Incident extends BaseModel {
   @TableColumn({
     required: false,
     type: TableColumnType.EntityArray,
-    modelType: Monitor,
+    modelType: OnCallDutyPolicy,
     title: "On-Call Duty Policies",
-    description: "List of on-call duty policy affected by this incident.",
+    description: "List of on-call duty policies affected by this incident.",
   })
   @ManyToMany(
     () => {
@@ -494,15 +506,15 @@ export default class Incident extends BaseModel {
   @JoinTable({
     name: "IncidentOnCallDutyPolicy",
     inverseJoinColumn: {
-      name: "monitorId",
-      referencedColumnName: "_id",
-    },
-    joinColumn: {
       name: "onCallDutyPolicyId",
       referencedColumnName: "_id",
     },
+    joinColumn: {
+      name: "incidentId",
+      referencedColumnName: "_id",
+    },
   })
-  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // monitors affected by this incident.
+  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // on-call duty policies affected by this incident.
 
   @ColumnAccessControl({
     create: [
@@ -516,6 +528,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -563,6 +576,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -605,6 +619,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -618,6 +633,7 @@ export default class Incident extends BaseModel {
     type: TableColumnType.ObjectID,
     isDefaultValueColumn: true,
     required: true,
+    canReadOnRelationQuery: true,
     title: "Current Incident State ID",
     description: "Current Incident State ID",
     example: "d4e5f6a7-b8c9-0123-defg-456789012345",
@@ -641,6 +657,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -682,6 +699,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -717,6 +735,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -758,6 +777,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -793,6 +813,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -830,6 +851,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -863,6 +885,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -900,6 +923,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -934,6 +958,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -963,6 +988,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -991,6 +1017,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1024,6 +1051,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1057,6 +1085,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1090,6 +1119,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1124,6 +1154,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1158,6 +1189,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1191,6 +1223,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1230,6 +1263,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1237,6 +1271,7 @@ export default class Incident extends BaseModel {
     isDefaultValueColumn: false,
     required: false,
     type: TableColumnType.JSON,
+    computed: true,
   })
   @Column({
     type: ColumnType.JSON,
@@ -1252,6 +1287,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1277,6 +1313,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1302,6 +1339,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1334,6 +1372,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1360,6 +1399,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1389,6 +1429,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1422,6 +1463,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1450,6 +1492,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -1461,6 +1504,7 @@ export default class Incident extends BaseModel {
     title: "Incident Number",
     description: "Incident Number",
     computed: true,
+    canReadOnRelationQuery: true,
   })
   @Column({
     type: ColumnType.Number,
@@ -1468,6 +1512,33 @@ export default class Incident extends BaseModel {
   })
   public incidentNumber?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Incident Number With Prefix",
+    description: "Incident number with prefix (e.g., 'INC-42' or '#42')",
+    computed: true,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public incidentNumberWithPrefix?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],
@@ -1499,6 +1570,7 @@ export default class Incident extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -1520,4 +1592,81 @@ export default class Incident extends BaseModel {
     nullable: true,
   })
   public isVisibleOnStatusPage?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description: "Relation to Incident Episode this incident belongs to",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    title: "Incident Episode ID",
+    description: "ID of the Incident Episode this incident belongs to",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
 }

Common/Models/DatabaseModels/IncidentCustomField.ts

@@ -40,6 +40,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadIncidentCustomField,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -75,6 +76,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -110,6 +112,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -140,6 +143,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -174,6 +178,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -208,6 +213,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -236,6 +242,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -272,6 +279,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -296,6 +304,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -329,6 +338,7 @@ export default class IncidentCustomField extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentCustomField,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/IncidentEpisodeFeed.ts

@@ -0,0 +1,549 @@
+import IncidentEpisode from "./IncidentEpisode";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import Color from "../../Types/Color";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+export enum IncidentEpisodeFeedEventType {
+  EpisodeCreated = "EpisodeCreated",
+  EpisodeStateChanged = "EpisodeStateChanged",
+  EpisodeUpdated = "EpisodeUpdated",
+  IncidentAdded = "IncidentAdded",
+  IncidentRemoved = "IncidentRemoved",
+  OwnerUserAdded = "OwnerUserAdded",
+  OwnerTeamAdded = "OwnerTeamAdded",
+  OwnerUserRemoved = "OwnerUserRemoved",
+  OwnerTeamRemoved = "OwnerTeamRemoved",
+  OwnerNotificationSent = "OwnerNotificationSent",
+  PrivateNote = "PrivateNote",
+  PublicNote = "PublicNote",
+  RootCause = "RootCause",
+  RemediationNotes = "RemediationNotes",
+  PostmortemNote = "PostmortemNote",
+  OnCallPolicy = "OnCallPolicy",
+  OnCallNotification = "OnCallNotification",
+  SeverityChanged = "SeverityChanged",
+  SubscriberNotificationSent = "SubscriberNotificationSent",
+}
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("incidentEpisode")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeFeed,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeFeed,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [],
+  update: [],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-feed"))
+@Entity({
+  name: "IncidentEpisodeFeed",
+})
+@TableMetadata({
+  tableName: "IncidentEpisodeFeed",
+  singularName: "Incident Episode Feed",
+  pluralName: "Incident Episode Feeds",
+  icon: IconProp.List,
+  tableDescription:
+    "Log of the entire incident episode activity. This is a log of all the episode state changes, incidents added/removed, notes, etc.",
+})
+export default class IncidentEpisodeFeed extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description: "Relation to Incident Episode in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Incident Episode ID",
+    description:
+      "Relation to Incident Episode ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: true,
+    title: "Log (in Markdown)",
+    description: "Log of the entire incident episode activity in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public feedInfoInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    title: "More Information (in Markdown)",
+    description: "More information in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+    unique: false,
+  })
+  public moreInformationInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: true,
+    title: "Incident Episode Feed Event",
+    description: "Incident Episode Feed Event Type",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    unique: false,
+  })
+  public incidentEpisodeFeedEventType?: IncidentEpisodeFeedEventType =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @ColorField()
+  @TableColumn({
+    type: TableColumnType.Color,
+    required: true,
+    title: "Color",
+    description: "Display color for the incident episode log",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: false,
+    unique: false,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public displayColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description:
+      "Relation to User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description:
+      "User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeFeed,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Feed Posted At",
+    description: "Date and time when the feed was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodeInternalNote.ts

@@ -0,0 +1,467 @@
+import IncidentEpisode from "./IncidentEpisode";
+import File from "./File";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("incidentEpisode")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeInternalNote,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeInternalNote,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodeInternalNote,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodeInternalNote,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-internal-note"))
+@Entity({
+  name: "IncidentEpisodeInternalNote",
+})
+@TableMetadata({
+  tableName: "IncidentEpisodeInternalNote",
+  singularName: "Incident Episode Internal Note",
+  pluralName: "Incident Episode Internal Notes",
+  icon: IconProp.Lock,
+  tableDescription: "Manage internal notes for your incident episodes",
+})
+export default class IncidentEpisodeInternalNote extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description: "Relation to Incident Episode in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Incident Episode ID",
+    description:
+      "Relation to Incident Episode ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeInternalNote,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    title: "Note",
+    description: "Notes in markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public note?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeInternalNote,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note",
+    required: false,
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "IncidentEpisodeInternalNoteFile",
+    joinColumn: {
+      name: "incidentEpisodeInternalNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    required: true,
+    isDefaultValueColumn: true,
+    title: "Are Owners Notified",
+    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotified?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeInternalNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeInternalNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.LongText,
+    title: "Posted from Slack Message ID",
+    description:
+      "Unique identifier for the Slack message this note was created from (channel_id:message_ts). Used to prevent duplicate notes when multiple users react to the same message.",
+    required: false,
+    example: "C1234567890:1234567890.123456",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    nullable: true,
+  })
+  public postedFromSlackMessageId?: string = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodeMember.ts

@@ -0,0 +1,604 @@
+import Incident from "./Incident";
+import IncidentEpisode from "./IncidentEpisode";
+import IncidentGroupingRule from "./IncidentGroupingRule";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+export enum IncidentEpisodeMemberAddedBy {
+  Rule = "rule",
+  Manual = "manual",
+  API = "api",
+}
+
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeMember,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeMember,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodeMember,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodeMember,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-member"))
+@TableMetadata({
+  tableName: "IncidentEpisodeMember",
+  singularName: "Incident Episode Member",
+  pluralName: "Incident Episode Members",
+  icon: IconProp.Layers,
+  tableDescription: "Link between incidents and episodes",
+})
+@Entity({
+  name: "IncidentEpisodeMember",
+})
+@Index(["incidentEpisodeId", "incidentId", "projectId"])
+export default class IncidentEpisodeMember extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description: "Relation to Incident Episode that this incident belongs to",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident Episode ID",
+    description: "ID of the Incident Episode that this incident belongs to",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentId",
+    type: TableColumnType.Entity,
+    modelType: Incident,
+    title: "Incident",
+    description: "Relation to Incident that is a member of this episode",
+  })
+  @ManyToOne(
+    () => {
+      return Incident;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentId" })
+  public incident?: Incident = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident ID",
+    description: "ID of the Incident that is a member of this episode",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Added At",
+    description: "When this incident was added to the episode",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public addedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: true,
+    isDefaultValueColumn: true,
+    title: "Added By",
+    description:
+      "How this incident was added to the episode (rule, manual, or api)",
+    defaultValue: IncidentEpisodeMemberAddedBy.Rule,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    default: IncidentEpisodeMemberAddedBy.Rule,
+    length: ColumnLength.ShortText,
+  })
+  public addedBy?: IncidentEpisodeMemberAddedBy = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "addedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Added By User",
+    description:
+      "User who manually added this incident to the episode (if applicable)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "addedByUserId" })
+  public addedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    title: "Added By User ID",
+    description: "User ID who manually added this incident to the episode",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public addedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "matchedRuleId",
+    type: TableColumnType.Entity,
+    modelType: IncidentGroupingRule,
+    title: "Matched Grouping Rule",
+    description:
+      "Relation to the Incident Grouping Rule that matched this incident (if applicable)",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentGroupingRule;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "matchedRuleId" })
+  public matchedRule?: IncidentGroupingRule = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    title: "Matched Rule ID",
+    description: "ID of the grouping rule that matched this incident",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public matchedRuleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodeOwnerTeam.ts

@@ -0,0 +1,433 @@
+import IncidentEpisode from "./IncidentEpisode";
+import Project from "./Project";
+import Team from "./Team";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeOwnerTeam,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeOwnerTeam,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodeOwnerTeam,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodeOwnerTeam,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-owner-team"))
+@TableMetadata({
+  tableName: "IncidentEpisodeOwnerTeam",
+  singularName: "Incident Episode Team Owner",
+  pluralName: "Incident Episode Team Owners",
+  icon: IconProp.Team,
+  tableDescription: "Add teams as owners to your incident episodes.",
+})
+@Entity({
+  name: "IncidentEpisodeOwnerTeam",
+})
+@Index(["incidentEpisodeId", "teamId", "projectId"])
+export default class IncidentEpisodeOwnerTeam extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "teamId",
+    type: TableColumnType.Entity,
+    modelType: Team,
+    title: "Team",
+    description:
+      "Team that is the owner. All users in this team will receive notifications.",
+  })
+  @ManyToOne(
+    () => {
+      return Team;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "teamId" })
+  public team?: Team = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Team ID",
+    description: "ID of your OneUptime Team in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public teamId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description:
+      "Relation to Incident Episode Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident Episode ID",
+    description:
+      "ID of your OneUptime Incident Episode in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerTeam,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerTeam,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    required: true,
+    isDefaultValueColumn: true,
+    title: "Are Owners Notified",
+    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotified?: boolean = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodeOwnerUser.ts

@@ -0,0 +1,431 @@
+import IncidentEpisode from "./IncidentEpisode";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeOwnerUser,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeOwnerUser,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodeOwnerUser,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodeOwnerUser,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-owner-user"))
+@TableMetadata({
+  tableName: "IncidentEpisodeOwnerUser",
+  singularName: "Incident Episode User Owner",
+  pluralName: "Incident Episode User Owners",
+  icon: IconProp.User,
+  tableDescription: "Add users as owners to your incident episodes.",
+})
+@Entity({
+  name: "IncidentEpisodeOwnerUser",
+})
+@Index(["incidentEpisodeId", "userId", "projectId"])
+export default class IncidentEpisodeOwnerUser extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User that is the owner of this episode",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "User ID",
+    description: "ID of the user who is the owner",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description:
+      "Relation to Incident Episode Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident Episode ID",
+    description:
+      "ID of your OneUptime Incident Episode in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeOwnerUser,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeOwnerUser,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    required: true,
+    isDefaultValueColumn: true,
+    title: "Are Owners Notified",
+    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotified?: boolean = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodePublicNote.ts

@@ -0,0 +1,611 @@
+import IncidentEpisode from "./IncidentEpisode";
+import Project from "./Project";
+import User from "./User";
+import File from "./File";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("incidentEpisode")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodePublicNote,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodePublicNote,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodePublicNote,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodePublicNote,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-public-note"))
+@Entity({
+  name: "IncidentEpisodePublicNote",
+})
+@TableMetadata({
+  tableName: "IncidentEpisodePublicNote",
+  singularName: "Incident Episode Public Note",
+  pluralName: "Incident Episode Public Notes",
+  icon: IconProp.Team,
+  tableDescription: "Manage public notes for your incident episode",
+})
+export default class IncidentEpisodePublicNote extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+    example: "5f8b9c0d-e1a2-4b3c-8d5e-6f7a8b9c0d1e",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description: "Relation to Incident Episode in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Incident Episode ID",
+    description:
+      "Relation to Incident Episode ID in which this resource belongs",
+    example: "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+    example: "7c8d9e0f-a1b2-3c4d-9e5f-8a9b0c1d2e3f",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+    example: "9d0e1f2a-b3c4-5d6e-af7b-8c9d0e1f2a3b",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodePublicNote,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    title: "Note",
+    description: "Notes in markdown",
+    example:
+      "## Update - Episode Resolved\n\nWe have identified and resolved the issue. All services are now operating normally.",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public note?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodePublicNote,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.EntityArray,
+    modelType: File,
+    title: "Attachments",
+    description: "Files attached to this note",
+    required: false,
+  })
+  @ManyToMany(
+    () => {
+      return File;
+    },
+    {
+      eager: false,
+    },
+  )
+  @JoinTable({
+    name: "IncidentEpisodePublicNoteFile",
+    joinColumn: {
+      name: "incidentEpisodePublicNoteId",
+      referencedColumnName: "_id",
+    },
+    inverseJoinColumn: {
+      name: "fileId",
+      referencedColumnName: "_id",
+    },
+  })
+  public attachments?: Array<File> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodePublicNote,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    computed: true,
+    hideColumnInDocumentation: true,
+    type: TableColumnType.ShortText,
+    title: "Subscriber Notification Status",
+    description: "Status of notification sent to subscribers about this note",
+    defaultValue: StatusPageSubscriberNotificationStatus.Pending,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    default: StatusPageSubscriberNotificationStatus.Pending,
+  })
+  public subscriberNotificationStatusOnNoteCreated?: StatusPageSubscriberNotificationStatus =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodePublicNote,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Notification Status Message",
+    description:
+      "Status message for subscriber notifications - includes success messages, failure reasons, or skip reasons",
+    required: false,
+    example: "Successfully notified 1,234 subscribers via email and SMS",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public subscriberNotificationStatusMessage?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Should subscribers be notified?",
+    description: "Should subscribers be notified about this note?",
+    defaultValue: true,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+  })
+  public shouldStatusPageSubscribersBeNotifiedOnNoteCreated?: boolean =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
+    required: true,
+    isDefaultValueColumn: true,
+    title: "Are Owners Notified",
+    description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotified?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodePublicNote,
+    ],
+  })
+  @TableColumn({
+    title: "Note Posted At",
+    description: "Date and time when the note was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodePublicNote,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodePublicNote,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.LongText,
+    title: "Posted from Slack Message ID",
+    description:
+      "Unique identifier for the Slack message this note was created from (channel_id:message_ts). Used to prevent duplicate notes when multiple users react to the same message.",
+    required: false,
+    example: "C1234567890:1234567890.123456",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    nullable: true,
+  })
+  public postedFromSlackMessageId?: string = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodeRoleMember.ts

@@ -0,0 +1,514 @@
+import IncidentEpisode from "./IncidentEpisode";
+import IncidentRole from "./IncidentRole";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeRoleMember,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeRoleMember,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodeRoleMember,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodeRoleMember,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-role-member"))
+@TableMetadata({
+  tableName: "IncidentEpisodeRoleMember",
+  singularName: "Incident Episode Role Member",
+  pluralName: "Incident Episode Role Members",
+  icon: IconProp.Call,
+  tableDescription:
+    "Assign users with specific roles to incident episodes. These assignments propagate to all incidents in the episode.",
+})
+@Entity({
+  name: "IncidentEpisodeRoleMember",
+})
+@Index(["incidentEpisodeId", "userId", "projectId"])
+export default class IncidentEpisodeRoleMember extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User assigned to the episode with a specific role.",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "User ID",
+    description: "ID of your OneUptime User assigned to this episode",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description:
+      "Relation to Incident Episode Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident Episode ID",
+    description:
+      "ID of your OneUptime Incident Episode in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeRoleMember,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentRoleId",
+    type: TableColumnType.Entity,
+    modelType: IncidentRole,
+    title: "Incident Role",
+    description: "The role assigned to the user for this episode",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentRole;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentRoleId" })
+  public incidentRole?: IncidentRole = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeRoleMember,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident Role ID",
+    description: "ID of the Incident Role assigned to this user",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentRoleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeRoleMember,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.LongText,
+    title: "Notes",
+    description: "Assignment context or notes",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+  })
+  public notes?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeRoleMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeRoleMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}

Common/Models/DatabaseModels/IncidentEpisodeStateTimeline.ts

@@ -0,0 +1,622 @@
+import IncidentEpisode from "./IncidentEpisode";
+import IncidentState from "./IncidentState";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import { JSONObject } from "../../Types/JSON";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("incidentEpisode")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentEpisodeStateTimeline,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentEpisodeStateTimeline,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentEpisodeStateTimeline,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentEpisodeStateTimeline,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-episode-state-timeline"))
+@Entity({
+  name: "IncidentEpisodeStateTimeline",
+})
+@Index(["incidentEpisodeId", "startsAt"])
+@TableMetadata({
+  tableName: "IncidentEpisodeStateTimeline",
+  singularName: "Incident Episode State Timeline",
+  pluralName: "Incident Episode State Timelines",
+  icon: IconProp.List,
+  tableDescription:
+    "Change state of the incident episodes (Created to Acknowledged for example)",
+})
+export default class IncidentEpisodeStateTimeline extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: IncidentEpisode,
+    title: "Incident Episode",
+    description: "Relation to Incident Episode in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentEpisodeId" })
+  public incidentEpisode?: IncidentEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Incident Episode ID",
+    description:
+      "Relation to Incident Episode ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentEpisodeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeStateTimeline,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentStateId",
+    type: TableColumnType.Entity,
+    modelType: IncidentState,
+    title: "Incident State",
+    description:
+      "Incident State Relation. Which incident state does this episode change to?",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentState;
+    },
+    {
+      eager: false,
+      nullable: true,
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentStateId" })
+  public incidentState?: IncidentState = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentEpisodeStateTimeline,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Incident State ID",
+    description:
+      "Incident State ID Relation. Which incident state does this episode change to?",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentStateId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    required: true,
+    isDefaultValueColumn: true,
+    title: "Are Owners Notified",
+    description: "Are owners notified of state change?",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotified?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.JSON,
+    computed: true,
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+    unique: false,
+  })
+  public stateChangeLog?: JSONObject = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    isDefaultValueColumn: false,
+    title: "Root Cause",
+    description: "What is the root cause of this status change?",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+  })
+  public rootCause?: string = undefined;
+
+  @Index()
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Ends At",
+    description: "When did this status change end?",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public endsAt?: Date = undefined;
+
+  @Index()
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Date,
+    title: "Starts At",
+    description: "When did this status change?",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public startsAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentEpisodeStateTimeline,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Should subscribers be notified?",
+    description:
+      "Should status page subscribers be notified about this state change?",
+    defaultValue: true,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+  })
+  public shouldStatusPageSubscribersBeNotified?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    computed: true,
+    hideColumnInDocumentation: true,
+    type: TableColumnType.ShortText,
+    title: "Subscriber Notification Status",
+    description:
+      "Status of notification sent to subscribers about this state change",
+    defaultValue: StatusPageSubscriberNotificationStatus.Pending,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    default: StatusPageSubscriberNotificationStatus.Pending,
+  })
+  public subscriberNotificationStatus?: StatusPageSubscriberNotificationStatus =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentEpisodeStateTimeline,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "Subscriber Notification Status Message",
+    description:
+      "Status message for subscriber notifications - includes success messages, failure reasons, or skip reasons",
+    required: false,
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public subscriberNotificationStatusMessage?: string = undefined;
+}

Common/Models/DatabaseModels/IncidentFeed.ts

@@ -38,6 +38,8 @@ export enum IncidentFeedEventType {
   OwnerTeamRemoved = "OwnerTeamRemoved",
   OnCallPolicy = "OnCallPolicy",
   OnCallNotification = "OnCallNotification",
+  IncidentMemberAdded = "IncidentMemberAdded",
+  IncidentMemberRemoved = "IncidentMemberRemoved",
 }
 
 @EnableDocumentation()
@@ -55,6 +57,7 @@ export enum IncidentFeedEventType {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadIncidentFeed,
+    Permission.ReadAllProjectResources,
   ],
   delete: [],
   update: [],
@@ -90,6 +93,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -127,6 +131,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -158,6 +163,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -195,6 +201,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -225,6 +232,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -263,6 +271,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -340,6 +349,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -370,6 +380,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -400,6 +411,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -429,6 +441,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -460,6 +473,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -498,6 +512,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -527,6 +542,7 @@ export default class IncidentFeed extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceFeed,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/IncidentInternalNote.ts

@@ -43,6 +43,7 @@ import {
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadIncidentInternalNote,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -87,6 +88,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -123,6 +125,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -154,6 +157,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -190,6 +194,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -220,6 +225,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -257,6 +263,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -333,6 +340,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -367,6 +375,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -410,6 +419,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -443,6 +453,7 @@ export default class IncidentInternalNote extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentInternalNote,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })

Common/Models/DatabaseModels/IncidentMember.ts

@@ -0,0 +1,544 @@
+import Incident from "./Incident";
+import IncidentRole from "./IncidentRole";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentMember,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentMember,
+    Permission.ReadAllProjectResources,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteIncidentMember,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditIncidentMember,
+  ],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-member"))
+@TableMetadata({
+  tableName: "IncidentMember",
+  singularName: "Incident Member",
+  pluralName: "Incident Members",
+  icon: IconProp.Call,
+  tableDescription: "Assign users with specific roles to incidents.",
+})
+@Entity({
+  name: "IncidentMember",
+})
+@Index(["incidentId", "userId", "projectId"])
+export default class IncidentMember extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+    example: "5f8b9c0d-e1a2-4b3c-8d5e-6f7a8b9c0d1e",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+    example: "5f8b9c0d-e1a2-4b3c-8d5e-6f7a8b9c0d1e",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User assigned to the incident with a specific role.",
+    example: "e5f6a7b8-c9d0-1234-efab-345678901234",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "User ID",
+    description: "ID of your OneUptime User in which this object belongs",
+    example: "e5f6a7b8-c9d0-1234-efab-345678901234",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentId",
+    type: TableColumnType.Entity,
+    modelType: Incident,
+    title: "Incident",
+    description: "Relation to Incident Resource in which this object belongs",
+    example: "f6a7b8c9-d0e1-2345-fabc-456789012345",
+  })
+  @ManyToOne(
+    () => {
+      return Incident;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentId" })
+  public incident?: Incident = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident ID",
+    description: "ID of your OneUptime Incident in which this object belongs",
+    example: "f6a7b8c9-d0e1-2345-fabc-456789012345",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentMember,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentRoleId",
+    type: TableColumnType.Entity,
+    modelType: IncidentRole,
+    title: "Incident Role",
+    description: "The role assigned to the user for this incident",
+    example: "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+  })
+  @ManyToOne(
+    () => {
+      return IncidentRole;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentRoleId" })
+  public incidentRole?: IncidentRole = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentMember,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incident Role ID",
+    description: "ID of the Incident Role assigned to this user",
+    example: "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentRoleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditIncidentMember,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.LongText,
+    title: "Notes",
+    description: "Assignment context or notes",
+    example: "Primary responder for this incident",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+  })
+  public notes?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+    example: "c3d4e5f6-a7b8-9012-cdef-123456789012",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+    example: "c3d4e5f6-a7b8-9012-cdef-123456789012",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    modelType: User,
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+    example: "d4e5f6a7-b8c9-0123-def0-234567890123",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentMember,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+    example: "d4e5f6a7-b8c9-0123-def0-234567890123",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Is Member Notified",
+    description: "Has the member been notified of this role assignment?",
+    defaultValue: false,
+    example: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isMemberNotified?: boolean = undefined;
+}

Common/Models/DatabaseModels/IncidentNoteTemplate.ts

@@ -40,6 +40,7 @@ import { PlanType } from "../../Types/Billing/SubscriptionPlan";
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadIncidentNoteTemplate,
+    Permission.ReadAllProjectResources,
   ],
   delete: [
     Permission.ProjectOwner,
@@ -84,6 +85,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -121,6 +123,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -152,6 +155,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -188,6 +192,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -223,6 +228,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [
       Permission.ProjectOwner,
@@ -259,6 +265,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })
@@ -297,6 +304,7 @@ export default class IncidentNoteTemplate extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ReadIncidentNoteTemplate,
+      Permission.ReadAllProjectResources,
     ],
     update: [],
   })