Merge branch 'refactor/mobx-store' of https://github.com/makeplane/plane into refactor/mobx-store

This commit is contained in:
Aaryan Khandelwal 2023-12-15 17:01:44 +05:30
commit 78bc9f615f
5 changed files with 9 additions and 17 deletions

View File

@ -282,9 +282,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
return Response(data, status=status.HTTP_200_OK) return Response(data, status=status.HTTP_200_OK)
cycles = CycleSerializer(queryset, many=True, fields=fields if fields else None).data cycles = CycleSerializer(queryset, many=True).data
cycle_dict = {str(cycle["id"]): cycle for cycle in cycles} return Response(cycles, status=status.HTTP_200_OK)
return Response(cycle_dict, status=status.HTTP_200_OK)
def create(self, request, slug, project_id): def create(self, request, slug, project_id):
if ( if (

View File

@ -157,8 +157,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
queryset = self.get_queryset() queryset = self.get_queryset()
fields = [field for field in request.GET.get("fields", "").split(",") if field] fields = [field for field in request.GET.get("fields", "").split(",") if field]
modules = ModuleSerializer(queryset, many=True, fields=fields if fields else None).data modules = ModuleSerializer(queryset, many=True, fields=fields if fields else None).data
modules_dict = {str(module["id"]): module for module in modules} return Response(modules, status=status.HTTP_200_OK)
return Response(modules_dict, status=status.HTTP_200_OK)
def retrieve(self, request, slug, project_id, pk): def retrieve(self, request, slug, project_id, pk):
queryset = self.get_queryset().get(pk=pk) queryset = self.get_queryset().get(pk=pk)

View File

@ -157,10 +157,8 @@ class PageViewSet(BaseViewSet):
def list(self, request, slug, project_id): def list(self, request, slug, project_id):
queryset = self.get_queryset().filter(archived_at__isnull=True) queryset = self.get_queryset().filter(archived_at__isnull=True)
fields = [field for field in request.GET.get("fields", "").split(",") if field] pages = PageSerializer(queryset, many=True).data
pages = PageSerializer(queryset, many=True, fields=fields if fields else None).data return Response(pages, status=status.HTTP_200_OK)
pages_dict = {str(page["id"]): page for page in pages}
return Response(pages_dict, status=status.HTTP_200_OK)
def archive(self, request, slug, project_id, page_id): def archive(self, request, slug, project_id, page_id):
page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id) page = Page.objects.get(pk=page_id, workspace__slug=slug, project_id=project_id)
@ -206,15 +204,13 @@ class PageViewSet(BaseViewSet):
return Response(status=status.HTTP_204_NO_CONTENT) return Response(status=status.HTTP_204_NO_CONTENT)
def archive_list(self, request, slug, project_id): def archive_list(self, request, slug, project_id):
fields = [field for field in request.GET.get("fields", "").split(",") if field]
pages = Page.objects.filter( pages = Page.objects.filter(
project_id=project_id, project_id=project_id,
workspace__slug=slug, workspace__slug=slug,
).filter(archived_at__isnull=False) ).filter(archived_at__isnull=False)
pages = PageSerializer(pages, many=True, fields=fields if fields else None).data pages = PageSerializer(pages, many=True).data
pages_dict = {str(page["id"]): page for page in pages} return Response(pages, status=status.HTTP_200_OK)
return Response(pages_dict, status=status.HTTP_200_OK)
def destroy(self, request, slug, project_id, pk): def destroy(self, request, slug, project_id, pk):

View File

@ -181,8 +181,7 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
).data, ).data,
) )
projects = ProjectListSerializer(projects, many=True, fields=fields if fields else None).data projects = ProjectListSerializer(projects, many=True, fields=fields if fields else None).data
project_dict = {str(project["id"]): project for project in projects} return Response(projects, status=status.HTTP_200_OK)
return Response(project_dict, status=status.HTTP_200_OK)
def create(self, request, slug): def create(self, request, slug):

View File

@ -218,8 +218,7 @@ class IssueViewViewSet(BaseViewSet):
queryset = self.get_queryset() queryset = self.get_queryset()
fields = [field for field in request.GET.get("fields", "").split(",") if field] fields = [field for field in request.GET.get("fields", "").split(",") if field]
views = IssueViewSerializer(queryset, many=True, fields=fields if fields else None).data views = IssueViewSerializer(queryset, many=True, fields=fields if fields else None).data
views_dict = {str(view["id"]): view for view in views} return Response(views, status=status.HTTP_200_OK)
return Response(views_dict, status=status.HTTP_200_OK)
class IssueViewFavoriteViewSet(BaseViewSet): class IssueViewFavoriteViewSet(BaseViewSet):