Remove implicated_systems from realm

responsible-ai-collaborative · Aug 30, 2024 · 1317be2 · 1317be2
1 parent 3167008
commit 1317be2
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 69 deletions.
diff --git a/site/gatsby-site/playwright/seeds/aiidprod/incidents.ts b/site/gatsby-site/playwright/seeds/aiidprod/incidents.ts
@@ -16,7 +16,7 @@ const incidents: DBIncident[] = [
         "Alleged harmed or nearly harmed parties": ["entity3"],
         editors: ["user1"],
         reports: [1],
-        implicated_systems: ["entity4"],
+        implicated_systems: ["entity1"],
 
         // TODO: this aren't required but break the build if missing
         nlp_similar_incidents: [],
@@ -33,7 +33,7 @@ const incidents: DBIncident[] = [
         "Alleged harmed or nearly harmed parties": ["entity3"],
         editors: ["user1"],
         reports: [2],
-        implicated_systems: ["entity4"],
+        implicated_systems: ["entity1"],
 
         // TODO: this aren't required but break the build if missing
         nlp_similar_incidents: [],
@@ -89,7 +89,7 @@ const incidents: DBIncident[] = [
         },
         // this field is currently present in the database but not mapped to any graphql fueld
         // "created_at": 1407974400000
-        implicated_systems: ["amazon"],
+        implicated_systems: ["entity1"],
     },
 ]
 

diff --git a/site/gatsby-site/playwright/seeds/aiidprod/submissions.ts b/site/gatsby-site/playwright/seeds/aiidprod/submissions.ts
@@ -30,7 +30,7 @@ const submissions: DBSubmission[] = [
         title: "Sample title",
         url: "http://example.com",
         user: "user1",
-        implicated_systems: ["entity4"]
+        implicated_systems: ["entity1"]
     }
 ]
 

diff --git a/site/gatsby-site/server/generated/graphql.ts b/site/gatsby-site/server/generated/graphql.ts
diff --git a/site/gatsby-site/server/tests/fixtures/submissions.ts b/site/gatsby-site/server/tests/fixtures/submissions.ts
@@ -37,7 +37,7 @@ const submission1 = {
     title: "Submission 1",
     url: "http://example.com",
     user: "user1",
-    implicated_systems: ["entity4"]
+    implicated_systems: ["entity1"]
 }
 
 const submission2 = {
@@ -62,7 +62,7 @@ const submission2 = {
     title: "Submission 2",
     url: "http://example.com",
     user: "user1",
-    implicated_systems: ["entity4"]
+    implicated_systems: ["entity1"]
 }
 
 const submission3 = {
@@ -75,7 +75,7 @@ const submission3 = {
     date_submitted: "2023-11-14T00:00:00.000Z",
     deployers: ["entity3"],
     description: "Another sample description",
-    developers: ["entity4"],
+    developers: ["entity1"],
     harmed_parties: ["entity5"],
     incident_editors: ["editor3"],
     image_url: "https://sample_image_url_4.com",
@@ -87,7 +87,7 @@ const submission3 = {
     title: "Submission 3",
     url: "http://example.com",
     user: "user1",
-    implicated_systems: ["entity4"]
+    implicated_systems: ["entity1"]
 }
 
 

diff --git a/site/gatsby-site/server/types/incidents.ts b/site/gatsby-site/server/types/incidents.ts
@@ -1,7 +1,7 @@
 import { GraphQLFloat, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLString } from "graphql";
 import { ObjectIdScalar } from "../scalars";
 import { EntityType } from "./entity";
-import { getListRelationshipConfig, getListRelationshipExtension, getListRelationshipResolver } from "../utils";
+import { getListRelationshipConfig, getListRelationshipExtension, getListRelationshipResolver, getRelationshipConfig } from "../utils";
 import { UserType } from "./user";
 import { NlpSimilarIncidentType } from "../types";
 import { ReportType } from "./report";
@@ -61,13 +61,7 @@ export const IncidentType = new GraphQLObjectType({
         nlp_similar_incidents: { type: new GraphQLList(NlpSimilarIncidentType) },
         reports: getListRelationshipConfig(ReportType, GraphQLInt, 'reports', 'report_number', 'reports', 'aiidprod'),
         tsne: { type: TsneType },
-        implicated_systems: {
-            type: new GraphQLList(EntityType),
-            resolve: getListRelationshipResolver('implicated_systems', 'entity_id', EntityType, 'aiidprod', 'entities'),
-            extensions: {
-                relationship: getListRelationshipExtension('implicated_systems', 'entity_id', GraphQLString, 'aiidprod', 'entities')
-            },
-        },
+        implicated_systems: getListRelationshipConfig(EntityType, GraphQLString, 'implicated_systems', 'entity_id', 'aiidprod', 'entities'),
     },
 });
 

diff --git a/site/gatsby-site/src/components/submissions/schemas.js b/site/gatsby-site/src/components/submissions/schemas.js
@@ -150,6 +150,7 @@ export const incidentSchema = schema.shape({
   description: description.required('*Description is required'),
   incident_date: incident_date.required('*Incident Date required'),
   incident_ids: yup.mixed(),
+  implicated_systems: yup.array().required('*Implicated Systems is required'),
 });
 
 export const reportSchema = schema.shape({

diff --git a/site/realm/data_sources/mongodb-atlas/aiidprod/incidents/relationships.json b/site/realm/data_sources/mongodb-atlas/aiidprod/incidents/relationships.json
@@ -17,12 +17,6 @@
         "foreign_key": "entity_id",
         "is_list": true
     },
-    "implicated_systems": {
-        "ref": "#/relationship/mongodb-atlas/aiidprod/entities",
-        "source_key": "implicated_systems",
-        "foreign_key": "entity_id",
-        "is_list": true
-    },
     "editors": {
         "ref": "#/relationship/mongodb-atlas/customData/users",
         "source_key": "editors",

diff --git a/site/realm/data_sources/mongodb-atlas/aiidprod/incidents/schema.json b/site/realm/data_sources/mongodb-atlas/aiidprod/incidents/schema.json
@@ -18,12 +18,6 @@
                 "bsonType": "string"
             }
         },
-        "implicated_systems": {
-            "bsonType": "array",
-            "items": {
-                "bsonType": "string"
-            }
-        },
         "_id": {
             "bsonType": "objectId"
         },

diff --git a/site/realm/data_sources/mongodb-atlas/aiidprod/submissions/relationships.json b/site/realm/data_sources/mongodb-atlas/aiidprod/submissions/relationships.json
@@ -28,11 +28,5 @@
         "source_key": "user",
         "foreign_key": "userId",
         "is_list": false
-    },
-    "implicated_systems": {
-        "ref": "#/relationship/mongodb-atlas/aiidprod/entities",
-        "source_key": "implicated_systems",
-        "foreign_key": "entity_id",
-        "is_list": true
     }
 }
diff --git a/site/realm/data_sources/mongodb-atlas/aiidprod/submissions/schema.json b/site/realm/data_sources/mongodb-atlas/aiidprod/submissions/schema.json
@@ -150,12 +150,6 @@
         },
         "quiet": {
             "bsonType": "bool"
-        },
-        "implicated_systems": {
-            "bsonType": "array",
-            "items": {
-                "bsonType": "string"
-            }
         }
     },
     "required": [

diff --git a/site/realm/data_sources/mongodb-atlas/history/incidents/schema.json b/site/realm/data_sources/mongodb-atlas/history/incidents/schema.json
@@ -18,12 +18,6 @@
                 "bsonType": "string"
             }
         },
-        "implicated_systems": {
-            "bsonType": "array",
-            "items": {
-                "bsonType": "string"
-            }
-        },
         "_id": {
             "bsonType": "objectId"
         },

diff --git a/site/realm/functions/promoteSubmissionToReport.js b/site/realm/functions/promoteSubmissionToReport.js
@@ -43,6 +43,7 @@ exports = async (input) => {
         nlp_similar_incidents: submission.nlp_similar_incidents || [],
         editor_similar_incidents: submission.editor_similar_incidents || [],
         editor_dissimilar_incidents: submission.editor_dissimilar_incidents || [],
+        implicated_systems: submission.implicated_systems || [],
       }
       if (submission.embedding) {
         newIncident.embedding = {