From 35951ed068a39e9d471cf191c73c02ecbeede7df Mon Sep 17 00:00:00 2001
From: Clara Youdale <clara@botsfactory.io>
Date: Wed, 29 Nov 2023 13:08:43 -0300
Subject: [PATCH 01/15] Create
 2023.11.29T14.56.25.delete-duplicated-subscriptions.js

Migration that removes duplicates in subscriptions collection
---
 ...4.56.25.delete-duplicated-subscriptions.js | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js

diff --git a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
new file mode 100644
index 0000000000..35064fc693
--- /dev/null
+++ b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
@@ -0,0 +1,74 @@
+const config = require('../config');
+
+/** @type {import('umzug').MigrationFn<any>} */
+exports.up = async ({ context: { client } }) => {
+  const db = client.db(config.realm.production_db.db_custom_data);
+
+  const subscriptions = db.collection('subscriptions');
+
+  // Remove duplicates of type "incident", "new-incidents" and "submission-promoted", based on type, incident_id and userId
+  subscriptions
+    .aggregate([
+      {
+        $match: {
+          type: { $in: ['incident', 'new-incidents', 'submission-promoted'] },
+        },
+      },
+      {
+        $group: {
+          _id: { incident_id: '$incident_id', type: '$type', userId: '$userId' },
+          uniqueIds: { $addToSet: '$_id' },
+          count: { $sum: 1 },
+        },
+      },
+      {
+        $match: {
+          count: { $gt: 1 },
+        },
+      },
+    ])
+    .forEach(function (doc) {
+      if (doc._id.incident_id && doc._id.type && doc._id.userId) {
+        console.log(
+          `Removing ${doc.count - 1} duplicated subscriptions for incident ${
+            doc._id.incident_id
+          } of type ${doc._id.type} for user ${doc._id.userId}`
+        );
+        doc.uniqueIds.pop(); // Remove one from the array to keep
+        subscriptions.deleteOne({ _id: { $in: doc.uniqueIds } });
+      }
+    });
+
+  // Remove duplicates of type "entity", based on type, entityId and userId
+  subscriptions
+    .aggregate([
+      {
+        $match: {
+          type: { $in: ['entity'] },
+        },
+      },
+      {
+        $group: {
+          _id: { entityId: '$entityId', type: '$type', userId: '$userId' },
+          uniqueIds: { $addToSet: '$_id' },
+          count: { $sum: 1 },
+        },
+      },
+      {
+        $match: {
+          count: { $gt: 1 },
+        },
+      },
+    ])
+    .forEach(function (doc) {
+      if (doc._id.entityId && doc._id.type && doc._id.userId) {
+        console.log(
+          `Removing ${doc.count - 1} duplicated subscriptions for entity ${
+            doc._id.entityId
+          } of type ${doc._id.type} for user ${doc._id.userId}`
+        );
+        doc.uniqueIds.pop(); // Remove one from the array to keep
+        subscriptions.deleteOne({ _id: { $in: doc.uniqueIds } });
+      }
+    });
+};

From 1deef8f1e2c597fed44532f77c62f3d421ce7d7d Mon Sep 17 00:00:00 2001
From: Luna McNulty <l.mcnulty@riseup.net>
Date: Tue, 5 Dec 2023 11:53:32 -0500
Subject: [PATCH 02/15] Factor common checklist test logic

---
 .../e2e/integration/apps/checklistsForm.cy.js | 126 +++++++-----------
 1 file changed, 45 insertions(+), 81 deletions(-)

diff --git a/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js b/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
index 89dee79b86..1875c438b9 100644
--- a/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
+++ b/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
@@ -4,6 +4,18 @@ const { gql } = require('@apollo/client');
 describe('Checklists App Form', () => {
   const url = '/apps/checklists?id=testChecklist';
 
+  const defaultChecklist = {
+    __typename: 'Checklist',
+    about: '',
+    id: 'testChecklist',
+    name: 'Test Checklist',
+    owner_id: 'a-fake-user-id-that-does-not-exist',
+    risks: [],
+    tags_goals: [],
+    tags_methods: [],
+    tags_other: [],
+  };
+
   const usersQuery = {
     query: gql`
       {
@@ -19,27 +31,36 @@ describe('Checklists App Form', () => {
     timeout: 120000, // mongodb admin api is extremely slow
   };
 
-  it('Should have read-only access for non-logged-in users', () => {
+  const withLogin = (callback) => {
+    cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
+
+    cy.query(usersQuery).then(({ data: { users } }) => {
+      const user = users.find((user) => user.adminData.email == Cypress.env('e2eUsername'));
+
+      callback({ user });
+    });
+  };
+
+  const interceptFindChecklist = (checklist) => {
     cy.conditionalIntercept(
       '**/graphql',
       (req) => req.body.operationName == 'findChecklist',
       'findChecklist',
-      {
-        data: {
-          checklist: {
-            __typename: 'Checklist',
-            about: '',
-            id: 'testChecklist',
-            name: 'Test Checklist',
-            owner_id: 'a-fake-user-id-that-does-not-exist',
-            risks: [],
-            tags_goals: [],
-            tags_methods: [],
-            tags_other: [],
-          },
-        },
-      }
+      { data: { checklist } }
     );
+  };
+
+  const interceptUpsertChecklist = (checklist) => {
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'upsertChecklist',
+      'upsertChecklist',
+      { data: { checklist } }
+    );
+  };
+
+  it('Should have read-only access for non-logged-in users', () => {
+    interceptFindChecklist(defaultChecklist);
 
     cy.visit(url);
 
@@ -55,26 +76,7 @@ describe('Checklists App Form', () => {
   maybeIt('Should have read-only access for logged-in non-owners', () => {
     cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
 
-    cy.conditionalIntercept(
-      '**/graphql',
-      (req) => req.body.operationName == 'findChecklist',
-      'findChecklist',
-      {
-        data: {
-          checklist: {
-            __typename: 'Checklist',
-            about: '',
-            id: 'testChecklist',
-            name: 'Test Checklist',
-            owner_id: 'a-fake-user-id-that-does-not-exist',
-            risks: [],
-            tags_goals: [],
-            tags_methods: [],
-            tags_other: [],
-          },
-        },
-      }
-    );
+    interceptFindChecklist(defaultChecklist);
 
     cy.visit(url);
 
@@ -88,51 +90,13 @@ describe('Checklists App Form', () => {
   });
 
   maybeIt('Should allow editing for owner', () => {
-    cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
-
-    cy.query(usersQuery).then(({ data: { users } }) => {
-      const user = users.find((user) => user.adminData.email == Cypress.env('e2eUsername'));
-
-      cy.conditionalIntercept(
-        '**/graphql',
-        (req) => req.body.operationName == 'findChecklist',
-        'findChecklist',
-        {
-          data: {
-            checklist: {
-              __typename: 'Checklist',
-              about: '',
-              id: 'testChecklist',
-              name: 'Test Checklist',
-              owner_id: user.userId,
-              risks: [],
-              tags_goals: [],
-              tags_methods: [],
-              tags_other: [],
-            },
-          },
-        }
-      );
-      cy.conditionalIntercept(
-        '**/graphql',
-        (req) => req.body.operationName == 'upsertChecklist',
-        'upsertChecklist',
-        {
-          data: {
-            checklist: {
-              __typename: 'Checklist',
-              about: "It's a system that does something probably.",
-              id: 'testChecklist',
-              name: 'Test Checklist',
-              owner_id: user.userId,
-              risks: [],
-              tags_goals: [],
-              tags_methods: [],
-              tags_other: [],
-            },
-          },
-        }
-      );
+    withLogin(({ user }) => {
+      interceptFindChecklist({ ...defaultChecklist, owner_id: user.userId });
+      interceptUpsertChecklist({
+        ...defaultChecklist,
+        owner_id: user.userId,
+        about: "It's a system that does something probably.",
+      });
 
       cy.visit(url);
 

From f158362579aabc0a2d54c3ee36956917a75ef9b3 Mon Sep 17 00:00:00 2001
From: Pablo Costa <pablo@botsfactory.io>
Date: Thu, 7 Dec 2023 17:53:02 -0300
Subject: [PATCH 03/15] Add migration to mark all pending notifications as
 processed

---
 ...09.mark-pending-notifications-as-processed.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 site/gatsby-site/migrations/2023.12.07T20.45.09.mark-pending-notifications-as-processed.js

diff --git a/site/gatsby-site/migrations/2023.12.07T20.45.09.mark-pending-notifications-as-processed.js b/site/gatsby-site/migrations/2023.12.07T20.45.09.mark-pending-notifications-as-processed.js
new file mode 100644
index 0000000000..59a6e9b0b9
--- /dev/null
+++ b/site/gatsby-site/migrations/2023.12.07T20.45.09.mark-pending-notifications-as-processed.js
@@ -0,0 +1,16 @@
+const config = require('../config');
+
+/** @type {import('umzug').MigrationFn<any>} */
+exports.up = async ({ context: { client } }) => {
+  const db = client.db(config.realm.production_db.db_custom_data);
+
+  const notifications = db.collection('notifications');
+
+  // Mark all pending notifications as processed
+  const result = await notifications.updateMany(
+    { processed: false },
+    { $set: { processed: true } }
+  );
+
+  console.log(`All pending notifications marked as processed. Total: ${result.modifiedCount}`);
+};

From eb55422c317a823425f56d1ee657560f0b3a8e2d Mon Sep 17 00:00:00 2001
From: kepae <kepae@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:33:53 -0500
Subject: [PATCH 04/15] Add Slack badge to README

To do: Create link to form for invites, rather than link to the slack workspace directly.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 40d13219c0..250833f1a8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Artificial Intelligence Incident Database (AIID)
 
 [![Netlify Status](https://api.netlify.com/api/v1/badges/9eb0dda2-916c-46f9-a0bd-9ddab3879c6e/deploy-status)](https://app.netlify.com/sites/aiid/deploys)
+[![Slack Link](https://img.shields.io/badge/Join%20the%20RAIC%20Slack!-purple?logo=slack)](https://raicollab.slack.com)
 
 Information about the goals and organization of the AI Incident Database can be found on the [production website](https://incidentdatabase.ai/). This page concentrates on onboarding for the following types of contributions to the database,
 

From 89d764d48a3830d120f2e75f1b3d7ee45f3f6ee5 Mon Sep 17 00:00:00 2001
From: Clara Youdale <clara@botsfactory.io>
Date: Fri, 8 Dec 2023 09:37:21 -0300
Subject: [PATCH 05/15] Fix migration to delete all duplicates

---
 ...4.56.25.delete-duplicated-subscriptions.js | 65 ++++++++++++-------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
index 35064fc693..b414f3c1a9 100644
--- a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
+++ b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
@@ -1,3 +1,5 @@
+const { ObjectID } = require('bson');
+
 const config = require('../config');
 
 /** @type {import('umzug').MigrationFn<any>} */
@@ -7,7 +9,8 @@ exports.up = async ({ context: { client } }) => {
   const subscriptions = db.collection('subscriptions');
 
   // Remove duplicates of type "incident", "new-incidents" and "submission-promoted", based on type, incident_id and userId
-  subscriptions
+
+  const result = await subscriptions
     .aggregate([
       {
         $match: {
@@ -27,20 +30,28 @@ exports.up = async ({ context: { client } }) => {
         },
       },
     ])
-    .forEach(function (doc) {
-      if (doc._id.incident_id && doc._id.type && doc._id.userId) {
-        console.log(
-          `Removing ${doc.count - 1} duplicated subscriptions for incident ${
-            doc._id.incident_id
-          } of type ${doc._id.type} for user ${doc._id.userId}`
-        );
-        doc.uniqueIds.pop(); // Remove one from the array to keep
-        subscriptions.deleteOne({ _id: { $in: doc.uniqueIds } });
-      }
-    });
+    .toArray();
+
+  for (const doc of result) {
+    const uniqueIds = doc.uniqueIds.map((id) => new ObjectID(id));
+
+    if (doc._id.incident_id && doc._id.type && doc._id.userId) {
+      console.log(
+        `Removing ${doc.count - 1} duplicated subscriptions for incident ${
+          doc._id.incident_id
+        } of type ${doc._id.type} for user ${doc._id.userId}`
+      );
+      uniqueIds.pop(); // Remove one from the array to keep
+      const deleteResult = await subscriptions.deleteMany({
+        _id: { $in: uniqueIds },
+      });
+
+      console.log('Delete Result: ', deleteResult);
+    }
+  }
 
   // Remove duplicates of type "entity", based on type, entityId and userId
-  subscriptions
+  const resultEntities = await subscriptions
     .aggregate([
       {
         $match: {
@@ -60,15 +71,21 @@ exports.up = async ({ context: { client } }) => {
         },
       },
     ])
-    .forEach(function (doc) {
-      if (doc._id.entityId && doc._id.type && doc._id.userId) {
-        console.log(
-          `Removing ${doc.count - 1} duplicated subscriptions for entity ${
-            doc._id.entityId
-          } of type ${doc._id.type} for user ${doc._id.userId}`
-        );
-        doc.uniqueIds.pop(); // Remove one from the array to keep
-        subscriptions.deleteOne({ _id: { $in: doc.uniqueIds } });
-      }
-    });
+    .toArray();
+
+  for (const doc of resultEntities) {
+    const uniqueIds = doc.uniqueIds.map((id) => new ObjectID(id));
+
+    if (doc._id.entityId && doc._id.type && doc._id.userId) {
+      console.log(
+        `Removing ${doc.count - 1} duplicated subscriptions for entity ${
+          doc._id.entityId
+        } of type ${doc._id.type} for user ${doc._id.userId}`
+      );
+      uniqueIds.pop(); // Remove one from the array to keep
+      const deleteResult = await subscriptions.deleteMany({ _id: { $in: uniqueIds } });
+
+      console.log('Delete Result: ', deleteResult);
+    }
+  }
 };

From 86d06eb94866bf4b45e78c76e4dc3895333a1ca5 Mon Sep 17 00:00:00 2001
From: Luna McNulty <l.mcnulty@riseup.net>
Date: Mon, 11 Dec 2023 01:37:03 -0500
Subject: [PATCH 06/15] Fix = vs == in find user

---
 site/gatsby-site/src/components/checklists/CheckListForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/gatsby-site/src/components/checklists/CheckListForm.js b/site/gatsby-site/src/components/checklists/CheckListForm.js
index 554ecda6ba..4e77fde626 100644
--- a/site/gatsby-site/src/components/checklists/CheckListForm.js
+++ b/site/gatsby-site/src/components/checklists/CheckListForm.js
@@ -36,7 +36,7 @@ export default function CheckListForm({
 
   const userIsOwner = values.owner_id == user.id;
 
-  const owner = users.find((u) => (u.userId = values.owner_id));
+  const owner = users.find((u) => u.userId == values.owner_id);
 
   const [deleteChecklist] = useMutation(DELETE_CHECKLIST);
 

From 63a9e31cc689cb62653bf32397ac84f9e2ee1915 Mon Sep 17 00:00:00 2001
From: Clara Youdale <clara@botsfactory.io>
Date: Mon, 11 Dec 2023 10:04:47 -0300
Subject: [PATCH 07/15] Fix migration to remove duplicates of new-incidents

---
 ...4.56.25.delete-duplicated-subscriptions.js | 72 ++++++++++++-------
 1 file changed, 47 insertions(+), 25 deletions(-)

diff --git a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
index b414f3c1a9..0ba731729d 100644
--- a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
+++ b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
@@ -14,7 +14,7 @@ exports.up = async ({ context: { client } }) => {
     .aggregate([
       {
         $match: {
-          type: { $in: ['incident', 'new-incidents', 'submission-promoted'] },
+          type: { $in: ['incident', 'submission-promoted'] },
         },
       },
       {
@@ -32,23 +32,7 @@ exports.up = async ({ context: { client } }) => {
     ])
     .toArray();
 
-  for (const doc of result) {
-    const uniqueIds = doc.uniqueIds.map((id) => new ObjectID(id));
-
-    if (doc._id.incident_id && doc._id.type && doc._id.userId) {
-      console.log(
-        `Removing ${doc.count - 1} duplicated subscriptions for incident ${
-          doc._id.incident_id
-        } of type ${doc._id.type} for user ${doc._id.userId}`
-      );
-      uniqueIds.pop(); // Remove one from the array to keep
-      const deleteResult = await subscriptions.deleteMany({
-        _id: { $in: uniqueIds },
-      });
-
-      console.log('Delete Result: ', deleteResult);
-    }
-  }
+  await removeDuplicates(subscriptions, result);
 
   // Remove duplicates of type "entity", based on type, entityId and userId
   const resultEntities = await subscriptions
@@ -73,19 +57,57 @@ exports.up = async ({ context: { client } }) => {
     ])
     .toArray();
 
-  for (const doc of resultEntities) {
+  await removeDuplicates(subscriptions, resultEntities);
+
+  // Remove duplicates of type "incident", "new-incidents" and "submission-promoted", based on type, incident_id and userId
+
+  const resultNewIncidents = await subscriptions
+    .aggregate([
+      {
+        $match: {
+          type: { $in: ['new-incidents'] },
+        },
+      },
+      {
+        $group: {
+          _id: { incident_id: '$incident_id', type: '$type', userId: '$userId' },
+          uniqueIds: { $addToSet: '$_id' },
+          count: { $sum: 1 },
+        },
+      },
+      {
+        $match: {
+          count: { $gt: 1 },
+        },
+      },
+    ])
+    .toArray();
+
+  await removeDuplicates(subscriptions, resultNewIncidents);
+};
+
+async function removeDuplicates(subscriptions, results) {
+  for (const doc of results) {
     const uniqueIds = doc.uniqueIds.map((id) => new ObjectID(id));
 
-    if (doc._id.entityId && doc._id.type && doc._id.userId) {
+    if (doc._id.type && doc._id.userId) {
       console.log(
-        `Removing ${doc.count - 1} duplicated subscriptions for entity ${
-          doc._id.entityId
-        } of type ${doc._id.type} for user ${doc._id.userId}`
+        `Removing ${doc.count - 1} duplicated subscriptions of type ${doc._id.type} for user ${
+          doc._id.userId
+        } ${
+          doc._id.incident_id
+            ? ' and for incident ' + doc._id.incident_id
+            : doc._id.entityId
+            ? ' and for entity ' + doc._id.entityId
+            : ''
+        }`
       );
       uniqueIds.pop(); // Remove one from the array to keep
-      const deleteResult = await subscriptions.deleteMany({ _id: { $in: uniqueIds } });
+      const deleteResult = await subscriptions.deleteMany({
+        _id: { $in: uniqueIds },
+      });
 
       console.log('Delete Result: ', deleteResult);
     }
   }
-};
+}

From 535c48dcf19f62df05f92538881e5c900dc05c62 Mon Sep 17 00:00:00 2001
From: kepae <kepae@users.noreply.github.com>
Date: Mon, 11 Dec 2023 16:43:37 -0500
Subject: [PATCH 08/15] nit: update comments

---
 .../2023.11.29T14.56.25.delete-duplicated-subscriptions.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
index 0ba731729d..2a29269487 100644
--- a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
+++ b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
@@ -8,7 +8,7 @@ exports.up = async ({ context: { client } }) => {
 
   const subscriptions = db.collection('subscriptions');
 
-  // Remove duplicates of type "incident", "new-incidents" and "submission-promoted", based on type, incident_id and userId
+  // Remove duplicates of type "incident" and "submission-promoted", based on type, incident_id and userId
 
   const result = await subscriptions
     .aggregate([

From 32a55fa9866446b44bf13b675e1e4a03a7c2ba54 Mon Sep 17 00:00:00 2001
From: kepae <kepae@users.noreply.github.com>
Date: Mon, 11 Dec 2023 16:44:00 -0500
Subject: [PATCH 09/15] nit: update comments

---
 .../2023.11.29T14.56.25.delete-duplicated-subscriptions.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
index 2a29269487..51b44f3d86 100644
--- a/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
+++ b/site/gatsby-site/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.js
@@ -59,7 +59,7 @@ exports.up = async ({ context: { client } }) => {
 
   await removeDuplicates(subscriptions, resultEntities);
 
-  // Remove duplicates of type "incident", "new-incidents" and "submission-promoted", based on type, incident_id and userId
+  // Remove duplicates of type "new-incidents" based on type, incident_id and userId
 
   const resultNewIncidents = await subscriptions
     .aggregate([

From 9d4a2d4472b87f4cba789f3acc271b8fc3bc6a5f Mon Sep 17 00:00:00 2001
From: Clara Youdale <clara@botsfactory.io>
Date: Tue, 12 Dec 2023 17:06:55 -0300
Subject: [PATCH 10/15] Add test for delete duplicate migration

---
 ...6.25.delete-duplicated-subscriptions.cy.js | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js

diff --git a/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js b/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js
new file mode 100644
index 0000000000..a64e9fc16e
--- /dev/null
+++ b/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js
@@ -0,0 +1,144 @@
+const { ObjectID } = require('bson');
+
+const {
+  up,
+} = require('../../../../migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions');
+
+describe('Migration Script - Remove Duplicated Subscriptions', () => {
+  it('Should remove duplicated subscriptions correctly', () => {
+    // Mocked data for all three cases
+    const testSubscriptions = {
+      incident: [
+        {
+          _id: {
+            type: 'incident',
+            userId: '642188372947d07020c1319d',
+            incident_id: 600,
+          },
+          uniqueIds: [
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a3'),
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a4'),
+          ],
+        },
+        {
+          _id: {
+            type: 'submission-promoted',
+            userId: '642188372947d07020c1319d',
+            incident_id: 600,
+          },
+          uniqueIds: [
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a0'),
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a1'),
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a2'),
+          ],
+        },
+      ],
+      entity: [
+        {
+          _id: {
+            type: 'entity',
+            userId: '642188372947d07020c1319d',
+            entity_id: 'trans-women',
+          },
+          uniqueIds: ['5f9f6b9b5f9c4c0001a3b3a5', '5f9f6b9b5f9c4c0001a3b3a6'],
+        },
+      ],
+      'new-incidents': [
+        {
+          _id: {
+            type: 'new-incidents',
+            userId: '642188372947d07020c1319d',
+          },
+          uniqueIds: ['5f9f6b9b5f9c4c0001a3b3a7', '5f9f6b9b5f9c4c0001a3b3a8'],
+        },
+      ],
+    };
+
+    // Mocked collection with stubbed methods
+    const subscriptionsCollection = {
+      aggregate: cy.stub().callsFake((query) => {
+        const type = query[0].$match.type.$in[0];
+
+        console.log(type);
+        return {
+          toArray: cy.stub().resolves(testSubscriptions[type]),
+        };
+      }),
+      deleteMany: cy.stub().callsFake((query) => {
+        console.log('deleteMany called with:', query._id.$in[0].toString()); // Log the query
+        return Promise.resolve({ deletedCount: 1 });
+      }),
+    };
+
+    // Mocked context with database client
+    const context = {
+      client: {
+        db: cy.stub().returns({
+          collection: cy.stub().withArgs('subscriptions').returns(subscriptionsCollection),
+        }),
+      },
+    };
+
+    // Execute the migration script
+    cy.wrap(up({ context })).then(() => {
+      // Assertions for each case
+      const args = subscriptionsCollection.deleteMany.getCall(0).args[0];
+
+      const argsSubmissionPromoted = subscriptionsCollection.deleteMany.getCall(1).args[0];
+
+      const argsEntity = subscriptionsCollection.deleteMany.getCall(2).args[0];
+
+      const argsNewIncidents = subscriptionsCollection.deleteMany.getCall(3).args[0];
+
+      let modifiedObjectIncident = {
+        _id: {
+          $in: args._id.$in.map((id) => id.toString()),
+        },
+      };
+
+      let modifiedObjectSubmissionPromoted = {
+        _id: {
+          $in: argsSubmissionPromoted._id.$in.map((id) => id.toString()),
+        },
+      };
+
+      let modifiedObjectEntity = {
+        _id: {
+          $in: argsEntity._id.$in.map((id) => id.toString()),
+        },
+      };
+
+      let modifiedObjectNewIncidents = {
+        _id: {
+          $in: argsNewIncidents._id.$in.map((id) => id.toString()),
+        },
+      };
+
+      expect(modifiedObjectIncident).to.be.deep.equal({
+        _id: {
+          $in: testSubscriptions['incident'][0].uniqueIds.slice(0, 1).map((id) => id.toString()),
+        },
+      });
+
+      expect(modifiedObjectSubmissionPromoted).to.be.deep.equal({
+        _id: {
+          $in: testSubscriptions['incident'][1].uniqueIds.slice(0, 2).map((id) => id.toString()),
+        },
+      });
+
+      expect(modifiedObjectEntity).to.be.deep.equal({
+        _id: {
+          $in: testSubscriptions['entity'][0].uniqueIds.slice(0, 1).map((id) => id.toString()),
+        },
+      });
+
+      expect(modifiedObjectNewIncidents).to.be.deep.equal({
+        _id: {
+          $in: testSubscriptions['new-incidents'][0].uniqueIds
+            .slice(0, 1)
+            .map((id) => id.toString()),
+        },
+      });
+    });
+  });
+});

From c85934d5c1097fc47d9d2c4568a3da39ab8d34c1 Mon Sep 17 00:00:00 2001
From: Clara Youdale <clara@botsfactory.io>
Date: Wed, 13 Dec 2023 09:04:40 -0300
Subject: [PATCH 11/15] keep consistency in object IDs

---
 ....29T14.56.25.delete-duplicated-subscriptions.cy.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js b/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js
index a64e9fc16e..956861ad3d 100644
--- a/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js
+++ b/site/gatsby-site/cypress/e2e/unit/migrations/2023.11.29T14.56.25.delete-duplicated-subscriptions.cy.js
@@ -40,7 +40,10 @@ describe('Migration Script - Remove Duplicated Subscriptions', () => {
             userId: '642188372947d07020c1319d',
             entity_id: 'trans-women',
           },
-          uniqueIds: ['5f9f6b9b5f9c4c0001a3b3a5', '5f9f6b9b5f9c4c0001a3b3a6'],
+          uniqueIds: [
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a5'),
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a6'),
+          ],
         },
       ],
       'new-incidents': [
@@ -49,7 +52,10 @@ describe('Migration Script - Remove Duplicated Subscriptions', () => {
             type: 'new-incidents',
             userId: '642188372947d07020c1319d',
           },
-          uniqueIds: ['5f9f6b9b5f9c4c0001a3b3a7', '5f9f6b9b5f9c4c0001a3b3a8'],
+          uniqueIds: [
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a7'),
+            new ObjectID('5f9f6b9b5f9c4c0001a3b3a8'),
+          ],
         },
       ],
     };
@@ -59,7 +65,6 @@ describe('Migration Script - Remove Duplicated Subscriptions', () => {
       aggregate: cy.stub().callsFake((query) => {
         const type = query[0].$match.type.$in[0];
 
-        console.log(type);
         return {
           toArray: cy.stub().resolves(testSubscriptions[type]),
         };

From fb32a52f076e4305cfc2eb9dd76e2090c74e1dae Mon Sep 17 00:00:00 2001
From: Luna McNulty <l.mcnulty@riseup.net>
Date: Mon, 18 Dec 2023 02:04:44 -0500
Subject: [PATCH 12/15] Add null check to className in string templates

---
 .../components/checklists/CheckListForm.js    | 16 +++++++++------
 .../components/checklists/EditableLabel.js    |  2 +-
 .../src/components/checklists/RiskSection.js  | 20 +++++++++----------
 .../src/components/cite/SimilarIncidents.js   |  2 +-
 .../src/components/discover/QuickAccess.js    |  2 +-
 .../components/discover/hitTypes/shared.js    |  2 +-
 .../components/forms/FlowbiteSearchInput.js   |  2 +-
 .../forms/SubmissionWizard/StepContainer.js   |  6 ++++--
 site/gatsby-site/src/components/forms/Tags.js |  2 +-
 .../src/components/forms/TextInputGroup.js    | 10 ++++++----
 .../src/components/i18n/TranslationBadge.js   |  2 +-
 .../src/components/incidents/IncidentCard.js  |  4 +++-
 .../src/components/loginSignup/index.js       |  2 +-
 .../src/components/reports/ReportCard.js      |  6 +++---
 .../src/components/sidebar/treeNode.js        |  2 +-
 site/gatsby-site/src/components/ui/Header.js  |  9 ++++++---
 .../src/components/ui/SocialShareButtons.js   |  2 +-
 site/gatsby-site/src/components/ui/Table.js   |  2 +-
 .../src/components/ui/WebArchiveLink.js       |  2 +-
 .../src/elements/ProgessCircle/index.js       |  2 +-
 site/gatsby-site/src/elements/Select/index.js |  2 +-
 .../src/elements/Skeletons/Card/index.js      |  4 +++-
 site/gatsby-site/src/utils/checklists.js      |  4 +++-
 site/gatsby-site/src/utils/cloudinary.js      |  4 ++--
 24 files changed, 64 insertions(+), 47 deletions(-)

diff --git a/site/gatsby-site/src/components/checklists/CheckListForm.js b/site/gatsby-site/src/components/checklists/CheckListForm.js
index f944aae79a..5943dc40f3 100644
--- a/site/gatsby-site/src/components/checklists/CheckListForm.js
+++ b/site/gatsby-site/src/components/checklists/CheckListForm.js
@@ -343,20 +343,22 @@ const Header = (props) => {
     lg:min-h-[5.5rem]
     flex justify-between flex-wrap gap-4
     pb-2 -mt-2
-    ${props.className}
+    ${props.className || ''}
   `;
 
   return <header {...{ ...props, className }}>{props.children}</header>;
 };
 
 const HeaderInfo = (props) => {
-  const className = `flex flex-col justify-center ${props.className}`;
+  const className = `flex flex-col justify-center ${props.className || ''}`;
 
   return <div {...{ ...props, className }}>{props.children}</div>;
 };
 
 const HeaderControls = (props) => {
-  const className = `flex flex-wrap md:flex-nowrap shrink-0 gap-2 items-center max-w-full ${props.className}`;
+  const className = `flex flex-wrap md:flex-nowrap shrink-0 gap-2 items-center max-w-full ${
+    props.className || ''
+  }`;
 
   return <div {...{ ...props, className }}>{props.children}</div>;
 };
@@ -366,14 +368,14 @@ const SideBySide = (props) => {
     flex flex-col md:flex-row gap-2
     [&>*]:w-full [&>*]:md:w-1/2
     [&>*]:h-full 
-    ${props.className}
+    ${props.className || ''}
   `;
 
   return <div {...{ ...props, className }}>{props.children}</div>;
 };
 
 function SavingIndicator({ isSubmitting, submissionError, className }) {
-  className = `text-lg text-gray-500 inline-block ${className}`;
+  className = `text-lg text-gray-500 inline-block ${className || ''}`;
 
   if (isSubmitting) {
     return (
@@ -404,7 +406,9 @@ function Info({ children, className }) {
   if (hide) return <></>;
   return (
     <div
-      className={`${className} bg-amber-50 text-amber-900 border border-amber-300 p-4 rounded shadow-md my-4`}
+      className={`${
+        className || ''
+      } bg-amber-50 text-amber-900 border border-amber-300 p-4 rounded shadow-md my-4`}
     >
       <button
         className="border-0 bg-none float-right text-xl pl-4 pb-2 -mt-3"
diff --git a/site/gatsby-site/src/components/checklists/EditableLabel.js b/site/gatsby-site/src/components/checklists/EditableLabel.js
index 17996c7f3c..a5b1acc9fa 100644
--- a/site/gatsby-site/src/components/checklists/EditableLabel.js
+++ b/site/gatsby-site/src/components/checklists/EditableLabel.js
@@ -26,7 +26,7 @@ const EditableLabel = ({ title, onChange, textClasses, iconClasses, disabled })
       {!disabled && (
         <button className="px-2" onClick={() => setEditingTitle((editingTitle) => !editingTitle)}>
           <FontAwesomeIcon
-            className={`${iconClasses} align-baseline`}
+            className={`${iconClasses || ''} align-baseline`}
             icon={editingTitle ? faCheck : faEdit}
           />
         </button>
diff --git a/site/gatsby-site/src/components/checklists/RiskSection.js b/site/gatsby-site/src/components/checklists/RiskSection.js
index 97aef12607..83ce2680a2 100644
--- a/site/gatsby-site/src/components/checklists/RiskSection.js
+++ b/site/gatsby-site/src/components/checklists/RiskSection.js
@@ -282,7 +282,7 @@ const RiskBody = (props) => (
   <div
     {...{
       ...props,
-      className: `grid grid-cols-1 md:grid-cols-2 gap-4 md:min-h-[24rem] ${props.className}`,
+      className: `grid grid-cols-1 md:grid-cols-2 gap-4 md:min-h-[24rem] ${props.className || ''}`,
     }}
   >
     {props.children}
@@ -306,7 +306,7 @@ const RiskDetails = (props) => (
           [&>summary]:before:content-['⏵']
     [&[open]>summary]:before:w-4
           [&>summary]:before:w-4
-    ${props.className}
+    ${props.className || ''}
   `,
     }}
   >
@@ -329,7 +329,7 @@ const RiskHeaderSummary = (props) => (
     before:text-lg 
     ${props.generated ? 'before:text-gray-400' : 'before:text-red-700'}
 
-    ${props.className}
+    ${props.className || ''}
   `,
     }}
   >
@@ -341,7 +341,7 @@ const HeaderItemsGroup = (props) => (
   <div
     {...{
       ...props,
-      className: `md:flex px-2 gap-2 bg-white items-center ${props.className}`,
+      className: `md:flex px-2 gap-2 bg-white items-center ${props.className || ''}`,
     }}
   >
     {props.children}
@@ -356,7 +356,7 @@ const HeaderTextWithIcon = (props) => (
     inline-flex flex gap-1 items-center
     inline-block bg-${props.color || 'gray'}-200 px-3 rounded-lg 
     text-${props.color || 'gray'}-800
-    ${props.className}
+    ${props.className || ''}
   `,
     }}
   >
@@ -365,17 +365,17 @@ const HeaderTextWithIcon = (props) => (
 );
 
 const PrecedentsQuery = (props) => (
-  <div {...{ ...props, className: `col-span-2 ${props.className}` }}>{props.children}</div>
+  <div {...{ ...props, className: `col-span-2 ${props.className || ''}` }}>{props.children}</div>
 );
 
 const Precedents = (props) => (
-  <div {...{ ...props, className: `col-span-1 flex flex-col h-full ${props.className}` }}>
+  <div {...{ ...props, className: `col-span-1 flex flex-col h-full ${props.className || ''}` }}>
     {props.children}
   </div>
 );
 
 const RiskFields = (props) => (
-  <div {...{ ...props, className: `col-span-1 flex flex-col gap-2 ${props.className}` }}>
+  <div {...{ ...props, className: `col-span-1 flex flex-col gap-2 ${props.className || ''}` }}>
     {props.children}
   </div>
 );
@@ -392,7 +392,7 @@ const PrecedentsList = (props) => (
     border-1 border-gray-200 
     rounded 
     shadow-inner
-    ${props.className}
+    ${props.className || ''}
   `,
     }}
   >
@@ -424,7 +424,7 @@ function ProgressCircle({ progress, className }) {
   const clearLength = c - filledLength;
 
   return (
-    <div title={Math.round(progress * 100) + '%'} className={`${className} inline`}>
+    <div title={Math.round(progress * 100) + '%'} className={`${className || ''} inline`}>
       <svg width="20" height="20" viewBox="0 0 60 60">
         <circle stroke="#d8dadc" strokeWidth="10" fill="transparent" r={r} cx="30" cy="30" />
         <circle
diff --git a/site/gatsby-site/src/components/cite/SimilarIncidents.js b/site/gatsby-site/src/components/cite/SimilarIncidents.js
index 933ed359a5..53b5d87f7a 100644
--- a/site/gatsby-site/src/components/cite/SimilarIncidents.js
+++ b/site/gatsby-site/src/components/cite/SimilarIncidents.js
@@ -170,7 +170,7 @@ const SimilarIncidents = ({
   );
 
   return (
-    <div className={`tw-similar-incidents ${className}`}>
+    <div className={`tw-similar-incidents ${className || ''}`}>
       {(editor_similar_incidents.length > 0 || nlp_only_incidents.length > 0) && (
         <LocalizedLink
           to={'/summaries/spatial?incident=' + parentIncident.incident_id}
diff --git a/site/gatsby-site/src/components/discover/QuickAccess.js b/site/gatsby-site/src/components/discover/QuickAccess.js
index 128b97ead4..1b82edb85f 100644
--- a/site/gatsby-site/src/components/discover/QuickAccess.js
+++ b/site/gatsby-site/src/components/discover/QuickAccess.js
@@ -7,7 +7,7 @@ import { faSearch, faPlus } from '@fortawesome/free-solid-svg-icons';
 export default function DiscoverQuickAccess({ className = '', isCollapsed = false }) {
   return (
     <div
-      className={`${className} ${
+      className={`${className || ''} ${
         isCollapsed ? 'opacity-0 h-0 p-0 m-0' : 'p-4 h-24'
       } md:bg-text-light-gray transition-all duration-500 opacity-1 font-karla font-bold text-[#001934] flex items-center justify-center`}
     >
diff --git a/site/gatsby-site/src/components/discover/hitTypes/shared.js b/site/gatsby-site/src/components/discover/hitTypes/shared.js
index f6c3e069a1..57260cbb95 100644
--- a/site/gatsby-site/src/components/discover/hitTypes/shared.js
+++ b/site/gatsby-site/src/components/discover/hitTypes/shared.js
@@ -42,7 +42,7 @@ export function HeaderTitle({ item, ...props }) {
 
 export function SourceDomainSubtitle({ item, className }) {
   return (
-    <div className={`${className} text-inherit`}>
+    <div className={`${className || ''} text-inherit`}>
       <WebArchiveLink url={item.url} date={item.date_submitted}>
         {item.source_domain} &middot; {format(fromUnixTime(item.epoch_date_published), 'yyyy')}
       </WebArchiveLink>
diff --git a/site/gatsby-site/src/components/forms/FlowbiteSearchInput.js b/site/gatsby-site/src/components/forms/FlowbiteSearchInput.js
index 1bbef0d1f8..75cc402fbd 100644
--- a/site/gatsby-site/src/components/forms/FlowbiteSearchInput.js
+++ b/site/gatsby-site/src/components/forms/FlowbiteSearchInput.js
@@ -42,7 +42,7 @@ const FlowbiteSearchInput = ({
           props.touched[name] && props.errors[name]
             ? 'border-red-600 focus:border-red-600 focus:ring-red-500'
             : 'border-gray-300 dark:border-gray-600 dark:focus:border-blue-500 focus:border-blue-500 focus:ring-blue-500 dark:focus:ring-blue-500'
-        } ${className}`}
+        } ${className || ''}`}
         placeholder={placeholder}
         onChange={handleChange}
         onBlur={handleBlur}
diff --git a/site/gatsby-site/src/components/forms/SubmissionWizard/StepContainer.js b/site/gatsby-site/src/components/forms/SubmissionWizard/StepContainer.js
index 2a172a993c..fb9207d2ab 100644
--- a/site/gatsby-site/src/components/forms/SubmissionWizard/StepContainer.js
+++ b/site/gatsby-site/src/components/forms/SubmissionWizard/StepContainer.js
@@ -4,9 +4,11 @@ import React from 'react';
 const StepContainer = (props) => {
   return (
     <div
-      className={`relative border rounded-lg mt-8 mb-6 shadow-md dark:bg-gray-800 dark:border-gray-700 ${props.className}`}
+      className={`relative border rounded-lg mt-8 mb-6 shadow-md dark:bg-gray-800 dark:border-gray-700 ${
+        props.className || ''
+      }`}
     >
-      <div className={`${props.childClassName}`}>
+      <div className={`${props.childClassName || ''}`}>
         {props.children}
         <div className="absolute -top-3 bg-white px-2 text-xl whitespace-nowrap">
           <Badge color={props.color ? props.color : 'info'}>{props.name}</Badge>
diff --git a/site/gatsby-site/src/components/forms/Tags.js b/site/gatsby-site/src/components/forms/Tags.js
index 87c324c4f1..ee16c98ae9 100644
--- a/site/gatsby-site/src/components/forms/Tags.js
+++ b/site/gatsby-site/src/components/forms/Tags.js
@@ -28,7 +28,7 @@ export default function Tags({
 
   return (
     <Typeahead
-      className={`Typeahead ${className}`}
+      className={`Typeahead ${className || ''}`}
       inputProps={{ id: inputId, name }}
       onKeyDown={(e) => {
         if (e.key === ',') {
diff --git a/site/gatsby-site/src/components/forms/TextInputGroup.js b/site/gatsby-site/src/components/forms/TextInputGroup.js
index 1eda7f11cb..f4665fb94e 100644
--- a/site/gatsby-site/src/components/forms/TextInputGroup.js
+++ b/site/gatsby-site/src/components/forms/TextInputGroup.js
@@ -31,7 +31,7 @@ const TextInputGroup = ({
   }, []);
 
   return (
-    <div className={`form-group ${className}`}>
+    <div className={`form-group ${className || ''}`}>
       <div className="flex items-center">
         {icon && <FontAwesomeIcon fixedWidth icon={icon} title={label} className="mr-1" />}
         {label && (
@@ -97,11 +97,13 @@ const TextAreaInput = ({
   <>
     <textarea
       name={name}
-      className={`block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border dark:bg-gray-700 dark:placeholder-gray-400 dark:text-white min-h-[40px] ${className} ${
+      className={`block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border dark:bg-gray-700 dark:placeholder-gray-400 dark:text-white min-h-[40px] ${
+        className || ''
+      } ${
         touched[name] && errors[name]
           ? 'border-red-600 focus:ring-red-500'
           : 'border-gray-300 dark:border-gray-600 focus:border-blue-500 dark:focus:border-blue-500 focus:ring-blue-500 dark:focus:ring-blue-500'
-      } ${className}`}
+      } ${className || ''}`}
       placeholder={placeholder}
       value={values[name] || props.defaultValue || ''}
       {...props}
@@ -134,7 +136,7 @@ const Input = ({
           errors && touched && touched[name] && errors[name]
             ? 'border-red-600 focus:ring-red-500'
             : 'border-gray-300 dark:border-gray-600 dark:focus:border-blue-500 focus:border-blue-500 focus:ring-blue-500 dark:focus:ring-blue-500'
-        } ${className}`}
+        } ${className || ''}`}
         placeholder={placeholder}
         value={values[name] || props.defaultValue || ''}
         {...props}
diff --git a/site/gatsby-site/src/components/i18n/TranslationBadge.js b/site/gatsby-site/src/components/i18n/TranslationBadge.js
index d5dc4d9f25..14f7a1368f 100644
--- a/site/gatsby-site/src/components/i18n/TranslationBadge.js
+++ b/site/gatsby-site/src/components/i18n/TranslationBadge.js
@@ -9,7 +9,7 @@ export default function TranslationBadge({ className = '', originalLanguage = ''
 
   if (locale !== originalLanguage) {
     return (
-      <div className={`inline-block ${className}`} data-cy="translation-badge">
+      <div className={`inline-block ${className || ''}`} data-cy="translation-badge">
         <Link to="/blog/multilingual-incident-reporting" className="hover:no-underline">
           <Badge>
             <Trans>AI Translated</Trans>
diff --git a/site/gatsby-site/src/components/incidents/IncidentCard.js b/site/gatsby-site/src/components/incidents/IncidentCard.js
index e1927fc766..2542ef2d5f 100644
--- a/site/gatsby-site/src/components/incidents/IncidentCard.js
+++ b/site/gatsby-site/src/components/incidents/IncidentCard.js
@@ -5,7 +5,9 @@ import { Trans } from 'react-i18next';
 export default function IncidentCard({ incident, className = '', ...props }) {
   return (
     <div
-      className={`p-6 bg-white rounded-lg border border-gray-200 shadow-md dark:bg-gray-800 dark:border-gray-700 ${className}`}
+      className={`p-6 bg-white rounded-lg border border-gray-200 shadow-md dark:bg-gray-800 dark:border-gray-700 ${
+        className || ''
+      }`}
       {...props}
     >
       <Link to={`/cite/${incident.incident_id}`} className="hover:underline">
diff --git a/site/gatsby-site/src/components/loginSignup/index.js b/site/gatsby-site/src/components/loginSignup/index.js
index 52236fc657..b15ef205c3 100644
--- a/site/gatsby-site/src/components/loginSignup/index.js
+++ b/site/gatsby-site/src/components/loginSignup/index.js
@@ -17,7 +17,7 @@ const LoginSignup = ({ className = '', location = null }) => {
 
   return (
     <>
-      <div className={`flex items-center ${className}`}>
+      <div className={`flex items-center ${className || ''}`}>
         {isUserLoggedIn ? <Subscriptions /> : <Subscribe location={location} />}
       </div>
     </>
diff --git a/site/gatsby-site/src/components/reports/ReportCard.js b/site/gatsby-site/src/components/reports/ReportCard.js
index a9e4c7d289..cf4e197f94 100644
--- a/site/gatsby-site/src/components/reports/ReportCard.js
+++ b/site/gatsby-site/src/components/reports/ReportCard.js
@@ -120,9 +120,9 @@ const ReportCard = ({
   return (
     <>
       <div
-        className={`inline-block w-full bg-white rounded-lg border  shadow-md dark:border-gray-700 dark:bg-gray-800 ${className} p-4 relative ${
-          expanded ? 'expanded' : ''
-        }`}
+        className={`inline-block w-full bg-white rounded-lg border  shadow-md dark:border-gray-700 dark:bg-gray-800 ${
+          className || ''
+        } p-4 relative ${expanded ? 'expanded' : ''}`}
         id={`r${item.report_number}`}
         ref={ref}
         data-cy="incident-report-card"
diff --git a/site/gatsby-site/src/components/sidebar/treeNode.js b/site/gatsby-site/src/components/sidebar/treeNode.js
index ffd202ec09..1abab3ddd5 100644
--- a/site/gatsby-site/src/components/sidebar/treeNode.js
+++ b/site/gatsby-site/src/components/sidebar/treeNode.js
@@ -20,7 +20,7 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 const TreeNode = ({ className = '', setCollapsed, navSetting, item, isCollapsed = false }) => {
-  const calculatedClassName = `${className} item ${
+  const calculatedClassName = `${className || ''} item ${
     item.current
       ? 'active bg-light-orange text-white dark:bg-gray-700'
       : 'text-white md:text-inherit hover:bg-light-orange dark:text-white hover:text-white dark:hover:bg-gray-700'
diff --git a/site/gatsby-site/src/components/ui/Header.js b/site/gatsby-site/src/components/ui/Header.js
index 74715a160e..05c43aed8a 100644
--- a/site/gatsby-site/src/components/ui/Header.js
+++ b/site/gatsby-site/src/components/ui/Header.js
@@ -111,7 +111,10 @@ const Header = ({ location = null }) => {
           );
 
         var HeaderLink = ({ className }) => (
-          <Link to={finalLogoLink} className={`hover:no-underline flex items-center ${className}`}>
+          <Link
+            to={finalLogoLink}
+            className={`hover:no-underline flex items-center ${className || ''}`}
+          >
             <div className="md:w-64 text-center">
               <img
                 className={'hidden md:inline ml-[10px] mr-[10px] w-[200px]'}
@@ -138,7 +141,7 @@ const Header = ({ location = null }) => {
           <a
             href="#content"
             className={`
-              ${className}
+              ${className || ''}
               relative 
               overflow-hidden
               text-white
@@ -205,7 +208,7 @@ const Header = ({ location = null }) => {
 };
 
 var Divider = ({ className }) => (
-  <span className={`divider hidden md:inline-block w-px h-[30px] bg-gray-400 ${className}`} />
+  <span className={`divider hidden md:inline-block w-px h-[30px] bg-gray-400 ${className || ''}`} />
 );
 
 export default Header;
diff --git a/site/gatsby-site/src/components/ui/SocialShareButtons.js b/site/gatsby-site/src/components/ui/SocialShareButtons.js
index d25da489f6..63c37521b3 100644
--- a/site/gatsby-site/src/components/ui/SocialShareButtons.js
+++ b/site/gatsby-site/src/components/ui/SocialShareButtons.js
@@ -10,7 +10,7 @@ const SocialShareButtons = ({ metaTitle, path, page, className = '' }) => {
   return (
     <div
       data-cy="social-share-buttons"
-      className={`flex social-btn-container ${page} ${className}`}
+      className={`flex social-btn-container ${page} ${className || ''}`}
     >
       {/* Twitter */}
       <button
diff --git a/site/gatsby-site/src/components/ui/Table.js b/site/gatsby-site/src/components/ui/Table.js
index be28065884..548e91d0ef 100644
--- a/site/gatsby-site/src/components/ui/Table.js
+++ b/site/gatsby-site/src/components/ui/Table.js
@@ -253,7 +253,7 @@ export default function Table({
   } = table;
 
   return (
-    <div className={`max-w-full ${className}`} {...props}>
+    <div className={`max-w-full ${className || ''}`} {...props}>
       {/* eslint-disable react/jsx-key */}
       <div className="max-w-full overflow-x-scroll">
         <table {...getTableProps()} className={`${tableClassName} w-full`}>
diff --git a/site/gatsby-site/src/components/ui/WebArchiveLink.js b/site/gatsby-site/src/components/ui/WebArchiveLink.js
index 656bbd15e2..0ffb2c45b4 100644
--- a/site/gatsby-site/src/components/ui/WebArchiveLink.js
+++ b/site/gatsby-site/src/components/ui/WebArchiveLink.js
@@ -30,7 +30,7 @@ export default function WebArchiveLink({ url, date, children, className = '' })
   };
 
   return (
-    <div className={`flex items-center ${className}`} data-cy="web-archive-link">
+    <div className={`flex items-center ${className || ''}`} data-cy="web-archive-link">
       <a className="text-black" href={url}>
         {children}
       </a>
diff --git a/site/gatsby-site/src/elements/ProgessCircle/index.js b/site/gatsby-site/src/elements/ProgessCircle/index.js
index 70db615206..62415c018e 100644
--- a/site/gatsby-site/src/elements/ProgessCircle/index.js
+++ b/site/gatsby-site/src/elements/ProgessCircle/index.js
@@ -18,7 +18,7 @@ const ProgressCircle = ({
   }, [size, strokeWidth, percentage]);
 
   return (
-    <svg className={`circular-progress ${className}`} width={size} height={size}>
+    <svg className={`circular-progress ${className || ''}`} width={size} height={size}>
       <circle
         className="progress-background"
         cx={size / 2}
diff --git a/site/gatsby-site/src/elements/Select/index.js b/site/gatsby-site/src/elements/Select/index.js
index c5af378fc2..cd0fc929e0 100644
--- a/site/gatsby-site/src/elements/Select/index.js
+++ b/site/gatsby-site/src/elements/Select/index.js
@@ -20,7 +20,7 @@ export default function Select(props) {
     dark:focus:ring-blue-500
          focus:ring-blue-500
 
-    ${props.className}
+    ${props.className || ''}
   `;
 
   return <select {...{ ...props, className }}>{props.children}</select>;
diff --git a/site/gatsby-site/src/elements/Skeletons/Card/index.js b/site/gatsby-site/src/elements/Skeletons/Card/index.js
index 7f4fb3e586..86ba6374f6 100644
--- a/site/gatsby-site/src/elements/Skeletons/Card/index.js
+++ b/site/gatsby-site/src/elements/Skeletons/Card/index.js
@@ -14,7 +14,9 @@ export default function CardSkeleton({
       role="status"
       className={`${
         maxWidthSmall ? 'max-w-sm' : ''
-      } p-4 rounded border border-gray-200 shadow animate-pulse md:p-6 dark:border-gray-700 ${className}`}
+      } p-4 rounded border border-gray-200 shadow animate-pulse md:p-6 dark:border-gray-700 ${
+        className || ''
+      }`}
       style={style}
     >
       {image && (
diff --git a/site/gatsby-site/src/utils/checklists.js b/site/gatsby-site/src/utils/checklists.js
index 0d6276a526..0bc421570d 100644
--- a/site/gatsby-site/src/utils/checklists.js
+++ b/site/gatsby-site/src/utils/checklists.js
@@ -54,7 +54,9 @@ const risksEqual = (risk1, risk2) => {
 };
 
 const Label = (props) => (
-  <label {...{ ...props, className: `mb-1 block ${props.className}` }}>{props.children}</label>
+  <label {...{ ...props, className: `mb-1 block ${props.className || ''}` }}>
+    {props.children}
+  </label>
 );
 
 const emptyRisk = (properties) => ({
diff --git a/site/gatsby-site/src/utils/cloudinary.js b/site/gatsby-site/src/utils/cloudinary.js
index 3a4212d512..9976890dfb 100644
--- a/site/gatsby-site/src/utils/cloudinary.js
+++ b/site/gatsby-site/src/utils/cloudinary.js
@@ -74,7 +74,7 @@ const Image = ({
         siteName="IncidentDatabase.AI"
         itemIdentifier={itemIdentifier}
         title={alt}
-        className={`${className} ${
+        className={`${className || ''} ${
           !publicID || publicID == '' || loadFailed ? '' : 'hidden'
         } h-full w-full object-cover`}
         height={height}
@@ -85,7 +85,7 @@ const Image = ({
         data-cy={'cloudinary-image'}
         ref={imageElement}
         alt={alt}
-        className={`${className} ${
+        className={`${className || ''} ${
           !publicID || publicID == '' || loadFailed ? 'hidden' : ''
         } h-full w-full object-cover`}
         cldImg={image}

From 330be896acb565393e41093bad370150f177e552 Mon Sep 17 00:00:00 2001
From: Kevin <kepae@users.noreply.github.com>
Date: Mon, 18 Dec 2023 16:59:58 -0500
Subject: [PATCH 13/15] Add form link for Slack invitation

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 250833f1a8..15f42032aa 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Artificial Intelligence Incident Database (AIID)
 
 [![Netlify Status](https://api.netlify.com/api/v1/badges/9eb0dda2-916c-46f9-a0bd-9ddab3879c6e/deploy-status)](https://app.netlify.com/sites/aiid/deploys)
-[![Slack Link](https://img.shields.io/badge/Join%20the%20RAIC%20Slack!-purple?logo=slack)](https://raicollab.slack.com)
+[![Slack Link](https://img.shields.io/badge/Join%20the%20RAIC%20Slack!-purple?logo=slack)](https://forms.gle/v7UHJvEkYSJQ7jHj7)
 
 Information about the goals and organization of the AI Incident Database can be found on the [production website](https://incidentdatabase.ai/). This page concentrates on onboarding for the following types of contributions to the database,
 

From f9850a296dd236d9fd62126297b685d04d0511df Mon Sep 17 00:00:00 2001
From: Luna McNulty <l.mcnulty@riseup.net>
Date: Tue, 19 Dec 2023 16:21:42 +0000
Subject: [PATCH 14/15] =?UTF-8?q?Checklists=20=E2=80=93=20Add=20icons=20(#?=
 =?UTF-8?q?2507)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* Add icons throughout checklisting app
---
 .../components/checklists/CheckListForm.js    | 25 +++++++++++++++++-
 .../components/checklists/ChecklistsIndex.js  | 10 ++++++-
 .../components/checklists/ExportDropdown.js   | 11 +++++++-
 .../src/components/checklists/RiskSection.js  | 26 ++++++++++++++++---
 site/gatsby-site/src/utils/checklists.js      |  4 ++-
 5 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/site/gatsby-site/src/components/checklists/CheckListForm.js b/site/gatsby-site/src/components/checklists/CheckListForm.js
index 5943dc40f3..360a73e921 100644
--- a/site/gatsby-site/src/components/checklists/CheckListForm.js
+++ b/site/gatsby-site/src/components/checklists/CheckListForm.js
@@ -5,6 +5,17 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useMutation, useApolloClient, gql } from '@apollo/client';
 import { LocalizedLink } from 'plugins/gatsby-theme-i18n';
 import debounce from 'lodash/debounce';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import {
+  faEnvelope,
+  faPlusCircle,
+  faWindowMaximize,
+  faWindowMinimize,
+  faBullseye,
+  faMicrochip,
+  faArrowsTurnToDots,
+  faTag,
+} from '@fortawesome/free-solid-svg-icons';
 
 import { DELETE_CHECKLIST } from '../../graphql/checklists';
 import {
@@ -144,6 +155,7 @@ export default function CheckListForm({
         <HeaderControls>
           <SavingIndicator className="mr-2" {...{ isSubmitting, submissionError }} />
           <Button color="light" onClick={() => alert('Coming soon')}>
+            <FontAwesomeIcon icon={faEnvelope} className="mr-2" />
             <Trans>Subscribe</Trans>
           </Button>
           {userIsOwner && (
@@ -176,6 +188,7 @@ export default function CheckListForm({
                 )
               }
             >
+              <FontAwesomeIcon icon={faWindowMaximize} className="mr-2" />
               <Trans>Expand all</Trans>
             </Button>
             <Button
@@ -187,6 +200,7 @@ export default function CheckListForm({
                 )
               }
             >
+              <FontAwesomeIcon icon={faWindowMinimize} className="mr-2" />
               <Trans>Collapse all</Trans>
             </Button>
             {userIsOwner && (
@@ -198,6 +212,7 @@ export default function CheckListForm({
                   );
                 }}
               >
+                <FontAwesomeIcon icon={faPlusCircle} className="mr-2" />
                 <Trans>Add Risk</Trans>
               </Button>
             )}
@@ -235,6 +250,7 @@ const AboutSystem = ({ formAbout, debouncedSetFieldValue, userIsOwner }) => {
   return (
     <section>
       <Label for="about-system">
+        <FontAwesomeIcon icon={faMicrochip} className="mr-2" />
         <Trans>About System</Trans>
       </Label>
       <Textarea
@@ -262,9 +278,13 @@ const QueryTagInput = ({
   setFieldValue,
   placeHolder,
   userIsOwner,
+  icon,
 }) => (
   <div className="bootstrap">
-    <Label for={id}>{title}</Label>
+    <Label for={id}>
+      {icon && <FontAwesomeIcon icon={icon} className="mr-2" />}
+      {title}
+    </Label>
     <Tags
       id={id}
       value={idValue}
@@ -285,6 +305,7 @@ const GoalsTagInput = ({ values, tags, setFieldValue, userIsOwner }) => (
     {...{
       title: 'Goals',
       id: 'tags_goals',
+      icon: faBullseye,
       idValue: values['tags_goals'],
       labelKey: abbreviatedTag,
       include: (tagParts) =>
@@ -303,6 +324,7 @@ const MethodsTagInput = ({ values, tags, setFieldValue, userIsOwner }) => (
     {...{
       title: 'Methods',
       id: 'tags_methods',
+      icon: faArrowsTurnToDots,
       idValue: values['tags_methods'],
       labelKey: abbreviatedTag,
       include: (tagParts) =>
@@ -321,6 +343,7 @@ const OtherTagInput = ({ values, tags, setFieldValue, userIsOwner }) => (
     {...{
       title: 'Other',
       id: 'tags_other',
+      icon: faTag,
       idValue: values['tags_other'],
       labelKey: (tag) => tag,
       include: (tagParts) =>
diff --git a/site/gatsby-site/src/components/checklists/ChecklistsIndex.js b/site/gatsby-site/src/components/checklists/ChecklistsIndex.js
index 5f2674a833..45ab32e860 100644
--- a/site/gatsby-site/src/components/checklists/ChecklistsIndex.js
+++ b/site/gatsby-site/src/components/checklists/ChecklistsIndex.js
@@ -6,7 +6,12 @@ import { Trans, useTranslation } from 'react-i18next';
 import { LocalizedLink } from 'plugins/gatsby-theme-i18n';
 import { useQuery, useMutation } from '@apollo/client';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faCheckToSlot } from '@fortawesome/free-solid-svg-icons';
+import {
+  faCheckToSlot,
+  faEnvelope,
+  faPlusCircle,
+  faClone,
+} from '@fortawesome/free-solid-svg-icons';
 import gql from 'graphql-tag';
 
 import CardSkeleton from 'elements/Skeletons/Card';
@@ -175,6 +180,7 @@ const ChecklistsIndex = ({ users }) => {
                   window.location = '/apps/checklists?id=' + newChecklist.id;
                 }}
               >
+                <FontAwesomeIcon icon={faPlusCircle} className="mr-2" />
                 <Trans>New</Trans>
               </Button>
             )}
@@ -262,9 +268,11 @@ const CheckListCard = ({ checklist, setChecklists, owner }) => {
             }
           }}
         >
+          <FontAwesomeIcon icon={faClone} className="mr-2" />
           <Trans>Clone</Trans>
         </Button>
         <Button color="light" onClick={() => alert('Coming soon')}>
+          <FontAwesomeIcon icon={faEnvelope} className="mr-2" />
           <Trans>Subscribe</Trans>
         </Button>
         {user.id == checklist.owner_id && (
diff --git a/site/gatsby-site/src/components/checklists/ExportDropdown.js b/site/gatsby-site/src/components/checklists/ExportDropdown.js
index 77ae6dd0c3..509051178d 100644
--- a/site/gatsby-site/src/components/checklists/ExportDropdown.js
+++ b/site/gatsby-site/src/components/checklists/ExportDropdown.js
@@ -2,10 +2,19 @@ import React from 'react';
 import { Trans } from 'react-i18next';
 import { Dropdown } from 'flowbite-react';
 import { exportJson, exportCsv, exportHtml } from 'utils/checklists';
+import { faDownload } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 const ExportDropdown = ({ checklist }) => {
+  const label = (
+    <>
+      <FontAwesomeIcon icon={faDownload} className="mr-2"/>
+      <Trans>Export</Trans>
+    </>
+  );
+
   return (
-    <Dropdown label="Export">
+    <Dropdown label={label}>
       <Dropdown.Item onClick={() => exportJson(checklist)}>
         <Trans>JSON</Trans>
       </Dropdown.Item>
diff --git a/site/gatsby-site/src/components/checklists/RiskSection.js b/site/gatsby-site/src/components/checklists/RiskSection.js
index 83ce2680a2..50ef54b784 100644
--- a/site/gatsby-site/src/components/checklists/RiskSection.js
+++ b/site/gatsby-site/src/components/checklists/RiskSection.js
@@ -16,6 +16,10 @@ import {
   faComputer,
   faHashtag,
   faTrash,
+  faBarsProgress,
+  faNoteSticky,
+  faRotateLeft,
+  faFilter,
 } from '@fortawesome/free-solid-svg-icons';
 
 export default function RiskSection({
@@ -143,6 +147,7 @@ export default function RiskSection({
         {showPrecedentFilters && (
           <PrecedentsQuery>
             <Label>
+              <FontAwesomeIcon icon={faFilter} className="mr-2" />
               <Trans>Precedents Filter</Trans>
             </Label>
             <div className="bootstrap">
@@ -159,7 +164,10 @@ export default function RiskSection({
         )}
         <Precedents>
           <div className="flex justify-between">
-            <Label>Precedents</Label>
+            <Label>
+              <FontAwesomeIcon icon={faRotateLeft} className="mr-2" />
+              {t('Precedents')}
+            </Label>
             <button
               className="text-gray-600 mb-1"
               onClick={() => setShowPrecedentFilters((value) => !value)}
@@ -192,6 +200,7 @@ export default function RiskSection({
         </Precedents>
         <RiskFields>
           <label className="-mb-1" htmlFor="risk_status">
+            <FontAwesomeIcon icon={faBarsProgress} className="mr-2" />
             Risk Status
           </label>
           <Select
@@ -224,7 +233,10 @@ const RiskSeverity = ({ risk, debouncedUpdateRisk, userIsOwner }) => {
 
   return (
     <div>
-      <Label>{t('Severity')}</Label>
+      <Label>
+        <FontAwesomeIcon icon={faBolt} className="mr-2" />
+        {t('Severity')}
+      </Label>
       <TextInput
         value={displaySeverity}
         disabled={!userIsOwner}
@@ -244,7 +256,10 @@ const RiskLikelihood = ({ risk, debouncedUpdateRisk, userIsOwner }) => {
 
   return (
     <div>
-      <Label>{t('Likelihood')}</Label>
+      <Label>
+        <FontAwesomeIcon icon={faPercent} className="mr-2" />
+        {t('Likelihood')}
+      </Label>
       <TextInput
         value={displayLikelihood}
         disabled={!userIsOwner}
@@ -264,7 +279,10 @@ const RiskNotes = ({ risk, debouncedUpdateRisk, userIsOwner }) => {
 
   return (
     <div className="md:h-full flex flex-col">
-      <Label>{t('Risk Notes')}</Label>
+      <Label>
+        <FontAwesomeIcon icon={faNoteSticky} className="mr-2" />
+        {t('Risk Notes')}
+      </Label>
       <Textarea
         className="md:h-full shrink-1"
         value={displayNotes}
diff --git a/site/gatsby-site/src/utils/checklists.js b/site/gatsby-site/src/utils/checklists.js
index 0bc421570d..565b02998a 100644
--- a/site/gatsby-site/src/utils/checklists.js
+++ b/site/gatsby-site/src/utils/checklists.js
@@ -1,7 +1,8 @@
 import React from 'react';
-import { faShield, faWarning } from '@fortawesome/free-solid-svg-icons';
+import { faShield, faWarning, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { v4 as uuidv4 } from 'uuid';
 import ReactDOMServer from 'react-dom/server';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 const riskStatusFeatures = {
   'Not Mitigated': {
@@ -279,6 +280,7 @@ const DeleteButton = (props) => (
   `,
     }}
   >
+    <FontAwesomeIcon icon={faTrash} className="mr-2" />
     {props.children}
   </button>
 );

From 80ec03d29208bea062aee0b07f6b9365eeec909d Mon Sep 17 00:00:00 2001
From: Luna McNulty <l.mcnulty@riseup.net>
Date: Tue, 19 Dec 2023 17:07:59 +0000
Subject: [PATCH 15/15] Test that removing tag results in an api request
 (#2471)

---
 .../e2e/integration/apps/checklistsForm.cy.js | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js b/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
index 1875c438b9..1798f5d6d3 100644
--- a/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
+++ b/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
@@ -109,4 +109,27 @@ describe('Checklists App Form', () => {
       cy.wait(['@upsertChecklist']);
     });
   });
+
+  maybeIt('Should trigger GraphQL update on removing tag', () => {
+    withLogin(({ user }) => {
+      interceptFindChecklist({
+        ...defaultChecklist,
+        owner_id: user.userId,
+        tags_goals: ['GMF:Known AI Goal:Code Generation'],
+      });
+      interceptUpsertChecklist({});
+
+      cy.visit(url);
+
+      cy.get('[option="GMF:Known AI Goal:Code Generation"] .close').click();
+
+      cy.wait(['@upsertChecklist']).then((xhr) => {
+        expect(xhr.request.body.variables.checklist).to.deep.nested.include({
+          tags_goals: [],
+        });
+      });
+
+      cy.visit(url);
+    });
+  });
 });