fix: preview sync merge conflict

Author: anmolsinghbhatia

apps/api/plane/api/serializers/project.py

@@ -1,4 +1,5 @@
 # Third party imports
+import random
 from rest_framework import serializers
 
 # Module imports
@@ -24,6 +25,47 @@ class ProjectCreateSerializer(BaseSerializer):
     and workspace association for new project initialization.
     """
 
+    PROJECT_ICON_DEFAULT_COLORS = [
+        "#95999f",
+        "#6d7b8a",
+        "#5e6ad2",
+        "#02b5ed",
+        "#02b55c",
+        "#f2be02",
+        "#e57a00",
+        "#f38e82",
+    ]
+    PROJECT_ICON_DEFAULT_ICONS = [
+        "home",
+        "apps",
+        "settings",
+        "star",
+        "favorite",
+        "done",
+        "check_circle",
+        "add_task",
+        "create_new_folder",
+        "dataset",
+        "terminal",
+        "key",
+        "rocket",
+        "public",
+        "quiz",
+        "mood",
+        "gavel",
+        "eco",
+        "diamond",
+        "forest",
+        "bolt",
+        "sync",
+        "cached",
+        "library_add",
+        "view_timeline",
+        "view_kanban",
+        "empty_dashboard",
+        "cycle",
+    ]
+
     class Meta:
         model = Project
         fields = [
@@ -44,10 +86,10 @@ class Meta:
             "archive_in",
             "close_in",
             "timezone",
-            "logo_props",
             "external_source",
             "external_id",
             "is_issue_type_enabled",
+            "is_time_tracking_enabled",
         ]
 
         read_only_fields = [
@@ -57,6 +99,7 @@ class Meta:
             "updated_at",
             "created_by",
             "updated_by",
+            "logo_props",
         ]
 
     def validate(self, data):
@@ -86,6 +129,16 @@ def create(self, validated_data):
         if ProjectIdentifier.objects.filter(name=identifier, workspace_id=self.context["workspace_id"]).exists():
             raise serializers.ValidationError(detail="Project Identifier is taken")
 
+        if validated_data.get("logo_props", None) is None:
+            # Generate a random icon and color for the project icon
+            validated_data["logo_props"] = {
+                "in_use": "icon",
+                "icon": {
+                    "name": random.choice(self.PROJECT_ICON_DEFAULT_ICONS),
+                    "color": random.choice(self.PROJECT_ICON_DEFAULT_COLORS),
+                },
+            }
+
         project = Project.objects.create(**validated_data, workspace_id=self.context["workspace_id"])
         return project
 

apps/api/plane/app/views/search/base.py

@@ -294,29 +294,15 @@ def get(self, request, slug):
                         .order_by("-created_at")
                     )
 
-                    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",
-                            )
+                    users = (
+                        users
+                        .distinct()
+                        .values(
+                            "member__avatar_url",
+                            "member__display_name",
+                            "member__id",
                         )
+                    )
 
                     response_data["user_mention"] = list(users[:count])
 

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/[archivedIssueId]/page.tsx

@@ -1,9 +1,12 @@
 "use client";
 
 import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import useSWR from "swr";
 // ui
+import { Banner } from "@plane/propel/banner";
+import { Button } from "@plane/propel/button";
+import { ArchiveIcon } from "@plane/propel/icons";
 import { Loader } from "@plane/ui";
 // components
 import { PageHead } from "@/components/core/page-title";
@@ -16,6 +19,7 @@ import { useProject } from "@/hooks/store/use-project";
 const ArchivedIssueDetailsPage = observer(() => {
   // router
   const { workspaceSlug, projectId, archivedIssueId } = useParams();
+  const router = useRouter();
   // states
   // hooks
   const {
@@ -62,18 +66,35 @@ const ArchivedIssueDetailsPage = observer(() => {
           </div>
         </Loader>
       ) : (
-        <div className="flex h-full overflow-hidden">
-          <div className="h-full w-full space-y-3 divide-y-2 divide-custom-border-200 overflow-y-auto">
-            {workspaceSlug && projectId && archivedIssueId && (
-              <IssueDetailRoot
-                workspaceSlug={workspaceSlug.toString()}
-                projectId={projectId.toString()}
-                issueId={archivedIssueId.toString()}
-                is_archived
-              />
-            )}
+        <>
+          <Banner
+            variant="warning"
+            title="This work item has been archived. Visit the Archives section to restore it."
+            icon={<ArchiveIcon className="size-4" />}
+            action={
+              <Button
+                variant="neutral-primary"
+                size="sm"
+                onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/archives/issues/`)}
+              >
+                Go to archives
+              </Button>
+            }
+            className="border-b border-custom-border-200"
+          />
+          <div className="flex h-full overflow-hidden">
+            <div className="h-full w-full space-y-3 divide-y-2 divide-custom-border-200 overflow-y-auto">
+              {workspaceSlug && projectId && archivedIssueId && (
+                <IssueDetailRoot
+                  workspaceSlug={workspaceSlug.toString()}
+                  projectId={projectId.toString()}
+                  issueId={archivedIssueId.toString()}
+                  is_archived
+                />
+              )}
+            </div>
           </div>
-        </div>
+        </>
       )}
     </>
   );

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/mobile-header.tsx

@@ -1,8 +1,10 @@
 "use client";
 
+import type React from "react";
 import type React from "react";
 import { observer } from "mobx-react";
 // ui
+import type { ISvgIcons } from "@plane/propel/icons";
 import { TimelineLayoutIcon, GridLayoutIcon, ListLayoutIcon } from "@plane/propel/icons";
 // plane package imports
 import type { TCycleLayoutOptions } from "@plane/types";
@@ -13,7 +15,7 @@ import { useProject } from "@/hooks/store/use-project";
 
 const CYCLE_VIEW_LAYOUTS: {
   key: TCycleLayoutOptions;
-  icon: React.FC<React.SVGProps<SVGSVGElement>>;
+  icon: React.FC<ISvgIcons>;
   title: string;
 }[] = [
   {

apps/web/core/components/issues/issue-layouts/properties/labels.tsx

@@ -101,7 +101,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
             fullWidth && "w-full"
           )}
         >
-          <LabelPropertyIcon className="h-3.5 w-3.5" strokeWidth={2} />
+          <LabelPropertyIcon className="h-3.5 w-3.5" />
           {placeholderText}
         </div>
       </Tooltip>

packages/propel/package.json

@@ -28,6 +28,10 @@
       "import": "./dist/avatar/index.mjs",
       "require": "./dist/avatar/index.js"
     },
+    "./banner": {
+      "import": "./dist/banner/index.mjs",
+      "require": "./dist/banner/index.js"
+    },
     "./button": {
       "import": "./dist/button/index.mjs",
       "require": "./dist/button/index.js"