Merge branch 'preview' of github.com:makeplane/plane into chore-activ…

…ity_filters

README.md

@@ -6,6 +6,7 @@
 </a>
 </p>
 <h1 align="center"><b>Plane</b></h1>
+<p align="center"><b>Open-source project management that unlocks customer value</b></p>
 
 <p align="center">
 <a href="https://discord.com/invite/A92xrEGCge">
@@ -57,7 +58,7 @@ Prefer full control over your data and infrastructure? Install and run Plane on
 | Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://developers.plane.so/self-hosting/methods/docker-compose)         |
 | Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://developers.plane.so/self-hosting/methods/kubernetes) |
 
-`Instance admins` can manage and customize settings using [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
+`Instance admins` can configure instance settings with [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
 
 ## 🌟 Features
 
@@ -117,9 +118,9 @@ Setting up your local environment is simple and straightforward. Follow these st
 
 That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
 
-## Built with
-[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)<br/>
-[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)<br/>
+## ⚙️ Built with
+[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)
+[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)
 [![Node JS](https://img.shields.io/badge/node.js-339933?style=for-the-badge&logo=Node.js&logoColor=white)](https://nodejs.org/en)
 
 ## 📸 Screenshots

apiserver/plane/app/views/search/base.py

@@ -277,28 +277,14 @@ def get(self, request, slug):
                         for field in fields:
                             q |= Q(**{f"{field}__icontains": query})
 
-                    base_filters = Q(
-                        q,
-                        is_active=True,
-                        workspace__slug=slug,
-                        member__is_bot=False,
-                        project_id=project_id,
-                        role__gt=10,
-                    )
-                    if issue_id:
-                        issue_created_by = (
-                            Issue.objects.filter(id=issue_id)
-                            .values_list("created_by_id", flat=True)
-                            .first()
-                        )
-                        # Add condition to include `issue_created_by` in the query
-                        filters = Q(member_id=issue_created_by) | base_filters
-                    else:
-                        filters = base_filters
-
-                    # Query to fetch users
                     users = (
-                        ProjectMember.objects.filter(filters)
+                        ProjectMember.objects.filter(
+                            q,
+                            is_active=True,
+                            workspace__slug=slug,
+                            member__is_bot=False,
+                            project_id=project_id,
+                        )
                         .annotate(
                             member__avatar_url=Case(
                                 When(
@@ -318,14 +304,35 @@ def get(self, request, slug):
                             )
                         )
                         .order_by("-created_at")
-                        .values(
-                            "member__avatar_url",
-                            "member__display_name",
-                            "member__id",
-                        )[:count]
                     )
 
-                    response_data["user_mention"] = list(users)
+                    if issue_id:
+                        issue_created_by = (
+                            Issue.objects.filter(id=issue_id)
+                            .values_list("created_by_id", flat=True)
+                            .first()
+                        )
+                        users = (
+                            users.filter(Q(role__gt=10) | Q(member_id=issue_created_by))
+                            .distinct()
+                            .values(
+                                "member__avatar_url",
+                                "member__display_name",
+                                "member__id",
+                            )
+                        )
+                    else:
+                        users = (
+                            users.filter(Q(role__gt=10))
+                            .distinct()
+                            .values(
+                                "member__avatar_url",
+                                "member__display_name",
+                                "member__id",
+                            )
+                        )
+
+                    response_data["user_mention"] = list(users[:count])
 
                 elif query_type == "project":
                     fields = ["name", "identifier"]

packages/constants/src/event.ts

@@ -0,0 +1 @@
+export const SIDEBAR_CLICKED = "Sidenav clicked";

packages/constants/src/index.ts

@@ -1,6 +1,7 @@
 export * from "./ai";
 export * from "./auth";
 export * from "./endpoints";
+export * from "./event";
 export * from "./file";
 export * from "./instance";
 export * from "./issue";

packages/constants/src/user.ts

@@ -19,3 +19,20 @@ export type TUserStatus = {
   status: EUserStatus | undefined;
   message?: string;
 };
+
+export enum EUserPermissionsLevel {
+  WORKSPACE = "WORKSPACE",
+  PROJECT = "PROJECT",
+}
+
+export enum EUserWorkspaceRoles {
+  ADMIN = 20,
+  MEMBER = 15,
+  GUEST = 5,
+}
+
+export enum EUserProjectRoles {
+  ADMIN = 20,
+  MEMBER = 15,
+  GUEST = 5,
+}

packages/hooks/src/index.ts

@@ -1,2 +1,3 @@
 export * from "./use-local-storage";
 export * from "./use-outside-click-detector";
+export * from "./use-platform-os";

packages/hooks/src/use-platform-os.tsx

@@ -0,0 +1,34 @@
+import { useState, useEffect } from "react";
+
+export const usePlatformOS = () => {
+  const [platformData, setPlatformData] = useState({
+    isMobile: false,
+    platform: "",
+  });
+
+  useEffect(() => {
+    const detectPlatform = () => {
+      const userAgent = window.navigator.userAgent;
+      const isMobile = /iPhone|iPad|iPod|Android/i.test(userAgent);
+      let platform = "";
+
+      if (!isMobile) {
+        if (userAgent.indexOf("Win") !== -1) {
+          platform = "Windows";
+        } else if (userAgent.indexOf("Mac") !== -1) {
+          platform = "MacOS";
+        } else if (userAgent.indexOf("Linux") !== -1) {
+          platform = "Linux";
+        } else {
+          platform = "Unknown";
+        }
+      }
+
+      setPlatformData({ isMobile, platform });
+    };
+
+    detectPlatform();
+  }, []);
+
+  return platformData;
+};

packages/i18n/src/locales/en/translations.json

@@ -43,6 +43,7 @@
   "activity": "Activity",
   "appearance": "Appearance",
   "notifications": "Notifications",
+  "inbox": "Inbox",
   "workspaces": "Workspaces",
   "create_workspace": "Create workspace",
   "invitations": "Invitations",

packages/i18n/src/locales/es/translations.json

@@ -314,5 +314,6 @@
   "change_parent_issue": "Cambiar problema padre",
   "remove_parent_issue": "Eliminar problema padre",
   "add_parent": "Agregar padre",
-  "loading_members": "Cargando miembros..."
+  "loading_members": "Cargando miembros...",
+  "inbox": "bandeja de entrada"
 }

packages/i18n/src/locales/fr/translations.json

@@ -314,5 +314,6 @@
   "change_parent_issue": "Modifier le problème parent",
   "remove_parent_issue": "Supprimer le problème parent",
   "add_parent": "Ajouter un parent",
-  "loading_members": "Chargement des membres..."
+  "loading_members": "Chargement des membres...",
+  "inbox": "boîte de réception"
 }

packages/i18n/src/locales/ja/translations.json

@@ -314,5 +314,6 @@
   "change_parent_issue": "親問題を変更",
   "remove_parent_issue": "親問題を削除",
   "add_parent": "親問題を追加",
-  "loading_members": "メンバーを読み込んでいます..."
+  "loading_members": "メンバーを読み込んでいます...",
+  "inbox": "受信箱"
 }

packages/types/src/search.d.ts

@@ -74,4 +74,5 @@ export type TSearchEntityRequestPayload = {
   query_type: TSearchEntities[];
   query: string;
   team_id?: string;
+  issue_id?: string;
 };