Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: home widget reorder fix (#6386)

sriram veeraghantab5493a31f86b
diff --git a/apiserver/plane/app/serializers/workspace.py b/apiserver/plane/app/serializers/workspace.py
index 08515bd20d..5d8e5a4d5e 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 cb0a026d19..90fdf64c27 100644
--- a/apiserver/plane/app/urls/workspace.py
+++ b/apiserver/plane/app/urls/workspace.py
@@ -29,7 +29,7 @@ from plane.app.views import (
WorkspaceDraftIssueViewSet,
QuickLinkViewSet,
UserRecentVisitViewSet,
- WorkspacePreferenceViewSet,
+ WorkspaceHomePreferenceViewSet,
WorkspaceStickyViewSet,
)
@@ -233,12 +233,12 @@ urlpatterns = [
# 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 01dba11a12..5b3cf0b4a5 100644
--- a/apiserver/plane/app/views/__init__.py
+++ b/apiserver/plane/app/views/__init__.py
@@ -41,7 +41,8 @@ from .workspace.base import (
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 e3da9184da..5ee9b0a39f 100644
--- a/apiserver/plane/app/views/workspace/preference.py
+++ b/apiserver/plane/app/views/workspace/home.py
@@ -5,17 +5,12 @@ from plane.app.permissions import allow_permission, ROLE
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 @@ class WorkspacePreferenceViewSet(BaseAPIView):
@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 d684b923e9..52f0faffef 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>
</>
);