Multi-select and bulk actions on the events list

Author: Dobrunia

jest.config.js

@@ -37,6 +37,10 @@ module.exports = {
   moduleNameMapper: {
     '^node:crypto$': '<rootDir>/test/__mocks__/node_crypto.js',
     '^node:util$': '<rootDir>/test/__mocks__/node_util.js',
+    /**
+     * demoWorkspace is TypeScript; CommonJS resolvers use require() without extension
+     */
+    '^.+/constants/demoWorkspace$': '<rootDir>/src/constants/demoWorkspace.ts',
   },
 
   /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.4.12",
+  "version": "1.5.0",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {

src/constants/demoWorkspace.ts

@@ -0,0 +1,5 @@
+/**
+ * Mongo ObjectId string of the public "Join Demo Workspace" (Garage landing).
+ * Keep in sync with operations that seed demo data in Mongo.
+ */
+export const DEMO_WORKSPACE_ID = '6213b6a01e6281087467cc7a';

src/integrations/github/routes.ts

@@ -11,6 +11,7 @@ import ProjectModel from '../../models/project';
 import WorkspaceModel from '../../models/workspace';
 import { sgr, Effect } from '../../utils/ansi';
 import { databases } from '../../mongo';
+import { DEMO_WORKSPACE_ID } from '../../constants/demoWorkspace';
 
 /**
  * Default task threshold for automatic task creation
@@ -108,7 +109,7 @@ export function createGitHubRouter(factories: ContextFactories): express.Router
     /**
      * Check if project is demo project (cannot be modified)
      */
-    if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+    if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
       res.status(400).json({ error: 'Unable to update demo project' });
 
       return null;

src/models/eventsFactory.js

@@ -918,6 +918,100 @@ class EventsFactory extends Factory {
     return collection.updateOne(query, update);
   }
 
+  /**
+   * Max original event ids per bulkToggleEventMark request
+   */
+  static get BULK_TOGGLE_EVENT_MARK_MAX() {
+    return 100;
+  }
+
+  /**
+   * Bulk mark for resolved / ignored (not the same as per-event toggleEventMark).
+   * - If every found event already has the mark: remove it from all (bulk "undo").
+   * - Otherwise: set the mark on every found event that does not have it yet (never remove
+   *   from a subset when the selection is mixed).
+   * Only 'resolved' and 'ignored' are allowed for bulk.
+   *
+   * @param {string[]} eventIds - original event ids
+   * @param {string} mark - 'resolved' | 'ignored'
+   * @returns {Promise<{ updatedCount: number, failedEventIds: string[] }>}
+   */
+  async bulkToggleEventMark(eventIds, mark) {
+    if (mark !== 'resolved' && mark !== 'ignored') {
+      throw new Error(`bulkToggleEventMark: mark must be resolved or ignored, got ${mark}`);
+    }
+
+    const max = EventsFactory.BULK_TOGGLE_EVENT_MARK_MAX;
+    const unique = [ ...new Set((eventIds || []).map(id => String(id))) ];
+
+    if (unique.length > max) {
+      throw new Error(`bulkToggleEventMark: at most ${max} event ids allowed`);
+    }
+
+    const failedEventIds = [];
+    const validObjectIds = [];
+
+    for (const id of unique) {
+      if (!ObjectId.isValid(id)) {
+        failedEventIds.push(id);
+      } else {
+        validObjectIds.push(new ObjectId(id));
+      }
+    }
+
+    if (validObjectIds.length === 0) {
+      return { updatedCount: 0, failedEventIds };
+    }
+
+    const collection = this.getCollection(this.TYPES.EVENTS);
+    const found = await collection.find({ _id: { $in: validObjectIds } }).toArray();
+    const foundByIdStr = new Map(found.map(doc => [ doc._id.toString(), doc ]));
+
+    for (const oid of validObjectIds) {
+      const idStr = oid.toString();
+
+      if (!foundByIdStr.has(idStr)) {
+        failedEventIds.push(idStr);
+      }
+    }
+
+    const nowSec = Math.floor(Date.now() / 1000);
+    const markKey = `marks.${mark}`;
+    const allHaveMark = found.length > 0 && found.every(doc => doc.marks && doc.marks[mark]);
+    const ops = [];
+
+    for (const doc of found) {
+      const hasMark = doc.marks && doc.marks[mark];
+      let update;
+
+      if (allHaveMark) {
+        update = { $unset: { [markKey]: '' } };
+      } else if (!hasMark) {
+        update = { $set: { [markKey]: nowSec } };
+      } else {
+        continue;
+      }
+
+      ops.push({
+        updateOne: {
+          filter: { _id: doc._id },
+          update,
+        },
+      });
+    }
+
+    if (ops.length === 0) {
+      return { updatedCount: 0, failedEventIds };
+    }
+
+    const bulkResult = await collection.bulkWrite(ops, { ordered: false });
+
+    return {
+      updatedCount: bulkResult.modifiedCount + bulkResult.upsertedCount,
+      failedEventIds,
+    };
+  }
+
   /**
    * Remove all project events
    *

src/resolvers/event.js

@@ -1,6 +1,8 @@
 const getEventsFactory = require('./helpers/eventsFactory').default;
 const sendPersonalNotification = require('../utils/personalNotifications').default;
 const { aiService } = require('../services/ai');
+const { DEMO_WORKSPACE_ID } = require('../constants/demoWorkspace');
+const { UserInputError } = require('apollo-server-express');
 
 /**
  * See all types and fields here {@see ../typeDefs/event.graphql}
@@ -48,7 +50,7 @@ module.exports = {
        */
       const project = await factories.projectsFactory.findById(projectId);
 
-      if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+      if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
         return [ await factories.usersFactory.findById(user.id) ];
       }
 
@@ -153,6 +155,39 @@ module.exports = {
       return !!result.acknowledged;
     },
 
+    /**
+     * Bulk set resolved/ignored: always set mark on events that lack it, unless all selected
+     * already have the mark — then remove from all.
+     *
+     * @param {ResolverObj} _obj - resolver context
+     * @param {string} projectId - project id
+     * @param {string[]} eventIds - original event ids
+     * @param {string} mark - EventMark enum value
+     * @param {object} context - gql context
+     * @return {Promise<{ updatedCount: number, failedEventIds: string[] }>}
+     */
+    async bulkToggleEventMarks(_obj, { projectId, eventIds, mark }, context) {
+      if (mark !== 'resolved' && mark !== 'ignored') {
+        throw new UserInputError('bulkToggleEventMarks supports only resolved and ignored marks');
+      }
+
+      if (!eventIds || !eventIds.length) {
+        throw new UserInputError('eventIds must contain at least one id');
+      }
+
+      const factory = getEventsFactory(context, projectId);
+
+      try {
+        return await factory.bulkToggleEventMark(eventIds, mark);
+      } catch (err) {
+        if (err.message && err.message.includes('bulkToggleEventMark: at most')) {
+          throw new UserInputError(err.message);
+        }
+
+        throw err;
+      }
+    },
+
     /**
      * Mutations namespace
      *

src/resolvers/project.js

@@ -1,5 +1,6 @@
 import { ReceiveTypes } from '@hawk.so/types';
 import * as telegram from '../utils/telegram';
+import { DEMO_WORKSPACE_ID } from '../constants/demoWorkspace';
 const mongo = require('../mongo');
 const { ObjectId } = require('mongodb');
 const { ApolloError, UserInputError } = require('apollo-server-express');
@@ -253,7 +254,7 @@ module.exports = {
         throw new ApolloError('There is no project with that id');
       }
 
-      if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+      if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
         throw new ApolloError('Unable to update demo project');
       }
 
@@ -291,7 +292,7 @@ module.exports = {
         throw new ApolloError('There is no project with that id');
       }
 
-      if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+      if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
         throw new ApolloError('Unable to update demo project');
       }
 
@@ -399,7 +400,7 @@ module.exports = {
         throw new ApolloError('There is no project with that id');
       }
 
-      if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+      if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
         throw new ApolloError('Unable to remove demo project');
       }
 
@@ -458,7 +459,7 @@ module.exports = {
         throw new ApolloError('There is no project with that id');
       }
 
-      if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+      if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
         throw new ApolloError('Unable to update demo project');
       }
 
@@ -509,7 +510,7 @@ module.exports = {
         throw new ApolloError('There is no project with that id');
       }
 
-      if (project.workspaceId.toString() === '6213b6a01e6281087467cc7a') {
+      if (project.workspaceId.toString() === DEMO_WORKSPACE_ID) {
         throw new ApolloError('Unable to update demo project');
       }
 

src/resolvers/workspace.js

@@ -10,6 +10,7 @@ import Validator from '../utils/validator';
 import { dateFromObjectId } from '../utils/dates';
 import cloudPaymentsApi from '../utils/cloudPaymentsApi';
 import { publish } from '../rabbitmq';
+import { DEMO_WORKSPACE_ID } from '../constants/demoWorkspace';
 
 const { ApolloError, UserInputError, ForbiddenError } = require('apollo-server-express');
 const crypto = require('crypto');
@@ -551,7 +552,7 @@ module.exports = {
       /**
        * Crutch for Demo Workspace
        */
-      if (workspaceData._id.toString() === '6213b6a01e6281087467cc7a') {
+      if (workspaceData._id.toString() === DEMO_WORKSPACE_ID) {
         return [
           {
             _id: user.id,

src/typeDefs/event.ts

@@ -452,6 +452,21 @@ type RemoveAssigneeResponse {
   success: Boolean!
 }
 
+"""
+Result of bulk toggling event marks (resolve / ignore)
+"""
+type BulkToggleEventMarksResult {
+  """
+  Number of events updated in the database
+  """
+  updatedCount: Int!
+
+  """
+  Event ids that were not updated (invalid id or not found)
+  """
+  failedEventIds: [ID!]!
+}
+
 type EventsMutations {
   """
   Set an assignee for the selected event
@@ -504,6 +519,28 @@ extend type Mutation {
     mark: EventMark!
   ): Boolean!
 
+  """
+  Toggle the same mark on many original events at once (only resolved or ignored).
+  Same toggle semantics as toggleEventMark per event.
+  """
+  bulkToggleEventMarks(
+    """
+    Project id
+    """
+    projectId: ID!
+
+    """
+    Original event ids (grouped event keys in Hawk)
+    """
+    eventIds: [ID!]!
+
+    """
+    Mark (resolved or ignored only): if every selected event already has it, clear it for all;
+    otherwise set it on every selected event that does not have it yet.
+    """
+    mark: EventMark!
+  ): BulkToggleEventMarksResult! @requireUserInWorkspace
+
   """
   Namespace that contains only mutations related to the events
   """

test/integrations/github-routes.test.ts

@@ -3,6 +3,7 @@ import { ObjectId } from 'mongodb';
 import express from 'express';
 import { createGitHubRouter } from '../../src/integrations/github/routes';
 import { ContextFactories } from '../../src/types/graphql';
+import { DEMO_WORKSPACE_ID } from '../../src/constants/demoWorkspace';
 
 /**
  * Mock GitHubService
@@ -32,8 +33,6 @@ jest.mock('../../src/integrations/github/store/install-state.redis.store', () =>
   })),
 }));
 
-const DEMO_WORKSPACE_ID = '6213b6a01e6281087467cc7a';
-
 function createMockProject(options: {
   projectId?: string;
   workspaceId?: string;