feat: Version 2

Closes #627, closes #1047
2025-08-05 05:25:29 +02:00 · 2025-05-10 02:09:06 +02:00 · 2025-05-10 02:09:06 +02:00 · 2ee1166747
commit 2ee1166747
parent ad7fb51cfa
1557 changed files with 76832 additions and 47042 deletions
--- a/server/api/helpers/board-memberships/create-one.js
+++ b/server/api/helpers/board-memberships/create-one.js
@ -1,24 +1,16 @@
-const valuesValidator = (value) => {
-  if (!_.isPlainObject(value)) {
-    return false;
-  }
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */

-  if (!_.isPlainObject(value.board)) {
-    return false;
-  }
+const { v4: uuid } = require('uuid');

-  if (!_.isPlainObject(value.user)) {
-    return false;
-  }
-
-  return true;
-};
+const normalizeValues = require('../../../utils/normalize-values');

 module.exports = {
  inputs: {
    values: {
      type: 'ref',
-      custom: valuesValidator,
      required: true,
    },
    project: {
@ -41,21 +33,29 @@ module.exports = {
  async fn(inputs) {
    const { values } = inputs;

-    if (values.role === BoardMembership.Roles.EDITOR) {
-      delete values.canComment;
-    } else if (values.role === BoardMembership.Roles.VIEWER) {
-      if (_.isNil(values.canComment)) {
-        values.canComment = false;
-      }
-    }
+    const normalizedValues = normalizeValues(
+      {
+        ...BoardMembership.SHARED_RULES,
+        ...BoardMembership.RULES_BY_ROLE[values.role],
+      },
+      values,
+    );

-    const boardMembership = await BoardMembership.create({
-      ...values,
-      boardId: values.board.id,
-      userId: values.user.id,
-    })
-      .intercept('E_UNIQUE', 'userAlreadyBoardMember')
-      .fetch();
+    let boardMembership;
+    try {
+      boardMembership = await BoardMembership.qm.createOne({
+        ...normalizedValues,
+        projectId: values.board.projectId,
+        boardId: values.board.id,
+        userId: values.user.id,
+      });
+    } catch (error) {
+      if (error.code === 'E_UNIQUE') {
+        throw 'userAlreadyBoardMember';
+      }
+
+      throw error;
+    }

    sails.sockets.broadcast(
      `user:${boardMembership.userId}`,
@ -66,25 +66,36 @@ module.exports = {
      inputs.request,
    );

-    sails.sockets.broadcast(
-      `board:${boardMembership.boardId}`,
-      'boardMembershipCreate',
-      {
-        item: boardMembership,
-      },
-      inputs.request,
-    );
+    const tempRoom = uuid();
+
+    sails.sockets.addRoomMembersToRooms(`board:${boardMembership.boardId}`, tempRoom, () => {
+      sails.sockets.removeRoomMembersFromRooms(`user:${boardMembership.userId}`, tempRoom, () => {
+        sails.sockets.broadcast(
+          tempRoom,
+          'boardMembershipCreate',
+          {
+            item: boardMembership,
+            included: {
+              users: [sails.helpers.users.presentOne(values.user, {})], // FIXME: hack
+            },
+          },
+          inputs.request,
+        );
+
+        sails.sockets.removeRoomMembersFromRooms(tempRoom, tempRoom);
+      });
+    });

    sails.helpers.utils.sendWebhooks.with({
      event: 'boardMembershipCreate',
-      data: {
+      buildData: () => ({
        item: boardMembership,
        included: {
-          users: [values.user],
+          users: [sails.helpers.users.presentOne(values.user)],
          projects: [inputs.project],
          boards: [values.board],
        },
-      },
+      }),
      user: inputs.actorUser,
    });

--- a/server/api/helpers/board-memberships/delete-one.js
+++ b/server/api/helpers/board-memberships/delete-one.js
@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
 const { v4: uuid } = require('uuid');

 module.exports = {
@ -6,6 +11,10 @@ module.exports = {
      type: 'ref',
      required: true,
    },
+    user: {
+      type: 'ref',
+      required: true,
+    },
    project: {
      type: 'ref',
      required: true,
@ -24,73 +33,89 @@ module.exports = {
  },

  async fn(inputs) {
+    await BoardSubscription.qm.delete({
+      boardId: inputs.record.boardId,
+      userId: inputs.user.id,
+    });
+
    const cardIds = await sails.helpers.boards.getCardIds(inputs.record.boardId);

-    await CardSubscription.destroy({
+    await CardSubscription.qm.delete({
      cardId: cardIds,
-      userId: inputs.record.userId,
+      userId: inputs.user.id,
    });

-    await CardMembership.destroy({
+    await CardMembership.qm.delete({
      cardId: cardIds,
-      userId: inputs.record.userId,
+      userId: inputs.user.id,
    });

-    const boardMembership = await BoardMembership.destroyOne(inputs.record.id);
+    const taskLists = await TaskList.qm.getByCardIds(cardIds);
+    const taskListIds = sails.helpers.utils.mapRecords(taskLists);
+
+    await Task.qm.update(
+      {
+        taskListId: taskListIds,
+        assigneeUserId: inputs.user.id,
+      },
+      {
+        assigneeUserId: null,
+      },
+    );
+
+    const boardMembership = await BoardMembership.qm.deleteOne(inputs.record.id);

    if (boardMembership) {
-      const notify = (room) => {
-        sails.sockets.broadcast(
-          room,
-          'boardMembershipDelete',
-          {
-            item: boardMembership,
-          },
-          inputs.request,
+      if (inputs.user.role !== User.Roles.ADMIN || inputs.project.ownerProjectManagerId) {
+        const isProjectManager = await sails.helpers.users.isProjectManager(
+          boardMembership.userId,
+          inputs.project.id,
        );
-      };

-      const isProjectManager = await sails.helpers.users.isProjectManager(
-        inputs.record.userId,
-        inputs.project.id,
+        if (!isProjectManager) {
+          sails.sockets.removeRoomMembersFromRooms(
+            `@user:${boardMembership.userId}`,
+            `board:${boardMembership.boardId}`,
+          );
+        }
+      }
+
+      sails.sockets.broadcast(
+        `user:${boardMembership.userId}`,
+        'boardMembershipDelete',
+        {
+          item: boardMembership,
+        },
+        inputs.request,
      );

-      if (!isProjectManager) {
-        sails.sockets.removeRoomMembersFromRooms(
-          `@user:${boardMembership.userId}`,
-          `board:${boardMembership.boardId}`,
-          () => {
-            notify(`board:${boardMembership.boardId}`);
-          },
-        );
-      }
+      const tempRoom = uuid();

-      notify(`user:${boardMembership.userId}`);
-
-      if (isProjectManager) {
-        const tempRoom = uuid();
-
-        sails.sockets.addRoomMembersToRooms(`board:${boardMembership.boardId}`, tempRoom, () => {
-          sails.sockets.removeRoomMembersFromRooms(
-            `user:${boardMembership.userId}`,
+      sails.sockets.addRoomMembersToRooms(`board:${boardMembership.boardId}`, tempRoom, () => {
+        sails.sockets.removeRoomMembersFromRooms(`user:${boardMembership.userId}`, tempRoom, () => {
+          sails.sockets.broadcast(
            tempRoom,
-            () => {
-              notify(tempRoom);
-              sails.sockets.removeRoomMembersFromRooms(tempRoom, tempRoom);
+            'boardMembershipDelete',
+            {
+              item: boardMembership,
            },
+            inputs.request,
          );
+
+          sails.sockets.removeRoomMembersFromRooms(tempRoom, tempRoom);
        });
-      }
+      });

      sails.helpers.utils.sendWebhooks.with({
        event: 'boardMembershipDelete',
-        data: {
+        buildData: () => ({
          item: boardMembership,
          included: {
+            users: [sails.helpers.users.presentOne(inputs.user)],
            projects: [inputs.project],
            boards: [inputs.board],
          },
-        },
+        }),
        user: inputs.actorUser,
      });
    }
--- a/server/api/helpers/board-memberships/get-many.js
+++ b/server/api/helpers/board-memberships/get-many.js
@ -1,14 +0,0 @@
-const criteriaValidator = (value) => _.isArray(value) || _.isPlainObject(value);
-
-module.exports = {
-  inputs: {
-    criteria: {
-      type: 'json',
-      custom: criteriaValidator,
-    },
-  },
-
-  async fn(inputs) {
-    return BoardMembership.find(inputs.criteria).sort('id');
-  },
-};
--- a/server/api/helpers/board-memberships/get-path-to-project-by-id.js
+++ b/server/api/helpers/board-memberships/get-path-to-project-by-id.js
@ -0,0 +1,39 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
+module.exports = {
+  inputs: {
+    id: {
+      type: 'string',
+      required: true,
+    },
+  },
+
+  exits: {
+    pathNotFound: {},
+  },
+
+  async fn(inputs) {
+    const boardMembership = await BoardMembership.qm.getOneById(inputs.id);
+
+    if (!boardMembership) {
+      throw 'pathNotFound';
+    }
+
+    const pathToProject = await sails.helpers.boards
+      .getPathToProjectById(boardMembership.boardId)
+      .intercept('pathNotFound', (nodes) => ({
+        pathNotFound: {
+          boardMembership,
+          ...nodes,
+        },
+      }));
+
+    return {
+      boardMembership,
+      ...pathToProject,
+    };
+  },
+};
--- a/server/api/helpers/board-memberships/get-project-path.js
+++ b/server/api/helpers/board-memberships/get-project-path.js
@ -1,34 +0,0 @@
-module.exports = {
-  inputs: {
-    criteria: {
-      type: 'json',
-      required: true,
-    },
-  },
-
-  exits: {
-    pathNotFound: {},
-  },
-
-  async fn(inputs) {
-    const boardMembership = await BoardMembership.findOne(inputs.criteria);
-
-    if (!boardMembership) {
-      throw 'pathNotFound';
-    }
-
-    const path = await sails.helpers.boards
-      .getProjectPath(boardMembership.boardId)
-      .intercept('pathNotFound', (nodes) => ({
-        pathNotFound: {
-          boardMembership,
-          ...nodes,
-        },
-      }));
-
-    return {
-      boardMembership,
-      ...path,
-    };
-  },
-};
--- a/server/api/helpers/board-memberships/update-one.js
+++ b/server/api/helpers/board-memberships/update-one.js
@ -1,3 +1,12 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
+const { v4: uuid } = require('uuid');
+
+const normalizeValues = require('../../../utils/normalize-values');
+
 module.exports = {
  inputs: {
    record: {
@ -27,25 +36,21 @@ module.exports = {

  async fn(inputs) {
    const { values } = inputs;
-    const role = values.role || inputs.record.role;

-    if (role === BoardMembership.Roles.EDITOR) {
-      values.canComment = null;
-    } else if (role === BoardMembership.Roles.VIEWER) {
-      const canComment = _.isUndefined(values.canComment)
-        ? inputs.record.canComment
-        : values.canComment;
+    const normalizedValues = normalizeValues(
+      {
+        ...BoardMembership.SHARED_RULES,
+        ...BoardMembership.RULES_BY_ROLE[values.role || inputs.record.role],
+      },
+      values,
+      inputs.record,
+    );

-      if (_.isNull(canComment)) {
-        values.canComment = false;
-      }
-    }
-
-    const boardMembership = await BoardMembership.updateOne(inputs.record.id).set({ ...values });
+    const boardMembership = await BoardMembership.qm.updateOne(inputs.record.id, normalizedValues);

    if (boardMembership) {
      sails.sockets.broadcast(
-        `board:${boardMembership.boardId}`,
+        `user:${boardMembership.userId}`,
        'boardMembershipUpdate',
        {
          item: boardMembership,
@ -53,18 +58,35 @@ module.exports = {
        inputs.request,
      );

+      const tempRoom = uuid();
+
+      sails.sockets.addRoomMembersToRooms(`board:${boardMembership.boardId}`, tempRoom, () => {
+        sails.sockets.removeRoomMembersFromRooms(`user:${boardMembership.userId}`, tempRoom, () => {
+          sails.sockets.broadcast(
+            tempRoom,
+            'boardMembershipUpdate',
+            {
+              item: boardMembership,
+            },
+            inputs.request,
+          );
+
+          sails.sockets.removeRoomMembersFromRooms(tempRoom, tempRoom);
+        });
+      });
+
      sails.helpers.utils.sendWebhooks.with({
        event: 'boardMembershipUpdate',
-        data: {
+        buildData: () => ({
          item: boardMembership,
          included: {
            projects: [inputs.project],
            boards: [inputs.board],
          },
-        },
-        prevData: {
+        }),
+        buildPrevData: () => ({
          item: inputs.record,
-        },
+        }),
        user: inputs.actorUser,
      });
    }