@oneuptime/common 11.0.9 → 11.0.12

package/Models/DatabaseModels/RumApplication.ts

@@ -77,6 +77,7 @@ import {
  * device — a per-device row would be a cardinality disaster.
  */
 @Index(["projectId", "appIdentifier"], { unique: true })
+@Index(["projectId", "isArchived"])
 @TableMetadata({
   tableName: "RumApplication",
   singularName: "RUM Application",
@@ -665,6 +666,139 @@ export default class RumApplication extends BaseModel {
   })
   public createdByUserId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateRumApplication,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadRumApplication,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditRumApplication,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    required: true,
+    type: TableColumnType.Boolean,
+    title: "Is Archived",
+    description:
+      "Is this RUM application archived? Archived RUM applications are hidden from lists but keep collecting telemetry.",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isArchived?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadRumApplication,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Date,
+    title: "Archived At",
+    description: "When was this RUM application archived?",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public archivedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadRumApplication,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "archivedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Archived by User",
+    description:
+      "Relation to User who archived this object (if this object was archived by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "archivedByUserId" })
+  public archivedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadRumApplication,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Archived by User ID",
+    description:
+      "User ID who archived this object (if this object was archived by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public archivedByUserId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/ServerlessFunction.ts

@@ -77,6 +77,7 @@ import {
  * function collapse into a single row instead of racing to create duplicates.
  */
 @Index(["projectId", "functionIdentifier"], { unique: true })
+@Index(["projectId", "isArchived"])
 @TableMetadata({
   tableName: "ServerlessFunction",
   singularName: "Serverless Function",
@@ -815,6 +816,139 @@ export default class ServerlessFunction extends BaseModel {
   })
   public createdByUserId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateServerlessFunction,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadServerlessFunction,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditServerlessFunction,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    required: true,
+    type: TableColumnType.Boolean,
+    title: "Is Archived",
+    description:
+      "Is this serverless function archived? Archived serverless functions are hidden from lists but keep collecting telemetry.",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isArchived?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadServerlessFunction,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Date,
+    title: "Archived At",
+    description: "When was this serverless function archived?",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public archivedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadServerlessFunction,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "archivedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Archived by User",
+    description:
+      "Relation to User who archived this object (if this object was archived by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "archivedByUserId" })
+  public archivedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadServerlessFunction,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Archived by User ID",
+    description:
+      "User ID who archived this object (if this object was archived by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public archivedByUserId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/Service.ts

@@ -100,6 +100,7 @@ import {
  * winning row.
  */
 @Index(["projectId", "name"], { unique: true })
+@Index(["projectId", "isArchived"])
 @TableMetadata({
   tableName: "Service",
   singularName: "Service",
@@ -421,6 +422,139 @@ export default class Service extends BaseModel {
   })
   public createdByUserId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateService,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadService,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditService,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    required: true,
+    type: TableColumnType.Boolean,
+    title: "Is Archived",
+    description:
+      "Is this service archived? Archived services are hidden from lists but keep collecting telemetry.",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isArchived?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadService,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Date,
+    title: "Archived At",
+    description: "When was this service archived?",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public archivedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadService,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "archivedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Archived by User",
+    description:
+      "Relation to User who archived this object (if this object was archived by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "archivedByUserId" })
+  public archivedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadService,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Archived by User ID",
+    description:
+      "User ID who archived this object (if this object was archived by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public archivedByUserId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/README.md

@@ -1,3 +1,3 @@
 # OneUptime Common UI Library
 
-The OneUptime Common UI Library is a collection of shared components, utilities that are used across the OneUptime platform. It is designed to be easy to install and use, and to be extensible. This library is built with React and TypeScript. It includes components like buttons, modals, and form elements. It also includes utilities like date formatting, and string manipulation.
+The OneUptime Common UI Library is a collection of shared components, utilities that are used across the OneUptime platform. It is designed to be easy to install and use, and to be extensible. This library is built with React and TypeScript. It includes components like buttons, modals, and form elements. It also includes utilities like date formatting, and string manipulation.

package/Scripts/generate-service-worker.js

@@ -2,24 +2,24 @@
 
 /**
  * Universal Service Worker Generator for OneUptime Services
- * 
+ *
  * This script can be used by any OneUptime service to generate
  * a service worker from a template with dynamic versioning.
- * 
+ *
  * Usage:
  *   node generate-service-worker.js [template-path] [output-path]
- * 
+ *
  * Example:
  *   node generate-service-worker.js sw.js.template public/sw.js
  */
 
-const fs = require('fs');
-const path = require('path');
-const crypto = require('crypto');
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
 
 // Default values
-const DEFAULT_APP_VERSION = '1.0.0';
-const DEFAULT_GIT_SHA = 'local';
+const DEFAULT_APP_VERSION = "1.0.0";
+const DEFAULT_GIT_SHA = "local";
 
 /**
  * Get app version from environment or package.json
@@ -29,13 +29,13 @@ function getAppVersion(packageJsonPath) {
   if (process.env.APP_VERSION) {
     return process.env.APP_VERSION;
   }
-  
+
   // Fallback to package.json version
   try {
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
     return packageJson.version || DEFAULT_APP_VERSION;
   } catch (error) {
-    console.warn('Could not read package.json, using default version');
+    console.warn("Could not read package.json, using default version");
     return DEFAULT_APP_VERSION;
   }
 }
@@ -48,16 +48,18 @@ function getGitSha() {
   if (process.env.GIT_SHA) {
     return process.env.GIT_SHA.substring(0, 8); // Short SHA
   }
-  
+
   // Try to get from git command if available
   try {
-    const { execSync } = require('child_process');
-    const gitSha = execSync('git rev-parse --short HEAD', { encoding: 'utf8' }).trim();
+    const { execSync } = require("child_process");
+    const gitSha = execSync("git rev-parse --short HEAD", {
+      encoding: "utf8",
+    }).trim();
     return gitSha;
   } catch (error) {
     // Fallback to timestamp-based hash for local development
     const timestamp = Date.now().toString();
-    const hash = crypto.createHash('md5').update(timestamp).digest('hex');
+    const hash = crypto.createHash("md5").update(timestamp).digest("hex");
     return hash.substring(0, 8);
   }
 }
@@ -65,34 +67,38 @@ function getGitSha() {
 /**
  * Generate service worker from template
  */
-function generateServiceWorker(templatePath, outputPath, serviceName = 'OneUptime') {
+function generateServiceWorker(
+  templatePath,
+  outputPath,
+  serviceName = "OneUptime",
+) {
   // Check if template exists
   if (!fs.existsSync(templatePath)) {
-    console.error('❌ Service worker template not found:', templatePath);
+    console.error("❌ Service worker template not found:", templatePath);
     process.exit(1);
   }
-  
+
   // Read template
-  const template = fs.readFileSync(templatePath, 'utf8');
-  
+  const template = fs.readFileSync(templatePath, "utf8");
+
   // Get version information
-  const packageJsonPath = path.join(path.dirname(templatePath), 'package.json');
+  const packageJsonPath = path.join(path.dirname(templatePath), "package.json");
   const appVersion = getAppVersion(packageJsonPath);
   const gitSha = getGitSha();
   const buildTimestamp = new Date().toISOString();
-  
+
   console.log(`🔧 Generating service worker for ${serviceName}...`);
   console.log(`   App Version: ${appVersion}`);
   console.log(`   Git SHA: ${gitSha}`);
   console.log(`   Build Time: ${buildTimestamp}`);
-  
+
   // Replace placeholders
   const generatedContent = template
     .replace(/\{\{APP_VERSION\}\}/g, appVersion)
     .replace(/\{\{GIT_SHA\}\}/g, gitSha)
     .replace(/\{\{BUILD_TIMESTAMP\}\}/g, buildTimestamp)
     .replace(/\{\{SERVICE_NAME\}\}/g, serviceName);
-  
+
   // Add generation comment at the top
   const header = `/*
  * Generated Service Worker for ${serviceName}
@@ -106,37 +112,41 @@ function generateServiceWorker(templatePath, outputPath, serviceName = 'OneUptim
  */
 
 `;
-  
+
   const finalContent = header + generatedContent;
-  
+
   // Ensure output directory exists
   const outputDir = path.dirname(outputPath);
   if (!fs.existsSync(outputDir)) {
     fs.mkdirSync(outputDir, { recursive: true });
   }
-  
+
   // Write generated service worker
-  fs.writeFileSync(outputPath, finalContent, 'utf8');
-  
-  console.log('✅ Service worker generated successfully:', outputPath);
+  fs.writeFileSync(outputPath, finalContent, "utf8");
+
+  console.log("✅ Service worker generated successfully:", outputPath);
   console.log(`   Cache version: oneuptime-v${appVersion}-${gitSha}`);
 }
 
 // Command line interface
 if (require.main === module) {
   const args = process.argv.slice(2);
-  const templatePath = args[0] || 'sw.js.template';
-  const outputPath = args[1] || 'public/sw.js';
+  const templatePath = args[0] || "sw.js.template";
+  const outputPath = args[1] || "public/sw.js";
   const serviceName = args[2] || path.basename(process.cwd());
-  
+
   try {
     // Resolve paths relative to current working directory
     const resolvedTemplatePath = path.resolve(templatePath);
     const resolvedOutputPath = path.resolve(outputPath);
-    
-    generateServiceWorker(resolvedTemplatePath, resolvedOutputPath, serviceName);
+
+    generateServiceWorker(
+      resolvedTemplatePath,
+      resolvedOutputPath,
+      serviceName,
+    );
   } catch (error) {
-    console.error('❌ Failed to generate service worker:', error.message);
+    console.error("❌ Failed to generate service worker:", error.message);
     process.exit(1);
   }
 }

package/Server/Infrastructure/Postgres/DataSourceOptions.ts

@@ -34,8 +34,10 @@ const dataSourceOptions: DataSourceOptions = {
   database: DatabaseName,
   migrationsTableName: "migrations",
   migrations: Migrations,
-  // Schema migrations run on connect unless disabled (e.g. runtime pods when a
-  // dedicated migrate Job owns migrations). See RunDatabaseMigrationsOnBoot.
+  /*
+   * Schema migrations run on connect unless disabled (e.g. runtime pods when a
+   * dedicated migrate Job owns migrations). See RunDatabaseMigrationsOnBoot.
+   */
   migrationsRun: RunDatabaseMigrationsOnBoot,
   entities: Entities,
   applicationName: "oneuptime",