Merge branch 'preview' of https://github.com/makeplane/plane into preview

chore: only admin can changed the project settings (#5766 )
[WEB-2605] fix: update URL regex pattern to allow complex links. (#5767 )
2024-10-10 14:21:16 +05:30 · 2024-10-10 14:06:14 +05:30 · 2024-10-10 14:06:14 +05:30 · 2024-10-10 14:06:14 +05:30 · 2024-10-10 14:06:14 +05:30 · 2024-10-10 14:06:14 +05:30
7 changed files with 100 additions and 17 deletions
@@ -285,7 +285,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                )

        # Only project admins and members can edit inbox issue attributes
-        if project_member.role > 5:
+        if project_member.role > 15:
            serializer = InboxIssueSerializer(
                inbox_issue, data=request.data, partial=True
            )
@@ -323,7 +323,7 @@ class InboxIssueViewSet(BaseViewSet):
                serializer.errors, status=status.HTTP_400_BAD_REQUEST
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=Issue)
    def partial_update(self, request, slug, project_id, pk):
        inbox_id = Inbox.objects.filter(
            workspace__slug=slug, project_id=project_id
@@ -418,7 +418,7 @@ class InboxIssueViewSet(BaseViewSet):
                )

        # Only project admins and members can edit inbox issue attributes
-        if project_member.role > 5:
+        if project_member.role > 15:
            serializer = InboxIssueSerializer(
                inbox_issue, data=request.data, partial=True
            )
@@ -1,7 +1,7 @@
 # base requirements

 # django
-Django==4.2.15
+Django==4.2.16
 # rest framework
 djangorestframework==3.15.2
 # postgres 
@@ -89,6 +89,12 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
  const canDelete =
    allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId) ||
    issue?.created_by === currentUser?.id;
+  const isProjectAdmin = allowPermissions(
+    [EUserPermissions.ADMIN],
+    EUserPermissionsLevel.PROJECT,
+    workspaceSlug,
+    projectId
+  );
  const isAcceptedOrDeclined = inboxIssue?.status ? [-1, 1, 2].includes(inboxIssue.status) : undefined;
  // days left for snooze
  const numberOfDaysLeft = findHowManyDaysLeft(inboxIssue?.snoozed_till);
@@ -199,6 +205,17 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
    [handleInboxIssueNavigation]
  );

+  const handleActionWithPermission = (isAdmin: boolean, action: () => void, errorMessage: string) => {
+    if (isAdmin) action();
+    else {
+      setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Permission denied",
+        message: errorMessage,
+      });
+    }
+  };
+
  useEffect(() => {
    if (!isNotificationEmbed) document.addEventListener("keydown", onKeyDown);
    return () => {
@@ -293,7 +310,13 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
                  size="sm"
                  prependIcon={<CircleCheck className="w-3 h-3" />}
                  className="text-green-500 border-0.5 border-green-500 bg-green-500/20 focus:bg-green-500/20 focus:text-green-500 hover:bg-green-500/40 bg-opacity-20"
-                  onClick={() => setAcceptIssueModal(true)}
+                  onClick={() =>
+                    handleActionWithPermission(
+                      isProjectAdmin,
+                      () => setAcceptIssueModal(true),
+                      "Only project admins can accept issues"
+                    )
+                  }
                >
                  Accept
                </Button>
@@ -307,7 +330,13 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
                  size="sm"
                  prependIcon={<CircleX className="w-3 h-3" />}
                  className="text-red-500 border-0.5 border-red-500 bg-red-500/20 focus:bg-red-500/20 focus:text-red-500 hover:bg-red-500/40 bg-opacity-20"
-                  onClick={() => setDeclineIssueModal(true)}
+                  onClick={() =>
+                    handleActionWithPermission(
+                      isProjectAdmin,
+                      () => setDeclineIssueModal(true),
+                      "Only project admins can deny issues"
+                    )
+                  }
                >
                  Decline
                </Button>
@@ -341,7 +370,15 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
                {isAllowed && (
                  <CustomMenu verticalEllipsis placement="bottom-start">
                    {canMarkAsAccepted && (
-                      <CustomMenu.MenuItem onClick={handleIssueSnoozeAction}>
+                      <CustomMenu.MenuItem
+                        onClick={() =>
+                          handleActionWithPermission(
+                            isProjectAdmin,
+                            handleIssueSnoozeAction,
+                            "Only project admins can snooze/Un-snooze issues"
+                          )
+                        }
+                      >
                        <div className="flex items-center gap-2">
                          <Clock size={14} strokeWidth={2} />
                          {inboxIssue?.snoozed_till && numberOfDaysLeft && numberOfDaysLeft > 0
@@ -351,7 +388,15 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
                      </CustomMenu.MenuItem>
                    )}
                    {canMarkAsDuplicate && (
-                      <CustomMenu.MenuItem onClick={() => setSelectDuplicateIssue(true)}>
+                      <CustomMenu.MenuItem
+                        onClick={() =>
+                          handleActionWithPermission(
+                            isProjectAdmin,
+                            () => setSelectDuplicateIssue(true),
+                            "Only project admins can mark issues as duplicate"
+                          )
+                        }
+                      >
                        <div className="flex items-center gap-2">
                          <FileStack size={14} strokeWidth={2} />
                          Mark as duplicate
@@ -401,6 +446,8 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
          setIsMobileSidebar={setIsMobileSidebar}
          isNotificationEmbed={isNotificationEmbed}
          embedRemoveCurrentNotification={embedRemoveCurrentNotification}
+          isProjectAdmin={isProjectAdmin}
+          handleActionWithPermission={handleActionWithPermission}
        />
      </div>
    </>
@@ -47,6 +47,8 @@ type Props = {
  setIsMobileSidebar: (value: boolean) => void;
  isNotificationEmbed: boolean;
  embedRemoveCurrentNotification?: () => void;
+  isProjectAdmin: boolean;
+  handleActionWithPermission: (isAdmin: boolean, action: () => void, errorMessage: string) => void;
 };

 export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) => {
@@ -70,6 +72,8 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
    setIsMobileSidebar,
    isNotificationEmbed,
    embedRemoveCurrentNotification,
+    isProjectAdmin,
+    handleActionWithPermission,
  } = props;
  const router = useAppRouter();
  const issue = inboxIssue?.issue;
@@ -139,7 +143,15 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
              </CustomMenu.MenuItem>
            )}
            {canMarkAsAccepted && !isAcceptedOrDeclined && (
-              <CustomMenu.MenuItem onClick={handleIssueSnoozeAction}>
+              <CustomMenu.MenuItem
+                onClick={() =>
+                  handleActionWithPermission(
+                    isProjectAdmin,
+                    handleIssueSnoozeAction,
+                    "Only project admins can snooze/Un-snooze issues"
+                  )
+                }
+              >
                <div className="flex items-center gap-2">
                  <Clock size={14} strokeWidth={2} />
                  {inboxIssue?.snoozed_till && numberOfDaysLeft && numberOfDaysLeft > 0 ? "Un-snooze" : "Snooze"}
@@ -147,7 +159,15 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
              </CustomMenu.MenuItem>
            )}
            {canMarkAsDuplicate && !isAcceptedOrDeclined && (
-              <CustomMenu.MenuItem onClick={() => setSelectDuplicateIssue(true)}>
+              <CustomMenu.MenuItem
+                onClick={() =>
+                  handleActionWithPermission(
+                    isProjectAdmin,
+                    () => setSelectDuplicateIssue(true),
+                    "Only project admins can mark issues as duplicate"
+                  )
+                }
+              >
                <div className="flex items-center gap-2">
                  <FileStack size={14} strokeWidth={2} />
                  Mark as duplicate
@@ -155,7 +175,15 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
              </CustomMenu.MenuItem>
            )}
            {canMarkAsAccepted && (
-              <CustomMenu.MenuItem onClick={() => setAcceptIssueModal(true)}>
+              <CustomMenu.MenuItem
+                onClick={() =>
+                  handleActionWithPermission(
+                    isProjectAdmin,
+                    () => setAcceptIssueModal(true),
+                    "Only project admins can accept issues"
+                  )
+                }
+              >
                <div className="flex items-center gap-2 text-green-500">
                  <CircleCheck size={14} strokeWidth={2} />
                  Accept
@@ -163,7 +191,15 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
              </CustomMenu.MenuItem>
            )}
            {canMarkAsDeclined && (
-              <CustomMenu.MenuItem onClick={() => setDeclineIssueModal(true)}>
+              <CustomMenu.MenuItem
+                onClick={() =>
+                  handleActionWithPermission(
+                    isProjectAdmin,
+                    () => setDeclineIssueModal(true),
+                    "Only project admins can deny issues"
+                  )
+                }
+              >
                <div className="flex items-center gap-2 text-red-500">
                  <CircleX size={14} strokeWidth={2} />
                  Decline
@@ -62,10 +62,10 @@ export const InboxContentRoot: FC<TInboxContentRoot> = observer((props) => {
    }
  );

-  const isEditable = allowPermissions(
-    [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-    EUserPermissionsLevel.PROJECT
-  );
+  const isEditable =
+    allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT) ||
+    inboxIssue.created_by === currentUser?.id;
+
  const isGuest = projectPermissionsByWorkspaceSlugAndProjectId(workspaceSlug, projectId) === EUserPermissions.GUEST;
  const isOwner = inboxIssue?.issue.created_by === currentUser?.id;
  const readOnly = !isOwner && isGuest;
@@ -423,7 +423,7 @@ export class ProjectInboxStore implements IProjectInboxStore {

      if (inboxIssue && issueId) {
        runInAction(() => {
-          set(this.inboxIssues, [issueId], new InboxIssueStore(workspaceSlug, projectId, inboxIssue, this.store));
+          this.createOrUpdateInboxIssue([inboxIssue], workspaceSlug, projectId);
          set(this, "loader", undefined);
        });
        await Promise.all([
Author	SHA1	Message	Date
sharma01ketan	33a5d0a5d3	Merge branch 'preview' of https://github.com/makeplane/plane into preview	2024-10-10 14:21:16 +05:30
Bavisetti Narayan	8a866e440c	chore: only admin can changed the project settings (#5766 )	2024-10-10 14:06:14 +05:30
Prateek Shourya	7495a7d0cb	[WEB-2605] fix: update URL regex pattern to allow complex links. (#5767 )	2024-10-10 14:06:14 +05:30
M. Palanikannan	2b1da96c3f	fix: drag handle scrolling fixed (#5619 ) * fix: drag handle scrolling fixed * fix: closest scrollable parent found and scrolled * fix: removed overflow auto from framerenderer * fix: make dragging dynamic and smoother	2024-10-10 14:06:14 +05:30
Aaryan Khandelwal	daa06f1831	[WEB-2532] fix: custom theme mutation logic (#5685 ) * fix: custom theme mutation logic * chore: update querySelector element	2024-10-10 14:06:14 +05:30
M. Palanikannan	b97fcfb46d	fix: show the full screen toolbar in read only instances as well (#5746 )	2024-10-10 14:06:14 +05:30
M. Palanikannan	852fc9bac1	[WEB-2603] fix: remove validation of roles from the live server (#5761 ) * fix: remove validation of roles from the live server * chore: remove the service * fix: remove all validation of authorization * fix: props updated	2024-10-10 14:06:14 +05:30
Akshita Goyal	55f44e0245	fix: spreadsheet flicker issue (#5769 )	2024-10-10 14:06:14 +05:30
Prateek Shourya	8981e52dcc	[WEB-2601] improvement: add click to copy issue identifier on peek-overview and issue detail page. (#5760 )	2024-10-10 14:06:14 +05:30
Akshita Goyal	d92dbaea72	[WEB-2589] Chore: inbox issue permissions (#5763 ) * chore: changed permission in inbox issue * chore: fixed permissions for intake * fix: refactoring * fix: lint --------- Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>	2024-10-10 14:06:14 +05:30
dependabot[bot]	58f3d0a68c	chore(deps): bump django in /apiserver/requirements (#5781 ) Bumps [django](https://github.com/django/django) from 4.2.15 to 4.2.16. - [Commits](https://github.com/django/django/compare/4.2.15...4.2.16) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-10-10 14:06:14 +05:30
sriram veeraghanta	d97ca68229	Merge pull request #5764 from makeplane/preview release: v0.23.0	2024-10-07 18:54:49 +05:30
sriram veeraghanta	707570ca7a	Merge pull request #5041 from makeplane/preview release: v0.22-dev	2024-07-05 13:28:45 +05:30
sriram veeraghanta	c76af7d7d6	Merge pull request #4688 from makeplane/preview release: v0.21-dev	2024-06-03 18:54:06 +05:30
sriram veeraghanta	1dcea9bcc8	Merge pull request #4569 from makeplane/preview release: v0.20-dev	2024-05-23 19:55:06 +05:30
sriram veeraghanta	da957e06b6	Merge pull request #4349 from makeplane/preview release: v0.19-dev	2024-05-03 20:36:07 +05:30
sriram veeraghanta	a0b9596cb4	Merge pull request #4239 from makeplane/preview chore:version update	2024-04-19 12:01:15 +05:30
sriram veeraghanta	f71e8a3a0f	Merge pull request #4238 from makeplane/preview release: v0.18-dev	2024-04-19 11:56:03 +05:30
sriram veeraghanta	002fb4547b	Merge pull request #4107 from makeplane/preview release: v0.17-dev	2024-04-02 20:07:48 +05:30
sriram veeraghanta	c1b1ba35c1	Merge pull request #3878 from makeplane/preview release: v0.16-dev	2024-03-05 20:04:08 +05:30
sriram veeraghanta	4566d6e80c	Merge pull request #3697 from makeplane/preview release: 0.15.4-dev	2024-02-19 19:30:06 +05:30
sriram veeraghanta	e8d359e625	Merge pull request #3674 from makeplane/preview fix: build branch docker images push on release	2024-02-15 14:35:32 +05:30
sriram veeraghanta	351eba8d61	Merge pull request #3671 from makeplane/preview release: peek overview issue description initial load bug (#3670)	2024-02-15 03:25:30 +05:30
sriram veeraghanta	1e27e37b51	Merge pull request #3666 from makeplane/preview release: v0.15.2-dev	2024-02-14 19:41:55 +05:30
sriram veeraghanta	7df2e9cf11	Merge pull request #3632 from makeplane/preview release: v0.15.1-dev	2024-02-12 20:59:56 +05:30
sriram veeraghanta	c6e3f1b932	Merge pull request #3535 from makeplane/preview release: 0.15-dev	2024-02-01 15:01:49 +05:30