From 09a0f6db0cd5faf3d2eed27fb5297a121fad80cd Mon Sep 17 00:00:00 2001
From: sriram veeraghanta <veeraghanta.sriram@gmail.com>
Date: Mon, 13 Jan 2025 16:23:39 +0530
Subject: [PATCH] fix: home widget reorder fix

---
 apiserver/plane/app/serializers/workspace.py             | 2 +-
 apiserver/plane/app/urls/workspace.py                    | 6 +++---
 apiserver/plane/app/views/__init__.py                    | 3 ++-
 .../plane/app/views/workspace/{preference.py => home.py} | 9 ++-------
 web/app/[workspaceSlug]/(projects)/page.tsx              | 4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)
 rename apiserver/plane/app/views/workspace/{preference.py => home.py} (95%)

diff --git a/apiserver/plane/app/serializers/workspace.py b/apiserver/plane/app/serializers/workspace.py
index 08515bd20d5..5d8e5a4d5e3 100644
--- a/apiserver/plane/app/serializers/workspace.py
+++ b/apiserver/plane/app/serializers/workspace.py
@@ -249,7 +249,7 @@ class WorkspaceHomePreferenceSerializer(BaseSerializer):
     class Meta:
         model = WorkspaceHomePreference
         fields = ["key", "is_enabled", "sort_order"]
-        read_only_fields = ["worspace", "created_by", "update_by"]
+        read_only_fields = ["workspace", "created_by", "updated_by"]
 
 
 class StickySerializer(BaseSerializer):
diff --git a/apiserver/plane/app/urls/workspace.py b/apiserver/plane/app/urls/workspace.py
index cb0a026d19a..90fdf64c272 100644
--- a/apiserver/plane/app/urls/workspace.py
+++ b/apiserver/plane/app/urls/workspace.py
@@ -29,7 +29,7 @@
     WorkspaceDraftIssueViewSet,
     QuickLinkViewSet,
     UserRecentVisitViewSet,
-    WorkspacePreferenceViewSet,
+    WorkspaceHomePreferenceViewSet,
     WorkspaceStickyViewSet,
 )
 
@@ -233,12 +233,12 @@
     # Widgets
     path(
         "workspaces/<str:slug>/home-preferences/",
-        WorkspacePreferenceViewSet.as_view(),
+        WorkspaceHomePreferenceViewSet.as_view(),
         name="workspace-home-preference",
     ),
     path(
         "workspaces/<str:slug>/home-preferences/<str:key>/",
-        WorkspacePreferenceViewSet.as_view(),
+        WorkspaceHomePreferenceViewSet.as_view(),
         name="workspace-home-preference",
     ),
     path(
diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.py
index 01dba11a127..5b3cf0b4a51 100644
--- a/apiserver/plane/app/views/__init__.py
+++ b/apiserver/plane/app/views/__init__.py
@@ -41,7 +41,8 @@
 
 from .workspace.draft import WorkspaceDraftIssueViewSet
 
-from .workspace.preference import WorkspacePreferenceViewSet
+from .workspace.home import WorkspaceHomePreferenceViewSet
+
 from .workspace.favorite import (
     WorkspaceFavoriteEndpoint,
     WorkspaceFavoriteGroupEndpoint,
diff --git a/apiserver/plane/app/views/workspace/preference.py b/apiserver/plane/app/views/workspace/home.py
similarity index 95%
rename from apiserver/plane/app/views/workspace/preference.py
rename to apiserver/plane/app/views/workspace/home.py
index e3da9184da2..5ee9b0a39f1 100644
--- a/apiserver/plane/app/views/workspace/preference.py
+++ b/apiserver/plane/app/views/workspace/home.py
@@ -5,17 +5,12 @@
 from plane.db.models import Workspace
 from plane.app.serializers.workspace import WorkspaceHomePreferenceSerializer
 
-# Django imports
-
-from django.db.models import Count
-
-
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
 
 
-class WorkspacePreferenceViewSet(BaseAPIView):
+class WorkspaceHomePreferenceViewSet(BaseAPIView):
     model = WorkspaceHomePreference
 
     def get_serializer_class(self):
@@ -72,7 +67,7 @@ def get(self, request, slug):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
     def patch(self, request, slug, key):
         preference = WorkspaceHomePreference.objects.filter(
-            key=key, workspace__slug=slug
+            key=key, workspace__slug=slug, user=request.user
         ).first()
 
         if preference:
diff --git a/web/app/[workspaceSlug]/(projects)/page.tsx b/web/app/[workspaceSlug]/(projects)/page.tsx
index d684b923e91..52f0faffefb 100644
--- a/web/app/[workspaceSlug]/(projects)/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/page.tsx
@@ -3,7 +3,7 @@
 import { observer } from "mobx-react";
 // components
 import { PageHead, AppHeader, ContentWrapper } from "@/components/core";
-import { WorkspaceDashboardView } from "@/components/page-views";
+import { WorkspaceHomeView } from "@/components/home";
 // hooks
 import { useWorkspace } from "@/hooks/store";
 // local components
@@ -19,7 +19,7 @@ const WorkspaceDashboardPage = observer(() => {
       <AppHeader header={<WorkspaceDashboardHeader />} />
       <ContentWrapper>
         <PageHead title={pageTitle} />
-        <WorkspaceDashboardView />
+        <WorkspaceHomeView />
       </ContentWrapper>
     </>
   );