pr feedback

server/src/controllers/plugin.controller.ts

@@ -19,7 +19,7 @@ export class PluginController {
     description: 'Retrieve a list of all available plugin triggers.',
     history: new HistoryBuilder().added('v2.3.0').alpha('v2.3.0'),
   })
-  getTriggers(): PluginTriggerResponseDto[] {
+  getPluginTriggers(): PluginTriggerResponseDto[] {
     return this.service.getTriggers();
   }
 

server/src/dtos/plugin.dto.ts

@@ -1,16 +1,16 @@
 import { IsNotEmpty, IsString } from 'class-validator';
 import { PluginAction, PluginFilter } from 'src/database';
-import { PluginContext, PluginTriggerType } from 'src/enum';
+import { PluginContext as PluginContextType, PluginTriggerType } from 'src/enum';
 import type { JSONSchema } from 'src/types/plugin-schema.types';
 import { ValidateEnum } from 'src/validation';
 
 export class PluginTriggerResponseDto {
   name!: string;
   @ValidateEnum({ enum: PluginTriggerType, name: 'PluginTriggerType' })
-  triggerType!: PluginTriggerType;
+  type!: PluginTriggerType;
   description!: string;
-  @ValidateEnum({ enum: PluginContext, name: 'PluginContext' })
-  context!: PluginContext;
+  @ValidateEnum({ enum: PluginContextType, name: 'PluginContextType' })
+  contextType!: PluginContextType;
 }
 
 export class PluginResponseDto {
@@ -33,8 +33,8 @@ export class PluginFilterResponseDto {
   title!: string;
   description!: string;
 
-  @ValidateEnum({ enum: PluginContext, name: 'PluginContext' })
-  supportedContexts!: PluginContext[];
+  @ValidateEnum({ enum: PluginContextType, name: 'PluginContextType' })
+  supportedContexts!: PluginContextType[];
   schema!: JSONSchema | null;
 }
 
@@ -45,8 +45,8 @@ export class PluginActionResponseDto {
   title!: string;
   description!: string;
 
-  @ValidateEnum({ enum: PluginContext, name: 'PluginContext' })
-  supportedContexts!: PluginContext[];
+  @ValidateEnum({ enum: PluginContextType, name: 'PluginContextType' })
+  supportedContexts!: PluginContextType[];
   schema!: JSONSchema | null;
 }
 

server/src/plugins.ts

@@ -2,22 +2,22 @@ import { PluginContext, PluginTriggerType } from 'src/enum';
 
 export type PluginTrigger = {
   name: string;
-  triggerType: PluginTriggerType;
+  type: PluginTriggerType;
   description: string;
-  context: PluginContext;
+  contextType: PluginContext;
 };
 
 export const pluginTriggers: PluginTrigger[] = [
   {
     name: 'Asset Uploaded',
-    triggerType: PluginTriggerType.AssetCreate,
+    type: PluginTriggerType.AssetCreate,
     description: 'Triggered when a new asset is uploaded',
-    context: PluginContext.Asset,
+    contextType: PluginContext.Asset,
   },
   {
     name: 'Person Recognized',
-    triggerType: PluginTriggerType.PersonRecognized,
+    type: PluginTriggerType.PersonRecognized,
     description: 'Triggered when a person is detected',
-    context: PluginContext.Person,
+    contextType: PluginContext.Person,
   },
 ];

server/src/queries/workflow.repository.sql

@@ -7,6 +7,8 @@ from
   "workflow"
 where
   "id" = $1
+order by
+  "createdAt" desc
 
 -- WorkflowRepository.getWorkflowsByOwner
 select
@@ -16,7 +18,7 @@ from
 where
   "ownerId" = $1
 order by
-  "name"
+  "createdAt" desc
 
 -- WorkflowRepository.getWorkflowsByTrigger
 select

server/src/repositories/workflow.repository.ts

@@ -12,12 +12,22 @@ export class WorkflowRepository {
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getWorkflow(id: string) {
-    return this.db.selectFrom('workflow').selectAll().where('id', '=', id).executeTakeFirst();
+    return this.db
+      .selectFrom('workflow')
+      .selectAll()
+      .where('id', '=', id)
+      .orderBy('createdAt', 'desc')
+      .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getWorkflowsByOwner(ownerId: string) {
-    return this.db.selectFrom('workflow').selectAll().where('ownerId', '=', ownerId).orderBy('name').execute();
+    return this.db
+      .selectFrom('workflow')
+      .selectAll()
+      .where('ownerId', '=', ownerId)
+      .orderBy('createdAt', 'desc')
+      .execute();
   }
 
   @GenerateSql({ params: [PluginTriggerType.AssetCreate] })

server/src/services/plugin.service.ts

@@ -116,12 +116,12 @@ export class PluginService extends BaseService {
   }
 
   private async loadPluginToDatabase(manifest: PluginManifestDto, basePath: string): Promise<void> {
-    // const currentPlugin = await this.pluginRepository.getPluginByName(manifest.name);
-    // if (currentPlugin != null && currentPlugin.version === manifest.version) {
-    //   this.logger.log(`Plugin ${manifest.name} is up to date (version ${manifest.version}). Skipping`);
-    //   return;
-    // }
-    //
+    const currentPlugin = await this.pluginRepository.getPluginByName(manifest.name);
+    if (currentPlugin != null && currentPlugin.version === manifest.version) {
+      this.logger.log(`Plugin ${manifest.name} is up to date (version ${manifest.version}). Skipping`);
+      return;
+    }
+
     const { plugin, filters, actions } = await this.pluginRepository.loadPlugin(manifest, basePath);
 
     this.logger.log(`Upserted plugin: ${plugin.name} (ID: ${plugin.id}, version: ${plugin.version})`);

server/src/services/workflow.service.ts

@@ -16,10 +16,10 @@ import { BaseService } from 'src/services/base.service';
 @Injectable()
 export class WorkflowService extends BaseService {
   async create(auth: AuthDto, dto: WorkflowCreateDto): Promise<WorkflowResponseDto> {
-    const trigger = this.getTriggerOrFail(dto.triggerType);
+    const context = this.getContextForTrigger(dto.triggerType);
 
-    const filterInserts = await this.validateAndMapFilters(dto.filters, trigger.context);
-    const actionInserts = await this.validateAndMapActions(dto.actions, trigger.context);
+    const filterInserts = await this.validateAndMapFilters(dto.filters, context);
+    const actionInserts = await this.validateAndMapActions(dto.actions, context);
 
     const workflow = await this.workflowRepository.createWorkflow(
       {
@@ -56,11 +56,11 @@ export class WorkflowService extends BaseService {
     }
 
     const workflow = await this.findOrFail(id);
-    const trigger = this.getTriggerOrFail(dto.triggerType ?? workflow.triggerType);
+    const context = this.getContextForTrigger(dto.triggerType ?? workflow.triggerType);
 
     const { filters, actions, ...workflowUpdate } = dto;
-    const filterInserts = filters && (await this.validateAndMapFilters(filters, trigger.context));
-    const actionInserts = actions && (await this.validateAndMapActions(actions, trigger.context));
+    const filterInserts = filters && (await this.validateAndMapFilters(filters, context));
+    const actionInserts = actions && (await this.validateAndMapActions(actions, context));
 
     const updatedWorkflow = await this.workflowRepository.updateWorkflow(
       id,
@@ -124,12 +124,12 @@ export class WorkflowService extends BaseService {
     }));
   }
 
-  private getTriggerOrFail(triggerType: PluginTriggerType) {
-    const trigger = pluginTriggers.find((t) => t.triggerType === triggerType);
+  private getContextForTrigger(type: PluginTriggerType) {
+    const trigger = pluginTriggers.find((t) => t.type === type);
     if (!trigger) {
-      throw new BadRequestException(`Invalid trigger type: ${triggerType}`);
+      throw new BadRequestException(`Invalid trigger type: ${type}`);
     }
-    return trigger;
+    return trigger.contextType;
   }
 
   private async findOrFail(id: string) {