fix: merge conflicts

Merge branch 'preview' of github.com:makeplane/plane into feat/power-k-v2

Author: prateekshourya29

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

@@ -367,31 +367,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)/analytics/[tabId]/page.tsx

@@ -6,20 +6,18 @@ import { useRouter } from "next/navigation";
 // plane package imports
 import { EUserPermissions, EUserPermissionsLevel, PROJECT_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { EmptyStateDetailed } from "@plane/propel/empty-state";
 import { Tabs } from "@plane/ui";
 import type { TabItem } from "@plane/ui";
 // components
 import AnalyticsFilterActions from "@/components/analytics/analytics-filter-actions";
 import { PageHead } from "@/components/core/page-title";
-import { ComicBoxButton } from "@/components/empty-state/comic-box-button";
-import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
 // hooks
 import { captureClick } from "@/helpers/event-tracker.helper";
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useProject } from "@/hooks/store/use-project";
 import { useWorkspace } from "@/hooks/store/use-workspace";
 import { useUserPermissions } from "@/hooks/store/user";
-import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 import { getAnalyticsTabs } from "@/plane-web/components/analytics/tabs";
 
 type Props = {
@@ -46,9 +44,6 @@ const AnalyticsPage = observer((props: Props) => {
   const { currentWorkspace } = useWorkspace();
   const { allowPermissions } = useUserPermissions();
 
-  // helper hooks
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/onboarding/analytics" });
-
   // permissions
   const canPerformEmptyStateActions = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
@@ -96,22 +91,20 @@ const AnalyticsPage = observer((props: Props) => {
               />
             </div>
           ) : (
-            <DetailedEmptyState
-              title={t("workspace_analytics.empty_state.general.title")}
-              description={t("workspace_analytics.empty_state.general.description")}
-              assetPath={resolvedPath}
-              customPrimaryButton={
-                <ComicBoxButton
-                  label={t("workspace_analytics.empty_state.general.primary_button.text")}
-                  title={t("workspace_analytics.empty_state.general.primary_button.comic.title")}
-                  description={t("workspace_analytics.empty_state.general.primary_button.comic.description")}
-                  onClick={() => {
+            <EmptyStateDetailed
+              assetKey="project"
+              title={t("workspace_projects.empty_state.no_projects.title")}
+              description={t("workspace_projects.empty_state.no_projects.description")}
+              actions={[
+                {
+                  label: "Create a project",
+                  onClick: () => {
                     toggleCreateProjectModal(true);
                     captureClick({ elementName: PROJECT_TRACKER_ELEMENTS.EMPTY_STATE_CREATE_PROJECT_BUTTON });
-                  }}
-                  disabled={!canPerformEmptyStateActions}
-                />
-              }
+                  },
+                  disabled: !canPerformEmptyStateActions,
+                },
+              ]}
             />
           )}
         </>

apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/webhooks/page.tsx

@@ -8,9 +8,9 @@ import useSWR from "swr";
 import { EUserPermissions, EUserPermissionsLevel, WORKSPACE_SETTINGS_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // components
+import { EmptyStateCompact } from "@plane/propel/empty-state";
 import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
 import { PageHead } from "@/components/core/page-title";
-import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
 import { SettingsContentWrapper } from "@/components/settings/content-wrapper";
 import { SettingsHeading } from "@/components/settings/heading";
 import { WebhookSettingsLoader } from "@/components/ui/loader/settings/web-hook";
@@ -20,7 +20,6 @@ import { captureClick } from "@/helpers/event-tracker.helper";
 import { useWebhook } from "@/hooks/store/use-webhook";
 import { useWorkspace } from "@/hooks/store/use-workspace";
 import { useUserPermissions } from "@/hooks/store/user";
-import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
 const WebhooksListPage = observer(() => {
   // states
@@ -35,7 +34,6 @@ const WebhooksListPage = observer(() => {
   const { currentWorkspace } = useWorkspace();
   // derived values
   const canPerformWorkspaceAdminActions = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.WORKSPACE);
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/workspace-settings/webhooks" });
 
   useSWR(
     workspaceSlug && canPerformWorkspaceAdminActions ? `WEBHOOKS_LIST_${workspaceSlug}` : null,
@@ -90,21 +88,23 @@ const WebhooksListPage = observer(() => {
         ) : (
           <div className="flex h-full w-full flex-col">
             <div className="h-full w-full flex items-center justify-center">
-              <DetailedEmptyState
-                className="!p-0"
-                title=""
-                description=""
-                assetPath={resolvedPath}
-                size="md"
-                primaryButton={{
-                  text: t("workspace_settings.settings.webhooks.add_webhook"),
-                  onClick: () => {
-                    captureClick({
-                      elementName: WORKSPACE_SETTINGS_TRACKER_ELEMENTS.EMPTY_STATE_ADD_WEBHOOK_BUTTON,
-                    });
-                    setShowCreateWebhookModal(true);
+              <EmptyStateCompact
+                assetKey="webhook"
+                title={t("settings.webhooks.title")}
+                description={t("settings.webhooks.description")}
+                actions={[
+                  {
+                    label: t("settings.webhooks.cta_primary"),
+                    onClick: () => {
+                      captureClick({
+                        elementName: WORKSPACE_SETTINGS_TRACKER_ELEMENTS.EMPTY_STATE_ADD_WEBHOOK_BUTTON,
+                      });
+                      setShowCreateWebhookModal(true);
+                    },
                   },
-                }}
+                ]}
+                align="start"
+                rootClassName="py-20"
               />
             </div>
           </div>

apps/web/core/components/cycles/archived-cycles/root.tsx

@@ -4,15 +4,14 @@ import { useParams } from "next/navigation";
 import useSWR from "swr";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { EmptyStateDetailed } from "@plane/propel/empty-state";
 import type { TCycleFilters } from "@plane/types";
 import { calculateTotalFilters } from "@plane/utils";
 // components
-import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
 import { CycleModuleListLayoutLoader } from "@/components/ui/loader/cycle-module-list-loader";
 // hooks
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useCycleFilter } from "@/hooks/store/use-cycle-filter";
-import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 // local imports
 import { CycleAppliedFiltersList } from "../applied-filters";
 import { ArchivedCyclesView } from "./view";
@@ -28,7 +27,6 @@ export const ArchivedCycleLayoutRoot: React.FC = observer(() => {
   const { clearAllFilters, currentProjectArchivedFilters, updateFilters } = useCycleFilter();
   // derived values
   const totalArchivedCycles = currentProjectArchivedCycleIds?.length ?? 0;
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/archived/empty-cycles" });
 
   useSWR(
     workspaceSlug && projectId ? `ARCHIVED_CYCLES_${workspaceSlug.toString()}_${projectId.toString()}` : null,
@@ -69,10 +67,10 @@ export const ArchivedCycleLayoutRoot: React.FC = observer(() => {
       )}
       {totalArchivedCycles === 0 ? (
         <div className="h-full place-items-center">
-          <DetailedEmptyState
-            title={t("project_cycles.empty_state.archived.title")}
-            description={t("project_cycles.empty_state.archived.description")}
-            assetPath={resolvedPath}
+          <EmptyStateDetailed
+            assetKey="archived-cycle"
+            title={t("workspace.archive_cycles.title")}
+            description={t("workspace.archive_cycles.description")}
           />
         </div>
       ) : (

apps/web/core/components/exporter/prev-exports.tsx

@@ -4,15 +4,13 @@ import useSWR, { mutate } from "swr";
 import { MoveLeft, MoveRight, RefreshCw } from "lucide-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { EmptyStateCompact } from "@plane/propel/empty-state";
 import type { IExportData } from "@plane/types";
 import { Table } from "@plane/ui";
 // components
-import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
 import { ImportExportSettingsLoader } from "@/components/ui/loader/settings/import-and-export";
 // constants
 import { EXPORT_SERVICES_LIST } from "@/constants/fetch-keys";
-// hooks
-import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 // services
 import { IntegrationService } from "@/services/integrations";
 // local imports
@@ -35,7 +33,6 @@ export const PrevExports = observer((props: Props) => {
   // hooks
   const { t } = useTranslation();
   const columns = useExportColumns();
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/workspace-settings/exports" });
 
   const { data: exporterServices } = useSWR(
     workspaceSlug && cursor ? EXPORT_SERVICES_LIST(workspaceSlug as string, cursor, `${per_page}`) : null,
@@ -125,12 +122,12 @@ export const PrevExports = observer((props: Props) => {
             </div>
           ) : (
             <div className="flex h-full w-full items-center justify-center">
-              <DetailedEmptyState
-                title={t("workspace_settings.empty_state.exports.title")}
-                description={t("workspace_settings.empty_state.exports.description")}
-                assetPath={resolvedPath}
-                className="w-full !px-0"
-                size="sm"
+              <EmptyStateCompact
+                assetKey="export"
+                title={t("settings.exports.title")}
+                description={t("settings.exports.description")}
+                align="start"
+                rootClassName="py-20"
               />
             </div>
           )

apps/web/core/components/inbox/sidebar/root.tsx

@@ -137,8 +137,8 @@ export const InboxSidebar: FC<IInboxSidebarProps> = observer((props) => {
                 {getAppliedFiltersCount > 0 ? (
                   <EmptyStateDetailed
                     assetKey="search"
-                    title={t("common.search.title")}
-                    description={t("common.search.description")}
+                    title={t("common_empty_state.search.title")}
+                    description={t("common_empty_state.search.description")}
                     assetClassName="size-20"
                   />
                 ) : currentTab === EInboxIssueCurrentTab.OPEN ? (
@@ -162,6 +162,7 @@ export const InboxSidebar: FC<IInboxSidebarProps> = observer((props) => {
                     title="No request closed yet"
                     description="All the work items whether accepted or declined can be found here."
                     assetClassName="size-20"
+                    className="px-10"
                   />
                 )}
               </div>