fix/incidents grouping postgres query, platform visualization as iterate over dictionary fields

Author: piotr-szewczyk

lib/src/db/entities/incident.entity.ts

@@ -2,7 +2,7 @@ import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "t
 import { User } from "./user.entity";
 import { Project } from "./project.entity";
 import { BaseEntity } from "../../common/base/base.entity";
-import { IIncident, IProject, Platform, SDK, Trace } from "@traceo/types";
+import { Dictionary, IIncident, IProject, Platform, SDK, Trace } from "@traceo/types";
 
 export enum IncidentStatus {
   RESOLVED = "resolved",
@@ -80,7 +80,7 @@ export class Incident extends BaseEntity implements IIncident {
     type: "simple-json",
     nullable: true
   })
-  platform: Platform;
+  platform: Dictionary<string | number>;
 
   @Column({
     type: "simple-json",

public/packages/app/src/features/project/explore/tracing/view/SpanRow.tsx

@@ -109,8 +109,9 @@ export const SpanRow = ({
       )}
 
       {isShowedChildrens &&
-        childrens.map((child) => (
+        childrens.map((child, index) => (
           <SpanRow
+            key={index}
             left={left}
             right={right}
             root={root}

public/packages/app/src/features/project/incidents/components/PlatformSection.tsx

@@ -7,15 +7,11 @@ export const PlatformSection = () => {
 
   return (
     <Card title="Platform" className="h-auto">
-      <FieldLabel label="Platform">
-        <Typography>{incident?.platform?.platform}</Typography>
-      </FieldLabel>
-      <FieldLabel label="Arch">
-        <Typography>{incident?.platform?.arch}</Typography>
-      </FieldLabel>
-      <FieldLabel label="Release">
-        <Typography>{incident?.platform?.release}</Typography>
-      </FieldLabel>
+      {Object.entries(incident?.platform || {}).map(([key, value]) => (
+        <FieldLabel label={key}>
+          <Typography>{value}</Typography>
+        </FieldLabel>
+      ))}
     </Card>
   );
 };

public/packages/shared/traceo-types/src/types/incident.ts

@@ -2,6 +2,7 @@ import { IProject } from "./project";
 import { BrowserInfoType } from "./browser";
 import { SDK } from "./sdk";
 import { IUser } from "./user";
+import { Dictionary } from ".";
 
 export enum IncidentStatus {
   RESOLVED = "resolved",
@@ -35,7 +36,7 @@ export interface IIncident {
   assigned: Pick<IUser, "id" | "name" | "gravatar">;
   // information about incident platform only for backend SDKs
   // for browsers this infomation is persisted inside IError structure
-  platform?: Platform;
+  platform?: Dictionary<string | number>;
 
   traces: Array<Trace>;
 

relay-worker/src/db/database.ts

@@ -81,7 +81,8 @@ export class DatabaseService {
         let sqlQuery = `SELECT * FROM incident WHERE name = '${name}' AND project_id = '${projectId}'`;
 
         if (message) {
-            sqlQuery += `AND message = '${message}'`;
+            // $4 - help to avoid issues with escaping both single and double quotes
+            sqlQuery += ` AND message = $$${message}$$`;
         }
 
         const result = await client.query<IIncident>(sqlQuery);
@@ -135,7 +136,7 @@ export class DatabaseService {
             createdAt,
             now,
             project.id,
-            platform,
+            JSON.stringify(platform),
             0
         ]);